X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffragmentation%2Ffragmentation.c;h=ecd82b2c4ba4e1809ebfa6fae1bcaa28b46b0b61;hb=ecc2c2e4f440fcfaeb267e41a929abe6c6d5b949;hp=c67059f344080a84324b6e729bd743983ef0d177;hpb=40ff2323130e2cbe383f9b00fdb5ddfef995d347;p=oweals%2Fgnunet.git

diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c
index c67059f34..ecd82b2c4 100644
--- a/src/fragmentation/fragmentation.c
+++ b/src/fragmentation/fragmentation.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -28,17 +28,19 @@
  *        fragmented packet at any given point in time (prevents
  *        DoS attacks).  Fragmented messages that have not been
  *        completed after a certain amount of time are discarded.
- * @author Christian Grothoff
+ * @author Ji Lu
  */
 
 #include "platform.h"
 #include "gnunet_fragmentation_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_util_lib.h"
+
 /**
  * Message fragment.  This header is followed
  * by the actual data of the fragment.
  */
+
 struct Fragment
 {
 
@@ -47,26 +49,26 @@ struct Fragment
 	/**
 	 * Fragment offset.
 	 */
-	uint32_t off GNUNET_PACKED;
+	uint16_t off GNUNET_PACKED;
 
 	/**
-	 * "unique" id for the fragment
+	* "unique" id for the fragment
 	 */
-	uint64_t id GNUNET_PACKED;
+	uint32_t id GNUNET_PACKED;
+	uint16_t mtu;
+	uint16_t totalNum;
+	uint16_t totalSize;
 
-	size_t mtu;
-	uint32_t totalNum;
-	uint64_t totalSize;
 };
 
 struct GNUNET_FRAGEMENT_Ctxbuffer{
 	struct GNUNET_FRAGEMENT_Ctxbuffer *next;
-	uint64_t id;
+	uint32_t id;
 	uint16_t size;
 	char * buff;
 	int counter;
 	struct GNUNET_TIME_Absolute receivedTime;
-	struct GNUNET_PeerIdentity *peerID;
+	struct GNUNET_PeerIdentity peerID;
 	int * num;
 };
 
@@ -99,6 +101,7 @@ GNUNET_FRAGMENT_fragment (const struct GNUNET_MessageHeader *msg,
 {
 	uint32_t id = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 256);
 	size_t size = sizeof(struct Fragment);
+
 	if(ntohs(msg->size) > mtu-size){
 		uint16_t lastSize;
 		uint16_t num;
@@ -114,15 +117,15 @@ GNUNET_FRAGMENT_fragment (const struct GNUNET_MessageHeader *msg,
 		{
 			struct Fragment *frag;
 			if(actualNum != num){
-							if(i!=actualNum-1){
-								frag = GNUNET_malloc(mtu);
-							}
-							else{
-							    frag = GNUNET_malloc(lastSize+size);
-								}
-							}
+				if(i!=actualNum-1){
+					frag = (struct Fragment *)GNUNET_malloc(mtu);
+				}
+				else{
+					frag = (struct Fragment *)GNUNET_malloc(lastSize+size);
+					}
+				}
 			else{
-					frag = GNUNET_malloc(mtu);
+					frag = (struct Fragment *)GNUNET_malloc(mtu);
 				}
 			frag->header.type = htons(GNUNET_MESSAGE_TYPE_FRAGMENT);
 			frag->id = htonl(id);
@@ -130,19 +133,20 @@ GNUNET_FRAGMENT_fragment (const struct GNUNET_MessageHeader *msg,
 			frag->mtu = htons(mtu);
 			frag->totalNum = htons(actualNum);
 			frag->totalSize = msg->size;
+			char *tmpMsg =  (char *)msg;
 			if(actualNum != num){
 				if(i!=actualNum-1){
 					frag->header.size = htons(mtu);
-					memcpy(&frag[1], msg + ntohs(frag->off), mtu - size);
+					memcpy(&frag[1], tmpMsg + (mtu-size)*i, mtu - size);
 				}
 				else{
 					frag->header.size = htons(lastSize+size);
-					memcpy(&frag[1], msg + ntohs(frag->off), lastSize);
+					memcpy(&frag[1], tmpMsg + (mtu-size)*i, lastSize);
 				}
 			}
 			else{
 				frag->header.size = htons(mtu);
-				memcpy(&frag[1], msg + ntohs(frag->off), mtu - size);
+				memcpy(&frag[1], tmpMsg + (mtu-size)*i, mtu - size);
 			}
 			proc(proc_cls, &frag->header);
 			GNUNET_free(frag);
@@ -150,7 +154,6 @@ GNUNET_FRAGMENT_fragment (const struct GNUNET_MessageHeader *msg,
 	}
 }
 
-
 /**
  * Create a defragmentation context.
  *
@@ -180,10 +183,16 @@ void
 GNUNET_FRAGMENT_context_destroy (struct GNUNET_FRAGMENT_Context *ctx)
 {
 	struct GNUNET_FRAGEMENT_Ctxbuffer *buffer;
-	for(buffer = ctx->buffer; buffer!=NULL; buffer = buffer->next){
-		GNUNET_free(buffer->num);
-		GNUNET_free(buffer);
-	}
+	struct GNUNET_FRAGEMENT_Ctxbuffer *temp;
+	buffer = ctx->buffer;
+
+	while (buffer != NULL)
+	  {
+            temp = buffer->next;
+            GNUNET_free(buffer->num);
+            GNUNET_free(buffer);
+            buffer = temp;
+          }
 	GNUNET_free(ctx);
 	GNUNET_assert (0);
 }
@@ -213,8 +222,8 @@ GNUNET_FRAGMENT_process (struct GNUNET_FRAGMENT_Context *ctx,
 	buffer = ctx->buffer;
 	while (buffer != NULL)
 	{
-//for(buffer = ctx->buffer; buffer != NULL; buffer = buffer->next){
-		if(buffer->id == ntohl(frag->id)&&(buffer->peerID==sender)){
+		if ((buffer->id == ntohl(frag->id))&&(0 == memcmp (&buffer->peerID,
+                             sender, sizeof (struct GNUNET_PeerIdentity)))){
 			exist = 1;
 			break;
 		}
@@ -235,17 +244,17 @@ GNUNET_FRAGMENT_process (struct GNUNET_FRAGMENT_Context *ctx,
 
 	if(!exist){
 		buffer = GNUNET_malloc(sizeof(struct GNUNET_FRAGEMENT_Ctxbuffer));
-		buffer->num = (int*)GNUNET_malloc(ntohs(frag->totalNum)*sizeof(int));
+		buffer->num = GNUNET_malloc(ntohs(frag->totalNum)*sizeof(int));
 		int j;
 		for(j = 0; j<ntohs(frag->totalNum); j++){
 			buffer->num[j] = -10;
 		}
-		buffer->peerID = sender;
+		buffer->peerID = *sender;
 		buffer->id = ntohl(frag->id);
 		buffer->receivedTime = GNUNET_TIME_absolute_get ();
-		uint64_t si = ntohs(frag->totalSize);
+		uint16_t si = ntohs(frag->totalSize);
 		buffer->size = si;
-		buffer->buff = (char *)GNUNET_malloc(si);
+		buffer->buff = GNUNET_malloc(si);
 		buffer->next = ctx->buffer;
 		ctx->buffer = buffer;
 	}