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

[gnunet]

Author: bartpolot
Date: 2013-07-10 00:50:41 +0200 (Wed, 10 Jul 2013)
New Revision: 27849

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
   gnunet/src/mesh/test_mesh.conf
   gnunet/src/mesh/test_mesh_small.c
Log:
- fix segfault on retransmission

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2013-07-09 22:36:54 UTC (rev 
27848)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2013-07-09 22:50:41 UTC (rev 
27849)
@@ -1623,6 +1623,8 @@
     return;
   }
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " *** Polling!\n");
+
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_MESH_POLL);
   msg.header.size = htons (sizeof (msg));
   msg.tid = htonl (t->id.tid);
@@ -1630,10 +1632,12 @@
 
   if (fc == &t->prev_fc)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " *** prev peer!\n");
     peer = t->prev_hop;
   }
   else if (fc == &t->next_fc)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " *** next peer!\n");
     peer = t->next_hop;
   }
   else
@@ -4583,6 +4587,7 @@
     struct GNUNET_MESH_Data *payload;
 
     copy = GNUNET_malloc (sizeof (struct MeshSentMessage) + size);
+    copy->t = t;
     copy->id = ntohl (data_msg->pid);
     copy->is_forward = GNUNET_YES;
     copy->retry_timer = GNUNET_TIME_UNIT_MINUTES;
@@ -4705,6 +4710,7 @@
     struct GNUNET_MESH_Data *payload;
 
     copy = GNUNET_malloc (sizeof (struct MeshSentMessage) + size);
+    copy->t = t;
     copy->id = ntohl (data_msg->pid);
     copy->is_forward = GNUNET_NO;
     copy->retry_timer = GNUNET_TIME_UNIT_MINUTES;

Modified: gnunet/src/mesh/test_mesh.conf
===================================================================
--- gnunet/src/mesh/test_mesh.conf      2013-07-09 22:36:54 UTC (rev 27848)
+++ gnunet/src/mesh/test_mesh.conf      2013-07-09 22:50:41 UTC (rev 27849)
@@ -9,14 +9,14 @@
 PORT = 10511
 #PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-REFRESH_PATH_TIME = 2 s
-APP_ANNOUNCE_TIME = 5 s
+REFRESH_PATH_TIME = 60 s
 ID_ANNOUNCE_TIME = 5 s
 CONNECT_TIMEOUT = 30 s
 DEFAULT_TTL = 16
 DHT_REPLICATION_LEVEL = 3
 MAX_TUNNELS = 10
 MAX_MSGS_QUEUE = 20
+DROP_PERCENT = 1
 
 [testbed]
 NUM_PEERS = 5

Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c   2013-07-09 22:36:54 UTC (rev 27848)
+++ gnunet/src/mesh/test_mesh_small.c   2013-07-09 22:50:41 UTC (rev 27849)
@@ -42,7 +42,7 @@
 /**
  * Time to wait for stuff that should be rather fast
  */
-#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
+#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 
120)
 
 /**
  * DIFFERENT TESTS TO RUN