aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-06-16 13:13:35 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-06-16 13:13:35 +0000
commitd58848f00bab995bce6dd8e44c6afc462db26bb8 (patch)
treedd6453279aa38b9ba25f41dfb6c72046a5850a1c /src/transport
parent134924d50bf7b1efa08ff2622c4d09576a9f9a39 (diff)
downloadgnunet-d58848f00bab995bce6dd8e44c6afc462db26bb8.tar.gz
gnunet-d58848f00bab995bce6dd8e44c6afc462db26bb8.zip
changes for wlan
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/gnunet-transport-wlan-helper.h4
-rw-r--r--src/transport/test_transport_api.c2
-rw-r--r--src/transport/test_transport_api_wlan_peer1.conf14
-rw-r--r--src/transport/test_transport_api_wlan_peer2.conf13
4 files changed, 16 insertions, 17 deletions
diff --git a/src/transport/gnunet-transport-wlan-helper.h b/src/transport/gnunet-transport-wlan-helper.h
index d4845af5a..fb347b8c0 100644
--- a/src/transport/gnunet-transport-wlan-helper.h
+++ b/src/transport/gnunet-transport-wlan-helper.h
@@ -57,8 +57,8 @@ typedef u32 __le32;
57*/ 57*/
58#define unlikely(x) (x) 58#define unlikely(x) (x)
59 59
60#define FIFO_FILE1 "/tmp/MYFIFOin" 60#define FIFO_FILE1 "/tmp/test-transport/api-wlan-p1/WLAN_FIFO_in"
61#define FIFO_FILE2 "/tmp/MYFIFOout" 61#define FIFO_FILE2 "/tmp/test-transport/api-wlan-p1/WLAN_FIFO_out"
62#define MAXLINE 4096 62#define MAXLINE 4096
63 63
64extern int closeprog; 64extern int closeprog;
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 853ce9aa5..95583c03c 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -37,7 +37,7 @@
37#include "transport.h" 37#include "transport.h"
38#include "transport-testing.h" 38#include "transport-testing.h"
39 39
40#define VERBOSE GNUNET_NO 40#define VERBOSE GNUNET_YES
41 41
42#define VERBOSE_ARM GNUNET_NO 42#define VERBOSE_ARM GNUNET_NO
43 43
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index d6dfc049c..fc5224338 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -33,7 +33,7 @@ MINIMUM-FRIENDS = 0
33 33
34[transport] 34[transport]
35PLUGINS = wlan 35PLUGINS = wlan
36#DEBUG = YES 36DEBUG = YES
37ACCEPT_FROM6 = ::1; 37ACCEPT_FROM6 = ::1;
38ACCEPT_FROM = 127.0.0.1; 38ACCEPT_FROM = 127.0.0.1;
39NEIGHBOUR_LIMIT = 50 39NEIGHBOUR_LIMIT = 50
@@ -41,7 +41,7 @@ BINARY = gnunet-service-transport
41CONFIG = $DEFAULTCONFIG 41CONFIG = $DEFAULTCONFIG
42HOME = $SERVICEHOME 42HOME = $SERVICEHOME
43HOSTNAME = localhost 43HOSTNAME = localhost
44PORT = 42365 44PORT = 12160
45UNIXPATH = /tmp/gnunet-p1-service-transport.sock 45UNIXPATH = /tmp/gnunet-p1-service-transport.sock
46#PREFIX = xterm -T transport2 -e gdb --command=cmd --args 46#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
47#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600 47#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
@@ -59,7 +59,7 @@ BINARY = gnunet-service-peerinfo
59CONFIG = $DEFAULTCONFIG 59CONFIG = $DEFAULTCONFIG
60HOME = $SERVICEHOME 60HOME = $SERVICEHOME
61HOSTNAME = localhost 61HOSTNAME = localhost
62PORT = 42369 62PORT = 12161
63UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 63UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
64 64
65[resolver] 65[resolver]
@@ -69,7 +69,7 @@ BINARY = gnunet-service-resolver
69CONFIG = $DEFAULTCONFIG 69CONFIG = $DEFAULTCONFIG
70HOME = $SERVICEHOME 70HOME = $SERVICEHOME
71HOSTNAME = localhost 71HOSTNAME = localhost
72PORT = 42364 72PORT = 12162
73UNIXPATH = /tmp/gnunet-p1-service-resolver.sock 73UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
74 74
75[statistics] 75[statistics]
@@ -79,7 +79,7 @@ BINARY = gnunet-service-statistics
79CONFIG = $DEFAULTCONFIG 79CONFIG = $DEFAULTCONFIG
80HOME = $SERVICEHOME 80HOME = $SERVICEHOME
81HOSTNAME = localhost 81HOSTNAME = localhost
82PORT = 42367 82PORT = 12163
83UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 83UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
84 84
85[arm] 85[arm]
@@ -90,7 +90,7 @@ BINARY = gnunet-service-arm
90#CONFIG = $DEFAULTCONFIG 90#CONFIG = $DEFAULTCONFIG
91HOME = $SERVICEHOME 91HOME = $SERVICEHOME
92HOSTNAME = localhost 92HOSTNAME = localhost
93PORT = 42366 93PORT = 12164
94UNIXPATH = /tmp/gnunet-p1-service-arm.sock 94UNIXPATH = /tmp/gnunet-p1-service-arm.sock
95 95
96[TESTING] 96[TESTING]
@@ -100,7 +100,7 @@ WEAKRANDOM = YES
100HOSTKEY = $SERVICEHOME/.hostkey 100HOSTKEY = $SERVICEHOME/.hostkey
101 101
102[PATHS] 102[PATHS]
103SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ 103SERVICEHOME = /tmp/test-transport/api-wlan-p1/
104 104
105 105
106[dht] 106[dht]
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index 450c5a808..85f5f70d5 100644
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ b/src/transport/test_transport_api_wlan_peer2.conf
@@ -41,7 +41,7 @@ BINARY = gnunet-service-transport
41CONFIG = $DEFAULTCONFIG 41CONFIG = $DEFAULTCONFIG
42HOME = $SERVICEHOME 42HOME = $SERVICEHOME
43HOSTNAME = localhost 43HOSTNAME = localhost
44PORT = 32365 44PORT = 12170
45UNIXPATH = /tmp/gnunet-p2-service-transport.sock 45UNIXPATH = /tmp/gnunet-p2-service-transport.sock
46#PREFIX = xterm -T transport1 -e gdb --command=cmd --args 46#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
47#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600 47#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
@@ -59,7 +59,7 @@ BINARY = gnunet-service-peerinfo
59CONFIG = $DEFAULTCONFIG 59CONFIG = $DEFAULTCONFIG
60HOME = $SERVICEHOME 60HOME = $SERVICEHOME
61HOSTNAME = localhost 61HOSTNAME = localhost
62PORT = 32369 62PORT = 12171
63UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 63UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
64 64
65[resolver] 65[resolver]
@@ -69,7 +69,7 @@ BINARY = gnunet-service-resolver
69CONFIG = $DEFAULTCONFIG 69CONFIG = $DEFAULTCONFIG
70HOME = $SERVICEHOME 70HOME = $SERVICEHOME
71HOSTNAME = localhost 71HOSTNAME = localhost
72PORT = 32364 72PORT = 12172
73UNIXPATH = /tmp/gnunet-p2-service-resolver.sock 73UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
74 74
75[statistics] 75[statistics]
@@ -79,7 +79,7 @@ BINARY = gnunet-service-statistics
79CONFIG = $DEFAULTCONFIG 79CONFIG = $DEFAULTCONFIG
80HOME = $SERVICEHOME 80HOME = $SERVICEHOME
81HOSTNAME = localhost 81HOSTNAME = localhost
82PORT = 32367 82PORT = 12173
83UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 83UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
84 84
85[arm] 85[arm]
@@ -90,7 +90,7 @@ BINARY = gnunet-service-arm
90CONFIG = $DEFAULTCONFIG 90CONFIG = $DEFAULTCONFIG
91HOME = $SERVICEHOME 91HOME = $SERVICEHOME
92HOSTNAME = localhost 92HOSTNAME = localhost
93PORT = 32366 93PORT = 12174
94UNIXPATH = /tmp/gnunet-p2-service-arm.sock 94UNIXPATH = /tmp/gnunet-p2-service-arm.sock
95 95
96[TESTING] 96[TESTING]
@@ -100,8 +100,7 @@ WEAKRANDOM = YES
100HOSTKEY = $SERVICEHOME/.hostkey 100HOSTKEY = $SERVICEHOME/.hostkey
101 101
102[PATHS] 102[PATHS]
103SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ 103SERVICEHOME = /tmp/test-transport/api-wlan-p2/
104
105 104
106[dht] 105[dht]
107AUTOSTART = NO 106AUTOSTART = NO