[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17278 - in gnunet/src: chat core dht dv fs hostlist includ
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r17278 - in gnunet/src: chat core dht dv fs hostlist include mesh nse testing topology |
|
Date: |
Fri, 7 Oct 2011 13:08:40 +0200 |
Author: grothoff
Date: 2011-10-07 13:08:40 +0200 (Fri, 07 Oct 2011)
New Revision: 17278
Modified:
gnunet/src/chat/gnunet-service-chat.c
gnunet/src/core/core.h
gnunet/src/core/core_api.c
gnunet/src/core/gnunet-service-core.c
gnunet/src/core/gnunet-service-core_clients.c
gnunet/src/core/test_core_api.c
gnunet/src/core/test_core_api_preferences.c
gnunet/src/core/test_core_api_reliability.c
gnunet/src/core/test_core_api_start_only.c
gnunet/src/core/test_core_quota_compliance.c
gnunet/src/dht/gnunet-service-dht_neighbours.c
gnunet/src/dv/gnunet-service-dv.c
gnunet/src/dv/test_transport_api_dv.c
gnunet/src/fs/gnunet-service-fs.c
gnunet/src/hostlist/gnunet-daemon-hostlist.c
gnunet/src/include/gnunet_core_service.h
gnunet/src/include/gnunet_transport_service.h
gnunet/src/mesh/gnunet-service-mesh.c
gnunet/src/mesh/mesh_api.c
gnunet/src/nse/gnunet-service-nse.c
gnunet/src/testing/test_testing_large_topology.c
gnunet/src/testing/test_testing_topology.c
gnunet/src/testing/testing.c
gnunet/src/testing/testing_group.c
gnunet/src/topology/gnunet-daemon-topology.c
Log:
removing 'publicKey' argument from CORE init callback
Modified: gnunet/src/chat/gnunet-service-chat.c
===================================================================
--- gnunet/src/chat/gnunet-service-chat.c 2011-10-07 11:06:39 UTC (rev
17277)
+++ gnunet/src/chat/gnunet-service-chat.c 2011-10-07 11:08:40 UTC (rev
17278)
@@ -1641,12 +1641,10 @@
* @param cls closure, NULL
* @param server handle to the server for this service
* @param my_identity the public identity of this peer
- * @param publicKey the public key of this peer
*/
static void
core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Core initialized\n");
me = my_identity;
Modified: gnunet/src/core/core.h
===================================================================
--- gnunet/src/core/core.h 2011-10-07 11:06:39 UTC (rev 17277)
+++ gnunet/src/core/core.h 2011-10-07 11:08:40 UTC (rev 17278)
@@ -95,7 +95,7 @@
/**
* Public key of the local peer.
*/
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded publicKey;
+ struct GNUNET_PeerIdentity my_identity;
};
Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c 2011-10-07 11:06:39 UTC (rev 17277)
+++ gnunet/src/core/core_api.c 2011-10-07 11:08:40 UTC (rev 17278)
@@ -870,9 +870,7 @@
trigger_next_request (h, GNUNET_NO);
}
h->retry_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
- GNUNET_CRYPTO_hash (&m->publicKey,
- sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &h->me.hashPubKey);
+ h->me = m->my_identity;
if (NULL != (init = h->init))
{
/* mark so we don't call init on reconnect */
@@ -882,7 +880,7 @@
"Connected to core service of peer `%s'.\n",
GNUNET_i2s (&h->me));
#endif
- init (h->cls, h, &h->me, &m->publicKey);
+ init (h->cls, h, &h->me);
}
else
{
Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c 2011-10-07 11:06:39 UTC (rev
17277)
+++ gnunet/src/core/gnunet-service-core.c 2011-10-07 11:08:40 UTC (rev
17278)
@@ -1393,8 +1393,7 @@
irm.header.size = htons (sizeof (struct InitReplyMessage));
irm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY);
irm.reserved = htonl (0);
- memcpy (&irm.publicKey, &my_public_key,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+ irm.my_identity = my_identity;
#if DEBUG_CORE_CLIENT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message to client.\n",
"INIT_REPLY");
Modified: gnunet/src/core/gnunet-service-core_clients.c
===================================================================
--- gnunet/src/core/gnunet-service-core_clients.c 2011-10-07 11:06:39 UTC
(rev 17277)
+++ gnunet/src/core/gnunet-service-core_clients.c 2011-10-07 11:08:40 UTC
(rev 17278)
@@ -289,7 +289,7 @@
irm.header.size = htons (sizeof (struct InitReplyMessage));
irm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY);
irm.reserved = htonl (0);
- irm.publicKey = GSC_my_public_key;
+ irm.my_identity = GSC_my_identity;
send_to_client (c, &irm.header, GNUNET_NO);
if (0 != (c->options & GNUNET_CORE_OPTION_SEND_CONNECT))
GSC_SESSIONS_notify_client_about_sessions (c);
Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c 2011-10-07 11:06:39 UTC (rev 17277)
+++ gnunet/src/core/test_core_api.c 2011-10-07 11:08:40 UTC (rev 17278)
@@ -283,8 +283,7 @@
static void
init_notify (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct PeerContext *p = cls;
Modified: gnunet/src/core/test_core_api_preferences.c
===================================================================
--- gnunet/src/core/test_core_api_preferences.c 2011-10-07 11:06:39 UTC (rev
17277)
+++ gnunet/src/core/test_core_api_preferences.c 2011-10-07 11:08:40 UTC (rev
17278)
@@ -346,8 +346,7 @@
static void
init_notify (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct PeerContext *p = cls;
Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2011-10-07 11:06:39 UTC (rev
17277)
+++ gnunet/src/core/test_core_api_reliability.c 2011-10-07 11:08:40 UTC (rev
17278)
@@ -365,8 +365,7 @@
static void
init_notify (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct PeerContext *p = cls;
Modified: gnunet/src/core/test_core_api_start_only.c
===================================================================
--- gnunet/src/core/test_core_api_start_only.c 2011-10-07 11:06:39 UTC (rev
17277)
+++ gnunet/src/core/test_core_api_start_only.c 2011-10-07 11:08:40 UTC (rev
17278)
@@ -116,8 +116,7 @@
static void
init_notify (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct PeerContext *p = cls;
Modified: gnunet/src/core/test_core_quota_compliance.c
===================================================================
--- gnunet/src/core/test_core_quota_compliance.c 2011-10-07 11:06:39 UTC
(rev 17277)
+++ gnunet/src/core/test_core_quota_compliance.c 2011-10-07 11:08:40 UTC
(rev 17278)
@@ -504,8 +504,7 @@
static void
init_notify (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct PeerContext *p = cls;
Modified: gnunet/src/dht/gnunet-service-dht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_neighbours.c 2011-10-07 11:06:39 UTC
(rev 17277)
+++ gnunet/src/dht/gnunet-service-dht_neighbours.c 2011-10-07 11:08:40 UTC
(rev 17278)
@@ -1527,12 +1527,10 @@
* @param cls service closure
* @param server handle to the server for this service
* @param identity the public identity of this peer
- * @param publicKey the public key of this peer
*/
static void
core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *identity)
{
GNUNET_assert (server != NULL);
my_identity = *identity;
Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c 2011-10-07 11:06:39 UTC (rev 17277)
+++ gnunet/src/dv/gnunet-service-dv.c 2011-10-07 11:08:40 UTC (rev 17278)
@@ -2286,8 +2286,7 @@
*/
void
core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *identity)
{
if (server == NULL)
Modified: gnunet/src/dv/test_transport_api_dv.c
===================================================================
--- gnunet/src/dv/test_transport_api_dv.c 2011-10-07 11:06:39 UTC (rev
17277)
+++ gnunet/src/dv/test_transport_api_dv.c 2011-10-07 11:08:40 UTC (rev
17278)
@@ -560,9 +560,7 @@
static void
init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
- *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -605,9 +603,7 @@
static void
init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
- *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
total_server_connections++;
#if VERBOSE
Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c 2011-10-07 11:06:39 UTC (rev 17277)
+++ gnunet/src/fs/gnunet-service-fs.c 2011-10-07 11:08:40 UTC (rev 17278)
@@ -462,13 +462,10 @@
* @param cls closure
* @param server handle to the server, NULL if we failed
* @param my_identity ID of this peer, NULL if we failed
- * @param publicKey public key of this peer, NULL if we failed
*/
static void
peer_init_handler (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
- *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
my_id = *my_identity;
}
Modified: gnunet/src/hostlist/gnunet-daemon-hostlist.c
===================================================================
--- gnunet/src/hostlist/gnunet-daemon-hostlist.c 2011-10-07 11:06:39 UTC
(rev 17277)
+++ gnunet/src/hostlist/gnunet-daemon-hostlist.c 2011-10-07 11:08:40 UTC
(rev 17278)
@@ -129,8 +129,7 @@
static void
core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
me = *my_identity;
}
Modified: gnunet/src/include/gnunet_core_service.h
===================================================================
--- gnunet/src/include/gnunet_core_service.h 2011-10-07 11:06:39 UTC (rev
17277)
+++ gnunet/src/include/gnunet_core_service.h 2011-10-07 11:08:40 UTC (rev
17278)
@@ -153,24 +153,19 @@
/**
- * Function called after GNUNET_CORE_connect has succeeded
- * (or failed for good). Note that the private key of the
- * peer is intentionally not exposed here; if you need it,
- * your process should try to read the private key file
- * directly (which should work if you are authorized...).
+ * Function called after GNUNET_CORE_connect has succeeded (or failed
+ * for good). Note that the private key of the peer is intentionally
+ * not exposed here; if you need it, your process should try to read
+ * the private key file directly (which should work if you are
+ * authorized...).
*
* @param cls closure
* @param server handle to the server, NULL if we failed
* @param my_identity ID of this peer, NULL if we failed
- * @param publicKey public key of this peer, NULL if we failed
*/
typedef void (*GNUNET_CORE_StartupCallback) (void *cls,
struct GNUNET_CORE_Handle *
server,
- const struct GNUNET_PeerIdentity *
- my_identity,
- const struct
-
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
- * publicKey);
+ const struct GNUNET_PeerIdentity
*my_identity);
/**
Modified: gnunet/src/include/gnunet_transport_service.h
===================================================================
--- gnunet/src/include/gnunet_transport_service.h 2011-10-07 11:06:39 UTC
(rev 17277)
+++ gnunet/src/include/gnunet_transport_service.h 2011-10-07 11:08:40 UTC
(rev 17278)
@@ -547,7 +547,7 @@
* @param handle connection to transport service
* @param target who should receive the message
* @param size how big is the message we want to transmit?
- * @param priority how important is the message?
+ * @param priority how important is the message? @deprecated - remove?
* @param timeout after how long should we give up (and call
* notify with buf NULL and size 0)?
* @param notify function to call when we are ready to
Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c 2011-10-07 11:06:39 UTC (rev
17277)
+++ gnunet/src/mesh/gnunet-service-mesh.c 2011-10-07 11:08:40 UTC (rev
17278)
@@ -3141,12 +3141,10 @@
* @param cls service closure
* @param server handle to the server for this service
* @param identity the public identity of this peer
- * @param publicKey the public key of this peer
*/
static void
core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *identity)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: Core init\n");
core_handle = server;
Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c 2011-10-07 11:06:39 UTC (rev 17277)
+++ gnunet/src/mesh/mesh_api.c 2011-10-07 11:08:40 UTC (rev 17278)
@@ -182,9 +182,7 @@
static void
core_startup (void *cls, struct GNUNET_CORE_Handle *core
__attribute__ ((unused)),
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey
- __attribute__ ((unused)))
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct GNUNET_MESH_Handle *handle = cls;
Modified: gnunet/src/nse/gnunet-service-nse.c
===================================================================
--- gnunet/src/nse/gnunet-service-nse.c 2011-10-07 11:06:39 UTC (rev 17277)
+++ gnunet/src/nse/gnunet-service-nse.c 2011-10-07 11:08:40 UTC (rev 17278)
@@ -1211,12 +1211,10 @@
* @param cls service closure
* @param server handle to the server for this service
* @param identity the public identity of this peer
- * @param publicKey the public key of this peer
*/
static void
core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *identity)
{
struct GNUNET_TIME_Absolute now;
struct GNUNET_TIME_Absolute prev_time;
Modified: gnunet/src/testing/test_testing_large_topology.c
===================================================================
--- gnunet/src/testing/test_testing_large_topology.c 2011-10-07 11:06:39 UTC
(rev 17277)
+++ gnunet/src/testing/test_testing_large_topology.c 2011-10-07 11:08:40 UTC
(rev 17278)
@@ -459,9 +459,7 @@
static void
init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
- *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct TestMessageContext *pos = cls;
@@ -547,9 +545,7 @@
static void
init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
- *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct TestMessageContext *pos = cls;
Modified: gnunet/src/testing/test_testing_topology.c
===================================================================
--- gnunet/src/testing/test_testing_topology.c 2011-10-07 11:06:39 UTC (rev
17277)
+++ gnunet/src/testing/test_testing_topology.c 2011-10-07 11:08:40 UTC (rev
17278)
@@ -498,9 +498,7 @@
static void
init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
- *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct TestMessageContext *pos = cls;
@@ -586,9 +584,7 @@
static void
init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
- *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct TestMessageContext *pos = cls;
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2011-10-07 11:06:39 UTC (rev 17277)
+++ gnunet/src/testing/testing.c 2011-10-07 11:08:40 UTC (rev 17278)
@@ -1952,13 +1952,10 @@
* @param cls a ConnectContext
* @param server handle to the core service
* @param my_identity the peer identity of this peer
- * @param publicKey the public key of the peer
*/
void
core_init_notify (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
- *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct GNUNET_TESTING_ConnectContext *connect_ctx = cls;
Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c 2011-10-07 11:06:39 UTC (rev 17277)
+++ gnunet/src/testing/testing_group.c 2011-10-07 11:08:40 UTC (rev 17278)
@@ -3483,12 +3483,10 @@
* @param cls a struct SendHelloContext *
* @param server handle to the core service
* @param my_identity the peer identity of this peer
- * @param publicKey the public key of the peer
*/
void
core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ struct GNUNET_PeerIdentity *my_identity)
{
struct SendHelloContext *send_hello_context = cls;
Modified: gnunet/src/topology/gnunet-daemon-topology.c
===================================================================
--- gnunet/src/topology/gnunet-daemon-topology.c 2011-10-07 11:06:39 UTC
(rev 17277)
+++ gnunet/src/topology/gnunet-daemon-topology.c 2011-10-07 11:08:40 UTC
(rev 17278)
@@ -938,12 +938,10 @@
* @param cls closure
* @param server handle to the server, NULL if we failed
* @param my_id ID of this peer, NULL if we failed
- * @param publicKey public key of this peer, NULL if we failed
*/
static void
core_init (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_id,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *my_id)
{
if (server == NULL)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17278 - in gnunet/src: chat core dht dv fs hostlist include mesh nse testing topology,
gnunet <=