[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27258 - gnunet/src/experimentation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27258 - gnunet/src/experimentation |
Date: |
Wed, 22 May 2013 16:11:43 +0200 |
Author: wachs
Date: 2013-05-22 16:11:42 +0200 (Wed, 22 May 2013)
New Revision: 27258
Modified:
gnunet/src/experimentation/gnunet-daemon-experimentation.c
Log:
modifications
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation.c 2013-05-22
14:11:21 UTC (rev 27257)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation.c 2013-05-22
14:11:42 UTC (rev 27258)
@@ -296,13 +296,14 @@
return size;
}
+
static void handle_request (const struct GNUNET_PeerIdentity *peer)
{
struct Node *n;
if (NULL != (n = GNUNET_CONTAINER_multihashmap_get (nodes_active,
&peer->hashPubKey)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Received %s from
peer `%s'\n"),
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Received %s from
%s peer `%s'\n"),
"REQUEST", "active", GNUNET_i2s (peer));
}
else if (NULL != (n = GNUNET_CONTAINER_multihashmap_get
(nodes_requested, &peer->hashPubKey)))
@@ -324,18 +325,21 @@
GNUNET_CONTAINER_multihashmap_put (nodes_active,
&peer->hashPubKey, n,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
update_stats (nodes_active);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Added peer `%s'
active node \n"),
+ GNUNET_i2s (peer));
}
else if (NULL != (n = GNUNET_CONTAINER_multihashmap_get
(nodes_inactive, &peer->hashPubKey)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Received %s from
peer `%s'\n"),
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Received %s from
%s peer `%s'\n"),
"REQUEST", "inactive", GNUNET_i2s
(peer));
GNUNET_CONTAINER_multihashmap_remove (nodes_inactive,
&peer->hashPubKey, n);
update_stats (nodes_inactive);
GNUNET_CONTAINER_multihashmap_put (nodes_active,
&peer->hashPubKey, n,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
update_stats (nodes_active);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Added peer `%s'
active node \n"),
+ GNUNET_i2s (peer));
}
-
else
{
/* Create new node */
@@ -346,18 +350,64 @@
GNUNET_CONTAINER_multihashmap_put (nodes_active,
&peer->hashPubKey, n,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
update_stats (nodes_active);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Added peer `%s'
active node \n"),
+ GNUNET_i2s (peer));
}
n->cth = GNUNET_CORE_notify_transmit_ready(ch, GNUNET_NO, 0,
GNUNET_TIME_relative_get_forever_(),
peer, sizeof
(struct Experimentation_Response),
send_response_cb, n);
-
}
static void handle_response (const struct GNUNET_PeerIdentity *peer)
{
+ struct Node *n;
+ if (NULL != (n = GNUNET_CONTAINER_multihashmap_get (nodes_active,
&peer->hashPubKey)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Received %s from
%s peer `%s'\n"),
+ "RESPONSE", "active", GNUNET_i2s
(peer));
+ }
+ else if (NULL != (n = GNUNET_CONTAINER_multihashmap_get
(nodes_requested, &peer->hashPubKey)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Received %s from
%s peer `%s'\n"),
+ "RESPONSE", "requested", GNUNET_i2s
(peer));
+ GNUNET_CONTAINER_multihashmap_remove (nodes_requested,
&peer->hashPubKey, n);
+ if (GNUNET_SCHEDULER_NO_TASK != n->timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (n->timeout_task);
+ n->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != n->cth)
+ {
+ GNUNET_CORE_notify_transmit_ready_cancel
(n->cth);
+ n->cth = NULL;
+ }
+ update_stats (nodes_requested);
+ GNUNET_CONTAINER_multihashmap_put (nodes_active,
+ &peer->hashPubKey, n,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ update_stats (nodes_active);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Added peer `%s'
active node \n"),
+ GNUNET_i2s (peer));
+ }
+ else if (NULL != (n = GNUNET_CONTAINER_multihashmap_get
(nodes_inactive, &peer->hashPubKey)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Received %s from
peer `%s'\n"),
+ "RESPONSE", "inactive", GNUNET_i2s
(peer));
+ GNUNET_CONTAINER_multihashmap_remove (nodes_inactive,
&peer->hashPubKey, n);
+ update_stats (nodes_inactive);
+ GNUNET_CONTAINER_multihashmap_put (nodes_active,
+ &peer->hashPubKey, n,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ update_stats (nodes_active);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Added peer `%s'
active node \n"),
+ GNUNET_i2s (peer));
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Received %s from
%s peer `%s'\n"),
+ "RESPONSE", "unknown", GNUNET_i2s
(peer));
+ }
}
/**
@@ -421,11 +471,8 @@
switch (ntohs (message->type)) {
case GNUNET_MESSAGE_TYPE_EXPERIMENTATION_REQUEST:
handle_request (other);
-
break;
case GNUNET_MESSAGE_TYPE_EXPERIMENTATION_RESPONSE:
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Received %s from
peer `%s'\n"),
- "RESPONSE", GNUNET_i2s (other));
handle_response (other);
break;
default:
@@ -452,7 +499,7 @@
stats = GNUNET_STATISTICS_create ("experimentation", cfg);
if (NULL == stats)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("Failed to create
statistics!\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to create
statistics!\n"));
return;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27258 - gnunet/src/experimentation,
gnunet <=