From 7b8e790147f04a3223040999e38562b9c7218abd Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Thu, 1 Apr 2010 16:20:35 +0000 Subject: [PATCH] work in progress. --- src/dv/dv_api.c | 6 +++--- src/dv/gnunet-service-dv.c | 3 +-- src/dv/test_transport_api_dv_peer3.conf | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c index abfb249e4..4418f3a0f 100644 --- 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 ce996dda3..bff6c4ae4 100644 --- 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 413817cfe..66100488e 100644 --- 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] -- 2.25.1