[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10630 - in gnunet/src: core peerinfo
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10630 - in gnunet/src: core peerinfo |
Date: |
Wed, 17 Mar 2010 10:51:00 +0100 |
Author: grothoff
Date: 2010-03-17 10:51:00 +0100 (Wed, 17 Mar 2010)
New Revision: 10630
Modified:
gnunet/src/core/gnunet-service-core.c
gnunet/src/peerinfo/gnunet-peerinfo.c
Log:
extra checks, shorter timeout
Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c 2010-03-17 09:38:56 UTC (rev
10629)
+++ gnunet/src/core/gnunet-service-core.c 2010-03-17 09:51:00 UTC (rev
10630)
@@ -1066,6 +1066,9 @@
{
struct MessageEntry *m;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Destroying neighbour entry for peer `%4s'\n",
+ GNUNET_i2s (&n->peer));
if (n->pitr != NULL)
{
GNUNET_PEERINFO_iterate_cancel (n->pitr);
@@ -2060,6 +2063,9 @@
struct Neighbour *n;
struct GNUNET_TIME_Absolute now;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating neighbour entry for peer `%4s'\n",
+ GNUNET_i2s (pid));
n = GNUNET_malloc (sizeof (struct Neighbour));
n->next = neighbours;
neighbours = n;
@@ -2116,6 +2122,14 @@
}
sm = (const struct SendMessage *) message;
msize -= sizeof (struct SendMessage);
+ if (0 == memcmp (&sm->peer, &my_identity, sizeof (struct
GNUNET_PeerIdentity)))
+ {
+ /* FIXME: should we not allow loopback-injection here? */
+ GNUNET_break (0);
+ if (client != NULL)
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
n = find_neighbour (&sm->peer);
if (n == NULL)
n = create_neighbour (&sm->peer);
@@ -3318,11 +3332,14 @@
"Received message of type %u from `%4s', demultiplexing.\n",
ntohs (message->type), GNUNET_i2s (peer));
#endif
+ if (0 == memcmp (peer, &my_identity, sizeof (struct GNUNET_PeerIdentity)))
+ {
+ GNUNET_break (0);
+ return;
+ }
n = find_neighbour (peer);
if (n == NULL)
n = create_neighbour (peer);
- if (n == NULL)
- return;
n->last_latency = latency;
n->last_distance = distance;
up = (n->status == PEER_STATE_KEY_CONFIRMED);
@@ -3532,6 +3549,11 @@
struct Neighbour *n;
struct ConnectNotifyMessage cnm;
+ if (0 == memcmp (peer, &my_identity, sizeof (struct GNUNET_PeerIdentity)))
+ {
+ GNUNET_break (0);
+ return;
+ }
n = find_neighbour (peer);
if (n != NULL)
{
Modified: gnunet/src/peerinfo/gnunet-peerinfo.c
===================================================================
--- gnunet/src/peerinfo/gnunet-peerinfo.c 2010-03-17 09:38:56 UTC (rev
10629)
+++ gnunet/src/peerinfo/gnunet-peerinfo.c 2010-03-17 09:51:00 UTC (rev
10630)
@@ -90,7 +90,7 @@
NULL,
0,
GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 30),
+ (GNUNET_TIME_UNIT_SECONDS, 2),
&print_peer_info, NULL);
}
else
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10630 - in gnunet/src: core peerinfo,
gnunet <=