Update to 4.6.20100215.

Feature safe:	yes

1 files changed, 36 insertions, 37 deletions

diff --git a/net/openbgpd/files/patch-bgpd_session.h b/net/openbgpd/files/patch-bgpd_session.h
index b7d84da0b6d2..2d855c2e8b3a 100644
--- a/net/openbgpd/files/patch-bgpd_session.h
+++ b/net/openbgpd/files/patch-bgpd_session.h
@@ -1,32 +1,43 @@
 Index: bgpd/session.h
 ===================================================================
 RCS file: /home/cvs/private/hrs/openbgpd/bgpd/session.h,v
-retrieving revision 1.1.1.1
-retrieving revision 1.1.1.3
-diff -u -p -r1.1.1.1 -r1.1.1.3
---- bgpd/session.h	30 Jun 2009 05:46:15 -0000	1.1.1.1
-+++ bgpd/session.h	22 Oct 2009 14:24:02 -0000	1.1.1.3
+retrieving revision 1.1.1.7
+retrieving revision 1.1.1.8
+diff -u -p -r1.1.1.7 -r1.1.1.8
+--- bgpd/session.h	14 Feb 2010 20:19:57 -0000	1.1.1.7
++++ bgpd/session.h	14 Feb 2010 20:27:06 -0000	1.1.1.8
 @@ -1,4 +1,4 @@
--/*	$OpenBSD: session.h,v 1.98 2008/05/08 09:53:12 henning Exp $ */
-+/*	$OpenBSD: session.h,v 1.101 2009/06/05 20:26:38 claudio Exp $ */
+-/*	$OpenBSD: session.h,v 1.101 2009/06/05 20:26:38 claudio Exp $ */
++/*	$OpenBSD: session.h,v 1.104 2009/12/31 15:34:02 claudio Exp $ */
  
  /*
   * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
-@@ -171,6 +171,7 @@ enum Timer {
- 	Timer_Hold,
- 	Timer_IdleHold,
- 	Timer_IdleHoldReset,
-+	Timer_CarpUndemote,
- 	Timer_Max
+@@ -189,6 +189,7 @@ struct peer {
+ 	struct {
+ 		struct capabilities	ann;
+ 		struct capabilities	peer;
++		struct capabilities	neg;
+ 	}			 capa;
+ 	struct {
+ 		struct bgpd_addr	local_addr;
+@@ -217,7 +218,7 @@ struct peer {
+ 	u_int8_t		 passive;
  };
  
-@@ -227,13 +228,15 @@ struct ctl_timer {
+-struct peer	*peers;
++extern struct peer	*peers;
+ 
+ struct ctl_timer {
+ 	enum Timer	type;
+@@ -226,16 +227,14 @@ struct ctl_timer {
+ 
+ /* session.c */
  void		 session_socket_blockmode(int, enum blockmodes);
- pid_t		 session_main(struct bgpd_config *, struct peer *,
- 		    struct network_head *, struct filter_head *,
--		    struct mrt_head *, int[2], int[2], int[2], int[2]);
-+		    struct mrt_head *, struct rib_names *,
-+		    int[2], int[2], int[2], int[2]);
+-pid_t		 session_main(struct bgpd_config *, struct peer *,
+-		    struct network_head *, struct filter_head *,
+-		    struct mrt_head *, struct rib_names *,
+-		    int[2], int[2], int[2], int[2]);
++pid_t		 session_main(int[2], int[2], int[2], int[2], char *, char *);
  void		 bgp_fsm(struct peer *, enum session_events);
  int		 session_neighbor_rrefresh(struct peer *p);
  struct peer	*getpeerbyaddr(struct bgpd_addr *);
@@ -37,26 +48,14 @@ diff -u -p -r1.1.1.1 -r1.1.1.3
  
  /* log.c */
  char		*log_fmt_peer(const struct peer_config *);
-@@ -254,8 +257,8 @@ void	 prepare_listeners(struct bgpd_conf
+@@ -255,9 +254,7 @@ int	 merge_config(struct bgpd_config *, 
+ void	 prepare_listeners(struct bgpd_config *);
  
  /* rde.c */
- pid_t	 rde_main(struct bgpd_config *, struct peer *, struct network_head *,
--	    struct filter_head *, struct mrt_head *, int[2], int[2], int[2],
--	    int[2], int);
-+	    struct filter_head *, struct mrt_head *, struct rib_names *,
-+	    int[2], int[2], int[2], int[2], int);
+-pid_t	 rde_main(struct bgpd_config *, struct peer *, struct network_head *,
+-	    struct filter_head *, struct mrt_head *, struct rib_names *,
+-	    int[2], int[2], int[2], int[2], int);
++pid_t	 rde_main(int[2], int[2], int[2], int[2], int);
  
  /* control.c */
  int	control_init(int, char *);
-@@ -270,8 +273,9 @@ int	pfkey_remove(struct peer *);
- int	pfkey_init(struct bgpd_sysdep *);
- 
- /* printconf.c */
--void	print_config(struct bgpd_config *, struct network_head *, struct peer *,
--	    struct filter_head *, struct mrt_head *);
-+void	print_config(struct bgpd_config *, struct rib_names *,
-+	    struct network_head *, struct peer *, struct filter_head *,
-+	    struct mrt_head *);
- 
- /* carp.c */
- int	 carp_demote_init(char *, int);