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

[gnunet]

Author: nevans
Date: 2010-02-10 16:39:14 +0100 (Wed, 10 Feb 2010)
New Revision: 10273

Modified:
   gnunet/src/transport/test_transport_api.c
   gnunet/src/transport/test_transport_api_tcp_peer1.conf
   gnunet/src/transport/test_transport_api_udp_peer1.conf
   gnunet/src/transport/transport.h
   gnunet/src/transport/transport_api.c
Log:
dce

Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c   2010-02-10 15:12:12 UTC (rev 
10272)
+++ gnunet/src/transport/test_transport_api.c   2010-02-10 15:39:14 UTC (rev 
10273)
@@ -107,7 +107,9 @@
 end_badly ()
 {
   /* do work here */
+#if VERBOSE
   fprintf(stderr, "Ending on an unhappy note.\n");
+#endif
 
   GNUNET_TRANSPORT_disconnect (p1.th);
   GNUNET_TRANSPORT_disconnect (p2.th);

Modified: gnunet/src/transport/test_transport_api_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer1.conf      2010-02-10 
15:12:12 UTC (rev 10272)
+++ gnunet/src/transport/test_transport_api_tcp_peer1.conf      2010-02-10 
15:39:14 UTC (rev 10273)
@@ -61,8 +61,8 @@
 
 [transport]
 PLUGINS = tcp
-DEBUG = NO
-PREFIX = 
+#DEBUG = YES
+PREFIX = valgrind --leak-check=full --log-file=valgrind_tcp_peer1.log
 ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;

Modified: gnunet/src/transport/test_transport_api_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_peer1.conf      2010-02-10 
15:12:12 UTC (rev 10272)
+++ gnunet/src/transport/test_transport_api_udp_peer1.conf      2010-02-10 
15:39:14 UTC (rev 10273)
@@ -62,16 +62,18 @@
 [transport]
 PLUGINS = udp
 DEBUG = NO
-PREFIX = 
 ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
+#BINARY = gnunet-service-transport
+BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 12365
+#PREFIX = valgrind --track-origins=yes --leak-check=full 
--log-file=valgrind_udp_peer1.log
+PREFIX = xterm -e xterm -T transport -e gdb --args 
 
 [peerinfo]
 TRUST = $SERVICEHOME/data/credit/

Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h    2010-02-10 15:12:12 UTC (rev 10272)
+++ gnunet/src/transport/transport.h    2010-02-10 15:39:14 UTC (rev 10273)
@@ -30,7 +30,7 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_transport_service.h"
 
-#define DEBUG_TRANSPORT GNUNET_NO
+#define DEBUG_TRANSPORT GNUNET_YES
 
 /**
  * For how long do we allow unused bandwidth

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2010-02-10 15:12:12 UTC (rev 
10272)
+++ gnunet/src/transport/transport_api.c        2010-02-10 15:39:14 UTC (rev 
10273)
@@ -146,18 +146,6 @@
    */
   void *rec_cls;
 
-  /**
-   * When to time out (call rec with NULL).
-   */
-  struct GNUNET_TIME_Absolute timeout;
-
-  /**
-   * Timeout task (used to trigger timeout,
-   * cancel if we get the HELLO in time).
-   */
-  GNUNET_SCHEDULER_TaskIdentifier task;
-
-
 };
 
 
@@ -888,7 +876,7 @@
   if (handle->client == NULL)
     {
 #if DEBUG_TRANSPORT
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Not connected to transport service, dropping offered 
HELLO\n");
 #endif
       return;
@@ -1478,7 +1466,6 @@
   while (NULL != (hwl = handle->hwl_head))
     {
       handle->hwl_head = hwl->next;
-      GNUNET_SCHEDULER_cancel (handle->sched, hwl->task);
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                   _
                   ("Disconnect while notification for `%s' still 
registered.\n"),
@@ -1926,6 +1913,11 @@
   if (size + sizeof (struct OutboundMessage) >=
       GNUNET_SERVER_MAX_MESSAGE_SIZE)
     {
+#if DEBUG_TRANSPORT
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Message size is %d, max allowed is %d.\n",
+                  size + sizeof (struct OutboundMessage), 
GNUNET_SERVER_MAX_MESSAGE_SIZE);
+#endif
       GNUNET_break (0);
       return NULL;
     }