diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-04-01 20:26:10 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-04-01 20:26:10 +0000 |
commit | 44e117cbab54ec4ed04e53a9498fd667bb4ddc69 (patch) | |
tree | e33d511d6a13aba015590f63d72c2998b717bb47 /src/fragmentation/fragmentation.c | |
parent | 7b8e790147f04a3223040999e38562b9c7218abd (diff) | |
download | gnunet-44e117cbab54ec4ed04e53a9498fd667bb4ddc69.tar.gz gnunet-44e117cbab54ec4ed04e53a9498fd667bb4ddc69.zip |
making it compile
Diffstat (limited to 'src/fragmentation/fragmentation.c')
-rw-r--r-- | src/fragmentation/fragmentation.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c index c06715b99..437104c75 100644 --- a/src/fragmentation/fragmentation.c +++ b/src/fragmentation/fragmentation.c | |||
@@ -66,7 +66,7 @@ struct GNUNET_FRAGEMENT_Ctxbuffer{ | |||
66 | char * buff; | 66 | char * buff; |
67 | int counter; | 67 | int counter; |
68 | struct GNUNET_TIME_Absolute receivedTime; | 68 | struct GNUNET_TIME_Absolute receivedTime; |
69 | struct GNUNET_PeerIdentity *peerID; | 69 | struct GNUNET_PeerIdentity peerID; |
70 | int * num; | 70 | int * num; |
71 | }; | 71 | }; |
72 | 72 | ||
@@ -214,7 +214,8 @@ GNUNET_FRAGMENT_process (struct GNUNET_FRAGMENT_Context *ctx, | |||
214 | buffer = ctx->buffer; | 214 | buffer = ctx->buffer; |
215 | while (buffer != NULL) | 215 | while (buffer != NULL) |
216 | { | 216 | { |
217 | if(buffer->id == ntohl(frag->id)&&(buffer->peerID==sender)){ | 217 | if ((buffer->id == ntohl(frag->id))&&(0 == memcmp (&buffer->peerID, |
218 | sender, sizeof (struct GNUNET_PeerIdentity)))){ | ||
218 | exist = 1; | 219 | exist = 1; |
219 | break; | 220 | break; |
220 | } | 221 | } |
@@ -234,18 +235,18 @@ GNUNET_FRAGMENT_process (struct GNUNET_FRAGMENT_Context *ctx, | |||
234 | } | 235 | } |
235 | 236 | ||
236 | if(!exist){ | 237 | if(!exist){ |
237 | buffer = (struct GNUNET_FRAGEMENT_Ctxbuffer*)GNUNET_malloc(sizeof(struct GNUNET_FRAGEMENT_Ctxbuffer)); | 238 | buffer = GNUNET_malloc(sizeof(struct GNUNET_FRAGEMENT_Ctxbuffer)); |
238 | buffer->num = (int*)GNUNET_malloc(ntohs(frag->totalNum)*sizeof(int)); | 239 | buffer->num = GNUNET_malloc(ntohs(frag->totalNum)*sizeof(int)); |
239 | int j; | 240 | int j; |
240 | for(j = 0; j<ntohs(frag->totalNum); j++){ | 241 | for(j = 0; j<ntohs(frag->totalNum); j++){ |
241 | buffer->num[j] = -10; | 242 | buffer->num[j] = -10; |
242 | } | 243 | } |
243 | buffer->peerID = sender; | 244 | buffer->peerID = *sender; |
244 | buffer->id = ntohl(frag->id); | 245 | buffer->id = ntohl(frag->id); |
245 | buffer->receivedTime = GNUNET_TIME_absolute_get (); | 246 | buffer->receivedTime = GNUNET_TIME_absolute_get (); |
246 | uint16_t si = ntohs(frag->totalSize); | 247 | uint16_t si = ntohs(frag->totalSize); |
247 | buffer->size = si; | 248 | buffer->size = si; |
248 | buffer->buff = (char*)GNUNET_malloc(si); | 249 | buffer->buff = GNUNET_malloc(si); |
249 | buffer->next = ctx->buffer; | 250 | buffer->next = ctx->buffer; |
250 | ctx->buffer = buffer; | 251 | ctx->buffer = buffer; |
251 | } | 252 | } |