diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-12-20 16:37:19 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-12-20 16:37:19 +0000 |
commit | d0c4105c48335034a0989ef7b0152c35c39c3bd4 (patch) | |
tree | 9978c22a2a8b11edaba9c768227ecfc17b092c90 /src/dv | |
parent | 313505b2679f00d6bab0f271347ad61ae9cd74cc (diff) | |
download | gnunet-d0c4105c48335034a0989ef7b0152c35c39c3bd4.tar.gz gnunet-d0c4105c48335034a0989ef7b0152c35c39c3bd4.zip |
at least they connect on transport level
Diffstat (limited to 'src/dv')
-rw-r--r-- | src/dv/gnunet-service-dv.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 7d5f24e6e..3934379f6 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c | |||
@@ -1539,6 +1539,7 @@ handle_set_union_result (void *cls, | |||
1539 | enum GNUNET_SET_Status status) | 1539 | enum GNUNET_SET_Status status) |
1540 | { | 1540 | { |
1541 | struct DirectNeighbor *neighbor = cls; | 1541 | struct DirectNeighbor *neighbor = cls; |
1542 | struct DirectNeighbor *dn; | ||
1542 | struct Target *target; | 1543 | struct Target *target; |
1543 | char *status_str; | 1544 | char *status_str; |
1544 | 1545 | ||
@@ -1575,9 +1576,7 @@ handle_set_union_result (void *cls, | |||
1575 | GNUNET_break_op (0); | 1576 | GNUNET_break_op (0); |
1576 | return; | 1577 | return; |
1577 | } | 1578 | } |
1578 | if (GNUNET_YES == | 1579 | if ( (NULL != (dn = GNUNET_CONTAINER_multipeermap_get (direct_neighbors, &((struct Target *) element->data)->peer))) && (DIRECT_NEIGHBOR_COST == dn->distance) ) |
1579 | GNUNET_CONTAINER_multipeermap_contains (direct_neighbors, | ||
1580 | &((struct Target *) element->data)->peer)) | ||
1581 | { | 1580 | { |
1582 | /* this is a direct neighbor of ours, we do not care about routes | 1581 | /* this is a direct neighbor of ours, we do not care about routes |
1583 | to this peer */ | 1582 | to this peer */ |
@@ -1775,6 +1774,7 @@ handle_dv_route_message (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
1775 | const struct GNUNET_MessageHeader *payload; | 1774 | const struct GNUNET_MessageHeader *payload; |
1776 | struct Route *route; | 1775 | struct Route *route; |
1777 | struct DirectNeighbor *neighbor; | 1776 | struct DirectNeighbor *neighbor; |
1777 | struct DirectNeighbor *dn; | ||
1778 | struct Target *target; | 1778 | struct Target *target; |
1779 | uint32_t distance; | 1779 | uint32_t distance; |
1780 | char me[5]; | 1780 | char me[5]; |
@@ -1812,8 +1812,9 @@ handle_dv_route_message (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
1812 | &my_identity, | 1812 | &my_identity, |
1813 | sizeof (struct GNUNET_PeerIdentity))) | 1813 | sizeof (struct GNUNET_PeerIdentity))) |
1814 | { | 1814 | { |
1815 | if (NULL != GNUNET_CONTAINER_multipeermap_get (direct_neighbors, | 1815 | if ((NULL |
1816 | &rm->sender)) | 1816 | != (dn = GNUNET_CONTAINER_multipeermap_get (direct_neighbors, |
1817 | &rm->sender))) && (DIRECT_NEIGHBOR_COST == dn->distance)) | ||
1817 | { | 1818 | { |
1818 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1819 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1819 | "Discarding DV message, as %s is a direct neighbor\n", | 1820 | "Discarding DV message, as %s is a direct neighbor\n", |