diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-06-16 13:13:35 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-06-16 13:13:35 +0000 |
commit | d58848f00bab995bce6dd8e44c6afc462db26bb8 (patch) | |
tree | dd6453279aa38b9ba25f41dfb6c72046a5850a1c /src/transport | |
parent | 134924d50bf7b1efa08ff2622c4d09576a9f9a39 (diff) | |
download | gnunet-d58848f00bab995bce6dd8e44c6afc462db26bb8.tar.gz gnunet-d58848f00bab995bce6dd8e44c6afc462db26bb8.zip |
changes for wlan
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/gnunet-transport-wlan-helper.h | 4 | ||||
-rw-r--r-- | src/transport/test_transport_api.c | 2 | ||||
-rw-r--r-- | src/transport/test_transport_api_wlan_peer1.conf | 14 | ||||
-rw-r--r-- | src/transport/test_transport_api_wlan_peer2.conf | 13 |
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 | ||
64 | extern int closeprog; | 64 | extern 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] |
35 | PLUGINS = wlan | 35 | PLUGINS = wlan |
36 | #DEBUG = YES | 36 | DEBUG = YES |
37 | ACCEPT_FROM6 = ::1; | 37 | ACCEPT_FROM6 = ::1; |
38 | ACCEPT_FROM = 127.0.0.1; | 38 | ACCEPT_FROM = 127.0.0.1; |
39 | NEIGHBOUR_LIMIT = 50 | 39 | NEIGHBOUR_LIMIT = 50 |
@@ -41,7 +41,7 @@ BINARY = gnunet-service-transport | |||
41 | CONFIG = $DEFAULTCONFIG | 41 | CONFIG = $DEFAULTCONFIG |
42 | HOME = $SERVICEHOME | 42 | HOME = $SERVICEHOME |
43 | HOSTNAME = localhost | 43 | HOSTNAME = localhost |
44 | PORT = 42365 | 44 | PORT = 12160 |
45 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | 45 | UNIXPATH = /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 | |||
59 | CONFIG = $DEFAULTCONFIG | 59 | CONFIG = $DEFAULTCONFIG |
60 | HOME = $SERVICEHOME | 60 | HOME = $SERVICEHOME |
61 | HOSTNAME = localhost | 61 | HOSTNAME = localhost |
62 | PORT = 42369 | 62 | PORT = 12161 |
63 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 63 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
64 | 64 | ||
65 | [resolver] | 65 | [resolver] |
@@ -69,7 +69,7 @@ BINARY = gnunet-service-resolver | |||
69 | CONFIG = $DEFAULTCONFIG | 69 | CONFIG = $DEFAULTCONFIG |
70 | HOME = $SERVICEHOME | 70 | HOME = $SERVICEHOME |
71 | HOSTNAME = localhost | 71 | HOSTNAME = localhost |
72 | PORT = 42364 | 72 | PORT = 12162 |
73 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | 73 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
74 | 74 | ||
75 | [statistics] | 75 | [statistics] |
@@ -79,7 +79,7 @@ BINARY = gnunet-service-statistics | |||
79 | CONFIG = $DEFAULTCONFIG | 79 | CONFIG = $DEFAULTCONFIG |
80 | HOME = $SERVICEHOME | 80 | HOME = $SERVICEHOME |
81 | HOSTNAME = localhost | 81 | HOSTNAME = localhost |
82 | PORT = 42367 | 82 | PORT = 12163 |
83 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 83 | UNIXPATH = /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 |
91 | HOME = $SERVICEHOME | 91 | HOME = $SERVICEHOME |
92 | HOSTNAME = localhost | 92 | HOSTNAME = localhost |
93 | PORT = 42366 | 93 | PORT = 12164 |
94 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 94 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
95 | 95 | ||
96 | [TESTING] | 96 | [TESTING] |
@@ -100,7 +100,7 @@ WEAKRANDOM = YES | |||
100 | HOSTKEY = $SERVICEHOME/.hostkey | 100 | HOSTKEY = $SERVICEHOME/.hostkey |
101 | 101 | ||
102 | [PATHS] | 102 | [PATHS] |
103 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 103 | SERVICEHOME = /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 | |||
41 | CONFIG = $DEFAULTCONFIG | 41 | CONFIG = $DEFAULTCONFIG |
42 | HOME = $SERVICEHOME | 42 | HOME = $SERVICEHOME |
43 | HOSTNAME = localhost | 43 | HOSTNAME = localhost |
44 | PORT = 32365 | 44 | PORT = 12170 |
45 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | 45 | UNIXPATH = /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 | |||
59 | CONFIG = $DEFAULTCONFIG | 59 | CONFIG = $DEFAULTCONFIG |
60 | HOME = $SERVICEHOME | 60 | HOME = $SERVICEHOME |
61 | HOSTNAME = localhost | 61 | HOSTNAME = localhost |
62 | PORT = 32369 | 62 | PORT = 12171 |
63 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 63 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
64 | 64 | ||
65 | [resolver] | 65 | [resolver] |
@@ -69,7 +69,7 @@ BINARY = gnunet-service-resolver | |||
69 | CONFIG = $DEFAULTCONFIG | 69 | CONFIG = $DEFAULTCONFIG |
70 | HOME = $SERVICEHOME | 70 | HOME = $SERVICEHOME |
71 | HOSTNAME = localhost | 71 | HOSTNAME = localhost |
72 | PORT = 32364 | 72 | PORT = 12172 |
73 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | 73 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
74 | 74 | ||
75 | [statistics] | 75 | [statistics] |
@@ -79,7 +79,7 @@ BINARY = gnunet-service-statistics | |||
79 | CONFIG = $DEFAULTCONFIG | 79 | CONFIG = $DEFAULTCONFIG |
80 | HOME = $SERVICEHOME | 80 | HOME = $SERVICEHOME |
81 | HOSTNAME = localhost | 81 | HOSTNAME = localhost |
82 | PORT = 32367 | 82 | PORT = 12173 |
83 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 83 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
84 | 84 | ||
85 | [arm] | 85 | [arm] |
@@ -90,7 +90,7 @@ BINARY = gnunet-service-arm | |||
90 | CONFIG = $DEFAULTCONFIG | 90 | CONFIG = $DEFAULTCONFIG |
91 | HOME = $SERVICEHOME | 91 | HOME = $SERVICEHOME |
92 | HOSTNAME = localhost | 92 | HOSTNAME = localhost |
93 | PORT = 32366 | 93 | PORT = 12174 |
94 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | 94 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
95 | 95 | ||
96 | [TESTING] | 96 | [TESTING] |
@@ -100,8 +100,7 @@ WEAKRANDOM = YES | |||
100 | HOSTKEY = $SERVICEHOME/.hostkey | 100 | HOSTKEY = $SERVICEHOME/.hostkey |
101 | 101 | ||
102 | [PATHS] | 102 | [PATHS] |
103 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 103 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
104 | |||
105 | 104 | ||
106 | [dht] | 105 | [dht] |
107 | AUTOSTART = NO | 106 | AUTOSTART = NO |