diff options
25 files changed, 34 insertions, 81 deletions
diff --git a/src/chat/gnunet-service-chat.c b/src/chat/gnunet-service-chat.c index ed8dfb9e9..2d6f192ec 100644 --- a/src/chat/gnunet-service-chat.c +++ b/src/chat/gnunet-service-chat.c | |||
@@ -1641,12 +1641,10 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1641 | * @param cls closure, NULL | 1641 | * @param cls closure, NULL |
1642 | * @param server handle to the server for this service | 1642 | * @param server handle to the server for this service |
1643 | * @param my_identity the public identity of this peer | 1643 | * @param my_identity the public identity of this peer |
1644 | * @param publicKey the public key of this peer | ||
1645 | */ | 1644 | */ |
1646 | static void | 1645 | static void |
1647 | core_init (void *cls, struct GNUNET_CORE_Handle *server, | 1646 | core_init (void *cls, struct GNUNET_CORE_Handle *server, |
1648 | const struct GNUNET_PeerIdentity *my_identity, | 1647 | const struct GNUNET_PeerIdentity *my_identity) |
1649 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
1650 | { | 1648 | { |
1651 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Core initialized\n"); | 1649 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Core initialized\n"); |
1652 | me = my_identity; | 1650 | me = my_identity; |
diff --git a/src/core/core.h b/src/core/core.h index 17a4c8fd4..8c208a2ed 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
@@ -95,7 +95,7 @@ struct InitReplyMessage | |||
95 | /** | 95 | /** |
96 | * Public key of the local peer. | 96 | * Public key of the local peer. |
97 | */ | 97 | */ |
98 | struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded publicKey; | 98 | struct GNUNET_PeerIdentity my_identity; |
99 | 99 | ||
100 | }; | 100 | }; |
101 | 101 | ||
diff --git a/src/core/core_api.c b/src/core/core_api.c index 3624a6e7f..24013b7cf 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c | |||
@@ -870,9 +870,7 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg) | |||
870 | trigger_next_request (h, GNUNET_NO); | 870 | trigger_next_request (h, GNUNET_NO); |
871 | } | 871 | } |
872 | h->retry_backoff = GNUNET_TIME_UNIT_MILLISECONDS; | 872 | h->retry_backoff = GNUNET_TIME_UNIT_MILLISECONDS; |
873 | GNUNET_CRYPTO_hash (&m->publicKey, | 873 | h->me = m->my_identity; |
874 | sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), | ||
875 | &h->me.hashPubKey); | ||
876 | if (NULL != (init = h->init)) | 874 | if (NULL != (init = h->init)) |
877 | { | 875 | { |
878 | /* mark so we don't call init on reconnect */ | 876 | /* mark so we don't call init on reconnect */ |
@@ -882,7 +880,7 @@ main_notify_handler (void *cls, const struct GNUNET_MessageHeader *msg) | |||
882 | "Connected to core service of peer `%s'.\n", | 880 | "Connected to core service of peer `%s'.\n", |
883 | GNUNET_i2s (&h->me)); | 881 | GNUNET_i2s (&h->me)); |
884 | #endif | 882 | #endif |
885 | init (h->cls, h, &h->me, &m->publicKey); | 883 | init (h->cls, h, &h->me); |
886 | } | 884 | } |
887 | else | 885 | else |
888 | { | 886 | { |
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 76ed02d2f..34b35f92a 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c | |||
@@ -1393,8 +1393,7 @@ handle_client_init (void *cls, struct GNUNET_SERVER_Client *client, | |||
1393 | irm.header.size = htons (sizeof (struct InitReplyMessage)); | 1393 | irm.header.size = htons (sizeof (struct InitReplyMessage)); |
1394 | irm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY); | 1394 | irm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY); |
1395 | irm.reserved = htonl (0); | 1395 | irm.reserved = htonl (0); |
1396 | memcpy (&irm.publicKey, &my_public_key, | 1396 | irm.my_identity = my_identity; |
1397 | sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)); | ||
1398 | #if DEBUG_CORE_CLIENT | 1397 | #if DEBUG_CORE_CLIENT |
1399 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message to client.\n", | 1398 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message to client.\n", |
1400 | "INIT_REPLY"); | 1399 | "INIT_REPLY"); |
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c index 7b884f44f..94fecb4ca 100644 --- a/src/core/gnunet-service-core_clients.c +++ b/src/core/gnunet-service-core_clients.c | |||
@@ -289,7 +289,7 @@ handle_client_init (void *cls, struct GNUNET_SERVER_Client *client, | |||
289 | irm.header.size = htons (sizeof (struct InitReplyMessage)); | 289 | irm.header.size = htons (sizeof (struct InitReplyMessage)); |
290 | irm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY); | 290 | irm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY); |
291 | irm.reserved = htonl (0); | 291 | irm.reserved = htonl (0); |
292 | irm.publicKey = GSC_my_public_key; | 292 | irm.my_identity = GSC_my_identity; |
293 | send_to_client (c, &irm.header, GNUNET_NO); | 293 | send_to_client (c, &irm.header, GNUNET_NO); |
294 | if (0 != (c->options & GNUNET_CORE_OPTION_SEND_CONNECT)) | 294 | if (0 != (c->options & GNUNET_CORE_OPTION_SEND_CONNECT)) |
295 | GSC_SESSIONS_notify_client_about_sessions (c); | 295 | GSC_SESSIONS_notify_client_about_sessions (c); |
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 3028f32b0..7695f9e86 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c | |||
@@ -283,8 +283,7 @@ connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
283 | 283 | ||
284 | static void | 284 | static void |
285 | init_notify (void *cls, struct GNUNET_CORE_Handle *server, | 285 | init_notify (void *cls, struct GNUNET_CORE_Handle *server, |
286 | const struct GNUNET_PeerIdentity *my_identity, | 286 | const struct GNUNET_PeerIdentity *my_identity) |
287 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
288 | { | 287 | { |
289 | struct PeerContext *p = cls; | 288 | struct PeerContext *p = cls; |
290 | 289 | ||
diff --git a/src/core/test_core_api_preferences.c b/src/core/test_core_api_preferences.c index 3aeb92572..19d51ef60 100644 --- a/src/core/test_core_api_preferences.c +++ b/src/core/test_core_api_preferences.c | |||
@@ -346,8 +346,7 @@ ask_connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
346 | 346 | ||
347 | static void | 347 | static void |
348 | init_notify (void *cls, struct GNUNET_CORE_Handle *server, | 348 | init_notify (void *cls, struct GNUNET_CORE_Handle *server, |
349 | const struct GNUNET_PeerIdentity *my_identity, | 349 | const struct GNUNET_PeerIdentity *my_identity) |
350 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
351 | { | 350 | { |
352 | struct PeerContext *p = cls; | 351 | struct PeerContext *p = cls; |
353 | 352 | ||
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index 7627a32c0..a696c7cbd 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c | |||
@@ -365,8 +365,7 @@ static struct GNUNET_CORE_MessageHandler handlers[] = { | |||
365 | 365 | ||
366 | static void | 366 | static void |
367 | init_notify (void *cls, struct GNUNET_CORE_Handle *server, | 367 | init_notify (void *cls, struct GNUNET_CORE_Handle *server, |
368 | const struct GNUNET_PeerIdentity *my_identity, | 368 | const struct GNUNET_PeerIdentity *my_identity) |
369 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
370 | { | 369 | { |
371 | struct PeerContext *p = cls; | 370 | struct PeerContext *p = cls; |
372 | 371 | ||
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index ff4b564bf..6b1f3da1c 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c | |||
@@ -116,8 +116,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
116 | 116 | ||
117 | static void | 117 | static void |
118 | init_notify (void *cls, struct GNUNET_CORE_Handle *server, | 118 | init_notify (void *cls, struct GNUNET_CORE_Handle *server, |
119 | const struct GNUNET_PeerIdentity *my_identity, | 119 | const struct GNUNET_PeerIdentity *my_identity) |
120 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
121 | { | 120 | { |
122 | struct PeerContext *p = cls; | 121 | struct PeerContext *p = cls; |
123 | 122 | ||
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 6f10635fe..5fce06b31 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -504,8 +504,7 @@ static struct GNUNET_CORE_MessageHandler handlers[] = { | |||
504 | 504 | ||
505 | static void | 505 | static void |
506 | init_notify (void *cls, struct GNUNET_CORE_Handle *server, | 506 | init_notify (void *cls, struct GNUNET_CORE_Handle *server, |
507 | const struct GNUNET_PeerIdentity *my_identity, | 507 | const struct GNUNET_PeerIdentity *my_identity) |
508 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
509 | { | 508 | { |
510 | struct PeerContext *p = cls; | 509 | struct PeerContext *p = cls; |
511 | 510 | ||
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 418474c74..9d4885b78 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c | |||
@@ -1527,12 +1527,10 @@ GDS_NEIGHBOURS_handle_reply (const struct GNUNET_PeerIdentity *target, | |||
1527 | * @param cls service closure | 1527 | * @param cls service closure |
1528 | * @param server handle to the server for this service | 1528 | * @param server handle to the server for this service |
1529 | * @param identity the public identity of this peer | 1529 | * @param identity the public identity of this peer |
1530 | * @param publicKey the public key of this peer | ||
1531 | */ | 1530 | */ |
1532 | static void | 1531 | static void |
1533 | core_init (void *cls, struct GNUNET_CORE_Handle *server, | 1532 | core_init (void *cls, struct GNUNET_CORE_Handle *server, |
1534 | const struct GNUNET_PeerIdentity *identity, | 1533 | const struct GNUNET_PeerIdentity *identity) |
1535 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
1536 | { | 1534 | { |
1537 | GNUNET_assert (server != NULL); | 1535 | GNUNET_assert (server != NULL); |
1538 | my_identity = *identity; | 1536 | my_identity = *identity; |
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 6699fef11..0940fd9f0 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c | |||
@@ -2286,8 +2286,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
2286 | */ | 2286 | */ |
2287 | void | 2287 | void |
2288 | core_init (void *cls, struct GNUNET_CORE_Handle *server, | 2288 | core_init (void *cls, struct GNUNET_CORE_Handle *server, |
2289 | const struct GNUNET_PeerIdentity *identity, | 2289 | const struct GNUNET_PeerIdentity *identity) |
2290 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
2291 | { | 2290 | { |
2292 | 2291 | ||
2293 | if (server == NULL) | 2292 | if (server == NULL) |
diff --git a/src/dv/test_transport_api_dv.c b/src/dv/test_transport_api_dv.c index 0e8444bd4..21fe7225e 100644 --- a/src/dv/test_transport_api_dv.c +++ b/src/dv/test_transport_api_dv.c | |||
@@ -560,9 +560,7 @@ connect_notify_peer2 (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
560 | 560 | ||
561 | static void | 561 | static void |
562 | init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server, | 562 | init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server, |
563 | const struct GNUNET_PeerIdentity *my_identity, | 563 | const struct GNUNET_PeerIdentity *my_identity) |
564 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded | ||
565 | *publicKey) | ||
566 | { | 564 | { |
567 | #if VERBOSE | 565 | #if VERBOSE |
568 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 566 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -605,9 +603,7 @@ connect_notify_peer1 (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
605 | 603 | ||
606 | static void | 604 | static void |
607 | init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server, | 605 | init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server, |
608 | const struct GNUNET_PeerIdentity *my_identity, | 606 | const struct GNUNET_PeerIdentity *my_identity) |
609 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded | ||
610 | *publicKey) | ||
611 | { | 607 | { |
612 | total_server_connections++; | 608 | total_server_connections++; |
613 | #if VERBOSE | 609 | #if VERBOSE |
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 2e3c7742f..f2770df3e 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -462,13 +462,10 @@ peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
462 | * @param cls closure | 462 | * @param cls closure |
463 | * @param server handle to the server, NULL if we failed | 463 | * @param server handle to the server, NULL if we failed |
464 | * @param my_identity ID of this peer, NULL if we failed | 464 | * @param my_identity ID of this peer, NULL if we failed |
465 | * @param publicKey public key of this peer, NULL if we failed | ||
466 | */ | 465 | */ |
467 | static void | 466 | static void |
468 | peer_init_handler (void *cls, struct GNUNET_CORE_Handle *server, | 467 | peer_init_handler (void *cls, struct GNUNET_CORE_Handle *server, |
469 | const struct GNUNET_PeerIdentity *my_identity, | 468 | const struct GNUNET_PeerIdentity *my_identity) |
470 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded | ||
471 | *publicKey) | ||
472 | { | 469 | { |
473 | my_id = *my_identity; | 470 | my_id = *my_identity; |
474 | } | 471 | } |
diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c index 9d47dfa9c..859f8498c 100644 --- a/src/hostlist/gnunet-daemon-hostlist.c +++ b/src/hostlist/gnunet-daemon-hostlist.c | |||
@@ -129,8 +129,7 @@ static struct GNUNET_PeerIdentity me; | |||
129 | 129 | ||
130 | static void | 130 | static void |
131 | core_init (void *cls, struct GNUNET_CORE_Handle *server, | 131 | core_init (void *cls, struct GNUNET_CORE_Handle *server, |
132 | const struct GNUNET_PeerIdentity *my_identity, | 132 | const struct GNUNET_PeerIdentity *my_identity) |
133 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
134 | { | 133 | { |
135 | me = *my_identity; | 134 | me = *my_identity; |
136 | } | 135 | } |
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index 11514ae29..f33a78926 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h | |||
@@ -153,24 +153,19 @@ struct GNUNET_CORE_MessageHandler | |||
153 | 153 | ||
154 | 154 | ||
155 | /** | 155 | /** |
156 | * Function called after GNUNET_CORE_connect has succeeded | 156 | * Function called after GNUNET_CORE_connect has succeeded (or failed |
157 | * (or failed for good). Note that the private key of the | 157 | * for good). Note that the private key of the peer is intentionally |
158 | * peer is intentionally not exposed here; if you need it, | 158 | * not exposed here; if you need it, your process should try to read |
159 | * your process should try to read the private key file | 159 | * the private key file directly (which should work if you are |
160 | * directly (which should work if you are authorized...). | 160 | * authorized...). |
161 | * | 161 | * |
162 | * @param cls closure | 162 | * @param cls closure |
163 | * @param server handle to the server, NULL if we failed | 163 | * @param server handle to the server, NULL if we failed |
164 | * @param my_identity ID of this peer, NULL if we failed | 164 | * @param my_identity ID of this peer, NULL if we failed |
165 | * @param publicKey public key of this peer, NULL if we failed | ||
166 | */ | 165 | */ |
167 | typedef void (*GNUNET_CORE_StartupCallback) (void *cls, | 166 | typedef void (*GNUNET_CORE_StartupCallback) (void *cls, |
168 | struct GNUNET_CORE_Handle * server, | 167 | struct GNUNET_CORE_Handle * server, |
169 | const struct GNUNET_PeerIdentity * | 168 | const struct GNUNET_PeerIdentity *my_identity); |
170 | my_identity, | ||
171 | const struct | ||
172 | GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded | ||
173 | * publicKey); | ||
174 | 169 | ||
175 | 170 | ||
176 | /** | 171 | /** |
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h index 8b9472cdb..2b6675c89 100644 --- a/src/include/gnunet_transport_service.h +++ b/src/include/gnunet_transport_service.h | |||
@@ -547,7 +547,7 @@ struct GNUNET_TRANSPORT_TransmitHandle; | |||
547 | * @param handle connection to transport service | 547 | * @param handle connection to transport service |
548 | * @param target who should receive the message | 548 | * @param target who should receive the message |
549 | * @param size how big is the message we want to transmit? | 549 | * @param size how big is the message we want to transmit? |
550 | * @param priority how important is the message? | 550 | * @param priority how important is the message? @deprecated - remove? |
551 | * @param timeout after how long should we give up (and call | 551 | * @param timeout after how long should we give up (and call |
552 | * notify with buf NULL and size 0)? | 552 | * notify with buf NULL and size 0)? |
553 | * @param notify function to call when we are ready to | 553 | * @param notify function to call when we are ready to |
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index c9ac99708..a35ef9a66 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -3141,12 +3141,10 @@ static struct GNUNET_SERVER_MessageHandler client_handlers[] = { | |||
3141 | * @param cls service closure | 3141 | * @param cls service closure |
3142 | * @param server handle to the server for this service | 3142 | * @param server handle to the server for this service |
3143 | * @param identity the public identity of this peer | 3143 | * @param identity the public identity of this peer |
3144 | * @param publicKey the public key of this peer | ||
3145 | */ | 3144 | */ |
3146 | static void | 3145 | static void |
3147 | core_init (void *cls, struct GNUNET_CORE_Handle *server, | 3146 | core_init (void *cls, struct GNUNET_CORE_Handle *server, |
3148 | const struct GNUNET_PeerIdentity *identity, | 3147 | const struct GNUNET_PeerIdentity *identity) |
3149 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
3150 | { | 3148 | { |
3151 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Core init\n"); | 3149 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Core init\n"); |
3152 | core_handle = server; | 3150 | core_handle = server; |
diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c index a1396cd08..4e510e596 100644 --- a/src/mesh/mesh_api.c +++ b/src/mesh/mesh_api.c | |||
@@ -182,9 +182,7 @@ call_connect_handler (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
182 | static void | 182 | static void |
183 | core_startup (void *cls, struct GNUNET_CORE_Handle *core | 183 | core_startup (void *cls, struct GNUNET_CORE_Handle *core |
184 | __attribute__ ((unused)), | 184 | __attribute__ ((unused)), |
185 | const struct GNUNET_PeerIdentity *my_identity, | 185 | const struct GNUNET_PeerIdentity *my_identity) |
186 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey | ||
187 | __attribute__ ((unused))) | ||
188 | { | 186 | { |
189 | struct GNUNET_MESH_Handle *handle = cls; | 187 | struct GNUNET_MESH_Handle *handle = cls; |
190 | 188 | ||
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index 543e4794a..47014fd60 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c | |||
@@ -1211,12 +1211,10 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1211 | * @param cls service closure | 1211 | * @param cls service closure |
1212 | * @param server handle to the server for this service | 1212 | * @param server handle to the server for this service |
1213 | * @param identity the public identity of this peer | 1213 | * @param identity the public identity of this peer |
1214 | * @param publicKey the public key of this peer | ||
1215 | */ | 1214 | */ |
1216 | static void | 1215 | static void |
1217 | core_init (void *cls, struct GNUNET_CORE_Handle *server, | 1216 | core_init (void *cls, struct GNUNET_CORE_Handle *server, |
1218 | const struct GNUNET_PeerIdentity *identity, | 1217 | const struct GNUNET_PeerIdentity *identity) |
1219 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
1220 | { | 1218 | { |
1221 | struct GNUNET_TIME_Absolute now; | 1219 | struct GNUNET_TIME_Absolute now; |
1222 | struct GNUNET_TIME_Absolute prev_time; | 1220 | struct GNUNET_TIME_Absolute prev_time; |
diff --git a/src/testing/test_testing_large_topology.c b/src/testing/test_testing_large_topology.c index 9581dc9b2..33a9eb787 100644 --- a/src/testing/test_testing_large_topology.c +++ b/src/testing/test_testing_large_topology.c | |||
@@ -459,9 +459,7 @@ static struct GNUNET_CORE_MessageHandler handlers[] = { | |||
459 | 459 | ||
460 | static void | 460 | static void |
461 | init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server, | 461 | init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server, |
462 | const struct GNUNET_PeerIdentity *my_identity, | 462 | const struct GNUNET_PeerIdentity *my_identity) |
463 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded | ||
464 | *publicKey) | ||
465 | { | 463 | { |
466 | struct TestMessageContext *pos = cls; | 464 | struct TestMessageContext *pos = cls; |
467 | 465 | ||
@@ -547,9 +545,7 @@ connect_notify_peers (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
547 | 545 | ||
548 | static void | 546 | static void |
549 | init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server, | 547 | init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server, |
550 | const struct GNUNET_PeerIdentity *my_identity, | 548 | const struct GNUNET_PeerIdentity *my_identity) |
551 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded | ||
552 | *publicKey) | ||
553 | { | 549 | { |
554 | struct TestMessageContext *pos = cls; | 550 | struct TestMessageContext *pos = cls; |
555 | 551 | ||
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c index 152b5cdcc..e29a3ff32 100644 --- a/src/testing/test_testing_topology.c +++ b/src/testing/test_testing_topology.c | |||
@@ -498,9 +498,7 @@ static struct GNUNET_CORE_MessageHandler handlers[] = { | |||
498 | 498 | ||
499 | static void | 499 | static void |
500 | init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server, | 500 | init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server, |
501 | const struct GNUNET_PeerIdentity *my_identity, | 501 | const struct GNUNET_PeerIdentity *my_identity) |
502 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded | ||
503 | *publicKey) | ||
504 | { | 502 | { |
505 | struct TestMessageContext *pos = cls; | 503 | struct TestMessageContext *pos = cls; |
506 | 504 | ||
@@ -586,9 +584,7 @@ connect_notify_peers (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
586 | 584 | ||
587 | static void | 585 | static void |
588 | init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server, | 586 | init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server, |
589 | const struct GNUNET_PeerIdentity *my_identity, | 587 | const struct GNUNET_PeerIdentity *my_identity) |
590 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded | ||
591 | *publicKey) | ||
592 | { | 588 | { |
593 | struct TestMessageContext *pos = cls; | 589 | struct TestMessageContext *pos = cls; |
594 | 590 | ||
diff --git a/src/testing/testing.c b/src/testing/testing.c index 8b080d800..ca7ed6376 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -1952,13 +1952,10 @@ send_hello (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1952 | * @param cls a ConnectContext | 1952 | * @param cls a ConnectContext |
1953 | * @param server handle to the core service | 1953 | * @param server handle to the core service |
1954 | * @param my_identity the peer identity of this peer | 1954 | * @param my_identity the peer identity of this peer |
1955 | * @param publicKey the public key of the peer | ||
1956 | */ | 1955 | */ |
1957 | void | 1956 | void |
1958 | core_init_notify (void *cls, struct GNUNET_CORE_Handle *server, | 1957 | core_init_notify (void *cls, struct GNUNET_CORE_Handle *server, |
1959 | const struct GNUNET_PeerIdentity *my_identity, | 1958 | const struct GNUNET_PeerIdentity *my_identity) |
1960 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded | ||
1961 | *publicKey) | ||
1962 | { | 1959 | { |
1963 | struct GNUNET_TESTING_ConnectContext *connect_ctx = cls; | 1960 | struct GNUNET_TESTING_ConnectContext *connect_ctx = cls; |
1964 | 1961 | ||
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 3f31c6e1a..1889cf7df 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -3483,12 +3483,10 @@ core_connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
3483 | * @param cls a struct SendHelloContext * | 3483 | * @param cls a struct SendHelloContext * |
3484 | * @param server handle to the core service | 3484 | * @param server handle to the core service |
3485 | * @param my_identity the peer identity of this peer | 3485 | * @param my_identity the peer identity of this peer |
3486 | * @param publicKey the public key of the peer | ||
3487 | */ | 3486 | */ |
3488 | void | 3487 | void |
3489 | core_init (void *cls, struct GNUNET_CORE_Handle *server, | 3488 | core_init (void *cls, struct GNUNET_CORE_Handle *server, |
3490 | const struct GNUNET_PeerIdentity *my_identity, | 3489 | struct GNUNET_PeerIdentity *my_identity) |
3491 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
3492 | { | 3490 | { |
3493 | struct SendHelloContext *send_hello_context = cls; | 3491 | struct SendHelloContext *send_hello_context = cls; |
3494 | 3492 | ||
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index 6f55419d9..e8704552b 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c | |||
@@ -938,12 +938,10 @@ process_peer (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
938 | * @param cls closure | 938 | * @param cls closure |
939 | * @param server handle to the server, NULL if we failed | 939 | * @param server handle to the server, NULL if we failed |
940 | * @param my_id ID of this peer, NULL if we failed | 940 | * @param my_id ID of this peer, NULL if we failed |
941 | * @param publicKey public key of this peer, NULL if we failed | ||
942 | */ | 941 | */ |
943 | static void | 942 | static void |
944 | core_init (void *cls, struct GNUNET_CORE_Handle *server, | 943 | core_init (void *cls, struct GNUNET_CORE_Handle *server, |
945 | const struct GNUNET_PeerIdentity *my_id, | 944 | const struct GNUNET_PeerIdentity *my_id) |
946 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | ||
947 | { | 945 | { |
948 | if (server == NULL) | 946 | if (server == NULL) |
949 | { | 947 | { |