From 36bfd342bf5703f0f482e0ea0c6adf0682f3d014 Mon Sep 17 00:00:00 2001 From: Ji Lu Date: Thu, 1 Apr 2010 15:16:00 +0000 Subject: final version from ji lu --- src/fragmentation/fragmentation.c | 28 ++++---- src/fragmentation/test_fragmentation_enhanced.c | 89 +++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 14 deletions(-) create mode 100644 src/fragmentation/test_fragmentation_enhanced.c (limited to 'src/fragmentation') diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c index c3739a3e9..c06715b99 100644 --- a/src/fragmentation/fragmentation.c +++ b/src/fragmentation/fragmentation.c @@ -28,7 +28,7 @@ * 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" @@ -115,13 +115,13 @@ GNUNET_FRAGMENT_fragment (const struct GNUNET_MessageHeader *msg, { struct Fragment *frag; if(actualNum != num){ - if(i!=actualNum-1){ - frag = (struct Fragment *)GNUNET_malloc(mtu); - } - else{ - frag = (struct Fragment *)GNUNET_malloc(lastSize+size); - } - } + if(i!=actualNum-1){ + frag = (struct Fragment *)GNUNET_malloc(mtu); + } + else{ + frag = (struct Fragment *)GNUNET_malloc(lastSize+size); + } + } else{ frag = (struct Fragment *)GNUNET_malloc(mtu); } @@ -131,20 +131,20 @@ GNUNET_FRAGMENT_fragment (const struct GNUNET_MessageHeader *msg, frag->mtu = htons(mtu); frag->totalNum = htons(actualNum); frag->totalSize = msg->size; - char *m = (char *)msg; + char *tmpMsg = (char *)msg; if(actualNum != num){ if(i!=actualNum-1){ - frag->header.size = frag->mtu; - memcpy(&frag[1], m + (mtu-size)*i, mtu - size); + frag->header.size = htons(mtu); + memcpy(&frag[1], tmpMsg + (mtu-size)*i, mtu - size); } else{ frag->header.size = htons(lastSize+size); - memcpy(&frag[1], m + (mtu-size)*i, lastSize); + memcpy(&frag[1], tmpMsg + (mtu-size)*i, lastSize); } } else{ - frag->header.size = frag->mtu; - memcpy(&frag[1], m + (mtu-size)*i, mtu - size); + frag->header.size = htons(mtu); + memcpy(&frag[1], tmpMsg + (mtu-size)*i, mtu - size); } proc(proc_cls, &frag->header); GNUNET_free(frag); diff --git a/src/fragmentation/test_fragmentation_enhanced.c b/src/fragmentation/test_fragmentation_enhanced.c new file mode 100644 index 000000000..b763e2cad --- /dev/null +++ b/src/fragmentation/test_fragmentation_enhanced.c @@ -0,0 +1,89 @@ +/* + This file is part of GNUnet. + (C) 2009 Christian Grothoff (and other contributing authors) + + 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 + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNUnet; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ + +/** + * @file fragmentation/test_fragmentation_enhanced.c + * @brief testcase for the fragmentation.c + * @author Ji Lu + */ + +#include "platform.h" +#include "gnunet_protocols.h" +#include "gnunet_fragmentation_lib.h" + +struct combine{ + struct GNUNET_FRAGMENT_Context* ctx; + struct GNUNET_PeerIdentity* sender; +}; + +void message_proc1(void *cls, const struct GNUNET_MessageHeader * msg){ + + fprintf(stderr, "enter into message_proc1\n"); + + struct GNUNET_MessageHeader * originalMsg = (struct GNUNET_MessageHeader *)cls; + + if(ntohs(originalMsg->size) != ntohs(msg->size)){ + fprintf(stderr, "the received message has the different size with the sent one!\n"); + } + if(ntohs(originalMsg->type) != ntohs(msg->type)){ + fprintf(stderr, "the received message has the different type with the sent one!\n"); + } + if(memcmp(msg, originalMsg, originalMsg->size)){ + fprintf(stderr, "the received message is not the sent one!\n"); + } + else{ + fprintf(stdout, "You got the right message!\n"); + } + +} + +void message_proc2(void *cls, const struct GNUNET_MessageHeader * msg){ + + printf("enter into message_proc2\n"); + + struct combine * com2 = (struct combine* )cls; + GNUNET_FRAGMENT_process(com2->ctx, com2->sender, msg); + +} + +int +main(int argc, char * argv[]){ + + uint32_t mtu = 512; + struct GNUNET_FRAGMENT_Context * ctx; + struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *)GNUNET_malloc(sizeof(struct GNUNET_MessageHeader)+2*mtu); + ctx = GNUNET_FRAGMENT_context_create(NULL, message_proc1, msg); + msg->size = htons(sizeof(struct GNUNET_MessageHeader)+4*mtu); + msg->type = htons(GNUNET_MESSAGE_TYPE_HELLO); + struct GNUNET_PeerIdentity *sender; + sender = (struct GNUNET_PeerIdentity *)GNUNET_malloc(sizeof(struct GNUNET_PeerIdentity)); + + memset(sender, 9, sizeof(struct GNUNET_PeerIdentity)); + + memset(&msg[1], 5, 2*mtu); + + struct combine *com; + com = (struct combine *)GNUNET_malloc(sizeof(struct combine)); + com->ctx = ctx; + com->sender = sender; + GNUNET_FRAGMENT_fragment(msg, mtu, message_proc2, com); + GNUNET_free(msg); + return 0; +} -- cgit v1.2.3