diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-11-13 14:07:26 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-11-13 14:07:26 +0000 |
commit | a1ab1459c85a5a647f36aba790c36d89c9faa268 (patch) | |
tree | cfacfae63e011d9bcd42c46454a515e3f0c92615 | |
parent | 125844501aeadb8bc4aafd804cbc71613e3ae04e (diff) | |
download | gnunet-a1ab1459c85a5a647f36aba790c36d89c9faa268.tar.gz gnunet-a1ab1459c85a5a647f36aba790c36d89c9faa268.zip |
- dont record route for regex_accept blocks, avoid any kind of duplication for datacache
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 7d125ca4b..63dc69f01 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -1556,8 +1556,8 @@ regex_find_path (const struct GNUNET_HashCode *key, | |||
1556 | GNUNET_BLOCK_TYPE_MESH_REGEX_ACCEPT, /* type */ | 1556 | GNUNET_BLOCK_TYPE_MESH_REGEX_ACCEPT, /* type */ |
1557 | key, /* key to search */ | 1557 | key, /* key to search */ |
1558 | dht_replication_level, /* replication level */ | 1558 | dht_replication_level, /* replication level */ |
1559 | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE | | 1559 | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE/* | |
1560 | GNUNET_DHT_RO_RECORD_ROUTE, | 1560 | GNUNET_DHT_RO_RECORD_ROUTE*/, |
1561 | NULL, /* xquery */ | 1561 | NULL, /* xquery */ |
1562 | // FIXME add BLOOMFILTER to exclude filtered peers | 1562 | // FIXME add BLOOMFILTER to exclude filtered peers |
1563 | 0, /* xquery bits */ | 1563 | 0, /* xquery bits */ |
@@ -1775,7 +1775,7 @@ regex_iterator (void *cls, | |||
1775 | (void) | 1775 | (void) |
1776 | GNUNET_DHT_put(dht_handle, key, | 1776 | GNUNET_DHT_put(dht_handle, key, |
1777 | dht_replication_level, | 1777 | dht_replication_level, |
1778 | opt | GNUNET_DHT_RO_RECORD_ROUTE, | 1778 | opt/* | GNUNET_DHT_RO_RECORD_ROUTE*/, |
1779 | GNUNET_BLOCK_TYPE_MESH_REGEX_ACCEPT, | 1779 | GNUNET_BLOCK_TYPE_MESH_REGEX_ACCEPT, |
1780 | size, | 1780 | size, |
1781 | (char *) &block, | 1781 | (char *) &block, |
@@ -5187,8 +5187,9 @@ queue_send (void *cls, size_t size, void *buf) | |||
5187 | GNUNET_i2s(&my_full_id)); | 5187 | GNUNET_i2s(&my_full_id)); |
5188 | if (NULL == cinfo) | 5188 | if (NULL == cinfo) |
5189 | cinfo = tunnel_get_neighbor_fc (t, &dst_id); | 5189 | cinfo = tunnel_get_neighbor_fc (t, &dst_id); |
5190 | cinfo->fc_poll = GNUNET_SCHEDULER_add_delayed(MESH_POLL_TIME, | 5190 | if (GNUNET_SCHEDULER_NO_TASK == cinfo->fc_poll) |
5191 | &tunnel_poll, cinfo); | 5191 | cinfo->fc_poll = GNUNET_SCHEDULER_add_delayed(MESH_POLL_TIME, |
5192 | &tunnel_poll, cinfo); | ||
5192 | } | 5193 | } |
5193 | } | 5194 | } |
5194 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* return %d\n", data_size); | 5195 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "********* return %d\n", data_size); |
@@ -6508,10 +6509,10 @@ dht_get_string_accept_handler (void *cls, struct GNUNET_TIME_Absolute exp, | |||
6508 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " for %s\n", info->description); | 6509 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " for %s\n", info->description); |
6509 | 6510 | ||
6510 | peer_info = peer_info_get(&block->id); | 6511 | peer_info = peer_info_get(&block->id); |
6511 | p = path_build_from_dht (get_path, get_path_length, put_path, | 6512 | // p = path_build_from_dht (get_path, get_path_length, put_path, |
6512 | put_path_length); | 6513 | // put_path_length); |
6513 | path_add_to_peers (p, GNUNET_NO); | 6514 | // path_add_to_peers (p, GNUNET_NO); |
6514 | path_destroy(p); | 6515 | // path_destroy(p); |
6515 | 6516 | ||
6516 | tunnel_add_peer (info->t, peer_info); | 6517 | tunnel_add_peer (info->t, peer_info); |
6517 | peer_info_connect (peer_info, info->t); | 6518 | peer_info_connect (peer_info, info->t); |