diff options
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_mrt.c')
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_mrt.c | 480 |
1 files changed, 457 insertions, 23 deletions
diff --git a/net/openbgpd/files/patch-bgpd_mrt.c b/net/openbgpd/files/patch-bgpd_mrt.c index c35359ac5f39..4b5248a73d4e 100644 --- a/net/openbgpd/files/patch-bgpd_mrt.c +++ b/net/openbgpd/files/patch-bgpd_mrt.c @@ -2,26 +2,228 @@ Index: bgpd/mrt.c =================================================================== RCS file: /home/cvs/private/hrs/openbgpd/bgpd/mrt.c,v retrieving revision 1.1.1.7 -retrieving revision 1.1.1.8 -diff -u -p -r1.1.1.7 -r1.1.1.8 +retrieving revision 1.1.1.9 +diff -u -p -r1.1.1.7 -r1.1.1.9 --- bgpd/mrt.c 14 Feb 2010 20:19:57 -0000 1.1.1.7 -+++ bgpd/mrt.c 14 Feb 2010 20:27:06 -0000 1.1.1.8 ++++ bgpd/mrt.c 12 Jun 2011 10:44:25 -0000 1.1.1.9 @@ -1,4 +1,4 @@ -/* $OpenBSD: mrt.c,v 1.63 2009/06/29 12:22:16 claudio Exp $ */ -+/* $OpenBSD: mrt.c,v 1.66 2009/12/01 14:28:05 claudio Exp $ */ ++/* $OpenBSD: mrt.c,v 1.70 2010/09/02 14:03:21 sobrado Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> -@@ -194,7 +194,7 @@ mrt_dump_entry_mp(struct mrt *mrt, struc +@@ -32,20 +32,20 @@ + + #include "mrt.h" + +-int mrt_attr_dump(struct buf *, struct rde_aspath *, struct bgpd_addr *); ++int mrt_attr_dump(struct ibuf *, struct rde_aspath *, struct bgpd_addr *); + int mrt_dump_entry_mp(struct mrt *, struct prefix *, u_int16_t, + struct rde_peer*); + int mrt_dump_entry(struct mrt *, struct prefix *, u_int16_t, struct rde_peer*); +-int mrt_dump_hdr_se(struct buf **, struct peer *, u_int16_t, u_int16_t, ++int mrt_dump_hdr_se(struct ibuf **, struct peer *, u_int16_t, u_int16_t, + u_int32_t, int); +-int mrt_dump_hdr_rde(struct buf **, u_int16_t type, u_int16_t, u_int32_t); ++int mrt_dump_hdr_rde(struct ibuf **, u_int16_t type, u_int16_t, u_int32_t); + int mrt_open(struct mrt *, time_t); + + #define DUMP_BYTE(x, b) \ + do { \ + u_char t = (b); \ +- if (buf_add((x), &t, sizeof(t)) == -1) { \ +- log_warnx("mrt_dump1: buf_add error"); \ ++ if (ibuf_add((x), &t, sizeof(t)) == -1) { \ ++ log_warnx("mrt_dump1: ibuf_add error"); \ + goto fail; \ + } \ + } while (0) +@@ -54,8 +54,8 @@ int mrt_open(struct mrt *, time_t); + do { \ + u_int16_t t; \ + t = htons((s)); \ +- if (buf_add((x), &t, sizeof(t)) == -1) { \ +- log_warnx("mrt_dump2: buf_add error"); \ ++ if (ibuf_add((x), &t, sizeof(t)) == -1) { \ ++ log_warnx("mrt_dump2: ibuf_add error"); \ + goto fail; \ + } \ + } while (0) +@@ -64,8 +64,8 @@ int mrt_open(struct mrt *, time_t); + do { \ + u_int32_t t; \ + t = htonl((l)); \ +- if (buf_add((x), &t, sizeof(t)) == -1) { \ +- log_warnx("mrt_dump3: buf_add error"); \ ++ if (ibuf_add((x), &t, sizeof(t)) == -1) { \ ++ log_warnx("mrt_dump3: ibuf_add error"); \ + goto fail; \ + } \ + } while (0) +@@ -73,8 +73,8 @@ int mrt_open(struct mrt *, time_t); + #define DUMP_NLONG(x, l) \ + do { \ + u_int32_t t = (l); \ +- if (buf_add((x), &t, sizeof(t)) == -1) { \ +- log_warnx("mrt_dump4: buf_add error"); \ ++ if (ibuf_add((x), &t, sizeof(t)) == -1) { \ ++ log_warnx("mrt_dump4: ibuf_add error"); \ + goto fail; \ + } \ + } while (0) +@@ -83,55 +83,63 @@ void + mrt_dump_bgp_msg(struct mrt *mrt, void *pkg, u_int16_t pkglen, + struct peer *peer) + { +- struct buf *buf; ++ struct ibuf *buf; + int incoming = 0; ++ u_int16_t subtype = BGP4MP_MESSAGE; ++ ++ if (peer->capa.neg.as4byte) ++ subtype = BGP4MP_MESSAGE_AS4; + + /* get the direction of the message to swap address and AS fields */ + if (mrt->type == MRT_ALL_IN || mrt->type == MRT_UPDATE_IN) + incoming = 1; + +- if (mrt_dump_hdr_se(&buf, peer, MSG_PROTOCOL_BGP4MP, BGP4MP_MESSAGE, ++ if (mrt_dump_hdr_se(&buf, peer, MSG_PROTOCOL_BGP4MP, subtype, + pkglen, incoming) == -1) + return; + +- if (buf_add(buf, pkg, pkglen) == -1) { ++ if (ibuf_add(buf, pkg, pkglen) == -1) { + log_warnx("mrt_dump_bgp_msg: buf_add error"); +- buf_free(buf); ++ ibuf_free(buf); + return; + } + +- buf_close(&mrt->wbuf, buf); ++ ibuf_close(&mrt->wbuf, buf); + } + + void + mrt_dump_state(struct mrt *mrt, u_int16_t old_state, u_int16_t new_state, + struct peer *peer) + { +- struct buf *buf; ++ struct ibuf *buf; ++ u_int16_t subtype = BGP4MP_STATE_CHANGE; ++ ++ if (peer->capa.neg.as4byte) ++ subtype = BGP4MP_STATE_CHANGE_AS4; + +- if (mrt_dump_hdr_se(&buf, peer, MSG_PROTOCOL_BGP4MP, BGP4MP_MESSAGE, ++ if (mrt_dump_hdr_se(&buf, peer, MSG_PROTOCOL_BGP4MP, subtype, + 2 * sizeof(short), 0) == -1) + return; + + DUMP_SHORT(buf, old_state); + DUMP_SHORT(buf, new_state); + +- buf_close(&mrt->wbuf, buf); ++ ibuf_close(&mrt->wbuf, buf); + return; + + fail: +- buf_free(buf); ++ ibuf_free(buf); + } + + int +-mrt_attr_dump(struct buf *buf, struct rde_aspath *a, struct bgpd_addr *nexthop) ++mrt_attr_dump(struct ibuf *buf, struct rde_aspath *a, struct bgpd_addr *nexthop) + { + struct attr *oa; + u_char *pdata; + u_int32_t tmp; + int neednewpath = 0; +- u_int16_t plen; +- u_int8_t l; ++ u_int16_t plen, afi; ++ u_int8_t l, mpattr[21]; + + /* origin */ + if (attr_writebuf(buf, ATTR_WELL_KNOWN, ATTR_ORIGIN, +@@ -141,11 +149,14 @@ mrt_attr_dump(struct buf *buf, struct rd + /* aspath */ + pdata = aspath_prepend(a->aspath, rde_local_as(), 0, &plen); + pdata = aspath_deflate(pdata, &plen, &neednewpath); +- if (attr_writebuf(buf, ATTR_WELL_KNOWN, ATTR_ASPATH, pdata, plen) == -1) ++ if (attr_writebuf(buf, ATTR_WELL_KNOWN, ATTR_ASPATH, pdata, ++ plen) == -1) { ++ free(pdata); + return (-1); ++ } + free(pdata); + +- if (nexthop) { ++ if (nexthop && nexthop->aid == AID_INET) { + /* nexthop, already network byte order */ + if (attr_writebuf(buf, ATTR_WELL_KNOWN, ATTR_NEXTHOP, + &nexthop->v4.s_addr, 4) == -1) +@@ -173,12 +184,27 @@ mrt_attr_dump(struct buf *buf, struct rd + return (-1); + } + ++ if (nexthop && nexthop->aid != AID_INET) { ++ if (aid2afi(nexthop->aid, &afi, &mpattr[2])) ++ return (-1); ++ afi = htons(afi); ++ memcpy(mpattr, &afi, sizeof(afi)); ++ mpattr[3] = sizeof(struct in6_addr); ++ memcpy(&mpattr[4], &nexthop->v6, sizeof(struct in6_addr)); ++ mpattr[20] = 0; /* Reserved must be 0 */ ++ if (attr_writebuf(buf, ATTR_OPTIONAL, ATTR_MP_REACH_NLRI, ++ mpattr, sizeof(mpattr)) == -1) ++ return (-1); ++ } ++ + if (neednewpath) { + pdata = aspath_prepend(a->aspath, rde_local_as(), 0, &plen); + if (plen != 0) + if (attr_writebuf(buf, ATTR_OPTIONAL|ATTR_TRANSITIVE, +- ATTR_AS4_PATH, pdata, plen) == -1) ++ ATTR_AS4_PATH, pdata, plen) == -1) { ++ free(pdata); + return (-1); ++ } + free(pdata); + } + +@@ -189,14 +215,14 @@ int + mrt_dump_entry_mp(struct mrt *mrt, struct prefix *p, u_int16_t snum, + struct rde_peer *peer) + { +- struct buf *buf, *hbuf = NULL, *h2buf = NULL; ++ struct ibuf *buf, *hbuf = NULL, *h2buf = NULL; + void *bptr; struct bgpd_addr addr, nexthop, *nh; u_int16_t len; u_int8_t p_len; - sa_family_t af; + u_int8_t aid; - if ((buf = buf_dynamic(0, MAX_PKTSIZE)) == NULL) { +- if ((buf = buf_dynamic(0, MAX_PKTSIZE)) == NULL) { ++ if ((buf = ibuf_dynamic(0, MAX_PKTSIZE)) == NULL) { + log_warn("mrt_dump_entry_mp: buf_dynamic"); + return (-1); + } +@@ -205,9 +231,9 @@ mrt_dump_entry_mp(struct mrt *mrt, struc + log_warnx("mrt_dump_entry_mp: mrt_attr_dump error"); + goto fail; + } +- len = buf_size(buf); ++ len = ibuf_size(buf); + +- if ((h2buf = buf_dynamic(MRT_BGP4MP_IPv4_HEADER_SIZE + ++ if ((h2buf = ibuf_dynamic(MRT_BGP4MP_IPv4_HEADER_SIZE + + MRT_BGP4MP_IPv4_ENTRY_SIZE, MRT_BGP4MP_IPv6_HEADER_SIZE + + MRT_BGP4MP_IPv6_ENTRY_SIZE + MRT_BGP4MP_MAX_PREFIXLEN)) == NULL) { log_warn("mrt_dump_entry_mp: buf_dynamic"); -@@ -219,14 +219,15 @@ mrt_dump_entry_mp(struct mrt *mrt, struc +@@ -219,25 +245,26 @@ mrt_dump_entry_mp(struct mrt *mrt, struc DUMP_SHORT(h2buf, /* ifindex */ 0); /* XXX is this for peer self? */ @@ -39,9 +241,14 @@ diff -u -p -r1.1.1.7 -r1.1.1.8 - case AF_INET6: + case AID_INET6: DUMP_SHORT(h2buf, AFI_IPv6); - if (buf_add(h2buf, &peer->local_v6_addr.v6, +- if (buf_add(h2buf, &peer->local_v6_addr.v6, ++ if (ibuf_add(h2buf, &peer->local_v6_addr.v6, sizeof(struct in6_addr)) == -1 || -@@ -237,7 +238,7 @@ mrt_dump_entry_mp(struct mrt *mrt, struc +- buf_add(h2buf, &peer->remote_addr.v6, ++ ibuf_add(h2buf, &peer->remote_addr.v6, + sizeof(struct in6_addr)) == -1) { + log_warnx("mrt_dump_entry_mp: buf_add error"); + goto fail; } break; default: @@ -50,7 +257,7 @@ diff -u -p -r1.1.1.7 -r1.1.1.8 goto fail; } -@@ -247,20 +248,20 @@ mrt_dump_entry_mp(struct mrt *mrt, struc +@@ -247,24 +274,24 @@ mrt_dump_entry_mp(struct mrt *mrt, struc if (p->aspath->nexthop == NULL) { bzero(&nexthop, sizeof(struct bgpd_addr)); @@ -75,35 +282,153 @@ diff -u -p -r1.1.1.7 -r1.1.1.8 DUMP_SHORT(h2buf, AFI_IPv6); /* afi */ DUMP_BYTE(h2buf, SAFI_UNICAST); /* safi */ DUMP_BYTE(h2buf, 16); /* nhlen */ -@@ -300,7 +301,7 @@ mrt_dump_entry_mp(struct mrt *mrt, struc +- if (buf_add(h2buf, &nh->v6, sizeof(struct in6_addr)) == -1) { ++ if (ibuf_add(h2buf, &nh->v6, sizeof(struct in6_addr)) == -1) { + log_warnx("mrt_dump_entry_mp: buf_add error"); + goto fail; + } +@@ -275,7 +302,7 @@ mrt_dump_entry_mp(struct mrt *mrt, struc + } + + p_len = PREFIX_SIZE(p->prefix->prefixlen); +- if ((bptr = buf_reserve(h2buf, p_len)) == NULL) { ++ if ((bptr = ibuf_reserve(h2buf, p_len)) == NULL) { + log_warnx("mrt_dump_entry_mp: buf_reserve error"); + goto fail; + } +@@ -285,24 +312,24 @@ mrt_dump_entry_mp(struct mrt *mrt, struc + } + + DUMP_SHORT(h2buf, len); +- len += buf_size(h2buf); ++ len += ibuf_size(h2buf); + + if (mrt_dump_hdr_rde(&hbuf, MSG_PROTOCOL_BGP4MP, BGP4MP_ENTRY, + len) == -1) + goto fail; + +- buf_close(&mrt->wbuf, hbuf); +- buf_close(&mrt->wbuf, h2buf); +- buf_close(&mrt->wbuf, buf); ++ ibuf_close(&mrt->wbuf, hbuf); ++ ibuf_close(&mrt->wbuf, h2buf); ++ ibuf_close(&mrt->wbuf, buf); + + return (len + MRT_HEADER_SIZE); + fail: if (hbuf) - buf_free(hbuf); +- buf_free(hbuf); - if (h2buf); +- buf_free(h2buf); +- buf_free(buf); ++ ibuf_free(hbuf); + if (h2buf) - buf_free(h2buf); - buf_free(buf); ++ ibuf_free(h2buf); ++ ibuf_free(buf); return (-1); -@@ -314,7 +315,8 @@ mrt_dump_entry(struct mrt *mrt, struct p + } + +@@ -310,34 +337,37 @@ int + mrt_dump_entry(struct mrt *mrt, struct prefix *p, u_int16_t snum, + struct rde_peer *peer) + { +- struct buf *buf, *hbuf; ++ struct ibuf *buf, *hbuf; struct bgpd_addr addr, *nh; size_t len; ++ u_int16_t subtype; ++ u_int8_t dummy; - if (p->prefix->af != AF_INET && peer->remote_addr.af == AF_INET) -+ if (p->prefix->aid != AID_INET && -+ peer->remote_addr.aid == AID_INET) - /* only able to dump IPv4 */ +- /* only able to dump IPv4 */ ++ if (p->prefix->aid != peer->remote_addr.aid && ++ p->prefix->aid != AID_INET && p->prefix->aid != AID_INET6) ++ /* only able to dump pure IPv4/IPv6 */ return (0); -@@ -325,7 +327,7 @@ mrt_dump_entry(struct mrt *mrt, struct p +- if ((buf = buf_dynamic(0, MAX_PKTSIZE)) == NULL) { ++ if ((buf = ibuf_dynamic(0, MAX_PKTSIZE)) == NULL) { + log_warnx("mrt_dump_entry: buf_dynamic"); + return (-1); + } if (p->aspath->nexthop == NULL) { bzero(&addr, sizeof(struct bgpd_addr)); - addr.af = AF_INET; -+ addr.aid = AID_INET; ++ addr.aid = p->prefix->aid; nh = &addr; } else nh = &p->aspath->nexthop->exit_nexthop; -@@ -387,7 +389,7 @@ mrt_dump_upcall(struct rib_entry *re, vo + if (mrt_attr_dump(buf, p->aspath, nh) == -1) { + log_warnx("mrt_dump_entry: mrt_attr_dump error"); +- buf_free(buf); ++ ibuf_free(buf); + return (-1); + } +- len = buf_size(buf); +- +- if (mrt_dump_hdr_rde(&hbuf, MSG_TABLE_DUMP, AFI_IPv4, len) == -1) { +- buf_free(buf); ++ len = ibuf_size(buf); ++ aid2afi(p->prefix->aid, &subtype, &dummy); ++ if (mrt_dump_hdr_rde(&hbuf, MSG_TABLE_DUMP, subtype, len) == -1) { ++ ibuf_free(buf); + return (-1); + } + +@@ -345,23 +375,44 @@ mrt_dump_entry(struct mrt *mrt, struct p + DUMP_SHORT(hbuf, snum); + + pt_getaddr(p->prefix, &addr); +- DUMP_NLONG(hbuf, addr.v4.s_addr); ++ switch (p->prefix->aid) { ++ case AID_INET: ++ DUMP_NLONG(hbuf, addr.v4.s_addr); ++ break; ++ case AID_INET6: ++ if (ibuf_add(hbuf, &addr.v6, sizeof(struct in6_addr)) == -1) { ++ log_warnx("mrt_dump_entry: buf_add error"); ++ goto fail; ++ } ++ break; ++ } + DUMP_BYTE(hbuf, p->prefix->prefixlen); + + DUMP_BYTE(hbuf, 1); /* state */ + DUMP_LONG(hbuf, p->lastchange); /* originated */ +- DUMP_NLONG(hbuf, peer->remote_addr.v4.s_addr); ++ switch (p->prefix->aid) { ++ case AID_INET: ++ DUMP_NLONG(hbuf, peer->remote_addr.v4.s_addr); ++ break; ++ case AID_INET6: ++ if (ibuf_add(hbuf, &peer->remote_addr.v6, ++ sizeof(struct in6_addr)) == -1) { ++ log_warnx("mrt_dump_entry: buf_add error"); ++ goto fail; ++ } ++ break; ++ } + DUMP_SHORT(hbuf, peer->short_as); + DUMP_SHORT(hbuf, len); + +- buf_close(&mrt->wbuf, hbuf); +- buf_close(&mrt->wbuf, buf); ++ ibuf_close(&mrt->wbuf, hbuf); ++ ibuf_close(&mrt->wbuf, buf); + + return (len + MRT_HEADER_SIZE); + + fail: +- buf_free(hbuf); +- buf_free(buf); ++ ibuf_free(hbuf); ++ ibuf_free(buf); + return (-1); + } + +@@ -387,7 +438,7 @@ mrt_dump_upcall(struct rib_entry *re, vo } void @@ -112,11 +437,120 @@ diff -u -p -r1.1.1.7 -r1.1.1.8 { struct mrt *mrtbuf = ptr; -@@ -541,6 +543,7 @@ mrt_write(struct mrt *mrt) - if ((r = buf_write(&mrt->wbuf)) < 0) { +@@ -395,12 +446,12 @@ mrt_dump_done(void *ptr) + } + + int +-mrt_dump_hdr_se(struct buf ** bp, struct peer *peer, u_int16_t type, ++mrt_dump_hdr_se(struct ibuf ** bp, struct peer *peer, u_int16_t type, + u_int16_t subtype, u_int32_t len, int swap) + { + time_t now; + +- if ((*bp = buf_dynamic(MRT_HEADER_SIZE, MRT_HEADER_SIZE + ++ if ((*bp = ibuf_dynamic(MRT_HEADER_SIZE, MRT_HEADER_SIZE + + MRT_BGP4MP_AS4_IPv6_HEADER_SIZE + len)) == NULL) { + log_warnx("mrt_dump_hdr_se: buf_open error"); + return (-1); +@@ -468,20 +519,20 @@ mrt_dump_hdr_se(struct buf ** bp, struct + case AF_INET6: + DUMP_SHORT(*bp, AFI_IPv6); + if (!swap) +- if (buf_add(*bp, &((struct sockaddr_in6 *) ++ if (ibuf_add(*bp, &((struct sockaddr_in6 *) + &peer->sa_local)->sin6_addr, + sizeof(struct in6_addr)) == -1) { + log_warnx("mrt_dump_hdr_se: buf_add error"); + goto fail; + } +- if (buf_add(*bp, ++ if (ibuf_add(*bp, + &((struct sockaddr_in6 *)&peer->sa_remote)->sin6_addr, + sizeof(struct in6_addr)) == -1) { + log_warnx("mrt_dump_hdr_se: buf_add error"); + goto fail; + } + if (swap) +- if (buf_add(*bp, &((struct sockaddr_in6 *) ++ if (ibuf_add(*bp, &((struct sockaddr_in6 *) + &peer->sa_local)->sin6_addr, + sizeof(struct in6_addr)) == -1) { + log_warnx("mrt_dump_hdr_se: buf_add error"); +@@ -493,17 +544,17 @@ mrt_dump_hdr_se(struct buf ** bp, struct + return (0); + + fail: +- buf_free(*bp); ++ ibuf_free(*bp); + return (-1); + } + + int +-mrt_dump_hdr_rde(struct buf **bp, u_int16_t type, u_int16_t subtype, ++mrt_dump_hdr_rde(struct ibuf **bp, u_int16_t type, u_int16_t subtype, + u_int32_t len) + { + time_t now; + +- if ((*bp = buf_dynamic(MRT_HEADER_SIZE, MRT_HEADER_SIZE + ++ if ((*bp = ibuf_dynamic(MRT_HEADER_SIZE, MRT_HEADER_SIZE + + MRT_BGP4MP_AS4_IPv6_HEADER_SIZE + MRT_BGP4MP_IPv6_ENTRY_SIZE)) == + NULL) { + log_warnx("mrt_dump_hdr_rde: buf_dynamic error"); +@@ -517,7 +568,15 @@ mrt_dump_hdr_rde(struct buf **bp, u_int1 + + switch (type) { + case MSG_TABLE_DUMP: +- DUMP_LONG(*bp, MRT_DUMP_HEADER_SIZE + len); ++ switch (subtype) { ++ case AFI_IPv4: ++ len += MRT_DUMP_HEADER_SIZE; ++ break; ++ case AFI_IPv6: ++ len += MRT_DUMP_HEADER_SIZE_V6; ++ break; ++ } ++ DUMP_LONG(*bp, len); + break; + case MSG_PROTOCOL_BGP4MP: + DUMP_LONG(*bp, len); +@@ -525,11 +584,11 @@ mrt_dump_hdr_rde(struct buf **bp, u_int1 + default: + log_warnx("mrt_dump_hdr_rde: unsupported type"); + goto fail; +- } ++ } + return (0); + + fail: +- buf_free(*bp); ++ ibuf_free(*bp); + return (-1); + } + +@@ -538,21 +597,22 @@ mrt_write(struct mrt *mrt) + { + int r; + +- if ((r = buf_write(&mrt->wbuf)) < 0) { ++ if ((r = ibuf_write(&mrt->wbuf)) < 0) { log_warn("mrt dump aborted, mrt_write"); mrt_clean(mrt); + mrt_done(mrt); } } + void + mrt_clean(struct mrt *mrt) + { +- struct buf *b; ++ struct ibuf *b; + + close(mrt->wbuf.fd); + while ((b = TAILQ_FIRST(&mrt->wbuf.bufs))) { + TAILQ_REMOVE(&mrt->wbuf.bufs, b, entry); +- buf_free(b); ++ ibuf_free(b); + } + mrt->wbuf.queued = 0; + } |