[GNUnet-SVN] r16346 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2011-08-03 13:42:08 +0200 (Wed, 03 Aug 2011)
New Revision: 16346

Modified:
   gnunet/src/mesh/
   gnunet/src/mesh/gnunet-service-mesh.c
   gnunet/src/mesh/test_mesh_small.c
Log:
fixes


Property changes on: gnunet/src/mesh
___________________________________________________________________
Modified: svn:ignore
   - test_mesh_api
Makefile.in
Makefile
.deps
gnunet-service-mesh

   + test_mesh_api
test_mesh_small
Makefile.in
Makefile
.deps
gnunet-service-mesh


Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2011-08-03 11:17:55 UTC (rev 
16345)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2011-08-03 11:42:08 UTC (rev 
16346)
@@ -762,7 +762,7 @@
 
     GNUNET_assert(NULL != info);
     total_size = sizeof(struct GNUNET_MESH_DataMessageToOrigin) + info->size;
-    GNUNET_assert(total_size < (uint16_t) -1); /* FIXME */
+    GNUNET_assert(total_size < 65536); /* UNIT16_MAX */
 
     if (total_size > size) {
         GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
@@ -805,7 +805,7 @@
                    "not enough buffer to send data futher\n");
         return 0;
     }
-    memcpy(msg, buf, total_size);
+    memcpy(buf, msg, total_size);
     return total_size;
 }
 

Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c   2011-08-03 11:17:55 UTC (rev 16345)
+++ gnunet/src/mesh/test_mesh_small.c   2011-08-03 11:42:08 UTC (rev 16346)
@@ -581,7 +581,7 @@
                                     GNUNET_DISK_PERM_USER_WRITE);
   if (data_file == NULL)
     GNUNET_log(GNUNET_ERROR_TYPE_WARNING, 
-              "Failed to open %s for output!\n", 
+              "Failed to open %s for output!\n",
               data_filename);
   GNUNET_free(data_filename);
 
@@ -651,4 +651,4 @@
   return ok;
 }
 
-/* end of nse-profiler.c */
+/* end of test_mesh_small.c */