Author: adrian.chadd
Date: Sun Feb 22 21:38:00 2009
New Revision: 13846
Removed:
playpen/LUSCA_HEAD_bgp/app/bgptest/bgpconn.c
playpen/LUSCA_HEAD_bgp/app/bgptest/bgpconn.h
Modified:
playpen/LUSCA_HEAD_bgp/Makefile.am
playpen/LUSCA_HEAD_bgp/app/bgptest/Makefile.am
playpen/LUSCA_HEAD_bgp/app/bgptest/bgptest.c
playpen/LUSCA_HEAD_bgp/src/Makefile.am
Log:
Tie the bGP code into the main build.
Remove the old bgpconn code; its in libsqbgp/ now.
Modified: playpen/LUSCA_HEAD_bgp/Makefile.am
==============================================================================
--- playpen/LUSCA_HEAD_bgp/Makefile.am (original)
+++ playpen/LUSCA_HEAD_bgp/Makefile.am Sun Feb 22 21:38:00 2009
@@ -4,8 +4,8 @@
#
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5
-DIST_SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat libhttp
libsqdns libsqident libsqinet libhelper libmime libsqdebug libstmem snmplib
scripts src icons errors contrib doc helpers tools app libsqbgp
-SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat
libhttp
libsqdns libsqident libsqinet libhelper libmime libsqdebug libstmem
@makesnmplib@ scripts src icons errors doc helpers tools app libsqbgp
+DIST_SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat libhttp
libsqbgp libsqdns libsqident libsqinet libhelper libmime libsqdebug
libstmem snmplib scripts src icons errors contrib doc helpers tools app
+SUBDIRS = lib libcore libmem libsqname libcb libiapp libstat
libhttp
libsqbgp libsqdns libsqident libsqinet libhelper libmime libsqdebug
libstmem @makesnmplib@ scripts src icons errors doc helpers tools app
DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
DEFAULT_PINGER = $(libexecdir)/`echo pinger |
sed '$(transform);s/$$/$(EXEEXT)/'`
Modified: playpen/LUSCA_HEAD_bgp/app/bgptest/Makefile.am
==============================================================================
--- playpen/LUSCA_HEAD_bgp/app/bgptest/Makefile.am (original)
+++ playpen/LUSCA_HEAD_bgp/app/bgptest/Makefile.am Sun Feb 22 21:38:00 2009
@@ -18,7 +18,7 @@
noinst_PROGRAMS = bgptest
-bgptest_SOURCES = bgptest.c bgpconn.c
+bgptest_SOURCES = bgptest.c
LDADD = -L../../lib -L../../libsqdebug -L../../libcore -L../../libmem
-L../../libcb -L../../libiapp -L../../libsqinet -L../../libhttp
-L../../libstat -L../../libsqbgp -liapp -lmem -lcb -lsqdebug -lcore -lstat
-lsqbgp -lm -lsqinet -lmiscutil @SSLLIB@
Modified: playpen/LUSCA_HEAD_bgp/app/bgptest/bgptest.c
==============================================================================
--- playpen/LUSCA_HEAD_bgp/app/bgptest/bgptest.c (original)
+++ playpen/LUSCA_HEAD_bgp/app/bgptest/bgptest.c Sun Feb 22 21:38:00 2009
@@ -45,8 +45,7 @@
#include "libsqbgp/bgp_packet.h"
#include "libsqbgp/bgp_rib.h"
#include "libsqbgp/bgp_core.h"
-
-#include "bgpconn.h"
+#include "libsqbgp/bgp_conn.h"
int
main(int argc, const char *argv[])
@@ -63,8 +62,8 @@
iapp_init();
squid_signal(SIGPIPE, SIG_IGN, SA_RESTART);
- _db_init("ALL,1 85,1");
- _db_set_stderr_debug(1);
+ _db_init("ALL,1 85,99");
+ _db_set_stderr_debug(99);
bc = bgp_conn_create();
inet_aton("216.12.163.53", &bgp_id);
Modified: playpen/LUSCA_HEAD_bgp/src/Makefile.am
==============================================================================
--- playpen/LUSCA_HEAD_bgp/src/Makefile.am (original)
+++ playpen/LUSCA_HEAD_bgp/src/Makefile.am Sun Feb 22 21:38:00 2009
@@ -252,6 +252,7 @@
-L../libsqident \
-L../libsqinet \
-L../libsqname \
+ -L../libsqbgp \
@XTRA_OBJS@ \
@REPL_OBJS@ \
@STORE_OBJS@ \
@@ -262,6 +263,7 @@
@LIB_MALLOC@ \
@SSLLIB@ \
@LIB_EPOLL@ \
+ -lsqbgp \
-lstmem \
-lsqdns \
-lsqident \
@@ -313,7 +315,7 @@
data_DATA = \
mib.txt
-LDADD = -L../lib -L../libcore -L../libsqdebug -L../libmem -L../libsqname
-L../libcb -L../libhelper -L../libmime -L../libstmem -L../libiapp
-L../libhttp -L../libstat -L../libsqdns -L../libsqident -L../libsqinet
-lsqinet -lsqdns -lsqdebug -lcore -lmem -lsqname -lcb -lsqident -lhelper
-lmime -lstmem -liapp -lhttp -lstat -lmiscutil @XTRA_LIBS@
+LDADD = -L../lib -L../libcore -L../libsqdebug -L../libmem -L../libsqname
-L../libsqbgp -L../libcb -L../libhelper -L../libmime -L../libstmem
-L../libiapp -L../libhttp -L../libstat -L../libsqdns -L../libsqident
-L../libsqinet -lsqinet -lsqbgp -lsqdns -lsqdebug -lcore -lmem -lsqname
-lcb -lsqident -lhelper -lmime -lstmem -liapp -lhttp -lstat -lmiscutil
@XTRA_LIBS@
EXTRA_DIST = \
cf_gen_defines \
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
