changes for wlan

diff --git a/src/transport/gnunet-transport-wlan-helper.h b/src/transport/gnunet-transport-wlan-helper.h
index d4845af5aaeb770680831958240bdacc28a8d019..fb347b8c0c150c57b91834ace341ad1e884a3844 100644 (file)
--- a/src/transport/gnunet-transport-wlan-helper.h
+++ b/src/transport/gnunet-transport-wlan-helper.h
@@ -57,8 +57,8 @@ typedef u32 __le32;
 */
 #define        unlikely(x) (x)
 
-#define FIFO_FILE1       "/tmp/MYFIFOin"
-#define FIFO_FILE2       "/tmp/MYFIFOout"
+#define FIFO_FILE1       "/tmp/test-transport/api-wlan-p1/WLAN_FIFO_in"
+#define FIFO_FILE2       "/tmp/test-transport/api-wlan-p1/WLAN_FIFO_out"
 #define MAXLINE         4096
 
 extern int closeprog;

diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 853ce9aa5c5b14c89c3334f772f108b2f1ae7a62..95583c03c608e3fcc63e1106f812ec077ef591e2 100644 (file)
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -37,7 +37,7 @@
 #include "transport.h"
 #include "transport-testing.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 
 #define VERBOSE_ARM GNUNET_NO
 

diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index d6dfc049c8662f45b6509787a7277bd1f573e5e1..fc52243389ff728e905b7e0974f5994a14eb41af 100644 (file)
--- 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
 
 [transport]
 PLUGINS = wlan
-#DEBUG = YES
+DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
@@ -41,7 +41,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 42365
+PORT = 12160
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
@@ -59,7 +59,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 42369
+PORT = 12161
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -69,7 +69,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 42364
+PORT = 12162
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -79,7 +79,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 42367
+PORT = 12163
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -90,7 +90,7 @@ BINARY = gnunet-service-arm
 #CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 42366
+PORT = 12164
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
 [TESTING]
@@ -100,7 +100,7 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-wlan-p1/
 
 
 [dht]

diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index 450c5a8080f0934d489c8f84ce2679b98c47e11f..85f5f70d592d563988db0d5331b9088224ab65d3 100644 (file)
--- 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
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 32365
+PORT = 12170
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = xterm -T transport1 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
@@ -59,7 +59,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 32369
+PORT = 12171
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -69,7 +69,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 32364
+PORT = 12172
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -79,7 +79,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 32367
+PORT = 12173
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [arm]
@@ -90,7 +90,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 32366
+PORT = 12174
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [TESTING]
@@ -100,8 +100,7 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
-
+SERVICEHOME = /tmp/test-transport/api-wlan-p2/
 
 [dht]
 AUTOSTART = NO