aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/transport/test_transport_api.c2
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf4
-rw-r--r--src/transport/test_transport_api_udp_peer1.conf6
-rw-r--r--src/transport/transport.h2
-rw-r--r--src/transport/transport_api.c20
5 files changed, 15 insertions, 19 deletions
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index b761f33af..85d6c244c 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -107,7 +107,9 @@ static void
107end_badly () 107end_badly ()
108{ 108{
109 /* do work here */ 109 /* do work here */
110#if VERBOSE
110 fprintf(stderr, "Ending on an unhappy note.\n"); 111 fprintf(stderr, "Ending on an unhappy note.\n");
112#endif
111 113
112 GNUNET_TRANSPORT_disconnect (p1.th); 114 GNUNET_TRANSPORT_disconnect (p1.th);
113 GNUNET_TRANSPORT_disconnect (p2.th); 115 GNUNET_TRANSPORT_disconnect (p2.th);
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index 7af00db9c..dbe760732 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -61,8 +61,8 @@ PORT = 2092
61 61
62[transport] 62[transport]
63PLUGINS = tcp 63PLUGINS = tcp
64DEBUG = NO 64#DEBUG = YES
65PREFIX = 65PREFIX = valgrind --leak-check=full --log-file=valgrind_tcp_peer1.log
66ALLOW_SHUTDOWN = YES 66ALLOW_SHUTDOWN = YES
67ACCEPT_FROM6 = ::1; 67ACCEPT_FROM6 = ::1;
68ACCEPT_FROM = 127.0.0.1; 68ACCEPT_FROM = 127.0.0.1;
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index 6a3200b01..a90c1431d 100644
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -62,16 +62,18 @@ PORT = 2092
62[transport] 62[transport]
63PLUGINS = udp 63PLUGINS = udp
64DEBUG = NO 64DEBUG = NO
65PREFIX =
66ALLOW_SHUTDOWN = YES 65ALLOW_SHUTDOWN = YES
67ACCEPT_FROM6 = ::1; 66ACCEPT_FROM6 = ::1;
68ACCEPT_FROM = 127.0.0.1; 67ACCEPT_FROM = 127.0.0.1;
69NEIGHBOUR_LIMIT = 50 68NEIGHBOUR_LIMIT = 50
70BINARY = gnunet-service-transport 69#BINARY = gnunet-service-transport
70BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
71CONFIG = $DEFAULTCONFIG 71CONFIG = $DEFAULTCONFIG
72HOME = $SERVICEHOME 72HOME = $SERVICEHOME
73HOSTNAME = localhost 73HOSTNAME = localhost
74PORT = 12365 74PORT = 12365
75#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log
76PREFIX = xterm -e xterm -T transport -e gdb --args
75 77
76[peerinfo] 78[peerinfo]
77TRUST = $SERVICEHOME/data/credit/ 79TRUST = $SERVICEHOME/data/credit/
diff --git a/src/transport/transport.h b/src/transport/transport.h
index 89f004ab8..603f1bbc1 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -30,7 +30,7 @@
30#include "gnunet_time_lib.h" 30#include "gnunet_time_lib.h"
31#include "gnunet_transport_service.h" 31#include "gnunet_transport_service.h"
32 32
33#define DEBUG_TRANSPORT GNUNET_NO 33#define DEBUG_TRANSPORT GNUNET_YES
34 34
35/** 35/**
36 * For how long do we allow unused bandwidth 36 * For how long do we allow unused bandwidth
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 0c75ce9f7..ae07421d8 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -146,18 +146,6 @@ struct HelloWaitList
146 */ 146 */
147 void *rec_cls; 147 void *rec_cls;
148 148
149 /**
150 * When to time out (call rec with NULL).
151 */
152 struct GNUNET_TIME_Absolute timeout;
153
154 /**
155 * Timeout task (used to trigger timeout,
156 * cancel if we get the HELLO in time).
157 */
158 GNUNET_SCHEDULER_TaskIdentifier task;
159
160
161}; 149};
162 150
163 151
@@ -888,7 +876,7 @@ GNUNET_TRANSPORT_offer_hello (struct GNUNET_TRANSPORT_Handle *handle,
888 if (handle->client == NULL) 876 if (handle->client == NULL)
889 { 877 {
890#if DEBUG_TRANSPORT 878#if DEBUG_TRANSPORT
891 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 879 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
892 "Not connected to transport service, dropping offered HELLO\n"); 880 "Not connected to transport service, dropping offered HELLO\n");
893#endif 881#endif
894 return; 882 return;
@@ -1478,7 +1466,6 @@ GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle)
1478 while (NULL != (hwl = handle->hwl_head)) 1466 while (NULL != (hwl = handle->hwl_head))
1479 { 1467 {
1480 handle->hwl_head = hwl->next; 1468 handle->hwl_head = hwl->next;
1481 GNUNET_SCHEDULER_cancel (handle->sched, hwl->task);
1482 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 1469 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
1483 _ 1470 _
1484 ("Disconnect while notification for `%s' still registered.\n"), 1471 ("Disconnect while notification for `%s' still registered.\n"),
@@ -1926,6 +1913,11 @@ GNUNET_TRANSPORT_notify_transmit_ready (struct GNUNET_TRANSPORT_Handle
1926 if (size + sizeof (struct OutboundMessage) >= 1913 if (size + sizeof (struct OutboundMessage) >=
1927 GNUNET_SERVER_MAX_MESSAGE_SIZE) 1914 GNUNET_SERVER_MAX_MESSAGE_SIZE)
1928 { 1915 {
1916#if DEBUG_TRANSPORT
1917 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1918 "Message size is %d, max allowed is %d.\n",
1919 size + sizeof (struct OutboundMessage), GNUNET_SERVER_MAX_MESSAGE_SIZE);
1920#endif
1929 GNUNET_break (0); 1921 GNUNET_break (0);
1930 return NULL; 1922 return NULL;
1931 } 1923 }