[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10745 - gnunet/src/dv
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10745 - gnunet/src/dv |
Date: |
Thu, 1 Apr 2010 18:20:35 +0200 |
Author: nevans
Date: 2010-04-01 18:20:35 +0200 (Thu, 01 Apr 2010)
New Revision: 10745
Modified:
gnunet/src/dv/dv_api.c
gnunet/src/dv/gnunet-service-dv.c
gnunet/src/dv/test_transport_api_dv_peer3.conf
Log:
work in progress.
Modified: gnunet/src/dv/dv_api.c
===================================================================
--- gnunet/src/dv/dv_api.c 2010-04-01 15:51:58 UTC (rev 10744)
+++ gnunet/src/dv/dv_api.c 2010-04-01 16:20:35 UTC (rev 10745)
@@ -291,9 +291,6 @@
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 @@
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);
Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c 2010-04-01 15:51:58 UTC (rev 10744)
+++ gnunet/src/dv/gnunet-service-dv.c 2010-04-01 16:20:35 UTC (rev 10745)
@@ -472,7 +472,7 @@
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 @@
"Received `%s' request from client\n", "START");
#endif
- GNUNET_assert(client_handle == NULL);
client_handle = client;
GNUNET_SERVER_receive_done (client, GNUNET_OK);
Modified: gnunet/src/dv/test_transport_api_dv_peer3.conf
===================================================================
--- gnunet/src/dv/test_transport_api_dv_peer3.conf 2010-04-01 15:51:58 UTC
(rev 10744)
+++ gnunet/src/dv/test_transport_api_dv_peer3.conf 2010-04-01 16:20:35 UTC
(rev 10745)
@@ -46,18 +46,18 @@
[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]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10745 - gnunet/src/dv,
gnunet <=