1 files changed, 760 insertions, 302 deletions

diff --git a/net/openbgpd/files/patch-bgpd_session.c b/net/openbgpd/files/patch-bgpd_session.c
index 5b7b15c9f99b..b6659f236a79 100644
--- a/net/openbgpd/files/patch-bgpd_session.c
+++ b/net/openbgpd/files/patch-bgpd_session.c
@@ -1,14 +1,14 @@
 Index: bgpd/session.c
 ===================================================================
 RCS file: /home/cvs/private/hrs/openbgpd/bgpd/session.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.5
-diff -u -p -r1.1.1.1 -r1.5
---- bgpd/session.c	30 Jun 2009 05:46:15 -0000	1.1.1.1
-+++ bgpd/session.c	22 Oct 2009 15:10:02 -0000	1.5
+retrieving revision 1.1.1.8
+retrieving revision 1.7
+diff -u -p -r1.1.1.8 -r1.7
+--- bgpd/session.c	14 Feb 2010 20:19:57 -0000	1.1.1.8
++++ bgpd/session.c	14 Feb 2010 19:53:36 -0000	1.7
 @@ -1,4 +1,4 @@
--/*	$OpenBSD: session.c,v 1.282 2008/06/26 00:01:51 claudio Exp $ */
-+/*	$OpenBSD: session.c,v 1.294 2009/07/24 13:09:29 claudio Exp $ */
+-/*	$OpenBSD: session.c,v 1.293 2009/06/07 05:56:24 eric Exp $ */
++/*	$OpenBSD: session.c,v 1.304 2010/01/05 08:49:57 claudio Exp $ */
  
  /*
   * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -23,57 +23,190 @@ diff -u -p -r1.1.1.1 -r1.5
  void	session_sighdlr(int);
  int	setup_listeners(u_int *);
  void	init_conf(struct bgpd_config *);
-@@ -65,8 +69,7 @@ void	session_accept(int);
+@@ -65,9 +69,8 @@ void	session_accept(int);
  int	session_connect(struct peer *);
  void	session_tcp_established(struct peer *);
  void	session_capa_ann_none(struct peer *);
 -int	session_capa_add(struct peer *, struct buf *, u_int8_t, u_int8_t,
 -	    u_int8_t *);
+-int	session_capa_add_mp(struct buf *, u_int16_t, u_int8_t);
 +int	session_capa_add(struct buf *, u_int8_t, u_int8_t);
- int	session_capa_add_mp(struct buf *, u_int16_t, u_int8_t);
++int	session_capa_add_mp(struct buf *, u_int8_t);
  struct bgp_msg	*session_newmsg(enum msg_type, u_int16_t);
  int	session_sendmsg(struct bgp_msg *, struct peer *);
-@@ -177,8 +180,8 @@ setup_listeners(u_int *la_cnt)
+ void	session_open(struct peer *);
+@@ -75,7 +78,7 @@ void	session_keepalive(struct peer *);
+ void	session_update(u_int32_t, void *, size_t);
+ void	session_notification(struct peer *, u_int8_t, u_int8_t, void *,
+ 	    ssize_t);
+-void	session_rrefresh(struct peer *, u_int16_t, u_int8_t);
++void	session_rrefresh(struct peer *, u_int8_t);
+ int	session_dispatch_msg(struct pollfd *, struct peer *);
+ int	parse_header(struct peer *, u_char *, u_int16_t *, u_int8_t *);
+ int	parse_open(struct peer *);
+@@ -83,22 +86,22 @@ int	parse_update(struct peer *);
+ int	parse_refresh(struct peer *);
+ int	parse_notification(struct peer *);
+ int	parse_capabilities(struct peer *, u_char *, u_int16_t, u_int32_t *);
++int	capa_neg_calc(struct peer *);
+ void	session_dispatch_imsg(struct imsgbuf *, int, u_int *);
+ void	session_up(struct peer *);
+ void	session_down(struct peer *);
+ void	session_demote(struct peer *, int);
+ 
+-int			 la_cmp(struct listen_addr *, struct listen_addr *);
+-struct peer		*getpeerbyip(struct sockaddr *);
+-int			 session_match_mask(struct peer *, struct sockaddr *);
+-struct peer		*getpeerbyid(u_int32_t);
+-static struct sockaddr	*addr2sa(struct bgpd_addr *, u_int16_t);
++int		 la_cmp(struct listen_addr *, struct listen_addr *);
++struct peer	*getpeerbyip(struct sockaddr *);
++int		 session_match_mask(struct peer *, struct bgpd_addr *);
++struct peer	*getpeerbyid(u_int32_t);
+ 
+-struct bgpd_config	*conf, *nconf = NULL;
++struct bgpd_config	*conf, *nconf;
+ struct bgpd_sysdep	 sysdep;
+-struct peer		*npeers;
+-volatile sig_atomic_t	 session_quit = 0;
+-int			 pending_reconf = 0;
++struct peer		*peers, *npeers;
++volatile sig_atomic_t	 session_quit;
++int			 pending_reconf;
+ int			 csock = -1, rcsock = -1;
+ u_int			 peer_cnt;
+ struct imsgbuf		*ibuf_rde;
+@@ -175,10 +178,8 @@ setup_listeners(u_int *la_cnt)
+ }
+ 
  pid_t
- session_main(struct bgpd_config *config, struct peer *cpeers,
-     struct network_head *net_l, struct filter_head *rules,
--    struct mrt_head *m_l, int pipe_m2s[2], int pipe_s2r[2], int pipe_m2r[2],
--    int pipe_s2rctl[2])
-+    struct mrt_head *m_l, struct rib_names *rib_l, int pipe_m2s[2],
-+    int pipe_s2r[2], int pipe_m2r[2], int pipe_s2rctl[2])
+-session_main(struct bgpd_config *config, struct peer *cpeers,
+-    struct network_head *net_l, struct filter_head *rules,
+-    struct mrt_head *m_l, struct rib_names *rib_l, int pipe_m2s[2],
+-    int pipe_s2r[2], int pipe_m2r[2], int pipe_s2rctl[2])
++session_main(int pipe_m2s[2], int pipe_s2r[2], int pipe_m2r[2], 
++    int pipe_s2rctl[2], char *cname, char *rcname)
  {
  	int			 nfds, timeout;
  	unsigned int		 i, j, idx_peers, idx_listeners, idx_mrts;
-@@ -195,6 +198,7 @@ session_main(struct bgpd_config *config,
+@@ -189,19 +190,13 @@ session_main(struct bgpd_config *config,
+ 	u_int32_t		 ctl_queued;
+ 	struct passwd		*pw;
+ 	struct peer		*p, **peer_l = NULL, *last, *next;
+-	struct network		*net;
+-	struct mrt		*m, **mrt_l = NULL;
+-	struct filter_rule	*r;
++	struct mrt		*m, *xm, **mrt_l = NULL;
  	struct pollfd		*pfd = NULL;
  	struct ctl_conn		*ctl_conn;
  	struct listen_addr	*la;
-+	struct rde_rib		*rr;
+-	struct rde_rib		*rr;
  	void			*newp;
  	short			 events;
  
-@@ -283,6 +287,11 @@ session_main(struct bgpd_config *config,
- 		LIST_REMOVE(m, entry);
- 		free(m);
+-	conf = config;
+-	peers = cpeers;
+-
+ 	switch (pid = fork()) {
+ 	case -1:
+ 		fatal("cannot fork");
+@@ -212,10 +207,9 @@ session_main(struct bgpd_config *config,
  	}
-+	/* rib names not used in the SE */
-+	while ((rr = SIMPLEQ_FIRST(&ribnames))) {
-+		SIMPLEQ_REMOVE_HEAD(&ribnames, entry);
-+		free(rr);
-+	}
+ 
+ 	/* control socket is outside chroot */
+-	if ((csock = control_init(0, conf->csock)) == -1)
++	if ((csock = control_init(0, cname)) == -1)
+ 		fatalx("control socket setup failed");
+-	if (conf->rcsock != NULL &&
+-	    (rcsock = control_init(1, conf->rcsock)) == -1)
++	if (rcname != NULL && (rcsock = control_init(1, rcname)) == -1)
+ 		fatalx("control socket setup failed");
+ 
+ 	if ((pw = getpwnam(BGPD_USER)) == NULL)
+@@ -237,20 +231,18 @@ session_main(struct bgpd_config *config,
+ 	    setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid))
+ 		fatal("can't drop privileges");
+ 
+-	listener_cnt = 0;
+-	setup_listeners(&listener_cnt);
+-
+ 	signal(SIGTERM, session_sighdlr);
+ 	signal(SIGINT, session_sighdlr);
+ 	signal(SIGPIPE, SIG_IGN);
+ 	signal(SIGHUP, SIG_IGN);
+-	log_info("session engine ready");
++	signal(SIGALRM, SIG_IGN);
++	signal(SIGUSR1, SIG_IGN);
++
+ 	close(pipe_m2s[0]);
+ 	close(pipe_s2r[1]);
+ 	close(pipe_s2rctl[1]);
+ 	close(pipe_m2r[0]);
+ 	close(pipe_m2r[1]);
+-	init_conf(conf);
+ 	if ((ibuf_rde = malloc(sizeof(struct imsgbuf))) == NULL ||
+ 	    (ibuf_rde_ctl = malloc(sizeof(struct imsgbuf))) == NULL ||
+ 	    (ibuf_main = malloc(sizeof(struct imsgbuf))) == NULL)
+@@ -258,37 +250,23 @@ session_main(struct bgpd_config *config,
+ 	imsg_init(ibuf_rde, pipe_s2r[0]);
+ 	imsg_init(ibuf_rde_ctl, pipe_s2rctl[0]);
+ 	imsg_init(ibuf_main, pipe_m2s[1]);
++
+ 	TAILQ_INIT(&ctl_conns);
+ 	control_listen(csock);
+ 	control_listen(rcsock);
+ 	LIST_INIT(&mrthead);
++	listener_cnt = 0;
+ 	peer_cnt = 0;
+ 	ctl_cnt = 0;
+ 
+-	/* filter rules are not used in the SE */
+-	while ((r = TAILQ_FIRST(rules)) != NULL) {
+-		TAILQ_REMOVE(rules, r, entry);
+-		free(r);
+-	}
+-	free(rules);
+-
+-	/* network list is not used in the SE */
+-	while ((net = TAILQ_FIRST(net_l)) != NULL) {
+-		TAILQ_REMOVE(net_l, net, entry);
+-		filterset_free(&net->net.attrset);
+-		free(net);
+-	}
++	if ((conf = malloc(sizeof(struct bgpd_config))) == NULL)
++		fatal(NULL);
++	if ((conf->listen_addrs = calloc(1, sizeof(struct listen_addrs))) ==
++	    NULL)
++		fatal(NULL);
++	TAILQ_INIT(conf->listen_addrs);
+ 
+-	/* main mrt list is not used in the SE */
+-	while ((m = LIST_FIRST(m_l)) != NULL) {
+-		LIST_REMOVE(m, entry);
+-		free(m);
+-	}
+-	/* rib names not used in the SE */
+-	while ((rr = SIMPLEQ_FIRST(&ribnames))) {
+-		SIMPLEQ_REMOVE_HEAD(&ribnames, entry);
+-		free(rr);
+-	}
++	log_info("session engine ready");
  
  	while (session_quit == 0) {
  		/* check for peers to be initialized or deleted */
-@@ -302,7 +311,7 @@ session_main(struct bgpd_config *config,
+@@ -308,8 +286,9 @@ session_main(struct bgpd_config *config,
  
  				/* reinit due? */
  				if (p->conf.reconf_action == RECONF_REINIT) {
 -					bgp_fsm(p, EVNT_STOP);
+-					timer_set(p, Timer_IdleHold, 0);
 +					session_stop(p, ERR_CEASE_ADMIN_RESET);
- 					timer_set(p, Timer_IdleHold, 0);
++					if (!p->conf.down)
++						timer_set(p, Timer_IdleHold, 0);
  				}
  
-@@ -311,7 +320,7 @@ session_main(struct bgpd_config *config,
+ 				/* deletion due? */
+@@ -317,7 +296,7 @@ session_main(struct bgpd_config *config,
  					if (p->demoted)
  						session_demote(p, -1);
  					p->conf.demote_group[0] = 0;
@@ -82,58 +215,26 @@ diff -u -p -r1.1.1.1 -r1.5
  					log_peer_warnx(&p->conf, "removed");
  					if (last != NULL)
  						last->next = next;
-@@ -341,7 +350,7 @@ session_main(struct bgpd_config *config,
+@@ -346,9 +325,17 @@ session_main(struct bgpd_config *config,
+ 		}
  
  		mrt_cnt = 0;
- 		LIST_FOREACH(m, &mrthead, entry)
--			if (m->queued)
-+			if (m->wbuf.queued)
+-		LIST_FOREACH(m, &mrthead, entry)
++		for (m = LIST_FIRST(&mrthead); m != NULL; m = xm) {
++			xm = LIST_NEXT(m, entry);
++			if (m->state == MRT_STATE_REMOVE) {
++				mrt_clean(m);
++				LIST_REMOVE(m, entry);
++				free(m);
++				continue;
++			}
+ 			if (m->wbuf.queued)
  				mrt_cnt++;
++		}
  
  		if (mrt_cnt > mrt_l_elms) {
-@@ -438,6 +447,12 @@ session_main(struct bgpd_config *config,
- 						    Timer_IdleHoldReset,
- 						    p->IdleHoldTime);
- 					break;
-+				case Timer_CarpUndemote:
-+					timer_stop(p, Timer_CarpUndemote);
-+					if (p->demoted &&
-+					    p->state == STATE_ESTABLISHED)
-+						session_demote(p, -1);
-+					break;
- 				default:
- 					fatalx("King Bula lost in time");
- 				}
-@@ -446,17 +461,6 @@ session_main(struct bgpd_config *config,
- 			    nextaction < timeout)
- 				timeout = nextaction;
- 
--			/* XXX carp demotion */
--			if (p->demoted && p->state == STATE_ESTABLISHED) {
--				if (time(NULL) - p->stats.last_updown >=
--				    INTERVAL_HOLD_DEMOTED)
--					session_demote(p, -1);
--				if (p->stats.last_updown + INTERVAL_HOLD_DEMOTED
--				    - time(NULL) < timeout)
--					timeout = p->stats.last_updown +
--					    INTERVAL_HOLD_DEMOTED - time(NULL);
--			}
--
- 			/* are we waiting for a write? */
- 			events = POLLIN;
- 			if (p->wbuf.queued > 0 || p->state == STATE_CONNECT)
-@@ -474,8 +478,8 @@ session_main(struct bgpd_config *config,
- 		idx_peers = i;
- 
- 		LIST_FOREACH(m, &mrthead, entry)
--			if (m->queued) {
--				pfd[i].fd = m->fd;
-+			if (m->wbuf.queued) {
-+				pfd[i].fd = m->wbuf.fd;
- 				pfd[i].events = POLLOUT;
- 				mrt_l[i - idx_peers] = m;
- 				i++;
-@@ -556,7 +560,7 @@ session_main(struct bgpd_config *config,
+ 			if ((newp = realloc(mrt_l, sizeof(struct mrt *) *
+@@ -557,7 +544,7 @@ session_main(struct bgpd_config *config,
  
  	while ((p = peers) != NULL) {
  		peers = p->next;
@@ -142,50 +243,7 @@ diff -u -p -r1.1.1.1 -r1.5
  		pfkey_remove(p);
  		free(p);
  	}
-@@ -594,6 +598,8 @@ init_conf(struct bgpd_config *c)
- {
- 	if (!c->holdtime)
- 		c->holdtime = INTERVAL_HOLD;
-+	if (!c->connectretry)
-+		c->connectretry = INTERVAL_CONNECTRETRY;
- }
- 
- void
-@@ -668,7 +674,7 @@ bgp_fsm(struct peer *peer, enum session_
- 			} else {
- 				change_state(peer, STATE_CONNECT, event);
- 				timer_set(peer, Timer_ConnectRetry,
--				    INTERVAL_CONNECTRETRY);
-+				    conf->connectretry);
- 				session_connect(peer);
- 			}
- 			peer->passive = 0;
-@@ -693,13 +699,13 @@ bgp_fsm(struct peer *peer, enum session_
- 			break;
- 		case EVNT_CON_OPENFAIL:
- 			timer_set(peer, Timer_ConnectRetry,
--			    INTERVAL_CONNECTRETRY);
-+			    conf->connectretry);
- 			session_close_connection(peer);
- 			change_state(peer, STATE_ACTIVE, event);
- 			break;
- 		case EVNT_TIMER_CONNRETRY:
- 			timer_set(peer, Timer_ConnectRetry,
--			    INTERVAL_CONNECTRETRY);
-+			    conf->connectretry);
- 			session_connect(peer);
- 			break;
- 		default:
-@@ -722,7 +728,7 @@ bgp_fsm(struct peer *peer, enum session_
- 			break;
- 		case EVNT_CON_OPENFAIL:
- 			timer_set(peer, Timer_ConnectRetry,
--			    INTERVAL_CONNECTRETRY);
-+			    conf->connectretry);
- 			session_close_connection(peer);
- 			change_state(peer, STATE_ACTIVE, event);
- 			break;
-@@ -743,13 +749,12 @@ bgp_fsm(struct peer *peer, enum session_
+@@ -746,7 +733,6 @@ bgp_fsm(struct peer *peer, enum session_
  			/* ignore */
  			break;
  		case EVNT_STOP:
@@ -193,14 +251,7 @@ diff -u -p -r1.1.1.1 -r1.5
  			change_state(peer, STATE_IDLE, event);
  			break;
  		case EVNT_CON_CLOSED:
- 			session_close_connection(peer);
- 			timer_set(peer, Timer_ConnectRetry,
--			    INTERVAL_CONNECTRETRY);
-+			    conf->connectretry);
- 			change_state(peer, STATE_ACTIVE, event);
- 			break;
- 		case EVNT_CON_FATAL:
-@@ -788,7 +793,6 @@ bgp_fsm(struct peer *peer, enum session_
+@@ -791,7 +777,6 @@ bgp_fsm(struct peer *peer, enum session_
  			/* ignore */
  			break;
  		case EVNT_STOP:
@@ -208,7 +259,7 @@ diff -u -p -r1.1.1.1 -r1.5
  			change_state(peer, STATE_IDLE, event);
  			break;
  		case EVNT_CON_CLOSED:
-@@ -823,7 +827,6 @@ bgp_fsm(struct peer *peer, enum session_
+@@ -826,7 +811,6 @@ bgp_fsm(struct peer *peer, enum session_
  			/* ignore */
  			break;
  		case EVNT_STOP:
@@ -216,35 +267,139 @@ diff -u -p -r1.1.1.1 -r1.5
  			change_state(peer, STATE_IDLE, event);
  			break;
  		case EVNT_CON_CLOSED:
-@@ -953,6 +956,9 @@ change_state(struct peer *peer, enum ses
- 		break;
- 	case STATE_ESTABLISHED:
- 		timer_set(peer, Timer_IdleHoldReset, peer->IdleHoldTime);
-+		if (peer->demoted)
-+			timer_set(peer, Timer_CarpUndemote,
-+			    INTERVAL_HOLD_DEMOTED);
- 		session_up(peer);
- 		break;
- 	default:		/* something seriously fucked */
-@@ -961,13 +967,12 @@ change_state(struct peer *peer, enum ses
- 
- 	log_statechange(peer, state, event);
- 	LIST_FOREACH(mrt, &mrthead, entry) {
--		if (mrt->type != MRT_ALL_IN && mrt->type != MRT_ALL_OUT)
-+		if (!(mrt->type == MRT_ALL_IN || mrt->type == MRT_ALL_OUT))
- 			continue;
- 		if ((mrt->peer_id == 0 && mrt->group_id == 0) ||
--		    mrt->peer_id == peer->conf.id ||
--		    mrt->group_id == peer->conf.groupid)
--			mrt_dump_state(mrt, peer->state, state,
--			    peer, conf);
-+		    mrt->peer_id == peer->conf.id || (mrt->group_id != 0 &&
-+		    mrt->group_id == peer->conf.groupid))
-+			mrt_dump_state(mrt, peer->state, state, peer);
+@@ -923,6 +907,7 @@ change_state(struct peer *peer, enum ses
+ 		timer_stop(peer, Timer_ConnectRetry);
+ 		timer_stop(peer, Timer_Keepalive);
+ 		timer_stop(peer, Timer_Hold);
++		timer_stop(peer, Timer_IdleHold);
+ 		timer_stop(peer, Timer_IdleHoldReset);
+ 		session_close_connection(peer);
+ 		msgbuf_clear(&peer->wbuf);
+@@ -1069,7 +1054,7 @@ session_connect(struct peer *peer)
+ 	if (peer->fd != -1)
+ 		return (-1);
+ 
+-	if ((peer->fd = socket(peer->conf.remote_addr.af, SOCK_STREAM,
++	if ((peer->fd = socket(aid2af(peer->conf.remote_addr.aid), SOCK_STREAM,
+ 	    IPPROTO_TCP)) == -1) {
+ 		log_peer_warn(&peer->conf, "session_connect socket");
+ 		bgp_fsm(peer, EVNT_CON_OPENFAIL);
+@@ -1100,8 +1085,7 @@ session_connect(struct peer *peer)
+ 	peer->wbuf.fd = peer->fd;
+ 
+ 	/* if update source is set we need to bind() */
+-	if (peer->conf.local_addr.af) {
+-		sa = addr2sa(&peer->conf.local_addr, 0);
++	if ((sa = addr2sa(&peer->conf.local_addr, 0)) != NULL) {
+ 		if (bind(peer->fd, sa, sa->sa_len) == -1) {
+ 			log_peer_warn(&peer->conf, "session_connect bind");
+ 			bgp_fsm(peer, EVNT_CON_OPENFAIL);
+@@ -1139,42 +1123,50 @@ session_setup_socket(struct peer *p)
+ 	int	nodelay = 1;
+ 	int	bsize;
+ 
+-	if (p->conf.ebgp && p->conf.remote_addr.af == AF_INET) {
+-		/* set TTL to foreign router's distance - 1=direct n=multihop
+-		   with ttlsec, we always use 255 */
+-		if (p->conf.ttlsec) {
+-			ttl = 256 - p->conf.distance;
+-			if (setsockopt(p->fd, IPPROTO_IP, IP_MINTTL, &ttl,
++	switch (p->conf.remote_addr.aid) {
++	case AID_INET:
++		/* set precedence, see RFC 1771 appendix 5 */
++		if (setsockopt(p->fd, IPPROTO_IP, IP_TOS, &pre, sizeof(pre)) ==
++		    -1) {
++			log_peer_warn(&p->conf,
++			    "session_setup_socket setsockopt TOS");
++			return (-1);
++		}
++
++		if (p->conf.ebgp) {
++			/* set TTL to foreign router's distance
++			   1=direct n=multihop with ttlsec, we always use 255 */
++			if (p->conf.ttlsec) {
++				ttl = 256 - p->conf.distance;
++				if (setsockopt(p->fd, IPPROTO_IP, IP_MINTTL,
++				    &ttl, sizeof(ttl)) == -1) {
++					log_peer_warn(&p->conf,
++					    "session_setup_socket: "
++					    "setsockopt MINTTL");
++					return (-1);
++				}
++				ttl = 255;
++			}
++
++			if (setsockopt(p->fd, IPPROTO_IP, IP_TTL, &ttl,
+ 			    sizeof(ttl)) == -1) {
+ 				log_peer_warn(&p->conf,
+-				    "session_setup_socket setsockopt MINTTL");
++				    "session_setup_socket setsockopt TTL");
+ 				return (-1);
+ 			}
+-			ttl = 255;
+-		}
+-
+-		if (setsockopt(p->fd, IPPROTO_IP, IP_TTL, &ttl,
+-		    sizeof(ttl)) == -1) {
+-			log_peer_warn(&p->conf,
+-			    "session_setup_socket setsockopt TTL");
+-			return (-1);
+ 		}
+-	}
+-
+-	if (p->conf.ebgp && p->conf.remote_addr.af == AF_INET6)
+-		/* set hoplimit to foreign router's distance */
+-		if (setsockopt(p->fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &ttl,
+-		    sizeof(ttl)) == -1) {
+-			log_peer_warn(&p->conf,
+-			    "session_setup_socket setsockopt hoplimit");
+-			return (-1);
++		break;
++	case AID_INET6:
++		if (p->conf.ebgp) {
++			/* set hoplimit to foreign router's distance */
++			if (setsockopt(p->fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS,
++			    &ttl, sizeof(ttl)) == -1) {
++				log_peer_warn(&p->conf,
++				    "session_setup_socket setsockopt hoplimit");
++				return (-1);
++			}
+ 		}
+-
+-	/* if ttlsec is in use, set minttl */
+-	if (p->conf.ttlsec) {
+-		ttl = 256 - p->conf.distance;
+-		setsockopt(p->fd, IPPROTO_IP, IP_MINTTL, &ttl, sizeof(ttl));
+-
++		break;
  	}
- 	peer->prev_state = peer->state;
- 	peer->state = state;
-@@ -1247,21 +1252,12 @@ session_capa_ann_none(struct peer *peer)
+ 
+ 	/* set TCP_NODELAY */
+@@ -1185,14 +1177,6 @@ session_setup_socket(struct peer *p)
+ 		return (-1);
+ 	}
+ 
+-	/* set precedence, see RFC 1771 appendix 5 */
+-	if (p->conf.remote_addr.af == AF_INET &&
+-	    setsockopt(p->fd, IPPROTO_IP, IP_TOS, &pre, sizeof(pre)) == -1) {
+-		log_peer_warn(&p->conf,
+-		    "session_setup_socket setsockopt TOS");
+-		return (-1);
+-	}
+-
+ 	/* only increase bufsize (and thus window) if md5 or ipsec is in use */
+ 	if (p->conf.auth.method != AUTH_NONE) {
+ 		/* try to increase bufsize. no biggie if it fails */
+@@ -1244,36 +1228,28 @@ session_tcp_established(struct peer *pee
+ void
+ session_capa_ann_none(struct peer *peer)
+ {
+-	peer->capa.ann.mp_v4 = SAFI_NONE;
+-	peer->capa.ann.mp_v4 = SAFI_NONE;
+-	peer->capa.ann.refresh = 0;
+-	peer->capa.ann.restart = 0;
+-	peer->capa.ann.as4byte = 0;
++	bzero(&peer->capa.ann, sizeof(peer->capa.ann));
  }
  
  int
@@ -258,8 +413,6 @@ diff -u -p -r1.1.1.1 -r1.5
 -	op_type = OPT_PARAM_CAPABILITIES;
 -	op_len = sizeof(capa_code) + sizeof(capa_len) + capa_len;
 -	tot_len = sizeof(op_type) + sizeof(op_len) + op_len;
--	if (buf_grow(opb, tot_len) == NULL)
--		return (1);
 -	errs += buf_add(opb, &op_type, sizeof(op_type));
 -	errs += buf_add(opb, &op_len, sizeof(op_len));
  	errs += buf_add(opb, &capa_code, sizeof(capa_code));
@@ -268,45 +421,30 @@ diff -u -p -r1.1.1.1 -r1.5
  	return (errs);
  }
  
-@@ -1317,22 +1313,16 @@ session_sendmsg(struct bgp_msg *msg, str
- 	struct mrt		*mrt;
- 
- 	LIST_FOREACH(mrt, &mrthead, entry) {
--		if (mrt->type != MRT_ALL_OUT &&
--		    msg->type == UPDATE && mrt->type != MRT_UPDATE_OUT)
-+		if (!(mrt->type == MRT_ALL_OUT || (msg->type == UPDATE &&
-+		    mrt->type == MRT_UPDATE_OUT)))
- 			continue;
- 		if ((mrt->peer_id == 0 && mrt->group_id == 0) ||
--		    mrt->peer_id == p->conf.id ||
--		    mrt->group_id == p->conf.groupid)
--			mrt_dump_bgp_msg(mrt, msg->buf->buf, msg->len, p, conf);
--	}
--
--	if (buf_close(&p->wbuf, msg->buf) == -1) {
--		log_peer_warn(&p->conf, "session_sendmsg buf_close");
--		buf_free(msg->buf);
--		free(msg);
--		return (-1);
-+		    mrt->peer_id == p->conf.id || (mrt->group_id == 0 &&
-+		    mrt->group_id == p->conf.groupid))
-+			mrt_dump_bgp_msg(mrt, msg->buf->buf, msg->len, p);
- 	}
+ int
+-session_capa_add_mp(struct buf *buf, u_int16_t afi, u_int8_t safi)
++session_capa_add_mp(struct buf *buf, u_int8_t aid)
+ {
+-	u_int8_t		 pad = 0;
++	u_int8_t		 safi, pad = 0;
++	u_int16_t		 afi;
+ 	int			 errs = 0;
  
-+	buf_close(&p->wbuf, msg->buf);
- 	free(msg);
- 	return (0);
- }
-@@ -1344,36 +1334,37 @@ session_open(struct peer *p)
++	if (aid2afi(aid, &afi, &safi) == -1)
++		fatalx("session_capa_add_mp: bad afi/safi pair");
+ 	afi = htons(afi);
+ 	errs += buf_add(buf, &afi, sizeof(afi));
+ 	errs += buf_add(buf, &pad, sizeof(pad));
+@@ -1341,36 +1317,34 @@ session_open(struct peer *p)
  	struct buf		*opb;
  	struct msg_open		 msg;
  	u_int16_t		 len;
 -	u_int8_t		 optparamlen = 0;
-+	u_int8_t		 op_type, optparamlen = 0;
++	u_int8_t		 i, op_type, optparamlen = 0;
  	u_int			 errs = 0;
  
  
--	if ((opb = buf_open(0)) == NULL) {
+-	if ((opb = buf_dynamic(0, MAX_PKTSIZE - MSGSIZE_OPEN_MIN)) == NULL) {
 +	if ((opb = buf_dynamic(0, UCHAR_MAX - sizeof(op_type) -
 +	    sizeof(optparamlen))) == NULL) {
  		bgp_fsm(p, EVNT_CON_FATAL);
@@ -314,16 +452,19 @@ diff -u -p -r1.1.1.1 -r1.5
  	}
  
  	/* multiprotocol extensions, RFC 4760 */
- 	if (p->capa.ann.mp_v4) {	/* 4 bytes data */
+-	if (p->capa.ann.mp_v4) {	/* 4 bytes data */
 -		errs += session_capa_add(p, opb, CAPA_MP, 4, &optparamlen);
-+		errs += session_capa_add(opb, CAPA_MP, 4);
- 		errs += session_capa_add_mp(opb, AFI_IPv4, p->capa.ann.mp_v4);
- 	}
- 	if (p->capa.ann.mp_v6) {	/* 4 bytes data */
+-		errs += session_capa_add_mp(opb, AFI_IPv4, p->capa.ann.mp_v4);
+-	}
+-	if (p->capa.ann.mp_v6) {	/* 4 bytes data */
 -		errs += session_capa_add(p, opb, CAPA_MP, 4, &optparamlen);
-+		errs += session_capa_add(opb, CAPA_MP, 4);
- 		errs += session_capa_add_mp(opb, AFI_IPv6, p->capa.ann.mp_v6);
- 	}
+-		errs += session_capa_add_mp(opb, AFI_IPv6, p->capa.ann.mp_v6);
+-	}
++	for (i = 0; i < AID_MAX; i++)
++		if (p->capa.ann.mp[i]) {	/* 4 bytes data */
++			errs += session_capa_add(opb, CAPA_MP, 4);
++			errs += session_capa_add_mp(opb, i);
++		}
  
  	/* route refresh, RFC 2918 */
  	if (p->capa.ann.refresh)	/* no data */
@@ -342,7 +483,7 @@ diff -u -p -r1.1.1.1 -r1.5
  		errs += buf_add(opb, &c, 2);
  	}
  
-@@ -1382,10 +1373,14 @@ session_open(struct peer *p)
+@@ -1379,10 +1353,14 @@ session_open(struct peer *p)
  		u_int32_t	nas;
  
  		nas = htonl(conf->as);
@@ -359,19 +500,7 @@ diff -u -p -r1.1.1.1 -r1.5
  	len = MSGSIZE_OPEN_MIN + optparamlen;
  	if (errs || (buf = session_newmsg(OPEN, len)) == NULL) {
  		buf_free(opb);
-@@ -1394,10 +1389,7 @@ session_open(struct peer *p)
- 	}
- 
- 	msg.version = 4;
--	if (conf->as > USHRT_MAX)
--		msg.myas = htons(conf->short_as);
--	else
--		msg.myas = htons(conf->as);
-+	msg.myas = htons(conf->short_as);
- 	if (p->conf.holdtime)
- 		msg.holdtime = htons(p->conf.holdtime);
- 	else
-@@ -1411,8 +1403,13 @@ session_open(struct peer *p)
+@@ -1405,8 +1383,13 @@ session_open(struct peer *p)
  	errs += buf_add(buf->buf, &msg.bgpid, sizeof(msg.bgpid));
  	errs += buf_add(buf->buf, &msg.optparamlen, sizeof(msg.optparamlen));
  
@@ -387,7 +516,7 @@ diff -u -p -r1.1.1.1 -r1.5
  
  	buf_free(opb);
  
-@@ -1487,7 +1484,6 @@ session_notification(struct peer *p, u_i
+@@ -1481,7 +1464,6 @@ session_notification(struct peer *p, u_i
  {
  	struct bgp_msg		*buf;
  	u_int			 errs = 0;
@@ -395,7 +524,7 @@ diff -u -p -r1.1.1.1 -r1.5
  
  	if (p->stats.last_sent_errcode)	/* some notification already sent */
  		return;
-@@ -1499,10 +1495,7 @@ session_notification(struct peer *p, u_i
+@@ -1493,10 +1475,7 @@ session_notification(struct peer *p, u_i
  	}
  
  	errs += buf_add(buf->buf, &errcode, sizeof(errcode));
@@ -407,26 +536,43 @@ diff -u -p -r1.1.1.1 -r1.5
  
  	if (datalen > 0)
  		errs += buf_add(buf->buf, data, datalen);
-@@ -1809,13 +1802,13 @@ parse_header(struct peer *peer, u_char *
+@@ -1521,23 +1500,29 @@ session_notification(struct peer *p, u_i
+ int
+ session_neighbor_rrefresh(struct peer *p)
+ {
++	u_int8_t	i;
++
+ 	if (!p->capa.peer.refresh)
  		return (-1);
- 	}
- 	LIST_FOREACH(mrt, &mrthead, entry) {
--		if (mrt->type != MRT_ALL_IN && (mrt->type != MRT_UPDATE_IN ||
--		    *type != UPDATE))
-+		if (!(mrt->type == MRT_ALL_IN || (*type == UPDATE &&
-+		    mrt->type == MRT_UPDATE_IN)))
- 			continue;
- 		if ((mrt->peer_id == 0 && mrt->group_id == 0) ||
--		    mrt->peer_id == peer->conf.id ||
--		    mrt->group_id == peer->conf.groupid)
--			mrt_dump_bgp_msg(mrt, data, *len, peer, conf);
-+		    mrt->peer_id == peer->conf.id || (mrt->group_id != 0 &&
-+		    mrt->group_id == peer->conf.groupid))
-+			mrt_dump_bgp_msg(mrt, data, *len, peer);
- 	}
+ 
+-	if (p->capa.peer.mp_v4 != SAFI_NONE)
+-		session_rrefresh(p, AFI_IPv4, p->capa.peer.mp_v4);
+-	if (p->capa.peer.mp_v6 != SAFI_NONE)
+-		session_rrefresh(p, AFI_IPv6, p->capa.peer.mp_v6);
++	for (i = 0; i < AID_MAX; i++) {
++		if (p->capa.peer.mp[i] != 0)
++			session_rrefresh(p, i);
++	}
+ 
  	return (0);
  }
-@@ -1859,12 +1852,6 @@ parse_open(struct peer *peer)
+ 
+ void
+-session_rrefresh(struct peer *p, u_int16_t afi, u_int8_t safi)
++session_rrefresh(struct peer *p, u_int8_t aid)
+ {
+ 	struct bgp_msg		*buf;
+ 	int			 errs = 0;
+-	u_int8_t		 null8 = 0;
++	u_int16_t		 afi;
++	u_int8_t		 safi, null8 = 0;
++
++	if (aid2afi(aid, &afi, &safi) == -1)
++		fatalx("session_rrefresh: bad afi/safi pair");
+ 
+ 	if ((buf = session_newmsg(RREFRESH, MSGSIZE_RREFRESH)) == NULL) {
+ 		bgp_fsm(p, EVNT_CON_FATAL);
+@@ -1853,12 +1838,6 @@ parse_open(struct peer *peer)
  	p += sizeof(short_as);
  	as = peer->short_as = ntohs(short_as);
  
@@ -439,7 +585,7 @@ diff -u -p -r1.1.1.1 -r1.5
  	memcpy(&oholdtime, p, sizeof(oholdtime));
  	p += sizeof(oholdtime);
  
-@@ -1972,6 +1959,15 @@ parse_open(struct peer *peer)
+@@ -1966,6 +1945,15 @@ parse_open(struct peer *peer)
  		}
  	}
  
@@ -455,47 +601,202 @@ diff -u -p -r1.1.1.1 -r1.5
  	if (peer->conf.remote_as != as) {
  		log_peer_warnx(&peer->conf, "peer sent wrong AS %s",
  		    log_as(as));
-@@ -2193,22 +2189,20 @@ parse_capabilities(struct peer *peer, u_
- 			memcpy(&mp_safi, capa_val + 3, sizeof(mp_safi));
- 			switch (mp_afi) {
- 			case AFI_IPv4:
--				if (mp_safi < 1 || mp_safi > 3) {
-+				if (mp_safi < 1 || mp_safi > 3)
- 					log_peer_warnx(&peer->conf,
- 					    "parse_capabilities: AFI IPv4, "
--					    "mp_safi %u illegal", mp_safi);
--					return (-1);
--				}
--				peer->capa.peer.mp_v4 = mp_safi;
-+					    "mp_safi %u unknown", mp_safi);
-+				else
-+					peer->capa.peer.mp_v4 = mp_safi;
- 				break;
- 			case AFI_IPv6:
--				if (mp_safi < 1 || mp_safi > 3) {
-+				if (mp_safi < 1 || mp_safi > 3)
- 					log_peer_warnx(&peer->conf,
- 					    "parse_capabilities: AFI IPv6, "
--					    "mp_safi %u illegal", mp_safi);
--					return (-1);
--				}
--				peer->capa.peer.mp_v6 = mp_safi;
-+					    "mp_safi %u unknown", mp_safi);
-+				else
-+					peer->capa.peer.mp_v6 = mp_safi;
+@@ -1974,6 +1962,14 @@ parse_open(struct peer *peer)
+ 		return (-1);
+ 	}
+ 
++	if (capa_neg_calc(peer) == -1) {
++		log_peer_warnx(&peer->conf,
++		    "capabilitiy negotiation calculation failed");
++		session_notification(peer, ERR_OPEN, 0, NULL, 0);
++		change_state(peer, STATE_IDLE, EVNT_RCVD_OPEN);
++		return (-1);
++	}
++
+ 	return (0);
+ }
+ 
+@@ -2008,24 +2004,35 @@ int
+ parse_refresh(struct peer *peer)
+ {
+ 	u_char		*p;
+-	struct rrefresh	 r;
++	u_int16_t	 afi;
++	u_int8_t	 aid, safi;
+ 
+ 	p = peer->rbuf->rptr;
+ 	p += MSGSIZE_HEADER;	/* header is already checked */
+ 
++	/*
++	 * We could check if we actually announced the capability but
++	 * as long as the message is correctly encoded we don't care.
++	 */
++
+ 	/* afi, 2 byte */
+-	memcpy(&r.afi, p, sizeof(r.afi));
+-	r.afi = ntohs(r.afi);
++	memcpy(&afi, p, sizeof(afi));
++	afi = ntohs(afi);
+ 	p += 2;
+ 	/* reserved, 1 byte */
+ 	p += 1;
+ 	/* safi, 1 byte */
+-	memcpy(&r.safi, p, sizeof(r.safi));
++	memcpy(&safi, p, sizeof(safi));
+ 
+ 	/* afi/safi unchecked -	unrecognized values will be ignored anyway */
++	if (afi2aid(afi, safi, &aid) == -1) {
++		log_peer_warnx(&peer->conf, "peer sent bad refresh, "
++		    "invalid afi/safi pair");
++		return (0);
++	}
+ 
+-	if (imsg_compose(ibuf_rde, IMSG_REFRESH, peer->conf.id, 0, -1, &r,
+-	    sizeof(r)) == -1)
++	if (imsg_compose(ibuf_rde, IMSG_REFRESH, peer->conf.id, 0, -1, &aid,
++	    sizeof(aid)) == -1)
+ 		return (-1);
+ 
+ 	return (0);
+@@ -2035,11 +2042,12 @@ int
+ parse_notification(struct peer *peer)
+ {
+ 	u_char		*p;
++	u_int16_t	 datalen;
+ 	u_int8_t	 errcode;
+ 	u_int8_t	 subcode;
+-	u_int16_t	 datalen;
+ 	u_int8_t	 capa_code;
+ 	u_int8_t	 capa_len;
++	u_int8_t	 i;
+ 
+ 	/* just log */
+ 	p = peer->rbuf->rptr;
+@@ -2094,8 +2102,8 @@ parse_notification(struct peer *peer)
+ 			datalen -= capa_len;
+ 			switch (capa_code) {
+ 			case CAPA_MP:
+-				peer->capa.ann.mp_v4 = SAFI_NONE;
+-				peer->capa.ann.mp_v6 = SAFI_NONE;
++				for (i = 0; i < AID_MAX; i++)
++					peer->capa.ann.mp[i] = 0;
+ 				log_peer_warnx(&peer->conf,
+ 				    "disabling multiprotocol capability");
  				break;
- 			default:			/* ignore */
+@@ -2139,13 +2147,14 @@ parse_notification(struct peer *peer)
+ int
+ parse_capabilities(struct peer *peer, u_char *d, u_int16_t dlen, u_int32_t *as)
+ {
++	u_char		*capa_val;
++	u_int32_t	 remote_as;
+ 	u_int16_t	 len;
++	u_int16_t	 afi;
++	u_int8_t	 safi;
++	u_int8_t	 aid;
+ 	u_int8_t	 capa_code;
+ 	u_int8_t	 capa_len;
+-	u_char		*capa_val;
+-	u_int16_t	 mp_afi;
+-	u_int8_t	 mp_safi;
+-	u_int32_t	 remote_as;
+ 
+ 	len = dlen;
+ 	while (len > 0) {
+@@ -2182,29 +2191,16 @@ parse_capabilities(struct peer *peer, u_
+ 				    "expect len 4, len is %u", capa_len);
+ 				return (-1);
+ 			}
+-			memcpy(&mp_afi, capa_val, sizeof(mp_afi));
+-			mp_afi = ntohs(mp_afi);
+-			memcpy(&mp_safi, capa_val + 3, sizeof(mp_safi));
+-			switch (mp_afi) {
+-			case AFI_IPv4:
+-				if (mp_safi < 1 || mp_safi > 3)
+-					log_peer_warnx(&peer->conf,
+-					    "parse_capabilities: AFI IPv4, "
+-					    "mp_safi %u unknown", mp_safi);
+-				else
+-					peer->capa.peer.mp_v4 = mp_safi;
+-				break;
+-			case AFI_IPv6:
+-				if (mp_safi < 1 || mp_safi > 3)
+-					log_peer_warnx(&peer->conf,
+-					    "parse_capabilities: AFI IPv6, "
+-					    "mp_safi %u unknown", mp_safi);
+-				else
+-					peer->capa.peer.mp_v6 = mp_safi;
+-				break;
+-			default:			/* ignore */
++			memcpy(&afi, capa_val, sizeof(afi));
++			afi = ntohs(afi);
++			memcpy(&safi, capa_val + 3, sizeof(safi));
++			if (afi2aid(afi, safi, &aid) == -1) {
++				log_peer_warnx(&peer->conf,
++				    "parse_capabilities: AFI %u, "
++				    "safi %u unknown", afi, safi);
  				break;
-@@ -2318,7 +2312,7 @@ session_dispatch_imsg(struct imsgbuf *ib
- 					fatalx("king bula sez: "
- 					    "expected REINIT");
- 
--				if ((nla->fd = imsg_get_fd(ibuf)) == -1)
-+				if ((nla->fd = imsg.fd) == -1)
- 					log_warnx("expected to receive fd for "
- 					    "%s but didn't receive any",
- 					    log_sockaddr((struct sockaddr *)
-@@ -2416,7 +2410,8 @@ session_dispatch_imsg(struct imsgbuf *ib
+ 			}
++			peer->capa.peer.mp[aid] = 1;
+ 			break;
+ 		case CAPA_REFRESH:
+ 			peer->capa.peer.refresh = 1;
+@@ -2232,6 +2228,37 @@ parse_capabilities(struct peer *peer, u_
+ 	return (0);
+ }
+ 
++int
++capa_neg_calc(struct peer *p)
++{
++	u_int8_t	i, hasmp = 0;
++
++	/* refresh: does not realy matter here, use peer setting */
++	p->capa.neg.refresh = p->capa.peer.refresh;
++
++	/* as4byte: both side must announce capability */
++	if (p->capa.ann.as4byte && p->capa.peer.as4byte)
++		p->capa.neg.as4byte = 1;
++	else
++		p->capa.neg.as4byte = 0;
++
++	/* MP: both side must announce capability */
++	for (i = 0; i < AID_MAX; i++) {
++		if (p->capa.ann.mp[i] && p->capa.peer.mp[i]) {
++			p->capa.neg.mp[i] = 1;
++			hasmp = 1;
++		} else
++			p->capa.neg.mp[i] = 0;
++	}
++	/* if no MP capability present for default IPv4 unicast mode */
++	if (!hasmp)
++		p->capa.neg.mp[AID_INET] = 1;
++
++	p->capa.neg.restart = p->capa.peer.restart;
++
++	return (0);
++}
++
+ void
+ session_dispatch_imsg(struct imsgbuf *ibuf, int idx, u_int *listener_cnt)
+ {
+@@ -2337,10 +2364,16 @@ session_dispatch_imsg(struct imsgbuf *ib
+ 				fatalx("reconf request not from parent");
+ 			if (nconf == NULL)
+ 				fatalx("got IMSG_RECONF_DONE but no config");
++			conf->flags = nconf->flags;
++			conf->log = nconf->log;
++			conf->rtableid = nconf->rtableid;
++			conf->bgpid = nconf->bgpid;
++			conf->clusterid = nconf->clusterid;
+ 			conf->as = nconf->as;
++			conf->short_as = nconf->short_as;
+ 			conf->holdtime = nconf->holdtime;
+-			conf->bgpid = nconf->bgpid;
+ 			conf->min_holdtime = nconf->min_holdtime;
++			conf->connectretry = nconf->connectretry;
+ 
+ 			/* add new peers */
+ 			for (p = npeers; p != NULL; p = next) {
+@@ -2408,7 +2441,8 @@ session_dispatch_imsg(struct imsgbuf *ib
  						bgp_fsm(p, EVNT_START);
  					} else if (!depend_ok && p->depend_ok) {
  						p->depend_ok = depend_ok;
@@ -505,41 +806,64 @@ diff -u -p -r1.1.1.1 -r1.5
  					}
  				}
  			break;
-@@ -2429,7 +2424,7 @@ session_dispatch_imsg(struct imsgbuf *ib
- 			}
+@@ -2612,29 +2646,23 @@ getpeerbydesc(const char *descr)
+ struct peer *
+ getpeerbyip(struct sockaddr *ip)
+ {
++	struct bgpd_addr addr;
+ 	struct peer	*p, *newpeer, *loose = NULL;
+ 	u_int32_t	 id;
  
- 			memcpy(&xmrt, imsg.data, sizeof(struct mrt));
--			if ((xmrt.fd = imsg_get_fd(ibuf)) == -1)
-+			if ((xmrt.wbuf.fd = imsg.fd) == -1)
- 				log_warnx("expected to receive fd for mrt dump "
- 				    "but didn't receive any");
- 
-@@ -2440,12 +2435,12 @@ session_dispatch_imsg(struct imsgbuf *ib
- 				if (mrt == NULL)
- 					fatal("session_dispatch_imsg");
- 				memcpy(mrt, &xmrt, sizeof(struct mrt));
--				TAILQ_INIT(&mrt->bufs);
-+				TAILQ_INIT(&mrt->wbuf.bufs);
- 				LIST_INSERT_HEAD(&mrthead, mrt, entry);
- 			} else {
- 				/* old dump reopened */
--				close(mrt->fd);
--				mrt->fd = xmrt.fd;
-+				close(mrt->wbuf.fd);
-+				mrt->wbuf.fd = xmrt.wbuf.fd;
++	sa2addr(ip, &addr);
++
+ 	/* we might want a more effective way to find peers by IP */
+ 	for (p = peers; p != NULL; p = p->next)
+ 		if (!p->conf.template &&
+-		    p->conf.remote_addr.af == ip->sa_family) {
+-			if (p->conf.remote_addr.af == AF_INET &&
+-			    p->conf.remote_addr.v4.s_addr ==
+-			    ((struct sockaddr_in *)ip)->sin_addr.s_addr)
+-				return (p);
+-			if (p->conf.remote_addr.af == AF_INET6 &&
+-			    !bcmp(&p->conf.remote_addr.v6,
+-			    &((struct sockaddr_in6 *)ip)->sin6_addr,
+-			    sizeof(p->conf.remote_addr.v6)))
+-				return (p);
+-		}
++		    !memcmp(&addr, &p->conf.remote_addr, sizeof(addr)))
++			return (p);
+ 
+ 	/* try template matching */
+ 	for (p = peers; p != NULL; p = p->next)
+ 		if (p->conf.template &&
+-		    p->conf.remote_addr.af == ip->sa_family &&
+-		    session_match_mask(p, ip))
++		    p->conf.remote_addr.aid == addr.aid &&
++		    session_match_mask(p, &addr))
+ 			if (loose == NULL || loose->conf.remote_masklen <
+ 			    p->conf.remote_masklen)
+ 				loose = p;
+@@ -2653,21 +2681,19 @@ getpeerbyip(struct sockaddr *ip)
+ 				break;
  			}
- 			break;
- 		case IMSG_MRT_CLOSE:
-@@ -2667,7 +2662,7 @@ getpeerbyip(struct sockaddr *ip)
- 			newpeer->conf.remote_masklen = 32;
  		}
- 		if (newpeer->conf.remote_addr.af == AF_INET6) {
+-		if (newpeer->conf.remote_addr.af == AF_INET) {
+-			newpeer->conf.remote_addr.v4.s_addr =
+-			    ((struct sockaddr_in *)ip)->sin_addr.s_addr;
++		sa2addr(ip, &newpeer->conf.remote_addr);
++		switch (ip->sa_family) {
++		case AF_INET:
+ 			newpeer->conf.remote_masklen = 32;
+-		}
+-		if (newpeer->conf.remote_addr.af == AF_INET6) {
 -			memcpy(&p->conf.remote_addr.v6,
-+			memcpy(&newpeer->conf.remote_addr.v6,
- 			    &((struct sockaddr_in6 *)ip)->sin6_addr,
- 			    sizeof(newpeer->conf.remote_addr.v6));
+-			    &((struct sockaddr_in6 *)ip)->sin6_addr,
+-			    sizeof(newpeer->conf.remote_addr.v6));
++			break;
++		case AF_INET6:
  			newpeer->conf.remote_masklen = 128;
-@@ -2675,7 +2670,7 @@ getpeerbyip(struct sockaddr *ip)
++			break;
+ 		}
  		newpeer->conf.template = 0;
  		newpeer->conf.cloned = 1;
  		newpeer->state = newpeer->prev_state = STATE_NONE;
@@ -548,7 +872,141 @@ diff -u -p -r1.1.1.1 -r1.5
  		newpeer->rbuf = NULL;
  		init_peer(newpeer);
  		bgp_fsm(newpeer, EVNT_START);
-@@ -2845,3 +2840,19 @@ session_demote(struct peer *p, int level
+@@ -2680,40 +2706,24 @@ getpeerbyip(struct sockaddr *ip)
+ }
+ 
+ int
+-session_match_mask(struct peer *p, struct sockaddr *ip)
++session_match_mask(struct peer *p, struct bgpd_addr *a)
+ {
+-	int		 i;
+ 	in_addr_t	 v4mask;
+-	struct in6_addr	*in;
+-	struct in6_addr	 mask;
++	struct in6_addr	 masked;
+ 
+-	if (p->conf.remote_addr.af == AF_INET) {
++	switch (p->conf.remote_addr.aid) {
++	case AID_INET:
+ 		v4mask = htonl(prefixlen2mask(p->conf.remote_masklen));
+-		if (p->conf.remote_addr.v4.s_addr ==
+-		    ((((struct sockaddr_in *)ip)->sin_addr.s_addr) & v4mask))
++		if (p->conf.remote_addr.v4.s_addr == (a->v4.s_addr & v4mask))
+ 			return (1);
+-		else
+-			return (0);
+-	}
+-
+-	if (p->conf.remote_addr.af == AF_INET6) {
+-		bzero(&mask, sizeof(mask));
+-		for (i = 0; i < p->conf.remote_masklen / 8; i++)
+-			mask.s6_addr[i] = 0xff;
+-		i = p->conf.remote_masklen % 8;
+-		if (i)
+-			mask.s6_addr[p->conf.remote_masklen / 8] = 0xff00 >> i;
+-
+-		in = &((struct sockaddr_in6 *)ip)->sin6_addr;
+-
+-		for (i = 0; i < 16; i++)
+-			if ((in->s6_addr[i] & mask.s6_addr[i]) !=
+-			    p->conf.remote_addr.addr8[i])
+-				return (0);
++		return (0);
++	case AID_INET6:
++		inet6applymask(&masked, &a->v6, p->conf.remote_masklen);
+ 
+-		return (1);
++		if (!memcmp(&masked, &p->conf.remote_addr.v6, sizeof(masked)))
++			return (1);
++		return (0);
+ 	}
+-
+ 	return (0);
+ }
+ 
+@@ -2733,6 +2743,7 @@ getpeerbyid(u_int32_t peerid)
+ void
+ session_down(struct peer *peer)
+ {
++	bzero(&peer->capa.neg, sizeof(peer->capa.neg));
+ 	peer->stats.last_updown = time(NULL);
+ 	if (imsg_compose(ibuf_rde, IMSG_SESSION_DOWN, peer->conf.id, 0, -1,
+ 	    NULL, 0) == -1)
+@@ -2748,35 +2759,12 @@ session_up(struct peer *p)
+ 	    &p->conf, sizeof(p->conf)) == -1)
+ 		fatalx("imsg_compose error");
+ 
+-	switch (p->sa_local.ss_family) {
+-	case AF_INET:
+-		sup.local_addr.af = AF_INET;
+-		memcpy(&sup.local_addr.v4,
+-		    &((struct sockaddr_in *)&p->sa_local)->sin_addr,
+-		    sizeof(sup.local_addr.v4));
+-		sup.remote_addr.af = AF_INET;
+-		memcpy(&sup.remote_addr.v4,
+-		    &((struct sockaddr_in *)&p->sa_remote)->sin_addr,
+-		    sizeof(sup.remote_addr.v4));
+-		break;
+-	case AF_INET6:
+-		sup.local_addr.af = AF_INET6;
+-		memcpy(&sup.local_addr.v6,
+-		    &((struct sockaddr_in6 *)&p->sa_local)->sin6_addr,
+-		    sizeof(sup.local_addr.v6));
+-		sup.remote_addr.af = AF_INET6;
+-		memcpy(&sup.remote_addr.v6,
+-		    &((struct sockaddr_in6 *)&p->sa_remote)->sin6_addr,
+-		    sizeof(sup.remote_addr.v6));
+-		break;
+-	default:
+-		fatalx("session_up: unsupported address family");
+-	}
++	sa2addr((struct sockaddr *)&p->sa_local, &sup.local_addr);
++	sa2addr((struct sockaddr *)&p->sa_remote, &sup.remote_addr);
+ 
+ 	sup.remote_bgpid = p->remote_bgpid;
+ 	sup.short_as = p->short_as;
+-	memcpy(&sup.capa_announced, &p->capa.ann, sizeof(sup.capa_announced));
+-	memcpy(&sup.capa_received, &p->capa.peer, sizeof(sup.capa_received));
++	memcpy(&sup.capa, &p->capa.neg, sizeof(sup.capa));
+ 	p->stats.last_updown = time(NULL);
+ 	if (imsg_compose(ibuf_rde, IMSG_SESSION_UP, p->conf.id, 0, -1,
+ 	    &sup, sizeof(sup)) == -1)
+@@ -2795,34 +2783,6 @@ imsg_compose_rde(int type, pid_t pid, vo
+ 	return (imsg_compose(ibuf_rde, type, 0, pid, -1, data, datalen));
+ }
+ 
+-static struct sockaddr *
+-addr2sa(struct bgpd_addr *addr, u_int16_t port)
+-{
+-	static struct sockaddr_storage	 ss;
+-	struct sockaddr_in		*sa_in = (struct sockaddr_in *)&ss;
+-	struct sockaddr_in6		*sa_in6 = (struct sockaddr_in6 *)&ss;
+-
+-	bzero(&ss, sizeof(ss));
+-	switch (addr->af) {
+-	case AF_INET:
+-		sa_in->sin_family = AF_INET;
+-		sa_in->sin_len = sizeof(struct sockaddr_in);
+-		sa_in->sin_addr.s_addr = addr->v4.s_addr;
+-		sa_in->sin_port = htons(port);
+-		break;
+-	case AF_INET6:
+-		sa_in6->sin6_family = AF_INET6;
+-		sa_in6->sin6_len = sizeof(struct sockaddr_in6);
+-		memcpy(&sa_in6->sin6_addr, &addr->v6,
+-		    sizeof(sa_in6->sin6_addr));
+-		sa_in6->sin6_port = htons(port);
+-		sa_in6->sin6_scope_id = addr->scope_id;
+-		break;
+-	}
+-
+-	return ((struct sockaddr *)&ss);
+-}
+-
+ void
+ session_demote(struct peer *p, int level)
+ {
+@@ -2837,3 +2797,19 @@ session_demote(struct peer *p, int level
  
  	p->demoted += level;
  }