diff options
author | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 01:49:16 +0100 |
---|---|---|
committer | Chris Hall <chris.hall@highwayman.com> | 2011-03-29 01:49:16 +0100 |
commit | f9956b9524ddafdb9d0cec042213eaa8229aad8c (patch) | |
tree | bf362c892837ef3f5a6a4d4265eb18e1b47ccf33 /bgpd/bgp_btoa.c | |
parent | 9470cb2c32eab220f796b1438b787528272cbe84 (diff) | |
download | quagga-ex15p.tar.bz2 quagga-ex15p.tar.xz |
Bring "ex" version up to date with 0.99.18ex15p
Release: 0.99.18ex15p -- Pipework Branch
Also fixes issue with unknown attributes -- does not release them prematurely.
Contains the "bgpd: New show commands for improved view and address family
support", which is post 0.99.18. (But not RFC 5082 GTSM.)
Diffstat (limited to 'bgpd/bgp_btoa.c')
-rw-r--r-- | bgpd/bgp_btoa.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bgpd/bgp_btoa.c b/bgpd/bgp_btoa.c index 7c708814..42cd0da2 100644 --- a/bgpd/bgp_btoa.c +++ b/bgpd/bgp_btoa.c @@ -18,8 +18,6 @@ along with GNU Zebra; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <zebra.h> - #include "zebra.h" #include "stream.h" #include "log.h" @@ -91,11 +89,11 @@ attr_parse (struct stream *s, u_int16_t len) aspath.str = aspath_make_str_count (&aspath); printf ("ASPATH: %s\n", aspath.str); free (aspath.str); - + stream_forward (s, length); } break; - case BGP_ATTR_NEXT_HOP: + case BGP_ATTR_NEXT_HOP: { struct in_addr nexthop; nexthop.s_addr = stream_get_ipv4 (s); @@ -144,7 +142,7 @@ main (int argc, char **argv) perror ("fopen"); exit (1); } - + while (1) { stream_reset (s); @@ -279,7 +277,7 @@ main (int argc, char **argv) sip.s_addr = stream_get_ipv4 (s); dip.s_addr = stream_get_ipv4 (s); - + printf ("saddr: %s\n", inet_ntoa (sip)); printf ("daddr: %s\n", inet_ntoa (dip)); |