[GNUnet-SVN] r34860 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2015-01-09 19:04:27 +0100 (Fri, 09 Jan 2015)
New Revision: 34860

Modified:
   gnunet/src/cadet/gnunet-service-cadet_channel.c
   gnunet/src/cadet/gnunet-service-cadet_channel.h
Log:
- add size argument to allow to verify message size

Modified: gnunet/src/cadet/gnunet-service-cadet_channel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_channel.c     2015-01-09 18:04:26 UTC 
(rev 34859)
+++ gnunet/src/cadet/gnunet-service-cadet_channel.c     2015-01-09 18:04:27 UTC 
(rev 34860)
@@ -1714,20 +1714,20 @@
  *
  * @param ch Channel.
  * @param c Client which sent the data.
- * @param message Message.
  * @param fwd Is this a FWD data?
+ * @param message Data message.
+ * @param size Size of data.
  *
  * @return GNUNET_OK if everything goes well, GNUNET_SYSERR in case of en 
error.
  */
 int
 GCCH_handle_local_data (struct CadetChannel *ch,
-                        struct CadetClient *c,
-                        struct GNUNET_MessageHeader *message,
-                        int fwd)
+                        struct CadetClient *c, int fwd,
+                        const struct GNUNET_MessageHeader *message,
+                        size_t size)
 {
   struct CadetChannelReliability *rel;
   struct GNUNET_CADET_Data *payload;
-  size_t size = ntohs (message->size);
   uint16_t p2p_size = sizeof(struct GNUNET_CADET_Data) + size;
   unsigned char cbuf[p2p_size];
 

Modified: gnunet/src/cadet/gnunet-service-cadet_channel.h
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_channel.h     2015-01-09 18:04:26 UTC 
(rev 34859)
+++ gnunet/src/cadet/gnunet-service-cadet_channel.h     2015-01-09 18:04:27 UTC 
(rev 34860)
@@ -184,16 +184,17 @@
  *
  * @param ch Channel.
  * @param c Client which sent the data.
- * @param message Message.
  * @param fwd Is this a FWD data?
+ * @param message Data message.
+ * @param size Size of data.
  *
  * @return GNUNET_OK if everything goes well, GNUNET_SYSERR in case of en 
error.
  */
 int
 GCCH_handle_local_data (struct CadetChannel *ch,
-                        struct CadetClient *c,
-                        struct GNUNET_MessageHeader *message,
-                        int fwd);
+                        struct CadetClient *c, int fwd,
+                        const struct GNUNET_MessageHeader *message,
+                        size_t size);
 
 /**
  * Handle a channel destroy requested by a client.