From 977c4ed7fefc4cd15d2896662e73da8fcc9c32c3 Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Fri, 2 Jul 2010 16:03:08 +0000 Subject: [PATCH] codesonar fixes --- src/dv/dv.h | 7 +------ src/dv/dv_api.c | 5 ++--- src/dv/gnunet-service-dv.c | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/dv/dv.h b/src/dv/dv.h index bb63bc004..cc335b2e6 100644 --- a/src/dv/dv.h +++ b/src/dv/dv.h @@ -64,7 +64,7 @@ struct GNUNET_DV_MessageReceived struct GNUNET_PeerIdentity sender; /** - * The message that was sent + * The length of the message that was sent (appended to this end of struct) */ uint32_t msg_len; @@ -73,11 +73,6 @@ struct GNUNET_DV_MessageReceived */ uint32_t distance; - /** - * Length of the sender address, appended to end of this message - */ - uint32_t sender_address_len; - }; diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c index e5713cdda..d9aef03c8 100644 --- a/src/dv/dv_api.c +++ b/src/dv/dv_api.c @@ -367,9 +367,8 @@ void handle_message_receipt (void *cls, received_msg = (struct GNUNET_DV_MessageReceived *)msg; packed_msg_len = ntohl(received_msg->msg_len); - sender_address_len = ntohl(received_msg->sender_address_len); - - GNUNET_assert(ntohs(msg->size) == (sizeof(struct GNUNET_DV_MessageReceived) + packed_msg_len + sender_address_len)); + sender_address_len = ntohs(msg->size) - packed_msg_len - sizeof(struct GNUNET_DV_MessageReceived); + GNUNET_assert(sender_address_len > 0); sender_address = GNUNET_malloc(sender_address_len); memcpy(sender_address, &received_msg[1], sender_address_len); packed_msg_start = (char *)&received_msg[1]; diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 4bb6555d3..84dc84965 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c @@ -814,7 +814,6 @@ 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 = htonl(sender_address_len); received_msg->distance = htonl(cost); received_msg->msg_len = htonl(message_size); /* Set the sender in this message to be the original sender! */ -- 2.25.1