[GNUnet-SVN] r15666 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-06-16 15:13:35 +0200 (Thu, 16 Jun 2011)
New Revision: 15666

Modified:
   gnunet/src/transport/gnunet-transport-wlan-helper.h
   gnunet/src/transport/test_transport_api.c
   gnunet/src/transport/test_transport_api_wlan_peer1.conf
   gnunet/src/transport/test_transport_api_wlan_peer2.conf
Log:
changes for wlan


Modified: gnunet/src/transport/gnunet-transport-wlan-helper.h
===================================================================
--- gnunet/src/transport/gnunet-transport-wlan-helper.h 2011-06-16 13:08:48 UTC 
(rev 15665)
+++ gnunet/src/transport/gnunet-transport-wlan-helper.h 2011-06-16 13:13:35 UTC 
(rev 15666)
@@ -57,8 +57,8 @@
 */
 #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;

Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c   2011-06-16 13:08:48 UTC (rev 
15665)
+++ gnunet/src/transport/test_transport_api.c   2011-06-16 13:13:35 UTC (rev 
15666)
@@ -37,7 +37,7 @@
 #include "transport.h"
 #include "transport-testing.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 
 #define VERBOSE_ARM GNUNET_NO
 

Modified: gnunet/src/transport/test_transport_api_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_wlan_peer1.conf     2011-06-16 
13:08:48 UTC (rev 15665)
+++ gnunet/src/transport/test_transport_api_wlan_peer1.conf     2011-06-16 
13:13:35 UTC (rev 15666)
@@ -33,7 +33,7 @@
 
 [transport]
 PLUGINS = wlan
-#DEBUG = YES
+DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
@@ -41,7 +41,7 @@
 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 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 42369
+PORT = 12161
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -69,7 +69,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 42364
+PORT = 12162
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -79,7 +79,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 42367
+PORT = 12163
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -90,7 +90,7 @@
 #CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 42366
+PORT = 12164
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
 [TESTING]
@@ -100,7 +100,7 @@
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-wlan-p1/
 
 
 [dht]

Modified: gnunet/src/transport/test_transport_api_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_wlan_peer2.conf     2011-06-16 
13:08:48 UTC (rev 15665)
+++ gnunet/src/transport/test_transport_api_wlan_peer2.conf     2011-06-16 
13:13:35 UTC (rev 15666)
@@ -41,7 +41,7 @@
 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 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 32369
+PORT = 12171
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -69,7 +69,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 32364
+PORT = 12172
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -79,7 +79,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 32367
+PORT = 12173
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [arm]
@@ -90,7 +90,7 @@
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 32366
+PORT = 12174
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [TESTING]
@@ -100,9 +100,8 @@
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
+SERVICEHOME = /tmp/test-transport/api-wlan-p2/
 
-
 [dht]
 AUTOSTART = NO