[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24417 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24417 - gnunet/src/mesh |
Date: |
Fri, 19 Oct 2012 12:35:15 +0200 |
Author: bartpolot
Date: 2012-10-19 12:35:15 +0200 (Fri, 19 Oct 2012)
New Revision: 24417
Modified:
gnunet/src/mesh/gnunet-service-mesh.c
Log:
- debug, style
Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c 2012-10-19 10:17:36 UTC (rev
24416)
+++ gnunet/src/mesh/gnunet-service-mesh.c 2012-10-19 10:35:15 UTC (rev
24417)
@@ -1584,11 +1584,11 @@
{
struct GNUNET_REGEX_Automaton *dfa;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "regex_put (%s) start\n", regex);
+ DEBUG_DHT (" regex_put (%s) start\n", regex);
dfa = GNUNET_REGEX_construct_dfa (regex, strlen(regex));
GNUNET_REGEX_iterate_all_edges (dfa, ®ex_iterator, NULL);
GNUNET_REGEX_automaton_destroy (dfa);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "regex_put (%s) end\n", regex);
+ DEBUG_DHT (" regex_put (%s) end\n", regex);
}
@@ -1769,9 +1769,9 @@
struct MeshClient *c = cls;
unsigned int i;
+ c->regex_announce_task = GNUNET_SCHEDULER_NO_TASK;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
{
- c->regex_announce_task = GNUNET_SCHEDULER_NO_TASK;
return;
}
@@ -1781,8 +1781,9 @@
{
regex_put (c->regexes[i]);
}
- c->regex_announce_task =
- GNUNET_SCHEDULER_add_delayed (app_announce_time, &announce_regex, cls);
+ c->regex_announce_task = GNUNET_SCHEDULER_add_delayed (app_announce_time,
+ &announce_regex,
+ cls);
DEBUG_DHT ("Finished PUT for regex\n");
return;
@@ -4710,10 +4711,13 @@
{
case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY:
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, " cancelling TUNNEL_DESTROY\n");
+ GNUNET_assert (GNUNET_YES == queue->tunnel->destroy);
+ /* FIXME: don't cancel, send and destroy tunnel in queue_send */
/* fall through */
case GNUNET_MESSAGE_TYPE_MESH_UNICAST:
case GNUNET_MESSAGE_TYPE_MESH_MULTICAST:
case GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN:
+ case GNUNET_MESSAGE_TYPE_MESH_ACK:
case GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
" prebuilt message\n");
@@ -5895,6 +5899,7 @@
return GNUNET_OK;
}
ack = ntohl (msg->pid);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " ACK %u\n", ack);
/* Is this a forward or backward ACK? */
if (tree_get_predecessor(t->tree) != GNUNET_PEER_search(peer))
@@ -8256,6 +8261,7 @@
GNUNET_SCHEDULER_shutdown ();
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "APP_ANNOUNCE_TIME %llu ms\n",
app_announce_time.rel_value);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (c, "MESH", "ID_ANNOUNCE_TIME",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24417 - gnunet/src/mesh,
gnunet <=