work in progress.

diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c
index abfb249e4e65b7be97e48becc1221bce2e14de0c..4418f3a0f98a015a5d6bc67dfef426701c591abf 100644 (file)
--- a/src/dv/dv_api.c
+++ b/src/dv/dv_api.c
@@ -291,9 +291,6 @@ void handle_message_receipt (void *cls,
     return; /* Connection closed? */
   }
 
-#if DEBUG_DV
-  fprintf(stdout, "dv api receives message of type %d or raw %d\n", ntohs(msg->type), msg->type);
-#endif
   GNUNET_assert(ntohs(msg->type) == GNUNET_MESSAGE_TYPE_TRANSPORT_DV_RECEIVE);
 
   if (ntohs(msg->size) < sizeof(struct GNUNET_DV_MessageReceived))
@@ -302,6 +299,9 @@ void handle_message_receipt (void *cls,
   received_msg = (struct GNUNET_DV_MessageReceived *)msg;
   packed_msg_len = ntohs(received_msg->msg_len);
   sender_address_len = ntohs(received_msg->sender_address_len);
+#if DEBUG_DV
+  fprintf(stdout, "dv api receives message from service: total len: %lu, packed len: %lu, sender_address_len: %lu, base message len: %lu\ntotal is %lu, should be %lu\n", ntohs(msg->size), packed_msg_len, sender_address_len, sizeof(struct GNUNET_DV_MessageReceived), sizeof(struct GNUNET_DV_MessageReceived) + packed_msg_len + sender_address_len, ntohs(msg->size));
+#endif
   GNUNET_assert(ntohs(msg->size) == (sizeof(struct GNUNET_DV_MessageReceived) + packed_msg_len + sender_address_len));
 
   sender_address = GNUNET_malloc(sender_address_len);

diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index ce996dda3c046b111244f74d9f27cb343b93a8ff..bff6c4ae48372c99829944b528053c20297ae5a6 100644 (file)
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -472,7 +472,7 @@ void send_to_plugin(const struct GNUNET_PeerIdentity * sender,
   received_msg = GNUNET_malloc(size);
   received_msg->header.size = htons(size);
   received_msg->header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_DV_RECEIVE);
-  received_msg->sender_address_len = sizeof(struct GNUNET_PeerIdentity);
+  received_msg->sender_address_len = htons(sizeof(struct GNUNET_PeerIdentity));
   received_msg->distance = htonl(cost);
   received_msg->msg_len = htons(message_size);
   /* Set the sender in this message to be the original sender! */
@@ -833,7 +833,6 @@ handle_start (void *cls,
               "Received `%s' request from client\n", "START");
 #endif
 
-  GNUNET_assert(client_handle == NULL);
   client_handle = client;
 
   GNUNET_SERVER_receive_done (client, GNUNET_OK);

diff --git a/src/dv/test_transport_api_dv_peer3.conf b/src/dv/test_transport_api_dv_peer3.conf
index 413817cfe30b670c1272250f3fa15ec4ed4404fe..66100488e59de2bb9df3cdb63096be330ae62718 100644 (file)
--- a/src/dv/test_transport_api_dv_peer3.conf
+++ b/src/dv/test_transport_api_dv_peer3.conf
@@ -46,18 +46,18 @@ MINIMUM-FRIENDS = 0
 
 [transport]
 PLUGINS = tcp dv
-#DEBUG = NO
+DEBUG = YES
 # PREFIX = 
 ALLOW_SHUTDOWN = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-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 = 32365
-#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
+PREFIX = xterm -T transport1 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
 
 [peerinfo]