aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-10-07 18:19:32 +0000
committerChristian Grothoff <christian@grothoff.org>2012-10-07 18:19:32 +0000
commita60b958f984d08525b636a2c7eae564ebec54ae6 (patch)
tree6dcbbf91d734834f804b2fd9ab790244e2d60e6c /src/core
parentdecf459805cdb3f6811f979df4831bc2ce9a2858 (diff)
downloadgnunet-a60b958f984d08525b636a2c7eae564ebec54ae6.tar.gz
gnunet-a60b958f984d08525b636a2c7eae564ebec54ae6.zip
-chaning multihashmap API to allow option for avoiding key allocation
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core_api.c2
-rw-r--r--src/core/gnunet-service-core_clients.c4
-rw-r--r--src/core/gnunet-service-core_neighbours.c2
-rw-r--r--src/core/gnunet-service-core_sessions.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/core/core_api.c b/src/core/core_api.c
index 46105a466..4d1a5493f 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -1173,7 +1173,7 @@ GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
1173 h->handlers = handlers; 1173 h->handlers = handlers;
1174 h->hcnt = 0; 1174 h->hcnt = 0;
1175 h->currently_down = GNUNET_YES; 1175 h->currently_down = GNUNET_YES;
1176 h->peers = GNUNET_CONTAINER_multihashmap_create (128); 1176 h->peers = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
1177 h->retry_backoff = GNUNET_TIME_UNIT_MILLISECONDS; 1177 h->retry_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
1178 if (NULL != handlers) 1178 if (NULL != handlers)
1179 while (handlers[h->hcnt].callback != NULL) 1179 while (handlers[h->hcnt].callback != NULL)
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c
index 91f1ae65a..56ebcc423 100644
--- a/src/core/gnunet-service-core_clients.c
+++ b/src/core/gnunet-service-core_clients.c
@@ -298,7 +298,7 @@ handle_client_init (void *cls, struct GNUNET_SERVER_Client *client,
298 c->options = ntohl (im->options); 298 c->options = ntohl (im->options);
299 all_client_options |= c->options; 299 all_client_options |= c->options;
300 c->types = (const uint16_t *) &c[1]; 300 c->types = (const uint16_t *) &c[1];
301 c->connectmap = GNUNET_CONTAINER_multihashmap_create (16); 301 c->connectmap = GNUNET_CONTAINER_multihashmap_create (16, GNUNET_NO);
302 GNUNET_assert (GNUNET_YES == 302 GNUNET_assert (GNUNET_YES ==
303 GNUNET_CONTAINER_multihashmap_put (c->connectmap, 303 GNUNET_CONTAINER_multihashmap_put (c->connectmap,
304 &GSC_my_identity.hashPubKey, 304 &GSC_my_identity.hashPubKey,
@@ -349,7 +349,7 @@ handle_client_send_request (void *cls, struct GNUNET_SERVER_Client *client,
349 return; 349 return;
350 } 350 }
351 if (c->requests == NULL) 351 if (c->requests == NULL)
352 c->requests = GNUNET_CONTAINER_multihashmap_create (16); 352 c->requests = GNUNET_CONTAINER_multihashmap_create (16, GNUNET_NO);
353 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 353 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
354 "Client asked for transmission to `%s'\n", 354 "Client asked for transmission to `%s'\n",
355 GNUNET_i2s (&req->peer)); 355 GNUNET_i2s (&req->peer));
diff --git a/src/core/gnunet-service-core_neighbours.c b/src/core/gnunet-service-core_neighbours.c
index 3b1357425..aa77fe47e 100644
--- a/src/core/gnunet-service-core_neighbours.c
+++ b/src/core/gnunet-service-core_neighbours.c
@@ -464,7 +464,7 @@ GSC_NEIGHBOURS_transmit (const struct GNUNET_PeerIdentity *target,
464int 464int
465GSC_NEIGHBOURS_init () 465GSC_NEIGHBOURS_init ()
466{ 466{
467 neighbours = GNUNET_CONTAINER_multihashmap_create (128); 467 neighbours = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
468 transport = 468 transport =
469 GNUNET_TRANSPORT_connect (GSC_cfg, &GSC_my_identity, NULL, 469 GNUNET_TRANSPORT_connect (GSC_cfg, &GSC_my_identity, NULL,
470 &handle_transport_receive, 470 &handle_transport_receive,
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c
index 87fa91189..3a603bc81 100644
--- a/src/core/gnunet-service-core_sessions.c
+++ b/src/core/gnunet-service-core_sessions.c
@@ -782,7 +782,7 @@ GSC_SESSIONS_add_to_typemap (const struct GNUNET_PeerIdentity *peer,
782void 782void
783GSC_SESSIONS_init () 783GSC_SESSIONS_init ()
784{ 784{
785 sessions = GNUNET_CONTAINER_multihashmap_create (128); 785 sessions = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
786} 786}
787 787
788 788