diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-06-08 10:23:47 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-06-08 10:23:47 +0000 |
commit | cc78806664bc75ba5724116deb5a0fa82a04d7e9 (patch) | |
tree | 0e99b19c65dfa6195395e3cdb8e69187cb3ee216 | |
parent | bc460c0dd8d61ab51ebd944c54b9826cac00920b (diff) | |
download | gnunet-cc78806664bc75ba5724116deb5a0fa82a04d7e9.tar.gz gnunet-cc78806664bc75ba5724116deb5a0fa82a04d7e9.zip |
stuff
-rw-r--r-- | contrib/defaults.conf | 7 | ||||
-rw-r--r-- | src/transport/Makefile.am | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/contrib/defaults.conf b/contrib/defaults.conf index 00f22370c..0d1bffab9 100644 --- a/contrib/defaults.conf +++ b/contrib/defaults.conf | |||
@@ -78,6 +78,13 @@ PORT = 1080 | |||
78 | [transport-https] | 78 | [transport-https] |
79 | PORT = 4433 | 79 | PORT = 4433 |
80 | 80 | ||
81 | [transport-wlan] | ||
82 | # Name of the interface in monitor mode (typically monX) | ||
83 | INTERFACE = mon0 | ||
84 | # Real hardware, no testing | ||
85 | TESTMODE = 0 | ||
86 | |||
87 | |||
81 | [arm] | 88 | [arm] |
82 | PORT = 2087 | 89 | PORT = 2087 |
83 | HOSTNAME = localhost | 90 | HOSTNAME = localhost |
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 0b2305c22..031cfe8b9 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -32,7 +32,6 @@ if USE_COVERAGE | |||
32 | AM_CFLAGS = --coverage -O0 | 32 | AM_CFLAGS = --coverage -O0 |
33 | endif | 33 | endif |
34 | 34 | ||
35 | if HAVE_PCAP | ||
36 | if LINUX | 35 | if LINUX |
37 | WLAN_BIN = gnunet-transport-wlan-helper | 36 | WLAN_BIN = gnunet-transport-wlan-helper |
38 | WLAN_BIN_DUMMY = gnunet-transport-wlan-helper-dummy | 37 | WLAN_BIN_DUMMY = gnunet-transport-wlan-helper-dummy |
@@ -41,7 +40,6 @@ if LINUX | |||
41 | WLAN_REL_TEST = test_transport_api_reliability_wlan | 40 | WLAN_REL_TEST = test_transport_api_reliability_wlan |
42 | WLAN_UREL_TEST = test_transport_api_unreliability_wlan | 41 | WLAN_UREL_TEST = test_transport_api_unreliability_wlan |
43 | endif | 42 | endif |
44 | endif | ||
45 | 43 | ||
46 | if !MINGW | 44 | if !MINGW |
47 | UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la | 45 | UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la |
@@ -435,7 +433,6 @@ test_transport_api_unreliability_udp_LDADD = \ | |||
435 | $(top_builddir)/src/hello/libgnunethello.la \ | 433 | $(top_builddir)/src/hello/libgnunethello.la \ |
436 | $(top_builddir)/src/util/libgnunetutil.la | 434 | $(top_builddir)/src/util/libgnunetutil.la |
437 | 435 | ||
438 | if HAVE_PCAP | ||
439 | if LINUX | 436 | if LINUX |
440 | test_transport_api_wlan_SOURCES = \ | 437 | test_transport_api_wlan_SOURCES = \ |
441 | test_transport_api.c | 438 | test_transport_api.c |
@@ -444,7 +441,6 @@ test_transport_api_wlan_LDADD = \ | |||
444 | $(top_builddir)/src/hello/libgnunethello.la \ | 441 | $(top_builddir)/src/hello/libgnunethello.la \ |
445 | $(top_builddir)/src/util/libgnunetutil.la | 442 | $(top_builddir)/src/util/libgnunetutil.la |
446 | endif | 443 | endif |
447 | endif | ||
448 | 444 | ||
449 | test_quota_compliance_tcp_SOURCES = \ | 445 | test_quota_compliance_tcp_SOURCES = \ |
450 | test_quota_compliance.c | 446 | test_quota_compliance.c |