diff options
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/Makefile.in | 2 | ||||
| -rw-r--r-- | bgpd/bgp_advertise.h | 33 | ||||
| -rw-r--r-- | bgpd/bgp_clist.c | 4 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 5 | ||||
| -rw-r--r-- | bgpd/bgp_snmp.c | 2 |
5 files changed, 8 insertions, 38 deletions
diff --git a/bgpd/Makefile.in b/bgpd/Makefile.in index 85b49e48..f6cceec4 100644 --- a/bgpd/Makefile.in +++ b/bgpd/Makefile.in @@ -204,7 +204,7 @@ all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --foreign bgpd/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status diff --git a/bgpd/bgp_advertise.h b/bgpd/bgp_advertise.h index e2ae0104..798cf0fd 100644 --- a/bgpd/bgp_advertise.h +++ b/bgpd/bgp_advertise.h @@ -99,39 +99,6 @@ struct bgp_synchronize struct bgp_advertise_fifo withdraw_low; }; -/* FIFO -- first in first out structure and macros. */ -struct fifo -{ - struct fifo *next; - struct fifo *prev; -}; - -#define FIFO_INIT(F) \ - do { \ - struct fifo *Xfifo = (struct fifo *)(F); \ - Xfifo->next = Xfifo->prev = Xfifo; \ - } while (0) - -#define FIFO_ADD(F,N) \ - do { \ - struct fifo *Xfifo = (struct fifo *)(F); \ - struct fifo *Xnode = (struct fifo *)(N); \ - Xnode->next = Xfifo; \ - Xnode->prev = Xfifo->prev; \ - Xfifo->prev = Xfifo->prev->next = Xnode; \ - } while (0) - -#define FIFO_DEL(N) \ - do { \ - struct fifo *Xnode = (struct fifo *)(N); \ - Xnode->prev->next = Xnode->next; \ - Xnode->next->prev = Xnode->prev; \ - } while (0) - -#define FIFO_HEAD(F) \ - ((((struct fifo *)(F))->next == (struct fifo *)(F)) \ - ? NULL : (F)->next) - /* BGP adjacency linked list. */ #define BGP_INFO_ADD(N,A,TYPE) \ do { \ diff --git a/bgpd/bgp_clist.c b/bgpd/bgp_clist.c index 4bf194e3..2e03f48d 100644 --- a/bgpd/bgp_clist.c +++ b/bgpd/bgp_clist.c @@ -269,7 +269,7 @@ community_list_delete (struct community_list *list) community_list_free (list); } -int +int community_list_empty_p (struct community_list *list) { return (list->head == NULL && list->tail == NULL) ? 1 : 0; @@ -514,7 +514,7 @@ community_list_exact_match (struct community *com, struct community_list *list) return 0; } -/* Delete all permitted communities in the list from com1 */ +/* Delete all permitted communities in the list from com. */ struct community * community_list_match_delete (struct community *com, struct community_list *list) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 58d97b0f..cc7dbfa6 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -620,7 +620,10 @@ bgp_announce_check (struct bgp_info *ri, struct peer *peer, struct prefix *p, if (transparent || reflect || (CHECK_FLAG (peer->af_flags[afi][safi], PEER_FLAG_NEXTHOP_UNCHANGED) && ((p->family == AF_INET && attr->nexthop.s_addr) - || (p->family == AF_INET6 && ri->peer != bgp->peer_self)))) +#ifdef HAVE_IPV6 + || (p->family == AF_INET6 && ri->peer != bgp->peer_self) +#endif /* HAVE_IPV6 */ + ))) { /* NEXT-HOP Unchanged. */ } diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index bf9c7f87..6215edee 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c @@ -516,7 +516,7 @@ bgpPeerTable (struct variable *v, oid name[], size_t *length, case BGPPEEROUTTOTALMESSAGES: return SNMP_INTEGER (peer->open_out + peer->update_out + peer->keepalive_out + peer->notify_out - + peer->refresh_out, peer->dynamic_cap_out); + + peer->refresh_out + peer->dynamic_cap_out); break; case BGPPEERLASTERROR: { |