diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-06-22 20:28:59 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2004-06-22 20:28:59 +0000 |
| commit | 6fea9855664583f52deafa42b35f7320cad8da93 (patch) | |
| tree | 03958bbe9997531e60137428ca3852b1405c29eb /usr.sbin/bgpd/rde_update.c | |
| parent | 73fe7b61cd58457249a00cb41a0673dc5db8bbaa (diff) | |
Make the RDE IPv6 ready missing is the message handling. The internal
prefix tree changed form a hash table to a per AF RB tree.
OK henning@ some ideas are from Brent Graveland.
Diffstat (limited to 'usr.sbin/bgpd/rde_update.c')
| -rw-r--r-- | usr.sbin/bgpd/rde_update.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/bgpd/rde_update.c b/usr.sbin/bgpd/rde_update.c index 3d0db418b8d..88adabcc2b9 100644 --- a/usr.sbin/bgpd/rde_update.c +++ b/usr.sbin/bgpd/rde_update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_update.c,v 1.19 2004/06/20 18:35:12 henning Exp $ */ +/* $OpenBSD: rde_update.c,v 1.20 2004/06/22 20:28:58 claudio Exp $ */ /* * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> @@ -213,6 +213,7 @@ up_generate_updates(struct rde_peer *peer, struct update_prefix *p; struct attr *atr; struct attr_flags attrs; + struct bgpd_addr addr; ENSURE(peer->state == PEER_UP); /* @@ -302,7 +303,8 @@ up_generate_updates(struct rde_peer *peer, /* copy attributes for output filter */ attr_copy(&attrs, &old->aspath->flags); - if (rde_filter(peer, &attrs, &old->prefix->prefix, + pt_getaddr(old->prefix, &addr); + if (rde_filter(peer, &attrs, &addr, old->prefix->prefixlen, DIR_OUT) == ACTION_DENY) { attr_free(&attrs); return; @@ -314,7 +316,7 @@ up_generate_updates(struct rde_peer *peer, if (p == NULL) fatal("up_queue_update"); - p->prefix = old->prefix->prefix; + p->prefix = addr; p->prefixlen = old->prefix->prefixlen; if (up_add(peer, p, NULL) == -1) log_warnx("queuing withdraw failed."); @@ -395,7 +397,8 @@ up_generate_updates(struct rde_peer *peer, /* copy attributes for output filter */ attr_copy(&attrs, &new->aspath->flags); - if (rde_filter(peer, &attrs, &new->prefix->prefix, + pt_getaddr(new->prefix, &addr); + if (rde_filter(peer, &attrs, &addr, new->prefix->prefixlen, DIR_OUT) == ACTION_DENY) { attr_free(&attrs); up_generate_updates(peer, NULL, old); @@ -439,7 +442,7 @@ up_generate_updates(struct rde_peer *peer, * but currently I don't care. */ a->attr_hash = aspath_hash(attrs.aspath); - p->prefix = new->prefix->prefix; + p->prefix = addr; p->prefixlen = new->prefix->prefixlen; /* no longer needed */ |