projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1c468a3
)
Don't try to send traffic to a peer that is not connected to us
author
Bart Polot
<bart@net.in.tum.de>
Mon, 31 Oct 2011 17:42:05 +0000
(17:42 +0000)
committer
Bart Polot
<bart@net.in.tum.de>
Mon, 31 Oct 2011 17:42:05 +0000
(17:42 +0000)
src/mesh/gnunet-service-mesh.c
patch
|
blob
|
history
diff --git
a/src/mesh/gnunet-service-mesh.c
b/src/mesh/gnunet-service-mesh.c
index 9b76e6b1e6e3cde432be72e2e123e2b7092c7c3f..0a481d6e99a71d1f094bfdb72aa6f9ad81c1e582 100644
(file)
--- a/
src/mesh/gnunet-service-mesh.c
+++ b/
src/mesh/gnunet-service-mesh.c
@@
-444,6
+444,11
@@
static struct GNUNET_CONTAINER_MultiHashMap *peers;
*/
static struct GNUNET_CORE_Handle *core_handle;
*/
static struct GNUNET_CORE_Handle *core_handle;
+/**
+ * Handle to communicate with transport
+ */
+// static struct GNUNET_TRANSPORT_Handle *transport_handle;
+
/**
* Handle to use DHT
*/
/**
* Handle to use DHT
*/
@@
-1139,14
+1144,29
@@
send_message (const struct GNUNET_MessageHeader *message,
{
struct MeshDataDescriptor *info;
struct MeshPeerInfo *neighbor;
{
struct MeshDataDescriptor *info;
struct MeshPeerInfo *neighbor;
+ struct MeshPeerPath *p;
unsigned int i;
size_t size;
unsigned int i;
size_t size;
+// GNUNET_TRANSPORT_try_connect();
+
size = ntohs (message->size);
info = GNUNET_malloc (sizeof (struct MeshDataDescriptor));
info->data = GNUNET_malloc (size);
memcpy (info->data, message, size);
neighbor = peer_info_get (peer);
size = ntohs (message->size);
info = GNUNET_malloc (sizeof (struct MeshDataDescriptor));
info->data = GNUNET_malloc (size);
memcpy (info->data, message, size);
neighbor = peer_info_get (peer);
+ for (p = neighbor->path_head; NULL != p; p = p->next)
+ {
+ if (2 == p->length)
+ {
+ break;
+ }
+ }
+ if (NULL == p)
+ {
+ GNUNET_break (0);
+ return;
+ }
i = peer_info_transmit_slot (neighbor);
info->handler_n = i;
info->peer = neighbor;
i = peer_info_transmit_slot (neighbor);
info->handler_n = i;
info->peer = neighbor;
@@
-4328,6
+4348,7
@@
run (void *cls, struct GNUNET_SERVER_Handle *server,
NULL, /* Don't notify about all outbound messages */
GNUNET_NO, /* For header-only out notification */
core_handlers); /* Register these handlers */
NULL, /* Don't notify about all outbound messages */
GNUNET_NO, /* For header-only out notification */
core_handlers); /* Register these handlers */
+
if (core_handle == NULL)
{
GNUNET_break (0);
if (core_handle == NULL)
{
GNUNET_break (0);
@@
-4359,6
+4380,13
@@
run (void *cls, struct GNUNET_SERVER_Handle *server,
&my_full_id.hashPubKey);
myid = GNUNET_PEER_intern (&my_full_id);
&my_full_id.hashPubKey);
myid = GNUNET_PEER_intern (&my_full_id);
+// // transport_handle = GNUNET_TRANSPORT_connect(c,
+// // &my_full_id,
+// // NULL,
+// // NULL,
+// // NULL,
+// // NULL);
+
dht_handle = GNUNET_DHT_connect (c, 64);
if (dht_handle == NULL)
{
dht_handle = GNUNET_DHT_connect (c, 64);
if (dht_handle == NULL)
{