[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12375 - in gnunet: . src/dht src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12375 - in gnunet: . src/dht src/transport |
Date: |
Wed, 28 Jul 2010 13:20:36 +0200 |
Author: grothoff
Date: 2010-07-28 13:20:36 +0200 (Wed, 28 Jul 2010)
New Revision: 12375
Modified:
gnunet/configure.ac
gnunet/src/dht/Makefile.am
gnunet/src/transport/Makefile.am
gnunet/src/transport/gnunet-transport-wlan-helper.c
gnunet/src/transport/gnunet-transport-wlan-helper.h
Log:
detect pcap
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2010-07-28 11:04:37 UTC (rev 12374)
+++ gnunet/configure.ac 2010-07-28 11:20:36 UTC (rev 12375)
@@ -346,7 +346,39 @@
AC_SUBST(POSTGRES_CPPFLAGS)
AC_SUBST(POSTGRES_LDFLAGS)
+# test for pcap
+pcap=false
+AC_MSG_CHECKING(for libpcap)
+AC_ARG_WITH(pcap,
+ [ --with-pcap=PFX base of pcap installation],
+ [AC_MSG_RESULT("$with_pcap")
+ case $with_pcap in
+ no)
+ ;;
+ yes)
+ AC_CHECK_HEADERS(pcap.h,
+ pcap=true)
+ ;;
+ *)
+ LDFLAGS="-L$with_pcap/lib $LDFLAGS"
+ CPPFLAGS="-I$with_pcap/include $CPPFLAGS"
+ AC_CHECK_HEADERS(pcap.h,
+ EXT_LIB_PATH="-L$with_pcap/lib $EXT_LIB_PATH"
+ PCAP_LDFLAGS="-L$with_pcap/lib"
+ PCAP_CPPFLAGS="-I$with_pcap/include"
+ pcap=true)
+ LDFLAGS=$SAVE_LDFLAGS
+ CPPFLAGS=$SAVE_CPPFLAGS
+ ;;
+ esac
+ ],
+ [AC_MSG_RESULT([--with-pcap not specified])
+ AC_CHECK_HEADERS(pcap.h, pcap=true)])
+AM_CONDITIONAL(HAVE_PCAP, test x$pcap = xtrue)
+AC_SUBST(PCAP_CPPFLAGS)
+AC_SUBST(PCAP_LDFLAGS)
+
# test for libz (maybe required for linking mysql)
zlib=1
AC_CHECK_LIB(z, compress,,zlib=0)
Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am 2010-07-28 11:04:37 UTC (rev 12374)
+++ gnunet/src/dht/Makefile.am 2010-07-28 11:20:36 UTC (rev 12375)
@@ -20,7 +20,7 @@
lib_LTLIBRARIES = libgnunetdht.la \
libgnunetdhtlog.la
-
+
plugin_LTLIBRARIES = \
libgnunet_plugin_dhtlog_dummy.la $(MYSQL_PLUGIN)
@@ -61,7 +61,12 @@
$(GN_LIB_LDFLAGS) $(WINFLAGS) \
-version-info 0:0:0
-bin_PROGRAMS = \
+STUD_PROGS = gnunet-service-dht-can \
+ gnunet-service-dht-freenet \
+ gnunet-service-dht-kademlia \
+ gnunet-service-dht-koorde
+
+bin_PROGRAMS = $(STUD_PROGS) \
gnunet-service-dht \
gnunet-dht-get \
gnunet-dht-get-peer \
@@ -81,6 +86,58 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/dht/libgnunetdhtlog.la
+gnunet_service_dht_can_SOURCES = \
+ dht_can.c dht_can_helper.c dht_can_helper.h
+gnunet_service_dht_can_LDADD = \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+gnunet_service_dht_freenet_SOURCES = \
+ dht_freenet.c
+gnunet_service_dht_freenet_LDADD = \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+gnunet_service_dht_kademlia_SOURCES = \
+ dht_kademlia.c dht_kademlia.h
+gnunet_service_dht_kademlia_LDADD = \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+gnunet_service_dht_koorde_SOURCES = \
+ dht_koorde.c dht_koorde.h
+gnunet_service_dht_koorde_LDADD = \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/datacache/libgnunetdatacache.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+#gnunet_service_dht_new_SOURCES = \
+# gnunet-service-dht-new.c
+#gnunet_service_dht_new_LDADD = \
+# $(top_builddir)/src/statistics/libgnunetstatistics.la \
+# $(top_builddir)/src/core/libgnunetcore.la \
+# $(top_builddir)/src/transport/libgnunettransport.la \
+# $(top_builddir)/src/hello/libgnunethello.la \
+# $(top_builddir)/src/datacache/libgnunetdatacache.la \
+# $(top_builddir)/src/util/libgnunetutil.la \
+# $(top_builddir)/src/dht/libgnunetdhtlog.la
+
gnunet_dht_get_SOURCES = \
gnunet-dht-get.c
gnunet_dht_get_LDADD = \
@@ -121,7 +178,6 @@
test_dhtlog
TESTS = test_dht_api $(check_SCRIPTS) \
- test_dhtlog \
test_dht_twopeer \
test_dht_twopeer_put_get
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2010-07-28 11:04:37 UTC (rev 12374)
+++ gnunet/src/transport/Makefile.am 2010-07-28 11:20:36 UTC (rev 12375)
@@ -12,7 +12,7 @@
HTTP_PLUGIN_TEST = test_plugin_transport_http
HTTP_API_TEST = test_transport_api_http
HTTP_REL_TEST = test_transport_api_reliability_http
-
+
HTTPS_PLUGIN_LA = libgnunet_plugin_transport_https.la
HTTPS_PLUGIN_TEST = test_plugin_transport_https
HTTPS_API_TEST = test_transport_api_https
@@ -23,9 +23,12 @@
AM_CFLAGS = --coverage -O0
endif
+if HAVE_PCAP
+WANBIN = gnunet-transport-wlan-helper
+endif
+
if LINUX
NATBIN = gnunet-nat-server gnunet-nat-client
-WANBIN = gnunet-wlan
install-exec-hook:
chown root $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client
$(bindir)/gnunet-wlan || true
chmod u+s $(bindir)/gnunet-nat-server $(bindir)/gnunet-nat-client
$(bindir)/gnunet-wlan || true
@@ -54,16 +57,16 @@
gnunet-transport \
$(WANBIN) \
gnunet-service-transport $(NATBIN)
-
+
bin_SCRIPTS = \
gnunet-transport-certificate-creation
gnunet_nat_server_SOURCES = \
gnunet-nat-server.c
-gnunet_wlan_SOURCES = \
+gnunet_transport_wlan_helper_SOURCES = \
gnunet-transport-wlan-helper.c
-gnunet_wlan_LDADD = \
+gnunet_transport_wlan_helper_LDADD = \
-lpcap
gnunet_nat_client_SOURCES = \
Modified: gnunet/src/transport/gnunet-transport-wlan-helper.c
===================================================================
--- gnunet/src/transport/gnunet-transport-wlan-helper.c 2010-07-28 11:04:37 UTC
(rev 12374)
+++ gnunet/src/transport/gnunet-transport-wlan-helper.c 2010-07-28 11:20:36 UTC
(rev 12375)
@@ -28,7 +28,7 @@
* gnunet
*/
-#include "gnunet_wlan.h"
+#include "gnunet-transport-wlan-helper.h"
#include <pcap/pcap.h>
//#include "radiotap.h"
Modified: gnunet/src/transport/gnunet-transport-wlan-helper.h
===================================================================
--- gnunet/src/transport/gnunet-transport-wlan-helper.h 2010-07-28 11:04:37 UTC
(rev 12374)
+++ gnunet/src/transport/gnunet-transport-wlan-helper.h 2010-07-28 11:20:36 UTC
(rev 12375)
@@ -314,6 +314,7 @@
(((x) == 14) ? 2484 : ((x) * 5) + 2407) : \
((x) + 1000) * 5)
+#if BROKEN
/* helpers */
static inline int ieee80211_get_radiotap_len(unsigned char *data)
{
@@ -322,7 +323,7 @@
return get_unaligned_le16(&hdr->it_len);
}
-
+#endif
#endif /* IEEE80211_RADIOTAP_H */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12375 - in gnunet: . src/dht src/transport,
gnunet <=