aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-10-14 09:07:59 +0000
committerChristian Grothoff <christian@grothoff.org>2011-10-14 09:07:59 +0000
commit4695ded30fc6c0308c34bc4c53f44abf3e58675d (patch)
treee9b0d816a0797fdddebd71cdac2bd8f5ee27a135
parent39e07a1f51c21260005a9d0a00f5c67460336259 (diff)
downloadgnunet-4695ded30fc6c0308c34bc4c53f44abf3e58675d.tar.gz
gnunet-4695ded30fc6c0308c34bc4c53f44abf3e58675d.zip
cleanup
-rw-r--r--src/ats/gnunet-service-ats_addresses.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 48a1b305d..f5de8973a 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -45,6 +45,7 @@ struct ATS_Address
45 struct GNUNET_TRANSPORT_ATS_Information * ats; 45 struct GNUNET_TRANSPORT_ATS_Information * ats;
46}; 46};
47 47
48
48static struct GNUNET_CONTAINER_MultiHashMap * addresses; 49static struct GNUNET_CONTAINER_MultiHashMap * addresses;
49 50
50 51
@@ -54,9 +55,11 @@ struct CompareAddressContext
54 struct ATS_Address * result; 55 struct ATS_Address * result;
55}; 56};
56 57
57int compare_address_it (void *cls, 58
58 const GNUNET_HashCode * key, 59static int
59 void *value) 60compare_address_it (void *cls,
61 const GNUNET_HashCode * key,
62 void *value)
60{ 63{
61 struct CompareAddressContext * cac = cls; 64 struct CompareAddressContext * cac = cls;
62 struct ATS_Address * aa = (struct ATS_Address *) value; 65 struct ATS_Address * aa = (struct ATS_Address *) value;
@@ -93,6 +96,7 @@ GAS_address_update (const struct GNUNET_PeerIdentity *peer,
93{ 96{
94 struct ATS_Address * aa; 97 struct ATS_Address * aa;
95 98
99 /* FIXME: should test first if address already exists! */
96 aa = GNUNET_malloc (sizeof (struct ATS_Address) + 100 aa = GNUNET_malloc (sizeof (struct ATS_Address) +
97 atsi_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) + 101 atsi_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information) +
98 plugin_addr_len); 102 plugin_addr_len);
@@ -121,12 +125,13 @@ GAS_address_destroyed (const struct GNUNET_PeerIdentity *peer,
121 uint32_t session_id) 125 uint32_t session_id)
122{ 126{
123#if 0 127#if 0
124 // struct AddressDestroyedMessage * msg = (struct AddressDestroyedMessage *) message; 128 struct ATS_Address * aa;
125/* 129
126 struct GNUNET_PeerIdentity *peer = &msg->peer; 130 aa = find_address (peer, plugin_name, plugin_addr, plugin_addr_len,
127 struct ATS_Address * aa = find_address_by_addr (peer); 131 session_client, session_id);
128 GNUNET_CONTAINER_multihashmap_remove(addresses, peer, aa); 132 GNUNET_break (GNUNET_YES ==
129 GNUNET_free (aa);*/ 133 GNUNET_CONTAINER_multihashmap_remove(addresses, &peer->hashPubKey, aa));
134 GNUNET_free (aa);
130#endif 135#endif
131} 136}
132 137