diff zebra-0.92a/bgpd/Makefile.am zebra-0.92b/bgpd/Makefile.am
15c15
< 	bgp_dump.c bgp_snmp.c bgp_ecommunity.c bgp_mplsvpn.c bgp_nexthop.c \
---
> 	bgp_dump.cc bgp_snmp.c bgp_ecommunity.c bgp_mplsvpn.c bgp_nexthop.c \
27c27
< bgpd_LDADD = ../lib/libzebra.a
---
> bgpd_LDADD = ../lib/libzebra.a /usr/local/lib/libbgpdump.a -ltcl
85c85
< bgp_dump.o: bgp_dump.c ../lib/log.h ../lib/stream.h ../lib/sockunion.h \
---
> bgp_dump.o: bgp_dump.cc ../lib/log.h ../lib/stream.h ../lib/sockunion.h \
diff zebra-0.92a/bgpd/Makefile.in zebra-0.92b/bgpd/Makefile.in
66a67
> CXX = @CXX@
97c98
< libbgp_a_SOURCES =  	bgpd.c bgp_fsm.c bgp_aspath.c bgp_community.c bgp_attr.c 	bgp_debug.c bgp_route.c bgp_zebra.c bgp_open.c bgp_routemap.c 	bgp_packet.c bgp_network.c bgp_filter.c bgp_regex.c bgp_clist.c 	bgp_dump.c bgp_snmp.c bgp_ecommunity.c bgp_mplsvpn.c bgp_nexthop.c 	bgp_damp.c
---
> libbgp_a_SOURCES =  	bgpd.c bgp_fsm.c bgp_aspath.c bgp_community.c bgp_attr.c 	bgp_debug.c bgp_route.c bgp_zebra.c bgp_open.c bgp_routemap.c 	bgp_packet.c bgp_network.c bgp_filter.c bgp_regex.c bgp_clist.c 	bgp_dump.cc bgp_snmp.c bgp_ecommunity.c bgp_mplsvpn.c bgp_nexthop.c 	bgp_damp.c
106c107
< bgpd_LDADD = ../lib/libzebra.a
---
> bgpd_LDADD = ../lib/libzebra.a /usr/local/lib/libbgpdump.a -ltcl
137c138
< bgpd_DEPENDENCIES =  ../lib/libzebra.a
---
> bgpd_DEPENDENCIES =  ../lib/libzebra.a /usr/local/lib/libbgpdump.a
138a140,143
> CXXFLAGS = @CXXFLAGS@
> CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
> CXXLD = $(CXX)
> CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
152c157
< TAR = tar
---
> TAR = gtar
159c164
< .SUFFIXES: .S .c .o .s
---
> .SUFFIXES: .S .c .cc .o .s
228c233,235
< 	$(LINK) $(bgpd_LDFLAGS) $(bgpd_OBJECTS) $(bgpd_LDADD) $(LIBS)
---
> 	$(CXXLINK) $(bgpd_LDFLAGS) $(bgpd_OBJECTS) $(bgpd_LDADD) $(LIBS)
> .cc.o:
> 	$(CXXCOMPILE) -c $<
273c280
< 	    cp -pr $$/$$file $(distdir)/$$file; \
---
> 	    cp -pr $$d/$$file $(distdir)/$$file; \
403c410
< bgp_dump.o: bgp_dump.c ../lib/log.h ../lib/stream.h ../lib/sockunion.h \
---
> bgp_dump.o: bgp_dump.cc ../lib/log.h ../lib/stream.h ../lib/sockunion.h \
23a24
> extern "C" {
36c37,43
< 
---
> }
> 
> #include <bgptools/trace.h>
> 
> #undef VTY_NEWLINE
> #define VTY_NEWLINE "\n"
> 
89c96,98
< 
---
> 
> traceClient tc("/tmp/zebra_bgpdump");
> 
120c129
< 
---
>   tc.connect_();
292c301
<     for (info = rn->info; info; info = info->next)
---
>     for (info = (bgp_info*)rn->info; info; info = info->next)
301c310
<   bgp_dump = THREAD_ARG (t);
---
>   bgp_dump = (struct bgp_dump*)THREAD_ARG (t);
392a402,403
>   /* for running traceroutes */
> 
413a425,432
> 
>   /* Write to sniffing BGP daemon */
>   int ret = tc.sendUpdate((char*)STREAM_DATA(obuf), (int)stream_get_putp(obuf));
>   if (ret < 0) 
>     fprintf(stderr, "error printing to sniffer...\n");
>   else
>     fprintf(stderr, "wrote to sniffer...%d\n", stream_get_putp(obuf));
>     
487c506
< 	  vty_out (vty, "Malformed interval string%s", VTY_NEWLINE);
---
>   	  vty_out (vty, "Malformed interval string%s", VTY_NEWLINE);
501c520
<   bgp_dump->type = type;
---
>   bgp_dump->type = (bgp_dump_type)type;
529a549
>   tc.close_();
724a745
> 
742a764,765
> 
>