[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5874 - in GNUnet/src: applications/advertising application
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r5874 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/chat applications/datastore applications/dht/module applications/dstore_mysql applications/dstore_sqlite applications/fragmentation applications/fs/ecrs applications/fs/fsui applications/fs/module applications/fs/namespace applications/fs/uritrack applications/gap applications/getoption applications/identity applications/kvstore_sqlite applications/pingpong applications/rpc applications/session applications/sqstore_mysql applications/sqstore_sqlite applications/stats applications/tbench applications/template applications/testbed applications/topology_default applications/tracekit applications/traffic applications/transport applications/vpn include server setup/gtk setup/lib transports |
|
Date: |
Wed, 12 Dec 2007 00:52:19 -0700 (MST) |
Author: grothoff
Date: 2007-12-12 00:52:18 -0700 (Wed, 12 Dec 2007)
New Revision: 5874
Modified:
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/advertising/bootstrap.c
GNUnet/src/applications/bootstrap_http/http.c
GNUnet/src/applications/bootstrap_http/httptest.c
GNUnet/src/applications/chat/chat.c
GNUnet/src/applications/datastore/datastore.c
GNUnet/src/applications/dht/module/cs.c
GNUnet/src/applications/dht/module/dstore.c
GNUnet/src/applications/dht/module/routing.c
GNUnet/src/applications/dht/module/table.c
GNUnet/src/applications/dstore_mysql/dstore_mysql.c
GNUnet/src/applications/dstore_mysql/dstore_test.c
GNUnet/src/applications/dstore_sqlite/dstore.c
GNUnet/src/applications/dstore_sqlite/dstore_test.c
GNUnet/src/applications/fragmentation/fragmentation.c
GNUnet/src/applications/fragmentation/fragmentationtest.c
GNUnet/src/applications/fs/ecrs/download.c
GNUnet/src/applications/fs/ecrs/tree.c
GNUnet/src/applications/fs/ecrs/tree.h
GNUnet/src/applications/fs/ecrs/unindex.c
GNUnet/src/applications/fs/ecrs/upload.c
GNUnet/src/applications/fs/fsui/download.c
GNUnet/src/applications/fs/module/dht_push.c
GNUnet/src/applications/fs/module/fs.c
GNUnet/src/applications/fs/module/migration.c
GNUnet/src/applications/fs/module/ondemand.c
GNUnet/src/applications/fs/module/querymanager.c
GNUnet/src/applications/fs/namespace/namespace_info.c
GNUnet/src/applications/fs/uritrack/callbacks.c
GNUnet/src/applications/fs/uritrack/callbacks.h
GNUnet/src/applications/fs/uritrack/file_info.c
GNUnet/src/applications/gap/gap.c
GNUnet/src/applications/gap/gap.h
GNUnet/src/applications/getoption/getoption.c
GNUnet/src/applications/identity/identity.c
GNUnet/src/applications/identity/identitytest.c
GNUnet/src/applications/kvstore_sqlite/kv_sqlitetest.c
GNUnet/src/applications/pingpong/pingpong.c
GNUnet/src/applications/rpc/rpc.c
GNUnet/src/applications/session/connect.c
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/src/applications/sqstore_mysql/mysqltest.c
GNUnet/src/applications/sqstore_mysql/mysqltest2.c
GNUnet/src/applications/sqstore_mysql/mysqltest3.c
GNUnet/src/applications/sqstore_sqlite/sqlite.c
GNUnet/src/applications/sqstore_sqlite/sqlitetest.c
GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c
GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c
GNUnet/src/applications/stats/sqstats.c
GNUnet/src/applications/stats/statistics.c
GNUnet/src/applications/tbench/tbench.c
GNUnet/src/applications/template/template.c
GNUnet/src/applications/testbed/testbed.c
GNUnet/src/applications/topology_default/topology.c
GNUnet/src/applications/tracekit/tracekit.c
GNUnet/src/applications/traffic/traffic.c
GNUnet/src/applications/transport/transport.c
GNUnet/src/applications/vpn/vpn.c
GNUnet/src/include/core.h
GNUnet/src/include/gnunet_core.h
GNUnet/src/include/gnunet_transport.h
GNUnet/src/server/connection.c
GNUnet/src/server/connection.h
GNUnet/src/server/core.c
GNUnet/src/server/gnunet-peer-info.c
GNUnet/src/server/gnunet-transport-check.c
GNUnet/src/server/gnunet-update.c
GNUnet/src/server/gnunetd.c
GNUnet/src/server/handler.c
GNUnet/src/server/handler.h
GNUnet/src/server/startup.c
GNUnet/src/server/startup.h
GNUnet/src/server/tcpserver.c
GNUnet/src/server/tcpserver.h
GNUnet/src/server/version.c
GNUnet/src/server/version.h
GNUnet/src/setup/gtk/wizard_gtk.c
GNUnet/src/setup/lib/gns.c
GNUnet/src/setup/lib/tree.c
GNUnet/src/setup/lib/tree.h
GNUnet/src/setup/lib/wizard_util.c
GNUnet/src/setup/lib/wizard_util.h
GNUnet/src/transports/http.c
GNUnet/src/transports/ip.c
GNUnet/src/transports/ip.h
GNUnet/src/transports/nat.c
GNUnet/src/transports/smtp.c
GNUnet/src/transports/tcp.c
GNUnet/src/transports/tcp6.c
GNUnet/src/transports/tcp_helper.c
GNUnet/src/transports/test.c
GNUnet/src/transports/test_repeat.c
GNUnet/src/transports/udp.c
GNUnet/src/transports/udp6.c
Log:
more symbol cleanup
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/advertising/advertising.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -449,7 +449,9 @@
/* ok, finally we can send! */
if ((res == GNUNET_OK) &&
- (GNUNET_SYSERR == coreAPI->sendPlaintext (tsession, buffer, helloEnd)))
+ (GNUNET_SYSERR ==
+ coreAPI->GNUNET_CORE_connection_send_plaintext (tsession, buffer,
+ helloEnd)))
{
if (stats != NULL)
@@ -561,9 +563,10 @@
}
if (stats != NULL)
stats->change (stat_hello_out, 1);
- coreAPI->sendPlaintext (tsession,
- (char *) &sd->m->header,
- GNUNET_sizeof_hello (sd->m));
+ coreAPI->GNUNET_CORE_connection_send_plaintext (tsession,
+ (char *) &sd->m->header,
+ GNUNET_sizeof_hello (sd->
+ m));
transport->disconnect (tsession, __FILE__);
#if DEBUG_ADVERTISING
GNUNET_GE_LOG (ectx,
@@ -844,43 +847,43 @@
{
coreAPI = capi;
ectx = capi->ectx;
- identity = capi->requestService ("identity");
+ identity = capi->GNUNET_CORE_request_service ("identity");
if (identity == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
return GNUNET_SYSERR;
}
- transport = capi->requestService ("transport");
+ transport = capi->GNUNET_CORE_request_service ("transport");
if (transport == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
- capi->releaseService (identity);
+ capi->GNUNET_CORE_release_service (identity);
identity = NULL;
return GNUNET_SYSERR;
}
- pingpong = capi->requestService ("pingpong");
+ pingpong = capi->GNUNET_CORE_request_service ("pingpong");
if (pingpong == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
- capi->releaseService (identity);
+ capi->GNUNET_CORE_release_service (identity);
identity = NULL;
- capi->releaseService (transport);
+ capi->GNUNET_CORE_release_service (transport);
transport = NULL;
return GNUNET_SYSERR;
}
- topology = capi->requestService ("topology");
+ topology = capi->GNUNET_CORE_request_service ("topology");
if (topology == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
- capi->releaseService (identity);
+ capi->GNUNET_CORE_release_service (identity);
identity = NULL;
- capi->releaseService (transport);
+ capi->GNUNET_CORE_release_service (transport);
transport = NULL;
- capi->releaseService (pingpong);
+ capi->GNUNET_CORE_release_service (pingpong);
pingpong = NULL;
return GNUNET_SYSERR;
}
- stats = capi->requestService ("stats");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_hello_in =
@@ -929,10 +932,11 @@
"advertising", GNUNET_P2P_PROTO_HELLO);
capi->registerHandler (GNUNET_P2P_PROTO_HELLO, &ehelloHandler);
- capi->registerPlaintextHandler (GNUNET_P2P_PROTO_HELLO, &phelloHandler);
- if (0 != GNUNET_GC_attach_change_listener (capi->cfg,
- &configurationUpdateCallback,
- NULL))
+ capi->GNUNET_CORE_plaintext_register_handler (GNUNET_P2P_PROTO_HELLO,
+ &phelloHandler);
+ if (0 !=
+ GNUNET_GC_attach_change_listener (capi->cfg,
+ &configurationUpdateCallback, NULL))
GNUNET_GE_BREAK (capi->ectx, 0);
startBootstrap (capi);
GNUNET_GE_ASSERT (capi->ectx,
@@ -967,19 +971,19 @@
activeCronJobs -= ACJ_FORWARD;
}
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_HELLO, &ehelloHandler);
- coreAPI->unregisterPlaintextHandler (GNUNET_P2P_PROTO_HELLO,
- &phelloHandler);
- coreAPI->releaseService (transport);
+ coreAPI->GNUNET_CORE_plaintext_unregister_handler (GNUNET_P2P_PROTO_HELLO,
+ &phelloHandler);
+ coreAPI->GNUNET_CORE_release_service (transport);
transport = NULL;
- coreAPI->releaseService (identity);
+ coreAPI->GNUNET_CORE_release_service (identity);
identity = NULL;
- coreAPI->releaseService (pingpong);
+ coreAPI->GNUNET_CORE_release_service (pingpong);
pingpong = NULL;
- coreAPI->releaseService (topology);
+ coreAPI->GNUNET_CORE_release_service (topology);
topology = NULL;
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
coreAPI = NULL;
Modified: GNUnet/src/applications/advertising/bootstrap.c
===================================================================
--- GNUnet/src/applications/advertising/bootstrap.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/advertising/bootstrap.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -87,9 +87,10 @@
hcq->hellos[rndidx] = hcq->hellos[hcq->hellosCount - 1];
GNUNET_array_grow (hcq->hellos, hcq->hellosCount, hcq->hellosCount - 1);
- coreAPI->injectMessage (NULL,
- (const char *) msg,
- ntohs (msg->header.size), GNUNET_NO, NULL);
+ coreAPI->GNUNET_CORE_p2p_inject_message (NULL,
+ (const char *) msg,
+ ntohs (msg->header.size),
+ GNUNET_NO, NULL);
GNUNET_free (msg);
if ((hcq->hellosCount > 0) && (!hlc.do_shutdown))
{
@@ -227,9 +228,9 @@
startBootstrap (GNUNET_CoreAPIForPlugins * capi)
{
coreAPI = capi;
- state = capi->requestService ("state");
+ state = capi->GNUNET_CORE_request_service ("state");
GNUNET_GE_ASSERT (capi->ectx, state != NULL);
- bootstrap = capi->requestService ("bootstrap");
+ bootstrap = capi->GNUNET_CORE_request_service ("bootstrap");
GNUNET_GE_ASSERT (capi->ectx, bootstrap != NULL);
hlc.do_shutdown = GNUNET_NO;
pt = GNUNET_thread_create (&processThread, NULL, 64 * 1024);
@@ -248,9 +249,9 @@
GNUNET_thread_stop_sleep (pt);
GNUNET_thread_join (pt, &unused);
pt = NULL;
- coreAPI->releaseService (bootstrap);
+ coreAPI->GNUNET_CORE_release_service (bootstrap);
bootstrap = NULL;
- coreAPI->releaseService (state);
+ coreAPI->GNUNET_CORE_release_service (state);
state = NULL;
coreAPI = NULL;
}
Modified: GNUnet/src/applications/bootstrap_http/http.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/http.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/bootstrap_http/http.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -390,7 +390,7 @@
coreAPI = capi;
ectx = capi->ectx;
- stats = coreAPI->requestService ("stats");
+ stats = coreAPI->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_hellodownloaded
@@ -404,7 +404,7 @@
release_module_bootstrap ()
{
if (stats != NULL)
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
coreAPI = NULL;
}
Modified: GNUnet/src/applications/bootstrap_http/httptest.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/httptest.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/bootstrap_http/httptest.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -95,8 +95,8 @@
"http://gnunet.org/hostlist";);
memset (&capi, 0, sizeof (GNUNET_CoreAPIForPlugins));
capi.cfg = cfg;
- capi.requestService = &rs;
- capi.releaseService = &rsx;
+ capi.GNUNET_CORE_request_service = &rs;
+ capi.GNUNET_CORE_release_service = &rsx;
plugin = GNUNET_plugin_load (NULL, "libgnunetmodule_", "bootstrap");
init =
GNUNET_plugin_resolve_function (plugin, "provide_module_", GNUNET_YES);
Modified: GNUnet/src/applications/chat/chat.c
===================================================================
--- GNUnet/src/applications/chat/chat.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/applications/chat/chat.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -109,7 +109,7 @@
broadcastToConnected (message, 5, 1);
cmsg->header.type = htons (GNUNET_CS_PROTO_CHAT_MSG);
for (j = 0; j < clientCount; j++)
- coreAPI->sendToClient (clients[j], &cmsg->header);
+ coreAPI->GNUNET_CORE_cs_send_to_client (clients[j], &cmsg->header);
pmsg->nick[CHAT_NICK_LENGTH - 1] = '\0';
pmsg->message[CHAT_MSG_LENGTH - 1] = '\0';
/*
@@ -152,7 +152,7 @@
if (clients[i] == client)
j = i;
else
- coreAPI->sendToClient (clients[i], message);
+ coreAPI->GNUNET_CORE_cs_send_to_client (clients[i], message);
if (j == -1)
{
if (clientCount == MAX_CLIENTS)
@@ -215,7 +215,7 @@
capi->registerHandler (GNUNET_P2P_PROTO_CHAT_MSG, &handleChatMSG))
ok = GNUNET_SYSERR;
if (GNUNET_SYSERR ==
- capi->registerClientExitHandler (&chatClientExitHandler))
+ capi->GNUNET_CORE_cs_register_exit_handler (&chatClientExitHandler))
ok = GNUNET_SYSERR;
if (GNUNET_SYSERR == capi->registerClientHandler (GNUNET_CS_PROTO_CHAT_MSG,
&csHandleChatRequest))
@@ -235,7 +235,7 @@
done_module_chat ()
{
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_CHAT_MSG, &handleChatMSG);
- coreAPI->unregisterClientExitHandler (&chatClientExitHandler);
+ coreAPI->GNUNET_CORE_cs_exit_handler_unregister (&chatClientExitHandler);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_CHAT_MSG,
&csHandleChatRequest);
GNUNET_mutex_destroy (&chatMutex);
Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/datastore/datastore.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -416,7 +416,7 @@
return NULL; /* OOPS */
}
quota = lquota * 1024 * 1024; /* MB to bytes */
- stats = capi->requestService ("stats");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_filtered =
@@ -428,13 +428,13 @@
create (gettext_noop ("# bytes allowed in datastore")),
quota);
}
- state = capi->requestService ("state");
+ state = capi->GNUNET_CORE_request_service ("state");
if (state != NULL)
{
sqot = GNUNET_htonll (lquota);
state->write (capi->ectx,
"FS-LAST-QUOTA", sizeof (unsigned long long), &sqot);
- capi->releaseService (state);
+ capi->GNUNET_CORE_release_service (state);
}
else
{
@@ -444,12 +444,12 @@
_
("Failed to load state service. Trying to do
without.\n"));
}
- sq = capi->requestService ("sqstore");
+ sq = capi->GNUNET_CORE_request_service ("sqstore");
if (sq == NULL)
{
if (stats != NULL)
{
- capi->releaseService (stats);
+ capi->GNUNET_CORE_release_service (stats);
stats = NULL;
}
GNUNET_GE_BREAK (capi->ectx, 0);
@@ -461,10 +461,10 @@
{
GNUNET_GE_BREAK (capi->ectx, 0);
donePrefetch ();
- capi->releaseService (sq);
+ capi->GNUNET_CORE_release_service (sq);
if (stats != NULL)
{
- capi->releaseService (stats);
+ capi->GNUNET_CORE_release_service (stats);
stats = NULL;
}
return NULL;
@@ -511,10 +511,10 @@
cron = NULL;
donePrefetch ();
doneFilters ();
- coreAPI->releaseService (sq);
+ coreAPI->GNUNET_CORE_release_service (sq);
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
sq = NULL;
@@ -555,7 +555,7 @@
-1) / 1024 / 1024,
1024, "a))
return; /* OOPS */
- state = uapi->requestService ("state");
+ state = uapi->GNUNET_CORE_request_service ("state");
lq = NULL;
if ((state != NULL) &&
(sizeof (unsigned long long) == state->read (uapi->ectx,
@@ -563,7 +563,7 @@
(void **) &lq)) &&
(GNUNET_ntohll (*lq) == quota))
{
- uapi->releaseService (state);
+ uapi->GNUNET_CORE_release_service (state);
GNUNET_free (lq);
return; /* no change */
}
@@ -571,11 +571,11 @@
/* ok, need to convert! */
deleteFilter (uapi->ectx, uapi->cfg);
initFilters (uapi->ectx, uapi->cfg);
- sq = uapi->requestService ("sqstore");
+ sq = uapi->GNUNET_CORE_request_service ("sqstore");
if (sq != NULL)
{
sq->iterateAllNow (&filterAddAll, NULL);
- uapi->releaseService (sq);
+ uapi->GNUNET_CORE_release_service (sq);
}
else
{
@@ -592,7 +592,7 @@
lastQuota = GNUNET_htonll (quota);
state->write (uapi->ectx,
"FS-LAST-QUOTA", sizeof (unsigned long long), &lastQuota);
- uapi->releaseService (state);
+ uapi->GNUNET_CORE_release_service (state);
}
}
Modified: GNUnet/src/applications/dht/module/cs.c
===================================================================
--- GNUnet/src/applications/dht/module/cs.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/dht/module/cs.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -128,13 +128,14 @@
&value[1]);
#endif
if (GNUNET_OK !=
- coreAPI->sendToClient (record->client, &msg->header, GNUNET_YES))
+ coreAPI->GNUNET_CORE_cs_send_to_client (record->client, &msg->header,
+ GNUNET_YES))
{
GNUNET_GE_LOG (coreAPI->ectx,
GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
_("`%s' failed. Terminating connection to client.\n"),
- "sendToClient");
- coreAPI->terminateClientConnection (record->client);
+ "GNUNET_CORE_cs_send_to_client");
+ coreAPI->GNUNET_CORE_cs_terminate_client_connection (record->client);
}
GNUNET_free (msg);
return GNUNET_OK;
@@ -233,7 +234,7 @@
{
int status;
- dhtAPI = capi->requestService ("dht");
+ dhtAPI = capi->GNUNET_CORE_request_service ("dht");
if (dhtAPI == NULL)
return GNUNET_SYSERR;
coreAPI = capi;
@@ -250,7 +251,8 @@
if (GNUNET_SYSERR ==
capi->registerClientHandler (GNUNET_CS_PROTO_DHT_REQUEST_GET, &csGet))
status = GNUNET_SYSERR;
- if (GNUNET_SYSERR == capi->registerClientExitHandler (&csClientExit))
+ if (GNUNET_SYSERR ==
+ capi->GNUNET_CORE_cs_register_exit_handler (&csClientExit))
status = GNUNET_SYSERR;
GNUNET_GE_ASSERT (capi->ectx,
0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
@@ -282,12 +284,13 @@
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_DHT_REQUEST_GET,
&csGet))
status = GNUNET_SYSERR;
- if (GNUNET_OK != coreAPI->unregisterClientExitHandler (&csClientExit))
+ if (GNUNET_OK !=
+ coreAPI->GNUNET_CORE_cs_exit_handler_unregister (&csClientExit))
status = GNUNET_SYSERR;
while (getRecordsSize > 0)
get_timeout (getRecords[0]);
- coreAPI->releaseService (dhtAPI);
+ coreAPI->GNUNET_CORE_release_service (dhtAPI);
dhtAPI = NULL;
coreAPI = NULL;
GNUNET_mutex_destroy (lock);
Modified: GNUnet/src/applications/dht/module/dstore.c
===================================================================
--- GNUnet/src/applications/dht/module/dstore.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/dht/module/dstore.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -78,7 +78,7 @@
init_dht_store (size_t max_size, GNUNET_CoreAPIForPlugins * capi)
{
coreAPI = capi;
- dstore = coreAPI->requestService ("dstore");
+ dstore = coreAPI->GNUNET_CORE_request_service ("dstore");
if (dstore == NULL)
return GNUNET_SYSERR;
return GNUNET_OK;
@@ -92,7 +92,7 @@
int
done_dht_store ()
{
- coreAPI->releaseService (dstore);
+ coreAPI->GNUNET_CORE_release_service (dstore);
coreAPI = NULL;
dstore = NULL;
return GNUNET_OK;
Modified: GNUnet/src/applications/dht/module/routing.c
===================================================================
--- GNUnet/src/applications/dht/module/routing.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/dht/module/routing.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -740,7 +740,7 @@
128, 1024 * 1024, 1024, &rts);
GNUNET_array_grow (records, rt_size, rts);
lock = GNUNET_mutex_create (GNUNET_NO);
- stats = capi->requestService ("stats");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_replies_routed =
@@ -762,8 +762,9 @@
coreAPI->registerHandler (GNUNET_P2P_PROTO_DHT_GET, &handleGet);
coreAPI->registerHandler (GNUNET_P2P_PROTO_DHT_PUT, &handlePut);
coreAPI->registerHandler (GNUNET_P2P_PROTO_DHT_RESULT, &handleResult);
- coreAPI->registerSendCallback (sizeof (DHT_GET_MESSAGE),
- &extra_get_callback);
+ coreAPI->
+ GNUNET_CORE_connection_register_send_callback (sizeof (DHT_GET_MESSAGE),
+ &extra_get_callback);
return GNUNET_OK;
}
@@ -777,14 +778,15 @@
{
unsigned int i;
- coreAPI->unregisterSendCallback (sizeof (DHT_GET_MESSAGE),
- &extra_get_callback);
+ coreAPI->
+ GNUNET_CORE_connection_unregister_send_callback (sizeof (DHT_GET_MESSAGE),
+ &extra_get_callback);
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_DHT_GET, &handleGet);
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_DHT_PUT, &handlePut);
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_DHT_RESULT, &handleResult);
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
GNUNET_mutex_destroy (lock);
Modified: GNUnet/src/applications/dht/module/table.c
===================================================================
--- GNUnet/src/applications/dht/module/table.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/dht/module/table.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -717,7 +717,9 @@
coreAPI = capi;
/* use less than 50% of peer's ideal number of
connections for DHT table size */
- i = coreAPI->getSlotCount () / MAINTAIN_BUCKET_SIZE / 2;
+ i =
+ coreAPI->GNUNET_CORE_connection_get_slot_count () / MAINTAIN_BUCKET_SIZE /
+ 2;
if (i < 4)
i = 4;
GNUNET_array_grow (buckets, bucketCount, i);
@@ -726,8 +728,8 @@
buckets[i].bstart = 512 * i / bucketCount;
buckets[i].bend = 512 * (i + 1) / bucketCount;
}
- lock = capi->getConnectionModuleLock ();
- stats = capi->requestService ("stats");
+ lock = capi->GNUNET_CORE_connection_get_lock ();
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_dht_total_peers =
@@ -739,9 +741,9 @@
stat_dht_advertisements =
stats->create (gettext_noop ("# dht discovery messages sent"));
}
- identity = coreAPI->requestService ("identity");
+ identity = coreAPI->GNUNET_CORE_request_service ("identity");
GNUNET_GE_ASSERT (coreAPI->ectx, identity != NULL);
- pingpong = coreAPI->requestService ("pingpong");
+ pingpong = coreAPI->GNUNET_CORE_request_service ("pingpong");
GNUNET_GE_ASSERT (coreAPI->ectx, pingpong != NULL);
capi->registerHandler (GNUNET_P2P_PROTO_DHT_DISCOVERY, &handleDiscovery);
capi->registerHandler (GNUNET_P2P_PROTO_DHT_ASK_HELLO, &handleAskHello);
@@ -770,12 +772,12 @@
NULL);
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
- coreAPI->releaseService (identity);
+ coreAPI->GNUNET_CORE_release_service (identity);
identity = NULL;
- coreAPI->releaseService (pingpong);
+ coreAPI->GNUNET_CORE_release_service (pingpong);
pingpong = NULL;
for (i = 0; i < bucketCount; i++)
{
Modified: GNUnet/src/applications/dstore_mysql/dstore_mysql.c
===================================================================
--- GNUnet/src/applications/dstore_mysql/dstore_mysql.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/dstore_mysql/dstore_mysql.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -656,7 +656,7 @@
5);
CLOSE (fd);
}
- stats = capi->requestService ("stats");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
stat_dstore_size = stats->create (gettext_noop ("# bytes in dstore"));
return &api;
@@ -678,7 +678,7 @@
bloom_name = NULL;
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
#if DEBUG_SQLITE
Modified: GNUnet/src/applications/dstore_mysql/dstore_test.c
===================================================================
--- GNUnet/src/applications/dstore_mysql/dstore_test.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/dstore_mysql/dstore_test.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -98,16 +98,16 @@
return -1;
}
cron = GNUNET_cron_create (NULL);
- initCore (NULL, cfg, cron, NULL);
- api = requestService ("dstore");
+ GNUNET_CORE_init (NULL, cfg, cron, NULL);
+ api = GNUNET_CORE_request_service ("dstore");
if (api != NULL)
{
ok = test (api);
- releaseService (api);
+ GNUNET_CORE_release_service (api);
}
else
ok = GNUNET_SYSERR;
- doneCore ();
+ GNUNET_CORE_done ();
if (ok == GNUNET_SYSERR)
return 1;
return error;
Modified: GNUnet/src/applications/dstore_sqlite/dstore.c
===================================================================
--- GNUnet/src/applications/dstore_sqlite/dstore.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/dstore_sqlite/dstore.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -530,7 +530,7 @@
5);
CLOSE (fd);
}
- stats = capi->requestService ("stats");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
stat_dstore_size = stats->create (gettext_noop ("# bytes in dstore"));
return &api;
@@ -555,7 +555,7 @@
bloom_name = NULL;
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
#if DEBUG_SQLITE
Modified: GNUnet/src/applications/dstore_sqlite/dstore_test.c
===================================================================
--- GNUnet/src/applications/dstore_sqlite/dstore_test.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/dstore_sqlite/dstore_test.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -100,16 +100,16 @@
return -1;
}
cron = GNUNET_cron_create (NULL);
- initCore (NULL, cfg, cron, NULL);
- api = requestService ("dstore");
+ GNUNET_CORE_init (NULL, cfg, cron, NULL);
+ api = GNUNET_CORE_request_service ("dstore");
if (api != NULL)
{
ok = test (api);
- releaseService (api);
+ GNUNET_CORE_release_service (api);
}
else
ok = GNUNET_SYSERR;
- doneCore ();
+ GNUNET_CORE_done ();
if (ok == GNUNET_SYSERR)
return 1;
return error;
Modified: GNUnet/src/applications/fragmentation/fragmentation.c
===================================================================
--- GNUnet/src/applications/fragmentation/fragmentation.c 2007-12-12
06:59:59 UTC (rev 5873)
+++ GNUnet/src/applications/fragmentation/fragmentation.c 2007-12-12
07:52:18 UTC (rev 5874)
@@ -229,7 +229,8 @@
printf ("Finished defragmentation!\n");
#endif
/* handle message! */
- coreAPI->injectMessage (&pep->sender, msg, len, GNUNET_YES, NULL);
+ coreAPI->GNUNET_CORE_p2p_inject_message (&pep->sender, msg, len, GNUNET_YES,
+ NULL);
GNUNET_free (msg);
CLEANUP:
/* free fragment buffers */
@@ -557,8 +558,8 @@
}
}
xlen = mtu - sizeof (P2P_fragmentation_MESSAGE);
- coreAPI->unicastCallback (peer, &fragmentBMC, fbmc, mtu, prio * xlen / len,
/* compute new prio */
- targetTime);
+ coreAPI->GNUNET_CORE_connection_send_using_callback (peer, &fragmentBMC,
fbmc, mtu, prio * xlen / len, /* compute new prio */
+ targetTime);
}
/**
@@ -571,7 +572,7 @@
int i;
coreAPI = capi;
- stats = coreAPI->requestService ("stats");
+ stats = coreAPI->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_defragmented =
@@ -622,7 +623,7 @@
}
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
GNUNET_mutex_destroy (defragCacheLock);
Modified: GNUnet/src/applications/fragmentation/fragmentationtest.c
===================================================================
--- GNUnet/src/applications/fragmentation/fragmentationtest.c 2007-12-12
06:59:59 UTC (rev 5873)
+++ GNUnet/src/applications/fragmentation/fragmentationtest.c 2007-12-12
07:52:18 UTC (rev 5874)
@@ -367,22 +367,22 @@
/* ************* driver ****************** */
static int
-registerp2pHandler (const unsigned short type,
- GNUNET_P2PRequestHandler callback)
+GNUNET_CORE_p2p_register_handler (const unsigned short type,
+ GNUNET_P2PRequestHandler callback)
{
return GNUNET_OK;
}
static int
-unregisterp2pHandler (const unsigned short type,
- GNUNET_P2PRequestHandler callback)
+GNUNET_CORE_p2p_unregister_handler (const unsigned short type,
+ GNUNET_P2PRequestHandler callback)
{
return GNUNET_OK;
}
static void *
-requestService (const char *name)
+GNUNET_CORE_request_service (const char *name)
{
return NULL;
}
@@ -394,10 +394,10 @@
memset (&capi, 0, sizeof (GNUNET_CoreAPIForPlugins));
capi.cron = GNUNET_cron_create (NULL);
- capi.injectMessage = &handleHelper;
- capi.requestService = &requestService;
- capi.registerHandler = ®isterp2pHandler;
- capi.unregisterHandler = &unregisterp2pHandler;
+ capi.GNUNET_CORE_p2p_inject_message = &handleHelper;
+ capi.GNUNET_CORE_request_service = &GNUNET_CORE_request_service;
+ capi.registerHandler = &GNUNET_CORE_p2p_register_handler;
+ capi.unregisterHandler = &GNUNET_CORE_p2p_unregister_handler;
provide_module_fragmentation (&capi);
fprintf (stderr, ".");
Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/fs/ecrs/download.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -159,7 +159,7 @@
this->ectx = ectx;
GNUNET_GE_ASSERT (ectx, filename != NULL);
- this->treedepth = computeDepth (filesize);
+ this->treedepth = GNUNET_ECRS_compute_depth (filesize);
this->lock = GNUNET_mutex_create (GNUNET_NO);
this->handles = GNUNET_malloc (sizeof (int) * (this->treedepth + 1));
this->filename = GNUNET_strdup (filename);
@@ -215,7 +215,7 @@
* @param len how many bytes to read or write
* @return number of bytes read, GNUNET_SYSERR on error
*/
-int
+static int
readFromIOC (IOContext * this,
unsigned int level,
unsigned long long pos, void *buf, unsigned int len)
@@ -250,7 +250,7 @@
* @param len how many bytes to write
* @return number of bytes written, GNUNET_SYSERR on error
*/
-int
+static int
writeToIOC (IOContext * this,
unsigned int level,
unsigned long long pos, void *buf, unsigned int len)
@@ -1481,7 +1481,7 @@
top->ctx = &ctx;
top->chk = fid.chk;
top->offset = 0;
- top->level = computeDepth (ctx.total);
+ top->level = GNUNET_ECRS_compute_depth (ctx.total);
if (GNUNET_NO == checkPresent (top))
addRequest (rm, top);
else
Modified: GNUnet/src/applications/fs/ecrs/tree.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/tree.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/fs/ecrs/tree.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -28,7 +28,7 @@
* @return depth of the tree
*/
unsigned int
-computeDepth (unsigned long long flen)
+GNUNET_ECRS_compute_depth (unsigned long long flen)
{
unsigned int treeDepth;
unsigned long long fl;
Modified: GNUnet/src/applications/fs/ecrs/tree.h
===================================================================
--- GNUnet/src/applications/fs/ecrs/tree.h 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/fs/ecrs/tree.h 2007-12-12 07:52:18 UTC (rev
5874)
@@ -50,6 +50,6 @@
* @param flen file length for which to compute the depth
* @return depth of the tree
*/
-unsigned int computeDepth (unsigned long long flen);
+unsigned int GNUNET_ECRS_compute_depth (unsigned long long flen);
#endif
Modified: GNUnet/src/applications/fs/ecrs/unindex.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/unindex.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/fs/ecrs/unindex.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -219,7 +219,7 @@
start = now;
/* reset the counter since the formula later does not
take the time for GNUNET_hash_file into account */
- treedepth = computeDepth (filesize);
+ treedepth = GNUNET_ECRS_compute_depth (filesize);
/* Test if file is indexed! */
wasIndexed = GNUNET_FS_test_indexed (sock, &fileId);
Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/fs/ecrs/upload.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -217,7 +217,7 @@
break;
}
}
- treedepth = computeDepth (filesize);
+ treedepth = GNUNET_ECRS_compute_depth (filesize);
fd = GNUNET_disk_file_open (ectx, filename, O_RDONLY | O_LARGEFILE);
if (fd == -1)
{
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/fs/fsui/download.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -241,7 +241,7 @@
/**
* Thread that downloads a file.
*/
-void *
+static void *
downloadThread (void *cls)
{
GNUNET_FSUI_DownloadList *dl = cls;
Modified: GNUnet/src/applications/fs/module/dht_push.c
===================================================================
--- GNUnet/src/applications/fs/module/dht_push.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/fs/module/dht_push.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -126,13 +126,13 @@
{
coreAPI = capi;
dht = d;
- sqstore = capi->requestService ("sqstore");
+ sqstore = capi->GNUNET_CORE_request_service ("sqstore");
if (sqstore == NULL)
{
GNUNET_GE_BREAK (capi->ectx, 0);
return;
}
- stats = capi->requestService ("stats");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
stat_push_count
= stats->create (gettext_noop ("# blocks pushed into DHT"));
@@ -155,10 +155,10 @@
GNUNET_thread_stop_sleep (thread);
GNUNET_thread_join (thread, &unused);
}
- coreAPI->releaseService (sqstore);
+ coreAPI->GNUNET_CORE_release_service (sqstore);
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
coreAPI = NULL;
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/fs/module/fs.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -332,8 +332,9 @@
cectx =
coreAPI->
- createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
- GNUNET_GE_ROUTEKIND, sock);
+ GNUNET_CORE_cs_create_client_log_context (GNUNET_GE_USER |
+ GNUNET_GE_EVENTKIND |
+ GNUNET_GE_ROUTEKIND, sock);
if (ntohs (req->size) < sizeof (CS_fs_request_insert_MESSAGE))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -447,8 +448,9 @@
cectx =
coreAPI->
- createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
- GNUNET_GE_ROUTEKIND, sock);
+ GNUNET_CORE_cs_create_client_log_context (GNUNET_GE_USER |
+ GNUNET_GE_EVENTKIND |
+ GNUNET_GE_ROUTEKIND, sock);
if (ntohs (req->size) < sizeof (CS_fs_request_init_index_MESSAGE))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -499,8 +501,9 @@
cectx =
coreAPI->
- createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
- GNUNET_GE_ROUTEKIND, sock);
+ GNUNET_CORE_cs_create_client_log_context (GNUNET_GE_USER |
+ GNUNET_GE_EVENTKIND |
+ GNUNET_GE_ROUTEKIND, sock);
if (ntohs (req->size) < sizeof (CS_fs_request_index_MESSAGE))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -585,8 +588,9 @@
cectx =
coreAPI->
- createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
- GNUNET_GE_ROUTEKIND, sock);
+ GNUNET_CORE_cs_create_client_log_context (GNUNET_GE_USER |
+ GNUNET_GE_EVENTKIND |
+ GNUNET_GE_ROUTEKIND, sock);
if (ntohs (req->size) < sizeof (CS_fs_request_delete_MESSAGE))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -662,8 +666,9 @@
cectx =
coreAPI->
- createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
- GNUNET_GE_ROUTEKIND, sock);
+ GNUNET_CORE_cs_create_client_log_context (GNUNET_GE_USER |
+ GNUNET_GE_EVENTKIND |
+ GNUNET_GE_ROUTEKIND, sock);
if (ntohs (req->size) != sizeof (CS_fs_request_unindex_MESSAGE))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -1224,14 +1229,14 @@
"QUOTA", "FS");
return GNUNET_SYSERR;
}
- datastore = capi->requestService ("datastore");
+ datastore = capi->GNUNET_CORE_request_service ("datastore");
if (datastore == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
return GNUNET_SYSERR;
}
- traffic = capi->requestService ("traffic");
- stats = capi->requestService ("stats");
+ traffic = capi->GNUNET_CORE_request_service ("traffic");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_expired_replies_dropped
@@ -1239,17 +1244,17 @@
stat_valid_replies_received
= stats->create (gettext_noop ("# FS valid replies received"));
}
- gap = capi->requestService ("gap");
+ gap = capi->GNUNET_CORE_request_service ("gap");
if (gap == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
- capi->releaseService (datastore);
+ capi->GNUNET_CORE_release_service (datastore);
if (stats != NULL)
- capi->releaseService (stats);
- capi->releaseService (traffic);
+ capi->GNUNET_CORE_release_service (stats);
+ capi->GNUNET_CORE_release_service (traffic);
return GNUNET_SYSERR;
}
- dht = capi->requestService ("dht");
+ dht = capi->GNUNET_CORE_request_service ("dht");
if (dht != NULL)
init_dht_push (capi, dht);
ltgSignal = GNUNET_semaphore_create (0);
@@ -1399,24 +1404,24 @@
GNUNET_semaphore_up (ltgSignal); /* lg_jobs == NULL => thread will
terminate */
GNUNET_thread_join (localGetProcessor, &unused);
doneQueryManager ();
- coreAPI->releaseService (datastore);
+ coreAPI->GNUNET_CORE_release_service (datastore);
datastore = NULL;
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
- coreAPI->releaseService (gap);
+ coreAPI->GNUNET_CORE_release_service (gap);
gap = NULL;
if (dht != NULL)
{
done_dht_push ();
- coreAPI->releaseService (dht);
+ coreAPI->GNUNET_CORE_release_service (dht);
dht = NULL;
}
if (traffic != NULL)
{
- coreAPI->releaseService (traffic);
+ coreAPI->GNUNET_CORE_release_service (traffic);
traffic = NULL;
}
coreAPI = NULL;
Modified: GNUnet/src/applications/fs/module/migration.c
===================================================================
--- GNUnet/src/applications/fs/module/migration.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/fs/module/migration.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -146,7 +146,7 @@
unsigned int dist;
unsigned int minDist;
- index = coreAPI->computeIndex (receiver);
+ index = coreAPI->GNUNET_CORE_connection_compute_index_of_peer (receiver);
GNUNET_mutex_lock (lock);
now = GNUNET_get_time ();
entry = -1;
@@ -372,9 +372,10 @@
gap = g;
dht = d;
traffic = t;
- coreAPI->registerSendCallback (GNUNET_GAP_ESTIMATED_DATA_SIZE,
- &activeMigrationCallback);
- stats = capi->requestService ("stats");
+ coreAPI->
+ GNUNET_CORE_connection_register_send_callback
+ (GNUNET_GAP_ESTIMATED_DATA_SIZE, &activeMigrationCallback);
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_migration_count
@@ -392,11 +393,12 @@
doneMigration ()
{
int i;
- coreAPI->unregisterSendCallback (GNUNET_GAP_ESTIMATED_DATA_SIZE,
- &activeMigrationCallback);
+ coreAPI->
+ GNUNET_CORE_connection_unregister_send_callback
+ (GNUNET_GAP_ESTIMATED_DATA_SIZE, &activeMigrationCallback);
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
datastore = NULL;
Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/fs/module/ondemand.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -688,7 +688,7 @@
char *tmp;
coreAPI = capi;
- state = capi->requestService ("state");
+ state = capi->GNUNET_CORE_request_service ("state");
if (state == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -715,7 +715,7 @@
int
ONDEMAND_done ()
{
- coreAPI->releaseService (state);
+ coreAPI->GNUNET_CORE_release_service (state);
state = NULL;
GNUNET_free (index_directory);
return GNUNET_OK;
Modified: GNUnet/src/applications/fs/module/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/module/querymanager.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/fs/module/querymanager.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -199,7 +199,8 @@
#endif
if (stats != NULL)
stats->change (stat_replies_transmitted, 1);
- coreAPI->sendToClient (trackers[i]->client, &rc->header, GNUNET_NO);
+ coreAPI->GNUNET_CORE_cs_send_to_client (trackers[i]->client,
+ &rc->header, GNUNET_NO);
GNUNET_free (rc);
}
}
@@ -222,10 +223,10 @@
{
coreAPI = capi;
ectx = capi->ectx;
- capi->registerClientExitHandler (&ceh);
+ capi->GNUNET_CORE_cs_register_exit_handler (&ceh);
GNUNET_array_grow (trackers, trackerSize, 64);
queryManagerLock = GNUNET_mutex_create (GNUNET_NO);
- stats = capi->requestService ("stats");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_queries_tracked
@@ -251,11 +252,11 @@
if (stats != NULL)
{
stats->set (stat_queries_tracked, 0);
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
- coreAPI->unregisterClientExitHandler (&ceh);
+ coreAPI->GNUNET_CORE_cs_exit_handler_unregister (&ceh);
GNUNET_mutex_destroy (queryManagerLock);
queryManagerLock = NULL;
coreAPI = NULL;
Modified: GNUnet/src/applications/fs/namespace/namespace_info.c
===================================================================
--- GNUnet/src/applications/fs/namespace/namespace_info.c 2007-12-12
06:59:59 UTC (rev 5873)
+++ GNUnet/src/applications/fs/namespace/namespace_info.c 2007-12-12
07:52:18 UTC (rev 5874)
@@ -1072,12 +1072,12 @@
}
-void __attribute__ ((constructor)) gnunet_namespace_ltdl_init ()
+void __attribute__ ((constructor)) GNUNET_NS_ltdl_init ()
{
lock = GNUNET_mutex_create (GNUNET_NO);
}
-void __attribute__ ((destructor)) gnunet_namespace_ltdl_fini ()
+void __attribute__ ((destructor)) GNUNET_NS_ltdl_fini ()
{
GNUNET_mutex_destroy (lock);
lock = NULL;
Modified: GNUnet/src/applications/fs/uritrack/callbacks.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/callbacks.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/fs/uritrack/callbacks.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -135,7 +135,7 @@
* Internal notification about new tracked URI.
*/
void
-URITRACK_internal_notify (const GNUNET_ECRS_FileInfo * fi)
+GNUNET_URITRACK_internal_notify (const GNUNET_ECRS_FileInfo * fi)
{
int i;
@@ -145,12 +145,12 @@
GNUNET_mutex_unlock (lock);
}
-void __attribute__ ((constructor)) gnunet_uritrack_ltdl_init ()
+void __attribute__ ((constructor)) GNUNET_URITRACK_ltdl_init ()
{
lock = GNUNET_mutex_create (GNUNET_NO);
}
-void __attribute__ ((destructor)) gnunet_uritrack_ltdl_fini ()
+void __attribute__ ((destructor)) GNUNET_URITRACK_ltdl_fini ()
{
GNUNET_mutex_destroy (lock);
lock = NULL;
Modified: GNUnet/src/applications/fs/uritrack/callbacks.h
===================================================================
--- GNUnet/src/applications/fs/uritrack/callbacks.h 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/fs/uritrack/callbacks.h 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -30,6 +30,6 @@
/**
* Internal notification about new tracked URI.
*/
-void URITRACK_internal_notify (const GNUNET_ECRS_FileInfo * fi);
+void GNUNET_URITRACK_internal_notify (const GNUNET_ECRS_FileInfo * fi);
#endif
Modified: GNUnet/src/applications/fs/uritrack/file_info.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/file_info.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/fs/uritrack/file_info.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -218,7 +218,7 @@
GNUNET_IPC_semaphore_destroy (sem);
GNUNET_free (data);
GNUNET_free (suri);
- URITRACK_internal_notify (fi);
+ GNUNET_URITRACK_internal_notify (fi);
}
/**
Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/applications/gap/gap.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -2224,7 +2224,7 @@
GNUNET_GE_ASSERT (ectx, sizeof (P2P_gap_reply_MESSAGE) == 68);
GNUNET_GE_ASSERT (ectx, sizeof (P2P_gap_query_MESSAGE) == 144);
- stats = capi->requestService ("stats");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_routing_totals =
@@ -2282,11 +2282,11 @@
GNUNET_array_grow (rewards, rewardSize, MAX_REWARD_TRACKS);
- identity = coreAPI->requestService ("identity");
+ identity = coreAPI->GNUNET_CORE_request_service ("identity");
GNUNET_GE_ASSERT (ectx, identity != NULL);
- topology = coreAPI->requestService ("topology");
+ topology = coreAPI->GNUNET_CORE_request_service ("topology");
GNUNET_GE_ASSERT (ectx, topology != NULL);
- traffic = coreAPI->requestService ("traffic");
+ traffic = coreAPI->GNUNET_CORE_request_service ("traffic");
if (traffic == NULL)
{
GNUNET_GE_LOG (ectx,
@@ -2310,7 +2310,7 @@
queries[i].expires = 0; /* all expired */
queries[i].msg = NULL;
}
- lock = coreAPI->getConnectionModuleLock ();
+ lock = coreAPI->GNUNET_CORE_connection_get_lock ();
GNUNET_cron_add_job (capi->cron, &ageRTD, 2 * GNUNET_CRON_MINUTES,
2 * GNUNET_CRON_MINUTES, NULL);
@@ -2321,8 +2321,10 @@
GNUNET_P2P_PROTO_GAP_RESULT);
capi->registerHandler (GNUNET_P2P_PROTO_GAP_QUERY, &handleQuery);
capi->registerHandler (GNUNET_P2P_PROTO_GAP_RESULT, &useContent);
- coreAPI->registerSendCallback (sizeof (P2P_gap_query_MESSAGE),
- &fillInQuery);
+ coreAPI->
+ GNUNET_CORE_connection_register_send_callback (sizeof
+ (P2P_gap_query_MESSAGE),
+ &fillInQuery);
api.init = &init;
api.get_start = &get_start;
@@ -2342,8 +2344,10 @@
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_GAP_QUERY, &handleQuery);
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_GAP_RESULT, &useContent);
- coreAPI->unregisterSendCallback (sizeof (P2P_gap_query_MESSAGE),
- &fillInQuery);
+ coreAPI->
+ GNUNET_CORE_connection_unregister_send_callback (sizeof
+ (P2P_gap_query_MESSAGE),
+ &fillInQuery);
GNUNET_cron_del_job (coreAPI->cron, &ageRTD, 2 * GNUNET_CRON_MINUTES, NULL);
@@ -2372,13 +2376,13 @@
for (i = 0; i < QUERY_RECORD_COUNT; i++)
GNUNET_free_non_null (queries[i].msg);
- coreAPI->releaseService (identity);
+ coreAPI->GNUNET_CORE_release_service (identity);
identity = NULL;
- coreAPI->releaseService (topology);
+ coreAPI->GNUNET_CORE_release_service (topology);
topology = NULL;
if (traffic != NULL)
{
- coreAPI->releaseService (traffic);
+ coreAPI->GNUNET_CORE_release_service (traffic);
traffic = NULL;
}
GNUNET_free (ROUTING_indTable_);
@@ -2387,7 +2391,7 @@
if (stats != NULL)
{
stats->set (stat_pending_rewards, 0);
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
lock = NULL;
Modified: GNUnet/src/applications/gap/gap.h
===================================================================
--- GNUnet/src/applications/gap/gap.h 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/applications/gap/gap.h 2007-12-12 07:52:18 UTC (rev 5874)
@@ -292,7 +292,7 @@
PID_INDEX noTarget;
/**
- * Bit-map marking the hostIndices (computeIndex) of nodes that have
+ * Bit-map marking the hostIndices
(GNUNET_CORE_connection_compute_index_of_peer) of nodes that have
* received this query already. Note that the bit-map has a maximum
* size, if the index is out-of-bounds, it is hashed into the
* smaller size of the bitmap. There may thus be nodes with
Modified: GNUnet/src/applications/getoption/getoption.c
===================================================================
--- GNUnet/src/applications/getoption/getoption.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/getoption/getoption.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -63,7 +63,8 @@
rep->header.size = htons (sizeof (GNUNET_MessageHeader) + strlen (val) + 1);
memcpy (rep->value, val, strlen (val) + 1);
rep->header.type = htons (GNUNET_CS_PROTO_GET_OPTION_REPLY);
- ret = coreAPI->sendToClient (sock, &rep->header, GNUNET_YES);
+ ret =
+ coreAPI->GNUNET_CORE_cs_send_to_client (sock, &rep->header, GNUNET_YES);
GNUNET_free (rep);
GNUNET_free (val);
return ret;
Modified: GNUnet/src/applications/identity/identity.c
===================================================================
--- GNUnet/src/applications/identity/identity.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/identity/identity.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -1221,9 +1221,10 @@
hello = GNUNET_malloc (ntohs (msg->header.size));
memcpy (hello, msg, ntohs (msg->header.size));
hello->header.type = htons (GNUNET_P2P_PROTO_HELLO);
- coreAPI->injectMessage (NULL,
- (const char *) hello,
- ntohs (msg->header.size), GNUNET_NO, NULL);
+ coreAPI->GNUNET_CORE_p2p_inject_message (NULL,
+ (const char *) hello,
+ ntohs (msg->header.size),
+ GNUNET_NO, NULL);
GNUNET_free (hello);
return GNUNET_OK;
}
@@ -1253,18 +1254,19 @@
/* we cannot permanently load transport
since that would cause a cyclic dependency;
however, we can request it briefly here */
- tapi = coreAPI->requestService ("transport");
+ tapi = coreAPI->GNUNET_CORE_request_service ("transport");
if (tapi == NULL)
return GNUNET_SYSERR;
hello = NULL;
pos = 0;
while ((hello == NULL) && (types[pos] != 0))
hello = tapi->createhello (types[pos++]);
- coreAPI->releaseService (tapi);
+ coreAPI->GNUNET_CORE_release_service (tapi);
if (hello == NULL)
return GNUNET_SYSERR;
hello->header.type = htons (GNUNET_CS_PROTO_IDENTITY_HELLO);
- ret = coreAPI->sendToClient (sock, &hello->header, GNUNET_YES);
+ ret =
+ coreAPI->GNUNET_CORE_cs_send_to_client (sock, &hello->header, GNUNET_YES);
GNUNET_free (hello);
return ret;
}
@@ -1283,7 +1285,8 @@
ntohs (message->size) -
sizeof (GNUNET_MessageHeader), &reply.sig))
return GNUNET_SYSERR;
- return coreAPI->sendToClient (sock, &reply.header, GNUNET_YES);
+ return coreAPI->GNUNET_CORE_cs_send_to_client (sock, &reply.header,
+ GNUNET_YES);
}
static int
@@ -1305,7 +1308,7 @@
hello = identity2Hello (identity, protocol, GNUNET_YES);
if (hello == NULL)
return GNUNET_OK; /* ignore -- happens if HELLO just expired */
- transport = coreAPI->requestService ("transport");
+ transport = coreAPI->GNUNET_CORE_request_service ("transport");
if (transport == NULL)
{
GNUNET_free (hello);
@@ -1316,7 +1319,7 @@
address = NULL;
transport->helloToAddress (hello, &address, &len);
GNUNET_free (hello);
- coreAPI->releaseService (transport);
+ coreAPI->GNUNET_CORE_release_service (transport);
if (len >= GNUNET_MAX_BUFFER_SIZE - sizeof (CS_identity_peer_info_MESSAGE))
{
GNUNET_free (address);
@@ -1337,7 +1340,8 @@
reply->bpm = htonl (bpm);
memcpy (&reply[1], address, len);
GNUNET_free_non_null (address);
- ret = coreAPI->sendToClient (sock, &reply->header, GNUNET_YES);
+ ret =
+ coreAPI->GNUNET_CORE_cs_send_to_client (sock, &reply->header, GNUNET_YES);
GNUNET_free (reply);
return ret;
}
Modified: GNUnet/src/applications/identity/identitytest.c
===================================================================
--- GNUnet/src/applications/identity/identitytest.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/identity/identitytest.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -43,8 +43,8 @@
printf("Assertion failed at %s:%d\n", \
__FILE__, __LINE__); \
GNUNET_cron_stop(cron); \
- releaseService(identity); \
- releaseService(transport); \
+ GNUNET_CORE_release_service(identity); \
+ GNUNET_CORE_release_service(transport); \
return GNUNET_SYSERR; \
} \
} while (0)
@@ -59,8 +59,8 @@
GNUNET_RSA_Signature sig;
GNUNET_MessageHello *hello;
- transport = requestService ("transport");
- identity = requestService ("identity");
+ transport = GNUNET_CORE_request_service ("transport");
+ identity = GNUNET_CORE_request_service ("identity");
GNUNET_cron_start (cron);
/* give cron job chance to run */
GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS);
@@ -69,8 +69,8 @@
{
printf ("Cannot run test, failed to create any hello.\n");
GNUNET_cron_stop (cron);
- releaseService (identity);
- releaseService (transport);
+ GNUNET_CORE_release_service (identity);
+ GNUNET_CORE_release_service (transport);
return GNUNET_SYSERR;
}
identity->addHost (hello);
@@ -79,9 +79,9 @@
identity->changeHostTrust (&pid, -identity->getHostTrust (&pid));
ASSERT (4 == identity->changeHostTrust (&pid, 4));
- releaseService (identity);
+ GNUNET_CORE_release_service (identity);
- identity = requestService ("identity");
+ identity = GNUNET_CORE_request_service ("identity");
ASSERT (4 == identity->getHostTrust (&pid));
ASSERT (5 == identity->changeHostTrust (&pid, 5));
ASSERT (-2 == identity->changeHostTrust (&pid, -2));
@@ -99,8 +99,8 @@
hello verification, temporary storage,
permanent storage, blacklisting, etc. */
GNUNET_cron_stop (cron);
- releaseService (identity);
- releaseService (transport);
+ GNUNET_CORE_release_service (identity);
+ GNUNET_CORE_release_service (transport);
return GNUNET_OK;
}
@@ -141,13 +141,13 @@
return -1;
}
cron = GNUNET_cron_create (NULL);
- initCore (NULL, cfg, cron, NULL);
+ GNUNET_CORE_init (NULL, cfg, cron, NULL);
err = 0;
if (GNUNET_OK != runTest ())
err = 1;
if (GNUNET_OK != runClientTest ())
err = 1;
- doneCore ();
+ GNUNET_CORE_done ();
GNUNET_cron_destroy (cron);
GNUNET_GC_free (cfg);
return err;
Modified: GNUnet/src/applications/kvstore_sqlite/kv_sqlitetest.c
===================================================================
--- GNUnet/src/applications/kvstore_sqlite/kv_sqlitetest.c 2007-12-12
06:59:59 UTC (rev 5873)
+++ GNUnet/src/applications/kvstore_sqlite/kv_sqlitetest.c 2007-12-12
07:52:18 UTC (rev 5874)
@@ -88,16 +88,16 @@
return -1;
}
cron = GNUNET_cron_create (NULL);
- initCore (NULL, cfg, cron, NULL);
- api = requestService ("kvstore_sqlite");
+ GNUNET_CORE_init (NULL, cfg, cron, NULL);
+ api = GNUNET_CORE_request_service ("kvstore_sqlite");
if (api != NULL)
{
ok = test (api);
- releaseService (api);
+ GNUNET_CORE_release_service (api);
}
else
ok = GNUNET_SYSERR;
- doneCore ();
+ GNUNET_CORE_done ();
if (ok == GNUNET_SYSERR)
return 1;
return 0;
Modified: GNUnet/src/applications/pingpong/pingpong.c
===================================================================
--- GNUnet/src/applications/pingpong/pingpong.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/pingpong/pingpong.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -166,8 +166,8 @@
}
static int
-sendPlaintext (const GNUNET_PeerIdentity * peer,
- const P2P_pingpong_MESSAGE * msg)
+GNUNET_CORE_connection_send_plaintext (const GNUNET_PeerIdentity * peer,
+ const P2P_pingpong_MESSAGE * msg)
{
GNUNET_TSession *mytsession;
int ret;
@@ -175,8 +175,10 @@
mytsession = transport->connectFreely (peer, GNUNET_YES, __FILE__);
if (mytsession == NULL)
return GNUNET_SYSERR;
- ret = coreAPI->sendPlaintext (mytsession,
- (char *) msg, sizeof (P2P_pingpong_MESSAGE));
+ ret = coreAPI->GNUNET_CORE_connection_send_plaintext (mytsession,
+ (char *) msg,
+ sizeof
+
(P2P_pingpong_MESSAGE));
transport->disconnect (mytsession, __FILE__);
return ret;
}
@@ -230,11 +232,12 @@
transport may have been uni-directional! */
ret = GNUNET_SYSERR;
if (tsession != NULL)
- ret = coreAPI->sendPlaintext (tsession,
- (char *) &pong,
- sizeof (P2P_pingpong_MESSAGE));
+ ret = coreAPI->GNUNET_CORE_connection_send_plaintext (tsession,
+ (char *) &pong,
+ sizeof
+
(P2P_pingpong_MESSAGE));
if (ret != GNUNET_OK)
- ret = sendPlaintext (sender, &pong);
+ ret = GNUNET_CORE_connection_send_plaintext (sender, &pong);
if (ret == GNUNET_OK)
{
if (stats != NULL)
@@ -468,7 +471,9 @@
if (usePlaintext == GNUNET_YES)
{
if (GNUNET_OK !=
- sendPlaintext (receiver, (const P2P_pingpong_MESSAGE *) pmsg))
+ GNUNET_CORE_connection_send_plaintext (receiver,
+ (const P2P_pingpong_MESSAGE
+ *) pmsg))
{
GNUNET_free (pmsg);
return GNUNET_SYSERR;
@@ -497,20 +502,20 @@
ectx = capi->ectx;
GNUNET_GE_ASSERT (ectx, sizeof (P2P_pingpong_MESSAGE) == 72);
coreAPI = capi;
- identity = capi->requestService ("identity");
+ identity = capi->GNUNET_CORE_request_service ("identity");
if (identity == NULL)
{
GNUNET_GE_BREAK (capi->ectx, 0);
return NULL;
}
- transport = capi->requestService ("transport");
+ transport = capi->GNUNET_CORE_request_service ("transport");
if (transport == NULL)
{
GNUNET_GE_BREAK (capi->ectx, 0);
- capi->releaseService (identity);
+ capi->GNUNET_CORE_release_service (identity);
return NULL;
}
- stats = capi->requestService ("stats");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_encryptedPongReceived
@@ -535,7 +540,7 @@
create (gettext_noop ("# plaintext PONG transmissions failed"));
}
- pingPongLock = capi->getConnectionModuleLock ();
+ pingPongLock = capi->GNUNET_CORE_connection_get_lock ();
pingPongs =
(PingPongEntry *) GNUNET_malloc (sizeof (PingPongEntry) * MAX_PING_PONG);
memset (pingPongs, 0, sizeof (PingPongEntry) * MAX_PING_PONG);
@@ -546,10 +551,10 @@
"pingpong", GNUNET_P2P_PROTO_PING, GNUNET_P2P_PROTO_PONG);
capi->registerHandler (GNUNET_P2P_PROTO_PING, &pingReceived);
capi->registerHandler (GNUNET_P2P_PROTO_PONG, &pongReceived);
- capi->registerPlaintextHandler (GNUNET_P2P_PROTO_PING,
- &plaintextPingReceived);
- capi->registerPlaintextHandler (GNUNET_P2P_PROTO_PONG,
- &plaintextPongReceived);
+ capi->GNUNET_CORE_plaintext_register_handler (GNUNET_P2P_PROTO_PING,
+ &plaintextPingReceived);
+ capi->GNUNET_CORE_plaintext_register_handler (GNUNET_P2P_PROTO_PONG,
+ &plaintextPongReceived);
ret.ping = &initiatePing;
ret.pingUser = &createPing;
ret.ping_size = sizeof (P2P_pingpong_MESSAGE);
@@ -564,21 +569,21 @@
{
int i;
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
- coreAPI->releaseService (transport);
+ coreAPI->GNUNET_CORE_release_service (transport);
transport = NULL;
- coreAPI->releaseService (identity);
+ coreAPI->GNUNET_CORE_release_service (identity);
identity = NULL;
for (i = 0; i < MAX_PING_PONG; i++)
GNUNET_free_non_null (pingPongs[i].data);
GNUNET_free (pingPongs);
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_PING, &pingReceived);
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_PONG, &pongReceived);
- coreAPI->unregisterPlaintextHandler (GNUNET_P2P_PROTO_PING,
- &plaintextPingReceived);
- coreAPI->unregisterPlaintextHandler (GNUNET_P2P_PROTO_PONG,
- &plaintextPongReceived);
+ coreAPI->GNUNET_CORE_plaintext_unregister_handler (GNUNET_P2P_PROTO_PING,
+ &plaintextPingReceived);
+ coreAPI->GNUNET_CORE_plaintext_unregister_handler (GNUNET_P2P_PROTO_PONG,
+ &plaintextPongReceived);
coreAPI = NULL;
return GNUNET_OK;
}
Modified: GNUnet/src/applications/rpc/rpc.c
===================================================================
--- GNUnet/src/applications/rpc/rpc.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/applications/rpc/rpc.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -1501,7 +1501,7 @@
int rvalue;
ectx = capi->ectx;
- rpcLock = capi->getConnectionModuleLock ();
+ rpcLock = capi->GNUNET_CORE_connection_get_lock ();
coreAPI = capi;
peerInformation = GNUNET_vector_create (16);
incomingCalls = GNUNET_vector_create (16);
@@ -1611,7 +1611,7 @@
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"RPC testcase starting\n");
- rpcAPI = capi->requestService ("rpc");
+ rpcAPI = capi->GNUNET_CORE_request_service ("rpc");
if (rpcAPI == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -1667,7 +1667,7 @@
GNUNET_GE_BREAK (ectx, 0);
ret = GNUNET_SYSERR;
}
- if (GNUNET_OK != capi->releaseService (rpcAPI))
+ if (GNUNET_OK != capi->GNUNET_CORE_release_service (rpcAPI))
{
GNUNET_GE_BREAK (ectx, 0);
ret = GNUNET_SYSERR;
Modified: GNUnet/src/applications/session/connect.c
===================================================================
--- GNUnet/src/applications/session/connect.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/session/connect.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -172,7 +172,7 @@
GNUNET_GE_ASSERT (ectx, hostId != NULL);
if (stats != NULL)
stats->change (stat_sessionEstablished, 1);
- coreAPI->confirmSessionUp (hostId);
+ coreAPI->GNUNET_CORE_connection_mark_session_as_confirmed (hostId);
GNUNET_free (hostId);
}
@@ -480,7 +480,9 @@
/* get or create our session key */
if (GNUNET_OK !=
- coreAPI->getCurrentSessionKey (receiver, &sk, &age, GNUNET_YES))
+ coreAPI->GNUNET_CORE_connection_get_session_key_of_peer (receiver, &sk,
+ &age,
+ GNUNET_YES))
{
age = GNUNET_get_time_int32 (NULL);
GNUNET_AES_create_session_key (&sk);
@@ -525,13 +527,16 @@
}
if (hello != NULL)
{
- coreAPI->sendPlaintext (tsession,
- (const char *) hello,
- GNUNET_sizeof_hello (hello));
+ coreAPI->GNUNET_CORE_connection_send_plaintext (tsession,
+ (const char *) hello,
+ GNUNET_sizeof_hello
+ (hello));
GNUNET_free (hello);
hello = NULL;
- coreAPI->sendPlaintext (tsession,
- (const char *) skey, ntohs (skey->header.size));
+ coreAPI->GNUNET_CORE_connection_send_plaintext (tsession,
+ (const char *) skey,
+ ntohs (skey->header.
+ size));
}
GNUNET_free (skey);
if (0 != memcmp (receiver, &tsession->peer, sizeof (GNUNET_PeerIdentity)))
@@ -543,7 +548,9 @@
coreAPI->offerTSessionFor (receiver, tsession);
}
transport->disconnect (tsession, __FILE__);
- coreAPI->assignSessionKey (&sk, receiver, age, GNUNET_YES);
+ coreAPI->GNUNET_CORE_connection_assign_session_key_to_peer (&sk, receiver,
+ age,
+ GNUNET_YES);
return GNUNET_OK;
}
@@ -616,14 +623,14 @@
&enc);
return GNUNET_SYSERR;
}
- if ((GNUNET_OK != coreAPI->getCurrentSessionKey (sender,
- NULL,
- NULL,
- GNUNET_YES)) &&
- ((GNUNET_YES == identity->isBlacklisted (sender, GNUNET_NO)) ||
- ((coreAPI->forAllConnectedNodes (NULL, NULL) >= 3) &&
- (GNUNET_cpu_get_load (ectx, coreAPI->cfg) >
- GNUNET_IDLE_LOAD_THRESHOLD))))
+ if ((GNUNET_OK !=
+ coreAPI->GNUNET_CORE_connection_get_session_key_of_peer (sender, NULL,
+ NULL,
+ GNUNET_YES))
+ && ((GNUNET_YES == identity->isBlacklisted (sender, GNUNET_NO))
+ || ((coreAPI->forAllConnectedNodes (NULL, NULL) >= 3)
+ && (GNUNET_cpu_get_load (ectx, coreAPI->cfg) >
+ GNUNET_IDLE_LOAD_THRESHOLD))))
return GNUNET_SYSERR; /* other peer initiated but is
listed as not allowed => discard */
@@ -710,10 +717,12 @@
if (stats != NULL)
stats->change (stat_skeyAccepted, 1);
/* notify core about session key */
- coreAPI->assignSessionKey (&key,
- sender,
- ntohl (sessionkeySigned->creationTime),
- GNUNET_NO);
+ coreAPI->GNUNET_CORE_connection_assign_session_key_to_peer (&key,
+ sender,
+ ntohl
+
(sessionkeySigned->
+ creationTime),
+ GNUNET_NO);
pos = sizeof (P2P_setkey_MESSAGE);
ping = NULL;
pong = NULL;
@@ -788,9 +797,10 @@
"Received PONG in session key from `%s', injecting!\n",
&enc);
#endif
- coreAPI->injectMessage (sender,
- (char *) pong,
- ntohs (pong->size), GNUNET_YES, tsession);
+ coreAPI->GNUNET_CORE_p2p_inject_message (sender,
+ (char *) pong,
+ ntohs (pong->size), GNUNET_YES,
+ tsession);
if (ping != NULL)
{ /* should always be true for well-behaved
peers */
/* pong can go out over ordinary channels */
@@ -914,32 +924,32 @@
ectx = capi->ectx;
GNUNET_GE_ASSERT (ectx, sizeof (P2P_setkey_MESSAGE) == 520);
coreAPI = capi;
- identity = capi->requestService ("identity");
+ identity = capi->GNUNET_CORE_request_service ("identity");
if (identity == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
return NULL;
}
- transport = capi->requestService ("transport");
+ transport = capi->GNUNET_CORE_request_service ("transport");
if (transport == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
- coreAPI->releaseService (identity);
+ coreAPI->GNUNET_CORE_release_service (identity);
identity = NULL;
return NULL;
}
- pingpong = capi->requestService ("pingpong");
+ pingpong = capi->GNUNET_CORE_request_service ("pingpong");
if (pingpong == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
- coreAPI->releaseService (transport);
+ coreAPI->GNUNET_CORE_release_service (transport);
transport = NULL;
- coreAPI->releaseService (identity);
+ coreAPI->GNUNET_CORE_release_service (identity);
identity = NULL;
return NULL;
}
- topology = capi->requestService ("topology");
- stats = capi->requestService ("stats");
+ topology = capi->GNUNET_CORE_request_service ("topology");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_skeySent = stats->create (gettext_noop ("# session keys sent"));
@@ -960,8 +970,8 @@
_
("`%s' registering handler %d (plaintext and ciphertext)\n"),
"session", GNUNET_P2P_PROTO_SET_KEY);
- coreAPI->registerPlaintextHandler (GNUNET_P2P_PROTO_SET_KEY,
- &acceptSessionKey);
+ coreAPI->GNUNET_CORE_plaintext_register_handler (GNUNET_P2P_PROTO_SET_KEY,
+ &acceptSessionKey);
coreAPI->registerHandler (GNUNET_P2P_PROTO_SET_KEY,
&acceptSessionKeyUpdate);
ret.tryConnect = &tryConnect;
@@ -974,22 +984,22 @@
int
release_module_session ()
{
- coreAPI->unregisterPlaintextHandler (GNUNET_P2P_PROTO_SET_KEY,
- &acceptSessionKey);
+ coreAPI->GNUNET_CORE_plaintext_unregister_handler (GNUNET_P2P_PROTO_SET_KEY,
+ &acceptSessionKey);
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_SET_KEY,
&acceptSessionKeyUpdate);
if (topology != NULL)
{
- coreAPI->releaseService (topology);
+ coreAPI->GNUNET_CORE_release_service (topology);
topology = NULL;
}
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
- coreAPI->releaseService (identity);
+ coreAPI->GNUNET_CORE_release_service (identity);
identity = NULL;
- coreAPI->releaseService (transport);
+ coreAPI->GNUNET_CORE_release_service (transport);
transport = NULL;
- coreAPI->releaseService (pingpong);
+ coreAPI->GNUNET_CORE_release_service (pingpong);
pingpong = NULL;
coreAPI = NULL;
return GNUNET_OK;
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -1478,7 +1478,7 @@
ectx = capi->ectx;
coreAPI = capi;
- stats = coreAPI->requestService ("stats");
+ stats = coreAPI->GNUNET_CORE_request_service ("stats");
if (stats)
stat_size = stats->create (gettext_noop ("# bytes in datastore"));
@@ -1514,7 +1514,7 @@
GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "fopen", cnffile);
if (stats != NULL)
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
GNUNET_free (cnffile);
return NULL;
}
@@ -1535,12 +1535,12 @@
("Failed to load MySQL database module. Check that MySQL
is running and configured properly!\n"));
dbh = NULL;
if (stats != NULL)
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
return NULL;
}
lock = GNUNET_mutex_create (GNUNET_NO);
- state = coreAPI->requestService ("state");
+ state = coreAPI->GNUNET_CORE_request_service ("state");
sb = NULL;
if (sizeof (unsigned long long)
!= state->read (ectx, "mysql-size", (void *) &sb))
@@ -1584,7 +1584,7 @@
the outdated state file! */
state->unlink (ectx, "mysql-size");
}
- coreAPI->releaseService (state);
+ coreAPI->GNUNET_CORE_release_service (state);
api.getSize = &getSize;
api.put = &put;
api.get = &get;
@@ -1611,12 +1611,12 @@
GNUNET_free (dbh);
dbh = NULL;
if (stats != NULL)
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
GNUNET_mutex_destroy (lock);
- state = coreAPI->requestService ("state");
+ state = coreAPI->GNUNET_CORE_request_service ("state");
state->write (ectx,
"mysql-size", sizeof (unsigned long long), &content_size);
- coreAPI->releaseService (state);
+ coreAPI->GNUNET_CORE_release_service (state);
mysql_library_end ();
ectx = NULL;
coreAPI = NULL;
Modified: GNUnet/src/applications/sqstore_mysql/mysqltest.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -263,16 +263,16 @@
return -1;
}
cron = GNUNET_cron_create (NULL);
- initCore (NULL, cfg, cron, NULL);
- api = requestService ("sqstore");
+ GNUNET_CORE_init (NULL, cfg, cron, NULL);
+ api = GNUNET_CORE_request_service ("sqstore");
if (api != NULL)
{
ok = test (api);
- releaseService (api);
+ GNUNET_CORE_release_service (api);
}
else
ok = GNUNET_SYSERR;
- doneCore ();
+ GNUNET_CORE_done ();
GNUNET_cron_destroy (cron);
GNUNET_GC_free (cfg);
if (ok == GNUNET_SYSERR)
Modified: GNUnet/src/applications/sqstore_mysql/mysqltest2.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest2.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest2.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -259,17 +259,17 @@
return -1;
}
cron = GNUNET_cron_create (NULL);
- initCore (NULL, cfg, cron, NULL);
- api = requestService ("sqstore");
+ GNUNET_CORE_init (NULL, cfg, cron, NULL);
+ api = GNUNET_CORE_request_service ("sqstore");
if (api != NULL)
{
start_time = GNUNET_get_time ();
ok = test (api);
- releaseService (api);
+ GNUNET_CORE_release_service (api);
}
else
ok = GNUNET_SYSERR;
- doneCore ();
+ GNUNET_CORE_done ();
GNUNET_cron_destroy (cron);
GNUNET_GC_free (cfg);
if (ok == GNUNET_SYSERR)
Modified: GNUnet/src/applications/sqstore_mysql/mysqltest3.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest3.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest3.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -183,17 +183,17 @@
return -1;
}
cron = GNUNET_cron_create (NULL);
- initCore (NULL, cfg, cron, NULL);
- api = requestService ("sqstore");
+ GNUNET_CORE_init (NULL, cfg, cron, NULL);
+ api = GNUNET_CORE_request_service ("sqstore");
if (api != NULL)
{
start_time = GNUNET_get_time ();
ok = test (api);
- releaseService (api);
+ GNUNET_CORE_release_service (api);
}
else
ok = GNUNET_SYSERR;
- doneCore ();
+ GNUNET_CORE_done ();
GNUNET_cron_destroy (cron);
GNUNET_GC_free (cfg);
if (ok == GNUNET_SYSERR)
Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -1331,7 +1331,7 @@
}
lock = GNUNET_mutex_create (GNUNET_NO);
coreAPI = capi;
- stats = coreAPI->requestService ("stats");
+ stats = coreAPI->GNUNET_CORE_request_service ("stats");
if (stats)
stat_size = stats->create (gettext_noop ("# bytes in datastore"));
@@ -1355,7 +1355,7 @@
release_module_sqstore_sqlite ()
{
if (stats != NULL)
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
sqlite_shutdown ();
#if DEBUG_SQLITE
GNUNET_GE_LOG (ectx,
Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -263,16 +263,16 @@
return -1;
}
cron = GNUNET_cron_create (NULL);
- initCore (NULL, cfg, cron, NULL);
- api = requestService ("sqstore");
+ GNUNET_CORE_init (NULL, cfg, cron, NULL);
+ api = GNUNET_CORE_request_service ("sqstore");
if (api != NULL)
{
ok = test (api);
- releaseService (api);
+ GNUNET_CORE_release_service (api);
}
else
ok = GNUNET_SYSERR;
- doneCore ();
+ GNUNET_CORE_done ();
GNUNET_cron_destroy (cron);
GNUNET_GC_free (cfg);
if (ok == GNUNET_SYSERR)
Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c 2007-12-12
06:59:59 UTC (rev 5873)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c 2007-12-12
07:52:18 UTC (rev 5874)
@@ -259,17 +259,17 @@
return -1;
}
cron = GNUNET_cron_create (NULL);
- initCore (NULL, cfg, cron, NULL);
- api = requestService ("sqstore");
+ GNUNET_CORE_init (NULL, cfg, cron, NULL);
+ api = GNUNET_CORE_request_service ("sqstore");
if (api != NULL)
{
start_time = GNUNET_get_time ();
ok = test (api);
- releaseService (api);
+ GNUNET_CORE_release_service (api);
}
else
ok = GNUNET_SYSERR;
- doneCore ();
+ GNUNET_CORE_done ();
GNUNET_cron_destroy (cron);
GNUNET_GC_free (cfg);
if (ok == GNUNET_SYSERR)
Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c 2007-12-12
06:59:59 UTC (rev 5873)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest3.c 2007-12-12
07:52:18 UTC (rev 5874)
@@ -183,17 +183,17 @@
return -1;
}
cron = GNUNET_cron_create (NULL);
- initCore (NULL, cfg, cron, NULL);
- api = requestService ("sqstore");
+ GNUNET_CORE_init (NULL, cfg, cron, NULL);
+ api = GNUNET_CORE_request_service ("sqstore");
if (api != NULL)
{
start_time = GNUNET_get_time ();
ok = test (api);
- releaseService (api);
+ GNUNET_CORE_release_service (api);
}
else
ok = GNUNET_SYSERR;
- doneCore ();
+ GNUNET_CORE_done ();
GNUNET_cron_destroy (cron);
GNUNET_GC_free (cfg);
if (ok == GNUNET_SYSERR)
Modified: GNUnet/src/applications/stats/sqstats.c
===================================================================
--- GNUnet/src/applications/stats/sqstats.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/stats/sqstats.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -145,7 +145,7 @@
static int
init_sqstore_stats ()
{
- sq = myCoreAPI->requestService ("sqstore");
+ sq = myCoreAPI->GNUNET_CORE_request_service ("sqstore");
if (sq == NULL)
return GNUNET_SYSERR;
stat_block[0] = stats->create (gettext_noop ("# Any-Blocks"));
@@ -175,6 +175,6 @@
{
if (sq == NULL)
return;
- myCoreAPI->releaseService (sq);
+ myCoreAPI->GNUNET_CORE_release_service (sq);
sq = NULL;
}
Modified: GNUnet/src/applications/stats/statistics.c
===================================================================
--- GNUnet/src/applications/stats/statistics.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/stats/statistics.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -337,7 +337,8 @@
ntohs(statMsg->header.size),
start, end, statCounters); */
if (GNUNET_SYSERR ==
- coreAPI->sendToClient (sock, &statMsg->header, GNUNET_YES))
+ coreAPI->GNUNET_CORE_cs_send_to_client (sock, &statMsg->header,
+ GNUNET_YES))
break; /* abort, socket error! */
start = end;
}
@@ -365,7 +366,7 @@
cmsg = (CS_stats_get_supported_MESSAGE *) message;
type = ntohs (cmsg->type);
htype = ntohs (cmsg->handlerType);
- supported = coreAPI->isHandlerRegistered (type, htype);
+ supported = coreAPI->GNUNET_CORE_p2p_test_handler_registered (type, htype);
return coreAPI->sendValueToClient (sock, supported);
}
@@ -407,7 +408,7 @@
{
GNUNET_GE_ASSERT (capi->ectx, myCoreAPI == NULL);
myCoreAPI = capi;
- stats = capi->requestService ("stats");
+ stats = capi->GNUNET_CORE_request_service ("stats");
if (stats == NULL)
{
GNUNET_GE_BREAK (capi->ectx, 0);
@@ -468,7 +469,7 @@
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_TRAFFIC_COUNT,
&processGetConnectionCountRequest);
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_NOISE, &processNoise);
- myCoreAPI->releaseService (stats);
+ myCoreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
myCoreAPI = NULL;
return GNUNET_OK;
Modified: GNUnet/src/applications/tbench/tbench.c
===================================================================
--- GNUnet/src/applications/tbench/tbench.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/tbench/tbench.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -384,7 +384,8 @@
reply.variance_loss = sum_variance_loss / (iterations - 1);
GNUNET_free (results);
results = NULL;
- return coreAPI->sendToClient (client, &reply.header, GNUNET_YES);
+ return coreAPI->GNUNET_CORE_cs_send_to_client (client, &reply.header,
+ GNUNET_YES);
}
/**
Modified: GNUnet/src/applications/template/template.c
===================================================================
--- GNUnet/src/applications/template/template.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/template/template.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -73,7 +73,8 @@
if (GNUNET_SYSERR ==
capi->registerHandler (GNUNET_P2P_PROTO_MAX_USED, &handlep2pMSG))
ok = GNUNET_SYSERR;
- if (GNUNET_SYSERR == capi->registerClientExitHandler (&clientExitHandler))
+ if (GNUNET_SYSERR ==
+ capi->GNUNET_CORE_cs_register_exit_handler (&clientExitHandler))
ok = GNUNET_SYSERR;
if (GNUNET_SYSERR ==
capi->registerClientHandler (GNUNET_CS_PROTO_MAX_USED, &csHandle))
@@ -85,7 +86,7 @@
done_module_template ()
{
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_MAX_USED, &handlep2pMSG);
- coreAPI->unregisterClientExitHandler (&clientExitHandler);
+ coreAPI->GNUNET_CORE_cs_exit_handler_unregister (&clientExitHandler);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_MAX_USED, &csHandle);
GNUNET_mutex_destroy (lock);
coreAPI = NULL;
Modified: GNUnet/src/applications/testbed/testbed.c
===================================================================
--- GNUnet/src/applications/testbed/testbed.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/testbed/testbed.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -106,14 +106,14 @@
static void
tb_DEL_PEER (GNUNET_ClientHandle client, TESTBED_DEL_PEER_MESSAGE * msg)
{
- coreAPI->disconnectFromPeer (&msg->host);
+ coreAPI->GNUNET_CORE_connection_disconnect_from_peer (&msg->host);
sendAcknowledgement (client, GNUNET_OK);
}
static void
doDisconnect (const GNUNET_PeerIdentity * id, void *unused)
{
- coreAPI->disconnectFromPeer (id);
+ coreAPI->GNUNET_CORE_connection_disconnect_from_peer (id);
}
/**
@@ -157,10 +157,11 @@
reply->header.header.type = htons (GNUNET_CS_PROTO_TESTBED_REPLY);
reply->header.msgType = htonl (TESTBED_hello_RESPONSE);
memcpy (&reply->helo, helo, ntohs (helo->header.size));
- coreAPI->sendToClient (client, &reply->header.header);
+ coreAPI->GNUNET_CORE_cs_send_to_client (client, &reply->header.header);
GNUNET_GE_LOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "%s: returning from sendToClient\n", __FUNCTION__);
+ "%s: returning from GNUNET_CORE_cs_send_to_client\n",
+ __FUNCTION__);
GNUNET_free (helo);
GNUNET_free (reply);
}
@@ -810,7 +811,8 @@
= htons (run + sizeof (TESTBED_OUTPUT_REPLY_MESSAGE));
memcpy (&((TESTBED_OUTPUT_REPLY_MESSAGE_GENERIC *) msg)->
data[0], &pi->output[pos], run);
- coreAPI->sendToClient (client, &msg->header.header);
+ coreAPI->GNUNET_CORE_cs_send_to_client (client,
+ &msg->header.header);
pos += run;
}
GNUNET_free (msg);
@@ -1401,7 +1403,7 @@
if ((handlers[i].msgId != i) && (handlers[i].handler != &tb_undefined))
GNUNET_GE_ASSERT (ectx, 0);
GNUNET_GE_ASSERT (ectx, handlers[TESTBED_MAX_MSG].handler == NULL);
- identity = capi->requestService ("identity");
+ identity = capi->GNUNET_CORE_request_service ("identity");
if (identity == NULL)
return GNUNET_SYSERR;
@@ -1413,7 +1415,8 @@
GNUNET_GE_ASSERT (ectx,
GNUNET_SYSERR !=
capi->
- registerClientExitHandler (&testbedClientExitHandler));
+ GNUNET_CORE_cs_register_exit_handler
+ (&testbedClientExitHandler));
GNUNET_GE_ASSERT (ectx,
GNUNET_SYSERR !=
capi->
@@ -1464,8 +1467,8 @@
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_TESTBED_REQUEST,
(GNUNET_ClientRequestHandler) &
csHandleTestbedRequest);
- coreAPI->unregisterClientExitHandler (&testbedClientExitHandler);
- coreAPI->releaseService (identity);
+ coreAPI->GNUNET_CORE_cs_exit_handler_unregister (&testbedClientExitHandler);
+ coreAPI->GNUNET_CORE_release_service (identity);
identity = NULL;
coreAPI = NULL;
}
Modified: GNUnet/src/applications/topology_default/topology.c
===================================================================
--- GNUnet/src/applications/topology_default/topology.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/topology_default/topology.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -136,7 +136,7 @@
if (0 == memcmp (coreAPI->myIdentity, id, sizeof (GNUNET_PeerIdentity)))
return GNUNET_OK;
- if (coreAPI->computeIndex (id) != im->index)
+ if (coreAPI->GNUNET_CORE_connection_compute_index_of_peer (id) != im->index)
return GNUNET_OK;
if (GNUNET_OK == coreAPI->queryPeerStatus (id, NULL, NULL))
return GNUNET_OK;
@@ -164,7 +164,7 @@
if (0 == memcmp (coreAPI->myIdentity, id, sizeof (GNUNET_PeerIdentity)))
return GNUNET_OK;
- if (coreAPI->computeIndex (id) != im->index)
+ if (coreAPI->GNUNET_CORE_connection_compute_index_of_peer (id) != im->index)
return GNUNET_OK;
if (GNUNET_OK == coreAPI->queryPeerStatus (id, NULL, NULL))
return GNUNET_OK;
@@ -225,7 +225,9 @@
if (0 == memcmp (coreAPI->myIdentity,
&indexMatch.match, sizeof (GNUNET_PeerIdentity)))
return; /* should happen really rarely */
- if (coreAPI->computeIndex (&indexMatch.match) != index)
+ if (coreAPI->
+ GNUNET_CORE_connection_compute_index_of_peer (&indexMatch.match) !=
+ index)
{
GNUNET_GE_BREAK (NULL, 0); /* should REALLY not happen */
return;
@@ -274,7 +276,7 @@
"Received liveness confirmation from `%s'.\n", &enc);
#endif
- coreAPI->confirmSessionUp (hostId);
+ coreAPI->GNUNET_CORE_connection_mark_session_as_confirmed (hostId);
GNUNET_free (hostId);
}
@@ -294,7 +296,8 @@
if (ran != 0)
return;
now = GNUNET_get_time ();
- if (GNUNET_SYSERR == coreAPI->getLastActivityOf (peer, &act))
+ if (GNUNET_SYSERR ==
+ coreAPI->GNUNET_CORE_connection_get_last_activity_of_peer (peer, &act))
{
GNUNET_GE_BREAK (coreAPI->ectx, 0);
return; /* this should not happen... */
@@ -347,7 +350,7 @@
"GNUNETD",
"DISABLE-AUTOCONNECT",
GNUNET_NO);
- slotCount = coreAPI->getSlotCount ();
+ slotCount = coreAPI->GNUNET_CORE_connection_get_slot_count ();
if ((GNUNET_NO == autoconnect) && (saturation < 1))
{
if (saturation * MAX_PEERS_PER_SLOT >= 1)
@@ -359,7 +362,7 @@
if (GNUNET_random_u32
(GNUNET_RANDOM_QUALITY_WEAK, LIVE_SCAN_EFFECTIVENESS) != 0)
continue;
- if (minint > coreAPI->isSlotUsed (i))
+ if (minint > coreAPI->GNUNET_CORE_connection_is_slot_used (i))
scanForHosts (i);
}
}
@@ -589,8 +592,9 @@
_
("Fewer friends specified than required by minimum
friend count. Will only connect to friends.\n"));
}
- if ((minimum_friend_count > coreAPI->getSlotCount ()) &&
- (friends_only == GNUNET_NO))
+ if ((minimum_friend_count >
+ coreAPI->GNUNET_CORE_connection_get_slot_count ())
+ && (friends_only == GNUNET_NO))
{
GNUNET_GE_LOG (ectx,
GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
@@ -608,27 +612,27 @@
static GNUNET_Topology_ServiceAPI api;
coreAPI = capi;
- identity = capi->requestService ("identity");
+ identity = capi->GNUNET_CORE_request_service ("identity");
if (identity == NULL)
{
GNUNET_GE_BREAK (capi->ectx, 0);
return NULL;
}
- transport = capi->requestService ("transport");
+ transport = capi->GNUNET_CORE_request_service ("transport");
if (transport == NULL)
{
GNUNET_GE_BREAK (capi->ectx, 0);
- capi->releaseService (identity);
+ capi->GNUNET_CORE_release_service (identity);
identity = NULL;
return NULL;
}
- pingpong = capi->requestService ("pingpong");
+ pingpong = capi->GNUNET_CORE_request_service ("pingpong");
if (pingpong == NULL)
{
GNUNET_GE_BREAK (capi->ectx, 0);
- capi->releaseService (identity);
+ capi->GNUNET_CORE_release_service (identity);
identity = NULL;
- capi->releaseService (transport);
+ capi->GNUNET_CORE_release_service (transport);
transport = NULL;
return NULL;
}
@@ -636,11 +640,11 @@
&rereadConfiguration, NULL))
{
GNUNET_GE_BREAK (coreAPI->ectx, 0);
- capi->releaseService (identity);
+ capi->GNUNET_CORE_release_service (identity);
identity = NULL;
- capi->releaseService (transport);
+ capi->GNUNET_CORE_release_service (transport);
transport = NULL;
- capi->releaseService (pingpong);
+ capi->GNUNET_CORE_release_service (pingpong);
pingpong = NULL;
return NULL;
}
@@ -661,11 +665,11 @@
GNUNET_cron_del_job (coreAPI->cron, &cronCheckLiveness, LIVE_SCAN_FREQUENCY,
NULL);
GNUNET_GC_detach_change_listener (coreAPI->cfg, &rereadConfiguration, NULL);
- coreAPI->releaseService (identity);
+ coreAPI->GNUNET_CORE_release_service (identity);
identity = NULL;
- coreAPI->releaseService (transport);
+ coreAPI->GNUNET_CORE_release_service (transport);
transport = NULL;
- coreAPI->releaseService (pingpong);
+ coreAPI->GNUNET_CORE_release_service (pingpong);
pingpong = NULL;
coreAPI = NULL;
GNUNET_array_grow (friends, friendCount, 0);
@@ -692,7 +696,7 @@
initialize_module_topology_default (GNUNET_CoreAPIForPlugins * capi)
{
myCapi = capi;
- myTopology = capi->requestService ("topology");
+ myTopology = capi->GNUNET_CORE_request_service ("topology");
GNUNET_GE_ASSERT (capi->ectx, myTopology != NULL);
GNUNET_GE_ASSERT (capi->ectx,
0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
@@ -707,7 +711,7 @@
void
done_module_topology_default ()
{
- myCapi->releaseService (myTopology);
+ myCapi->GNUNET_CORE_release_service (myTopology);
myCapi = NULL;
myTopology = NULL;
}
Modified: GNUnet/src/applications/tracekit/tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/tracekit.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/tracekit/tracekit.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -138,8 +138,9 @@
peerList[0],
&((P2P_tracekit_reply_MESSAGE_GENERIC *) reply)->
peerList[0], hostCount * sizeof (GNUNET_PeerIdentity));
- coreAPI->sendToClient (clients[idx], &csReply->header,
- GNUNET_YES);
+ coreAPI->GNUNET_CORE_cs_send_to_client (clients[idx],
+ &csReply->header,
+ GNUNET_YES);
GNUNET_free (csReply);
}
else
@@ -447,7 +448,8 @@
if (GNUNET_SYSERR == capi->registerHandler (GNUNET_P2P_PROTO_TRACEKIT_REPLY,
&handlep2pReply))
ok = GNUNET_SYSERR;
- if (GNUNET_SYSERR == capi->registerClientExitHandler (&clientExitHandler))
+ if (GNUNET_SYSERR ==
+ capi->GNUNET_CORE_cs_register_exit_handler (&clientExitHandler))
ok = GNUNET_SYSERR;
if (GNUNET_SYSERR ==
capi->registerClientHandler (GNUNET_CS_PROTO_TRACEKIT_PROBE,
@@ -472,7 +474,7 @@
&handlep2pProbe);
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_TRACEKIT_REPLY,
&handlep2pReply);
- coreAPI->unregisterClientExitHandler (&clientExitHandler);
+ coreAPI->GNUNET_CORE_cs_exit_handler_unregister (&clientExitHandler);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_TRACEKIT_PROBE,
&csHandle);
for (i = 0; i < MAXROUTE; i++)
Modified: GNUnet/src/applications/traffic/traffic.c
===================================================================
--- GNUnet/src/applications/traffic/traffic.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/applications/traffic/traffic.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -347,7 +347,8 @@
return GNUNET_SYSERR;
msg = (const CS_traffic_request_MESSAGE *) message;
reply = buildReply (ntohl (msg->timePeriod));
- ret = coreAPI->sendToClient (sock, &reply->header, GNUNET_YES);
+ ret =
+ coreAPI->GNUNET_CORE_cs_send_to_client (sock, &reply->header, GNUNET_YES);
GNUNET_free (reply);
return ret;
}
@@ -581,17 +582,18 @@
api.get = &getTrafficStats;
for (i = 0; i < GNUNET_P2P_PROTO_MAX_USED; i++)
stat_traffic_transmitted_by_type[i] = 0;
- coreAPI->registerSendNotify (&trafficSend);
+ coreAPI->
+ GNUNET_CORE_connection_register_send_notification_callback (&trafficSend);
for (i = 0; i < GNUNET_P2P_PROTO_MAX_USED; i++)
{
stat_traffic_received_by_type[i] = 0;
coreAPI->registerHandler (i, &trafficReceive);
- coreAPI->registerPlaintextHandler (i, &plaintextReceive);
+ coreAPI->GNUNET_CORE_plaintext_register_handler (i, &plaintextReceive);
}
GNUNET_GE_ASSERT (coreAPI->ectx, counters == NULL);
lock = GNUNET_mutex_create (GNUNET_NO);
- stats = capi->requestService ("stats");
+ stats = capi->GNUNET_CORE_request_service ("stats");
return &api;
}
@@ -606,10 +608,13 @@
for (i = 0; i < GNUNET_P2P_PROTO_MAX_USED; i++)
{
coreAPI->unregisterHandler (i, &trafficReceive);
- coreAPI->unregisterPlaintextHandler (i, &plaintextReceive);
+ coreAPI->GNUNET_CORE_plaintext_unregister_handler (i,
+ &plaintextReceive);
}
- coreAPI->unregisterSendNotify (&trafficSend);
- coreAPI->releaseService (stats);
+ coreAPI->
+ GNUNET_CORE_connection_unregister_send_notification_callback
+ (&trafficSend);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
for (i = 0; i < max_message_type; i++)
GNUNET_free_non_null (counters[i]);
@@ -632,7 +637,7 @@
{
GNUNET_GE_ASSERT (capi->ectx, myCoreAPI == NULL);
myCoreAPI = capi;
- myApi = capi->requestService ("traffic");
+ myApi = capi->GNUNET_CORE_request_service ("traffic");
if (myApi == NULL)
{
GNUNET_GE_BREAK (capi->ectx, 0);
@@ -663,7 +668,7 @@
myCoreAPI->
unregisterClientHandler (GNUNET_CS_PROTO_TRAFFIC_QUERY,
&trafficQueryHandler));
- myCoreAPI->releaseService (myApi);
+ myCoreAPI->GNUNET_CORE_release_service (myApi);
myApi = NULL;
myCoreAPI = NULL;
}
Modified: GNUnet/src/applications/transport/transport.c
===================================================================
--- GNUnet/src/applications/transport/transport.c 2007-12-12 06:59:59 UTC
(rev 5873)
+++ GNUnet/src/applications/transport/transport.c 2007-12-12 07:52:18 UTC
(rev 5874)
@@ -721,7 +721,7 @@
hello_live *= 60;
GNUNET_GE_ASSERT (ectx, sizeof (GNUNET_MessageHello) == 600);
- identity = capi->requestService ("identity");
+ identity = capi->GNUNET_CORE_request_service ("identity");
if (identity == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -735,9 +735,10 @@
ctapi.load_monitor = coreAPI->load_monitor;
ctapi.cron = coreAPI->cron;
ctapi.receive = NULL; /* initialized LATER! */
- ctapi.requestService = coreAPI->requestService;
- ctapi.releaseService = coreAPI->releaseService;
- ctapi.assertUnused = coreAPI->assertUnused;
+ ctapi.GNUNET_CORE_request_service = coreAPI->GNUNET_CORE_request_service;
+ ctapi.GNUNET_CORE_release_service = coreAPI->GNUNET_CORE_release_service;
+ ctapi.GNUNET_CORE_connection_assert_tsession_unused =
+ coreAPI->GNUNET_CORE_connection_assert_tsession_unused;
GNUNET_array_grow (tapis, tapis_count,
GNUNET_TRANSPORT_PROTOCOL_NUMBER_UDP + 1);
@@ -875,7 +876,7 @@
tapis_lock = NULL;
GNUNET_array_grow (tapis, tapis_count, 0);
- coreAPI->releaseService (identity);
+ coreAPI->GNUNET_CORE_release_service (identity);
identity = NULL;
coreAPI = NULL;
return GNUNET_OK;
Modified: GNUnet/src/applications/vpn/vpn.c
===================================================================
--- GNUnet/src/applications/vpn/vpn.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/applications/vpn/vpn.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -241,13 +241,14 @@
b->size = htons (sizeof (GNUNET_MessageHeader) + strlen ((char *) (b + 1)));
if (c != NULL)
{
- coreAPI->sendToClient (c, b, GNUNET_YES);
+ coreAPI->GNUNET_CORE_cs_send_to_client (c, b, GNUNET_YES);
}
else
{
for (r = 0; r < clients_entries; r++)
{
- coreAPI->sendToClient (*(clients_store + r), b, GNUNET_YES);
+ coreAPI->GNUNET_CORE_cs_send_to_client (*(clients_store + r), b,
+ GNUNET_YES);
}
}
GNUNET_free (b);
@@ -1749,7 +1750,8 @@
if (GNUNET_SYSERR ==
capi->registerHandler (GNUNET_P2P_PROTO_HANG_UP, &handlep2pMSG))
return GNUNET_SYSERR;
- if (GNUNET_SYSERR == capi->registerClientExitHandler (&clientExitHandler))
+ if (GNUNET_SYSERR ==
+ capi->GNUNET_CORE_cs_register_exit_handler (&clientExitHandler))
return GNUNET_SYSERR;
if (GNUNET_SYSERR ==
capi->registerClientHandler (GNUNET_CS_PROTO_VPN_MSG, &csHandle))
@@ -1785,8 +1787,8 @@
capi->registerClientHandler (GNUNET_CS_PROTO_VPN_REPLY, &csHandle))
return GNUNET_SYSERR;
- identity = coreAPI->requestService ("identity");
- session = coreAPI->requestService ("session");
+ identity = coreAPI->GNUNET_CORE_request_service ("identity");
+ session = coreAPI->GNUNET_CORE_request_service ("session");
GNUNET_GE_ASSERT (ectx, identity != NULL);
GNUNET_GE_ASSERT (ectx, session != NULL);
@@ -1845,7 +1847,7 @@
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_VPN_ADD, &csHandle);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_VPN_TRUST, &csHandle);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_VPN_REPLY, &csHandle);
- coreAPI->unregisterClientExitHandler (&clientExitHandler);
+ coreAPI->GNUNET_CORE_cs_exit_handler_unregister (&clientExitHandler);
GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
_("RFC4193 Waiting for tun thread to end\n"));
@@ -1865,8 +1867,8 @@
GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
_("RFC4193 The tun thread has ended\n"));
- coreAPI->releaseService (identity);
- coreAPI->releaseService (session);
+ coreAPI->GNUNET_CORE_release_service (identity);
+ coreAPI->GNUNET_CORE_release_service (session);
identity = NULL;
Modified: GNUnet/src/include/core.h
===================================================================
--- GNUnet/src/include/core.h 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/include/core.h 2007-12-12 07:52:18 UTC (rev 5874)
@@ -33,30 +33,30 @@
/**
* Initialize the CORE's globals.
*/
-int initCore (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_CronManager *cron,
- struct GNUNET_LoadMonitor *monitor);
+int GNUNET_CORE_init (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ struct GNUNET_CronManager *cron,
+ struct GNUNET_LoadMonitor *monitor);
/**
* Shutdown the CORE modules (also shuts down all
* application modules).
*/
-void doneCore (void);
+void GNUNET_CORE_done (void);
-void *requestService (const char *pos);
+void *GNUNET_CORE_request_service (const char *pos);
-int releaseService (void *service);
+int GNUNET_CORE_release_service (void *service);
/**
* @return GNUNET_OK on success, GNUNET_SYSERR if some modules failed to unload
*/
-int unloadApplicationModules (void);
+int GNUNET_CORE_unload_application_modules (void);
/**
* @return GNUNET_OK on success, GNUNET_SYSERR if some modules failed to load
*/
-int loadApplicationModules (void);
+int GNUNET_CORE_load_application_modules (void);
Modified: GNUnet/src/include/gnunet_core.h
===================================================================
--- GNUnet/src/include/gnunet_core.h 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/include/gnunet_core.h 2007-12-12 07:52:18 UTC (rev 5874)
@@ -249,7 +249,7 @@
* loaded or unloaded inside the module initialization or shutdown
* code.
*/
- void *(*requestService) (const char *name);
+ void *(*GNUNET_CORE_request_service) (const char *name);
/**
* Notification that the given service is no longer required. This
@@ -261,7 +261,7 @@
*
* @return GNUNET_OK if service was successfully released, GNUNET_SYSERR on
error
*/
- int (*releaseService) (void *service);
+ int (*GNUNET_CORE_release_service) (void *service);
/* ****************** P2P data exchange **************** */
@@ -277,8 +277,9 @@
* @param msg the message to transmit, should contain MESSAGE_HEADERs
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
- int (*sendPlaintext) (GNUNET_TSession * session,
- const char *msg, unsigned int size);
+ int (*GNUNET_CORE_connection_send_plaintext) (GNUNET_TSession * session,
+ const char *msg,
+ unsigned int size);
/**
* Send an encrypted message to another node.
@@ -303,11 +304,14 @@
* @param importance how important is the message?
* @param maxdelay how long can the message wait?
*/
- void (*unicastCallback) (const GNUNET_PeerIdentity * receiver,
- GNUNET_BuildMessageCallback callback,
- void *closure,
- unsigned short len,
- unsigned int importance, unsigned int maxdelay);
+ void (*GNUNET_CORE_connection_send_using_callback) (const
+ GNUNET_PeerIdentity *
+ receiver,
+
GNUNET_BuildMessageCallback
+ callback, void *closure,
+ unsigned short len,
+ unsigned int importance,
+ unsigned int maxdelay);
/**
* Perform an operation for all connected hosts.
@@ -339,15 +343,19 @@
* that buffer (must be a positive number).
* @return GNUNET_OK if the handler was registered, GNUNET_SYSERR on error
*/
- int (*registerSendCallback) (const unsigned int minimumPadding,
- GNUNET_BufferFillCallback callback);
+ int (*GNUNET_CORE_connection_register_send_callback) (const unsigned int
+ minimumPadding,
+
GNUNET_BufferFillCallback
+ callback);
/**
- * Unregister a handler that was registered with registerSendCallback.
+ * Unregister a handler that was registered with
GNUNET_CORE_connection_register_send_callback.
* @return GNUNET_OK if the handler was removed, GNUNET_SYSERR on error
*/
- int (*unregisterSendCallback) (const unsigned int minimumPadding,
- GNUNET_BufferFillCallback callback);
+ int (*GNUNET_CORE_connection_unregister_send_callback) (const unsigned int
+ minimumPadding,
+
GNUNET_BufferFillCallback
+ callback);
/**
* Register a handler that is to be called for each
@@ -357,7 +365,8 @@
* P2P message part that is transmitted
* @return GNUNET_OK on success, GNUNET_SYSERR if there is a problem
*/
- int (*registerSendNotify) (GNUNET_P2PRequestHandler callback);
+ int (*GNUNET_CORE_connection_register_send_notification_callback)
+ (GNUNET_P2PRequestHandler callback);
/**
* Unregister a handler that is to be called for each
@@ -367,7 +376,8 @@
* P2P message part that is transmitted
* @return GNUNET_OK on success, GNUNET_SYSERR if there is a problem
*/
- int (*unregisterSendNotify) (GNUNET_P2PRequestHandler callback);
+ int (*GNUNET_CORE_connection_unregister_send_notification_callback)
+ (GNUNET_P2PRequestHandler callback);
/* ********************* handlers ***************** */
@@ -407,8 +417,8 @@
* @return number of handlers registered, 0 for none,
* GNUNET_SYSERR for invalid value of handlerType
*/
- int (*isHandlerRegistered) (unsigned short type,
- unsigned short handlerType);
+ int (*GNUNET_CORE_p2p_test_handler_registered) (unsigned short type,
+ unsigned short handlerType);
/**
* Register a method as a handler for specific message
@@ -419,9 +429,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is already a
* handler for that type
*/
- int (*registerPlaintextHandler) (unsigned short type,
- GNUNET_P2PPlaintextRequestHandler
- callback);
+ int (*GNUNET_CORE_plaintext_register_handler) (unsigned short type,
+
GNUNET_P2PPlaintextRequestHandler
+ callback);
/**
* Unregister a method as a handler for specific message
@@ -433,9 +443,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is a different
* handler for that type
*/
- int (*unregisterPlaintextHandler) (unsigned short type,
- GNUNET_P2PPlaintextRequestHandler
- callback);
+ int (*GNUNET_CORE_plaintext_unregister_handler) (unsigned short type,
+
GNUNET_P2PPlaintextRequestHandler
+ callback);
/* ***************** traffic management ******************* */
@@ -461,9 +471,15 @@
* @param forSending GNUNET_NO if it is the key for receiving,
* GNUNET_YES if it is the key for sending
*/
- void (*assignSessionKey) (const GNUNET_AES_SessionKey * key,
- const GNUNET_PeerIdentity * peer,
- GNUNET_Int32Time age, int forSending);
+ void (*GNUNET_CORE_connection_assign_session_key_to_peer) (const
+
GNUNET_AES_SessionKey
+ * key,
+ const
+
GNUNET_PeerIdentity
+ * peer,
+ GNUNET_Int32Time
+ age,
+ int forSending);
/**
* Obtain the session key used for traffic from or to a given peer.
@@ -476,9 +492,13 @@
* @return GNUNET_SYSERR if no sessionkey is known to the core,
* GNUNET_OK if the sessionkey was set.
*/
- int (*getCurrentSessionKey) (const GNUNET_PeerIdentity * peer,
- GNUNET_AES_SessionKey * key,
- GNUNET_Int32Time * age, int forSending);
+ int (*GNUNET_CORE_connection_get_session_key_of_peer) (const
+ GNUNET_PeerIdentity *
+ peer,
+ GNUNET_AES_SessionKey
+ * key,
+ GNUNET_Int32Time *
+ age, int forSending);
/**
* We have confirmed that the other peer is communicating with us,
@@ -487,7 +507,9 @@
* this could happen if in between the core has discarded
* the session information).
*/
- void (*confirmSessionUp) (const GNUNET_PeerIdentity * peer);
+ void (*GNUNET_CORE_connection_mark_session_as_confirmed) (const
+ GNUNET_PeerIdentity
+ * peer);
/**
* Increase the preference for traffic from some other peer.
@@ -515,7 +537,9 @@
*
* @param peer the peer to disconnect
*/
- void (*disconnectFromPeer) (const GNUNET_PeerIdentity * peer);
+ void (*GNUNET_CORE_connection_disconnect_from_peer) (const
+ GNUNET_PeerIdentity *
+ peer);
/* **************** Client-server interaction **************** */
@@ -535,7 +559,7 @@
* on the other hand does NOT confirm delivery since the actual
* transfer happens asynchronously.
*/
- GNUNET_SendToClientCallback sendToClient;
+ GNUNET_SendToClientCallback GNUNET_CORE_cs_send_to_client;
/**
* Register a method as a handler for specific message
@@ -567,7 +591,8 @@
* of every client that disconnected.
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
- int (*registerClientExitHandler) (GNUNET_ClientExitHandler callback);
+ int (*GNUNET_CORE_cs_register_exit_handler) (GNUNET_ClientExitHandler
+ callback);
/**
* Unregister a handler to call if any client exits.
@@ -575,13 +600,16 @@
* of every client that disconnected.
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
- int (*unregisterClientExitHandler) (GNUNET_ClientExitHandler callback);
+ int (*GNUNET_CORE_cs_exit_handler_unregister) (GNUNET_ClientExitHandler
+ callback);
/**
* Terminate the connection with the given client (asynchronous
* detection of a protocol violation).
*/
- void (*terminateClientConnection) (struct GNUNET_ClientHandle * handle);
+ void (*GNUNET_CORE_cs_terminate_client_connection) (struct
+ GNUNET_ClientHandle *
+ handle);
/* ************************ MISC ************************ */
@@ -596,35 +624,38 @@
* @param session for plaintext messages, the
* assumed transport session. Maybe NULL.
*/
- void (*injectMessage) (const GNUNET_PeerIdentity * sender,
- const char *msg,
- unsigned int size,
- int wasEncrypted, GNUNET_TSession * session);
+ void (*GNUNET_CORE_p2p_inject_message) (const GNUNET_PeerIdentity * sender,
+ const char *msg,
+ unsigned int size,
+ int wasEncrypted,
+ GNUNET_TSession * session);
/**
* Compute the index (small, positive, pseudo-unique identification
* number) of a hostId.
*/
- unsigned int (*computeIndex) (const GNUNET_PeerIdentity * hostId);
+ unsigned int (*GNUNET_CORE_connection_compute_index_of_peer) (const
+
GNUNET_PeerIdentity
+ * hostId);
/**
* The the lock of the connection module. A module that registers
* callbacks may need this.
*/
- struct GNUNET_Mutex *(*getConnectionModuleLock) (void);
+ struct GNUNET_Mutex *(*GNUNET_CORE_connection_get_lock) (void);
/**
* Get the current number of slots in the connection table (as computed
* from the available bandwidth).
*/
- int (*getSlotCount) (void);
+ int (*GNUNET_CORE_connection_get_slot_count) (void);
/**
* Is the given slot used?
* @return 0 if not, otherwise number of peers in
* the slot
*/
- int (*isSlotUsed) (int slot);
+ int (*GNUNET_CORE_connection_is_slot_used) (int slot);
/**
* Get the time of the last encrypted message that was received
@@ -632,8 +663,11 @@
* @param time updated with the time
* @return GNUNET_SYSERR if we are not connected to the peer at the moment
*/
- int (*getLastActivityOf) (const GNUNET_PeerIdentity * peer,
- GNUNET_CronTime * time);
+ int (*GNUNET_CORE_connection_get_last_activity_of_peer) (const
+ GNUNET_PeerIdentity
+ * peer,
+ GNUNET_CronTime *
+ time);
/* here for binary compatibility (for now) */
@@ -647,12 +681,13 @@
int (*sendErrorMessageToClient) (struct GNUNET_ClientHandle * handle,
GNUNET_GE_KIND kind, const char *value);
- struct GNUNET_GE_Context *(*createClientLogContext) (GNUNET_GE_KIND mask,
- struct
- GNUNET_ClientHandle *
- handle);
+ struct GNUNET_GE_Context
+ *(*GNUNET_CORE_cs_create_client_log_context) (GNUNET_GE_KIND mask,
+ struct GNUNET_ClientHandle *
+ handle);
- int (*assertUnused) (GNUNET_TSession * tsession);
+ int (*GNUNET_CORE_connection_assert_tsession_unused) (GNUNET_TSession *
+ tsession);
} GNUNET_CoreAPIForPlugins;
@@ -724,7 +759,7 @@
* loaded or unloaded inside the module initialization or shutdown
* code.
*/
- void *(*requestService) (const char *name);
+ void *(*GNUNET_CORE_request_service) (const char *name);
/**
* Notification that the given service is no longer required. This
@@ -736,7 +771,7 @@
*
* @return GNUNET_OK if service was successfully released, GNUNET_SYSERR on
error
*/
- int (*releaseService) (void *service);
+ int (*GNUNET_CORE_release_service) (void *service);
} GNUNET_UpdateAPI;
Modified: GNUnet/src/include/gnunet_transport.h
===================================================================
--- GNUnet/src/include/gnunet_transport.h 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/include/gnunet_transport.h 2007-12-12 07:52:18 UTC (rev
5874)
@@ -144,7 +144,7 @@
* loaded or unloaded inside the module initialization or shutdown
* code.
*/
- void *(*requestService) (const char *name);
+ void *(*GNUNET_CORE_request_service) (const char *name);
/**
* Notification that the given service is no longer required. This
@@ -156,9 +156,10 @@
*
* @return GNUNET_OK if service was successfully released, GNUNET_SYSERR on
error
*/
- int (*releaseService) (void *service);
+ int (*GNUNET_CORE_release_service) (void *service);
- int (*assertUnused) (GNUNET_TSession * tsession);
+ int (*GNUNET_CORE_connection_assert_tsession_unused) (GNUNET_TSession *
+ tsession);
} GNUNET_CoreAPIForTransport;
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/connection.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -718,7 +718,7 @@
* Update available_send_window. Call only when already synchronized.
* @param be the connection for which to update available_send_window
*/
-void
+static void
updateCurBPS (BufferEntry * be)
{
GNUNET_CronTime now;
@@ -2016,7 +2016,8 @@
{
BufferEntry *root;
- root = CONNECTION_buffer_[computeIndex (hostId)];
+ root =
+ CONNECTION_buffer_[GNUNET_CORE_connection_compute_index_of_peer (hostId)];
while (root != NULL)
{
if (0 == memcmp (&hostId->hashPubKey,
@@ -2048,7 +2049,7 @@
ENTRY ();
root = lookForHost (hostId);
- index = computeIndex (hostId);
+ index = GNUNET_CORE_connection_compute_index_of_peer (hostId);
if (root == NULL)
{
root = CONNECTION_buffer_[index];
@@ -2116,7 +2117,7 @@
}
/**
- * Little helper function for forEachConnectedNode.
+ * Little helper function for GNUNET_CORE_connection_iterate_peers.
*
* @param be the connection
* @param arg closure of type fENHWrap giving the function
@@ -2880,9 +2881,12 @@
msgBuf, hSize);
if (mSize > 0)
{
- unicast (&root->session.sender,
- (GNUNET_MessageHeader *) msgBuf,
- 0, 5 * GNUNET_CRON_MINUTES);
+ GNUNET_CORE_connection_unicast (&root->session.
+ sender,
+
(GNUNET_MessageHeader
+ *) msgBuf, 0,
+ 5 *
+
GNUNET_CRON_MINUTES);
if (mSize > hSize)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -2962,8 +2966,9 @@
* GNUNET_SYSERR if it was malformed
*/
int
-checkHeader (const GNUNET_PeerIdentity * sender,
- GNUNET_TransportPacket_HEADER * msg, unsigned short size)
+GNUNET_CORE_connection_check_header (const GNUNET_PeerIdentity * sender,
+ GNUNET_TransportPacket_HEADER * msg,
+ unsigned short size)
{
BufferEntry *be;
int res;
@@ -3176,9 +3181,11 @@
* GNUNET_YES if it is the key for sending
*/
void
-assignSessionKey (const GNUNET_AES_SessionKey * key,
- const GNUNET_PeerIdentity * peer, GNUNET_Int32Time age,
- int forSending)
+GNUNET_CORE_connection_assign_session_key_to_peer (const GNUNET_AES_SessionKey
+ * key,
+ const GNUNET_PeerIdentity *
+ peer, GNUNET_Int32Time age,
+ int forSending)
{
BufferEntry *be;
@@ -3223,7 +3230,8 @@
* @param peer the other peer,
*/
void
-confirmSessionUp (const GNUNET_PeerIdentity * peer)
+GNUNET_CORE_connection_mark_session_as_confirmed (const GNUNET_PeerIdentity *
+ peer)
{
BufferEntry *be;
@@ -3266,7 +3274,7 @@
* from the available bandwidth).
*/
int
-getSlotCount ()
+GNUNET_CORE_connection_get_slot_count ()
{
return CONNECTION_MAX_HOSTS_;
}
@@ -3277,7 +3285,7 @@
* the slot
*/
int
-isSlotUsed (int slot)
+GNUNET_CORE_connection_is_slot_used (int slot)
{
BufferEntry *be;
int ret;
@@ -3307,7 +3315,9 @@
* @return GNUNET_SYSERR if we are not connected to the peer at the moment
*/
int
-getLastActivityOf (const GNUNET_PeerIdentity * peer, GNUNET_CronTime * time)
+GNUNET_CORE_connection_get_last_activity_of_peer (const GNUNET_PeerIdentity *
+ peer,
+ GNUNET_CronTime * time)
{
int ret;
BufferEntry *be;
@@ -3343,9 +3353,11 @@
* GNUNET_OK if the sessionkey was set.
*/
int
-getCurrentSessionKey (const GNUNET_PeerIdentity * peer,
- GNUNET_AES_SessionKey * key, GNUNET_Int32Time * age,
- int forSending)
+GNUNET_CORE_connection_get_session_key_of_peer (const GNUNET_PeerIdentity *
+ peer,
+ GNUNET_AES_SessionKey * key,
+ GNUNET_Int32Time * age,
+ int forSending)
{
int ret;
BufferEntry *be;
@@ -3399,8 +3411,8 @@
* @param sender the identity of the other node
*/
void
-considerTakeover (const GNUNET_PeerIdentity * sender,
- GNUNET_TSession * tsession)
+GNUNET_CORE_connection_consider_takeover (const GNUNET_PeerIdentity * sender,
+ GNUNET_TSession * tsession)
{
BufferEntry *be;
unsigned int cost;
@@ -3532,7 +3544,10 @@
unsigned int j;
next = be->overflowChain;
- j = computeIndex (&be->session.sender);
+ j =
+ GNUNET_CORE_connection_compute_index_of_peer (&be->
+ session.
+ sender);
be->overflowChain = newBuffer[j];
newBuffer[j] = be;
be = next;
@@ -3561,9 +3576,10 @@
* Initialize this module.
*/
void
-initConnection (struct GNUNET_GE_Context *e,
- struct GNUNET_GC_Configuration *c,
- struct GNUNET_LoadMonitor *m, struct GNUNET_CronManager *cm)
+GNUNET_CORE_connection_init (struct GNUNET_GE_Context *e,
+ struct GNUNET_GC_Configuration *c,
+ struct GNUNET_LoadMonitor *m,
+ struct GNUNET_CronManager *cm)
{
ectx = e;
cfg = c;
@@ -3582,7 +3598,7 @@
&connectionConfigChangeCallback,
NULL));
GNUNET_GE_ASSERT (ectx, CONNECTION_MAX_HOSTS_ != 0);
- registerp2pHandler (GNUNET_P2P_PROTO_HANG_UP, &handleHANGUP);
+ GNUNET_CORE_p2p_register_handler (GNUNET_P2P_PROTO_HANG_UP, &handleHANGUP);
GNUNET_cron_add_job (cron,
&cronDecreaseLiveness, CDL_FREQUENCY, CDL_FREQUENCY,
NULL);
@@ -3590,17 +3606,17 @@
prioFile = FOPEN ("/tmp/knapsack_prio.txt", "w");
#endif
- transport = requestService ("transport");
+ transport = GNUNET_CORE_request_service ("transport");
GNUNET_GE_ASSERT (ectx, transport != NULL);
- identity = requestService ("identity");
+ identity = GNUNET_CORE_request_service ("identity");
GNUNET_GE_ASSERT (ectx, identity != NULL);
- session = requestService ("session");
+ session = GNUNET_CORE_request_service ("session");
GNUNET_GE_ASSERT (ectx, session != NULL);
- fragmentation = requestService ("fragmentation");
+ fragmentation = GNUNET_CORE_request_service ("fragmentation");
GNUNET_GE_ASSERT (ectx, fragmentation != NULL);
- topology = requestService ("topology");
+ topology = GNUNET_CORE_request_service ("topology");
GNUNET_GE_ASSERT (ectx, topology != NULL);
- stats = requestService ("stats");
+ stats = GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_messagesDropped = stats->create (gettext_noop ( /* number of
messages dropped by GNUnet core
@@ -3654,7 +3670,7 @@
stats->
create (gettext_noop ("# transports switched to stream transport"));
}
- transport->start (&core_receive);
+ transport->start (&GNUNET_CORE_p2p_receive);
EXIT ();
}
@@ -3663,7 +3679,7 @@
* Shutdown the connection module.
*/
void
-doneConnection ()
+GNUNET_CORE_connection_done ()
{
unsigned int i;
BufferEntry *be;
@@ -3704,17 +3720,17 @@
}
scl_nextTail = NULL;
transport->stop ();
- releaseService (transport);
+ GNUNET_CORE_release_service (transport);
transport = NULL;
- releaseService (identity);
+ GNUNET_CORE_release_service (identity);
identity = NULL;
- releaseService (session);
+ GNUNET_CORE_release_service (session);
session = NULL;
- releaseService (fragmentation);
+ GNUNET_CORE_release_service (fragmentation);
fragmentation = NULL;
- releaseService (topology);
+ GNUNET_CORE_release_service (topology);
topology = NULL;
- releaseService (stats);
+ GNUNET_CORE_release_service (stats);
stats = NULL;
#if DEBUG_COLLECT_PRIO
if (prioFile != NULL)
@@ -3739,7 +3755,8 @@
* @return number of connected nodes
*/
int
-forEachConnectedNode (GNUNET_NodeIteratorCallback method, void *arg)
+GNUNET_CORE_connection_iterate_peers (GNUNET_NodeIteratorCallback method,
+ void *arg)
{
fENHWrap wrap;
int ret;
@@ -3758,7 +3775,7 @@
* Print the contents of the connection buffer (for debugging).
*/
void
-printConnectionBuffer ()
+GNUNET_CORE_connection_print_buffer ()
{
unsigned int i;
BufferEntry *tmp;
@@ -3826,8 +3843,10 @@
* @return GNUNET_OK if the handler was registered, GNUNET_SYSERR on error
*/
int
-registerSendCallback (const unsigned int minimumPadding,
- GNUNET_BufferFillCallback callback)
+GNUNET_CORE_connection_register_send_callback (const unsigned int
+ minimumPadding,
+ GNUNET_BufferFillCallback
+ callback)
{
SendCallbackList *scl;
@@ -3853,7 +3872,7 @@
}
/**
- * Unregister a handler that was registered with registerSendCallback.
+ * Unregister a handler that was registered with
GNUNET_CORE_connection_register_send_callback.
*
* @param minimumPadding how large must the padding be in order
* to call this method?
@@ -3866,8 +3885,10 @@
* @return GNUNET_OK if the handler was removed, GNUNET_SYSERR on error
*/
int
-unregisterSendCallback (const unsigned int minimumPadding,
- GNUNET_BufferFillCallback callback)
+GNUNET_CORE_connection_unregister_send_callback (const unsigned int
+ minimumPadding,
+ GNUNET_BufferFillCallback
+ callback)
{
SendCallbackList *pos;
SendCallbackList *prev;
@@ -3913,7 +3934,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on failure, GNUNET_NO on
temporary failure
*/
int
-sendPlaintext (GNUNET_TSession * tsession, const char *msg, unsigned int size)
+GNUNET_CORE_connection_send_plaintext (GNUNET_TSession * tsession,
+ const char *msg, unsigned int size)
{
char *buf;
int ret;
@@ -3958,11 +3980,13 @@
* @param maxdelay how long can the message wait?
*/
void
-unicastCallback (const GNUNET_PeerIdentity * hostId,
- GNUNET_BuildMessageCallback callback,
- void *closure,
- unsigned short len,
- unsigned int importance, unsigned int maxdelay)
+GNUNET_CORE_connection_send_using_callback (const GNUNET_PeerIdentity *
+ hostId,
+ GNUNET_BuildMessageCallback
+ callback, void *closure,
+ unsigned short len,
+ unsigned int importance,
+ unsigned int maxdelay)
{
BufferEntry *be;
@@ -4001,15 +4025,17 @@
* @param maxdelay how long can the message be delayed?
*/
void
-unicast (const GNUNET_PeerIdentity * receiver,
- const GNUNET_MessageHeader * msg,
- unsigned int importance, unsigned int maxdelay)
+GNUNET_CORE_connection_unicast (const GNUNET_PeerIdentity * receiver,
+ const GNUNET_MessageHeader * msg,
+ unsigned int importance,
+ unsigned int maxdelay)
{
char *closure;
unsigned short len;
ENTRY ();
- if (getBandwidthAssignedTo (receiver, NULL, NULL) != GNUNET_OK)
+ if (GNUNET_CORE_connection_get_bandwidth_assigned_to_peer
+ (receiver, NULL, NULL) != GNUNET_OK)
session->tryConnect (receiver);
if (msg == NULL)
{
@@ -4027,7 +4053,8 @@
}
closure = GNUNET_malloc (len);
memcpy (closure, msg, len);
- unicastCallback (receiver, NULL, closure, len, importance, maxdelay);
+ GNUNET_CORE_connection_send_using_callback (receiver, NULL, closure, len,
+ importance, maxdelay);
EXIT ();
}
@@ -4038,7 +4065,8 @@
* @return the index for this peer in the connection table
*/
unsigned int
-computeIndex (const GNUNET_PeerIdentity * hostId)
+GNUNET_CORE_connection_compute_index_of_peer (const GNUNET_PeerIdentity *
+ hostId)
{
unsigned int res;
@@ -4055,15 +4083,19 @@
* @return the lock
*/
struct GNUNET_Mutex *
-getConnectionModuleLock ()
+GNUNET_CORE_connection_get_lock ()
{
GNUNET_GE_ASSERT (NULL, lock != NULL);
return lock;
}
int
-getBandwidthAssignedTo (const GNUNET_PeerIdentity * node,
- unsigned int *bpm, GNUNET_CronTime * last_seen)
+GNUNET_CORE_connection_get_bandwidth_assigned_to_peer (const
+ GNUNET_PeerIdentity *
+ node,
+ unsigned int *bpm,
+ GNUNET_CronTime *
+ last_seen)
{
BufferEntry *be;
unsigned int ret;
@@ -4094,7 +4126,10 @@
* @param preference how much should the traffic preference be increased?
*/
void
-updateTrafficPreference (const GNUNET_PeerIdentity * node, double preference)
+GNUNET_CORE_connection_update_traffic_preference_for_peer (const
+ GNUNET_PeerIdentity
+ * node,
+ double preference)
{
BufferEntry *be;
@@ -4114,7 +4149,7 @@
* @param peer the peer to disconnect
*/
void
-disconnectFromPeer (const GNUNET_PeerIdentity * node)
+GNUNET_CORE_connection_disconnect_from_peer (const GNUNET_PeerIdentity * node)
{
BufferEntry *be;
@@ -4154,7 +4189,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is a problem
*/
int
-registerSendNotify (GNUNET_P2PRequestHandler callback)
+GNUNET_CORE_connection_register_send_notification_callback
+ (GNUNET_P2PRequestHandler callback)
{
if (callback == NULL)
return GNUNET_SYSERR;
@@ -4176,7 +4212,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is a problem
*/
int
-unregisterSendNotify (GNUNET_P2PRequestHandler callback)
+GNUNET_CORE_connection_unregister_send_notification_callback
+ (GNUNET_P2PRequestHandler callback)
{
int i;
@@ -4206,7 +4243,7 @@
* @return GNUNET_OK if that is true, GNUNET_SYSERR if not.
*/
int
-assertUnused (GNUNET_TSession * tsession)
+GNUNET_CORE_connection_assert_tsession_unused (GNUNET_TSession * tsession)
{
int i;
BufferEntry *root;
@@ -4234,12 +4271,12 @@
}
-void __attribute__ ((constructor)) gnunet_connection_ltdl_init ()
+void __attribute__ ((constructor)) GNUNET_CORE_connection_ltdl_init ()
{
lock = GNUNET_mutex_create (GNUNET_YES);
}
-void __attribute__ ((destructor)) gnunet_connection_ltdl_fini ()
+void __attribute__ ((destructor)) GNUNET_CORE_connection_ltdl_fini ()
{
GNUNET_mutex_destroy (lock);
}
Modified: GNUnet/src/server/connection.h
===================================================================
--- GNUnet/src/server/connection.h 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/connection.h 2007-12-12 07:52:18 UTC (rev 5874)
@@ -57,20 +57,20 @@
/**
* Initialize this module.
*/
-void initConnection (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_LoadMonitor *mon,
- struct GNUNET_CronManager *cron);
+void GNUNET_CORE_connection_init (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ struct GNUNET_LoadMonitor *mon,
+ struct GNUNET_CronManager *cron);
/**
* Shutdown the connection module.
*/
-void doneConnection (void);
+void GNUNET_CORE_connection_done (void);
/**
* For debugging.
*/
-void printConnectionBuffer (void);
+void GNUNET_CORE_connection_print_buffer (void);
/**
* Check the sequence number and timestamp. Decrypts the
@@ -84,8 +84,9 @@
* GNUNET_NO if it was in plaintext,
* GNUNET_SYSERR if it was malformed
*/
-int checkHeader (const GNUNET_PeerIdentity * sender,
- GNUNET_TransportPacket_HEADER * msg, unsigned short size);
+int GNUNET_CORE_connection_check_header (const GNUNET_PeerIdentity * sender,
+ GNUNET_TransportPacket_HEADER * msg,
+ unsigned short size);
/**
* Consider switching the transport mechanism used for contacting the
@@ -98,15 +99,17 @@
* @param tsession the transport session that is for grabs
* @param sender the identity of the other node
*/
-void considerTakeover (const GNUNET_PeerIdentity * sender,
- GNUNET_TSession * tsession);
+void GNUNET_CORE_connection_consider_takeover (const GNUNET_PeerIdentity *
+ sender,
+ GNUNET_TSession * tsession);
/* ***************** CORE API methods ************* */
/**
* Call method for every connected node.
*/
-int forEachConnectedNode (GNUNET_NodeIteratorCallback method, void *arg);
+int GNUNET_CORE_connection_iterate_peers (GNUNET_NodeIteratorCallback method,
+ void *arg);
/**
@@ -121,13 +124,16 @@
* @param msg the message to transmit, should contain MESSAGE_HEADERs
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
-int sendPlaintext (GNUNET_TSession * tsession, const char *msg,
- unsigned int size);
+int GNUNET_CORE_connection_send_plaintext (GNUNET_TSession * tsession,
+ const char *msg,
+ unsigned int size);
/**
* Compute the hashtable index of a host id.
*/
-unsigned int computeIndex (const GNUNET_PeerIdentity * hostId);
+unsigned int GNUNET_CORE_connection_compute_index_of_peer (const
+ GNUNET_PeerIdentity
+ * hostId);
/**
* Register a callback method that should be invoked whenever a
@@ -149,15 +155,19 @@
* that buffer (must be a positive number).
* @return GNUNET_OK if the handler was registered, GNUNET_SYSERR on error
*/
-int registerSendCallback (const unsigned int minimumPadding,
- GNUNET_BufferFillCallback callback);
+int GNUNET_CORE_connection_register_send_callback (const unsigned int
+ minimumPadding,
+ GNUNET_BufferFillCallback
+ callback);
/**
- * Unregister a handler that was registered with registerSendCallback.
+ * Unregister a handler that was registered with
GNUNET_CORE_connection_register_send_callback.
* @return GNUNET_OK if the handler was removed, GNUNET_SYSERR on error
*/
-int unregisterSendCallback (const unsigned int minimumPadding,
- GNUNET_BufferFillCallback callback);
+int GNUNET_CORE_connection_unregister_send_callback (const unsigned int
+ minimumPadding,
+ GNUNET_BufferFillCallback
+ callback);
/**
* Send an encrypted, on-demand build message to another node.
@@ -169,11 +179,13 @@
* @param importance how important is the message?
* @param maxdelay how long can the message wait?
*/
-void unicastCallback (const GNUNET_PeerIdentity * hostId,
- GNUNET_BuildMessageCallback callback,
- void *closure,
- unsigned short len,
- unsigned int importance, unsigned int maxdelay);
+void GNUNET_CORE_connection_send_using_callback (const GNUNET_PeerIdentity *
+ hostId,
+ GNUNET_BuildMessageCallback
+ callback, void *closure,
+ unsigned short len,
+ unsigned int importance,
+ unsigned int maxdelay);
/**
* Send an encrypted message to another node.
@@ -183,14 +195,15 @@
* @param importance how important is the message?
* @param maxdelay how long can the message be delayed?
*/
-void unicast (const GNUNET_PeerIdentity * receiver,
- const GNUNET_MessageHeader * msg,
- unsigned int importance, unsigned int maxdelay);
+void GNUNET_CORE_connection_unicast (const GNUNET_PeerIdentity * receiver,
+ const GNUNET_MessageHeader * msg,
+ unsigned int importance,
+ unsigned int maxdelay);
/**
* Return a pointer to the lock of the connection module.
*/
-struct GNUNET_Mutex *getConnectionModuleLock (void);
+struct GNUNET_Mutex *GNUNET_CORE_connection_get_lock (void);
/* ******************** traffic management ********** */
@@ -199,16 +212,23 @@
* How many bpm did we assign this peer (how much traffic
* may the given peer send to us per minute?)
*/
-int getBandwidthAssignedTo (const GNUNET_PeerIdentity * hostId,
- unsigned int *bpm, GNUNET_CronTime * last_seen);
+int GNUNET_CORE_connection_get_bandwidth_assigned_to_peer (const
+ GNUNET_PeerIdentity
+ * hostId,
+ unsigned int *bpm,
+ GNUNET_CronTime *
+ last_seen);
/**
* Increase the preference for traffic from some other peer.
* @param node the identity of the other peer
* @param preference how much should the traffic preference be increased?
*/
-void updateTrafficPreference (const GNUNET_PeerIdentity * node,
- double preference);
+void GNUNET_CORE_connection_update_traffic_preference_for_peer (const
+
GNUNET_PeerIdentity
+ * node,
+ double
+ preference);
/**
@@ -217,7 +237,8 @@
*
* @param peer the peer to disconnect
*/
-void disconnectFromPeer (const GNUNET_PeerIdentity * node);
+void GNUNET_CORE_connection_disconnect_from_peer (const GNUNET_PeerIdentity *
+ node);
/**
@@ -230,9 +251,14 @@
* @param forSending GNUNET_NO if it is the key for receiving,
* GNUNET_YES if it is the key for sending
*/
-void assignSessionKey (const GNUNET_AES_SessionKey * key,
- const GNUNET_PeerIdentity * peer, GNUNET_Int32Time age,
- int forSending);
+void GNUNET_CORE_connection_assign_session_key_to_peer (const
+ GNUNET_AES_SessionKey
+ * key,
+ const
+ GNUNET_PeerIdentity *
+ peer,
+ GNUNET_Int32Time age,
+ int forSending);
/**
* Obtain the session key used for traffic from or to a given peer.
@@ -245,23 +271,26 @@
* @return GNUNET_SYSERR if no sessionkey is known to the core,
* GNUNET_OK if the sessionkey was set.
*/
-int getCurrentSessionKey (const GNUNET_PeerIdentity * peer,
- GNUNET_AES_SessionKey * key, GNUNET_Int32Time * age,
- int forSending);
+int GNUNET_CORE_connection_get_session_key_of_peer (const GNUNET_PeerIdentity
+ * peer,
+ GNUNET_AES_SessionKey *
+ key,
+ GNUNET_Int32Time * age,
+ int forSending);
/**
* Get the current number of slots in the connection table (as computed
* from the available bandwidth).
*/
-int getSlotCount (void);
+int GNUNET_CORE_connection_get_slot_count (void);
/**
* Is the given slot used?
* @return 0 if not, otherwise number of peers in
* the slot
*/
-int isSlotUsed (int slot);
+int GNUNET_CORE_connection_is_slot_used (int slot);
/**
* Get the time of the last encrypted message that was received
@@ -269,8 +298,10 @@
* @param time updated with the time
* @return GNUNET_SYSERR if we are not connected to the peer at the moment
*/
-int getLastActivityOf (const GNUNET_PeerIdentity * peer,
- GNUNET_CronTime * time);
+int GNUNET_CORE_connection_get_last_activity_of_peer (const
+ GNUNET_PeerIdentity *
+ peer,
+ GNUNET_CronTime * time);
/**
@@ -278,7 +309,9 @@
*
* @param peer the other peer,
*/
-void confirmSessionUp (const GNUNET_PeerIdentity * peer);
+void GNUNET_CORE_connection_mark_session_as_confirmed (const
+ GNUNET_PeerIdentity *
+ peer);
/**
@@ -289,7 +322,9 @@
* P2P message part that is transmitted
* @return GNUNET_OK on success, GNUNET_SYSERR if there is a problem
*/
-int registerSendNotify (GNUNET_P2PRequestHandler callback);
+int
+GNUNET_CORE_connection_register_send_notification_callback
+(GNUNET_P2PRequestHandler callback);
/**
* Unregister a handler that is to be called for each
@@ -299,13 +334,16 @@
* P2P message part that is transmitted
* @return GNUNET_OK on success, GNUNET_SYSERR if there is a problem
*/
-int unregisterSendNotify (GNUNET_P2PRequestHandler callback);
+int
+GNUNET_CORE_connection_unregister_send_notification_callback
+(GNUNET_P2PRequestHandler callback);
/**
* Verify that the given session handle is not in use.
* @return GNUNET_OK if that is true, GNUNET_SYSERR if not.
*/
-int assertUnused (GNUNET_TSession * tsession);
+int GNUNET_CORE_connection_assert_tsession_unused (GNUNET_TSession *
+ tsession);
#endif
/* end of connection.h */
Modified: GNUnet/src/server/core.c
===================================================================
--- GNUnet/src/server/core.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/core.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -282,7 +282,7 @@
}
void *
-requestService (const char *rpos)
+GNUNET_CORE_request_service (const char *rpos)
{
ShutdownList *nxt;
GNUNET_ServicePluginInitializationMethod mptr;
@@ -380,7 +380,7 @@
}
int
-releaseService (void *service)
+GNUNET_CORE_release_service (void *service)
{
ShutdownList *pos;
ShutdownList *prev;
@@ -441,7 +441,7 @@
}
int
-loadApplicationModules ()
+GNUNET_CORE_load_application_modules ()
{
char *dso;
char *next;
@@ -489,7 +489,7 @@
}
int
-unloadApplicationModules ()
+GNUNET_CORE_unload_application_modules ()
{
ShutdownList *pos;
ShutdownList *nxt;
@@ -519,9 +519,10 @@
* Initialize the CORE's globals.
*/
int
-initCore (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_CronManager *cron, struct GNUNET_LoadMonitor *monitor)
+GNUNET_CORE_init (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ struct GNUNET_CronManager *cron,
+ struct GNUNET_LoadMonitor *monitor)
{
applicationCore.ectx = ectx;
applicationCore.cfg = cfg;
@@ -531,62 +532,65 @@
applicationCore.myIdentity = NULL; /* for now */
applicationCore.loadApplicationModule = &loadApplicationModule; /*
core.c */
applicationCore.unloadApplicationModule = &unloadApplicationModule; /*
core.c */
- applicationCore.requestService = &requestService; /* core.c */
- applicationCore.releaseService = &releaseService; /* core.c */
+ applicationCore.GNUNET_CORE_request_service = &GNUNET_CORE_request_service;
/* core.c */
+ applicationCore.GNUNET_CORE_release_service = &GNUNET_CORE_release_service;
/* core.c */
- applicationCore.sendPlaintext = &sendPlaintext; /* connection.c */
- applicationCore.unicast = &unicast; /* connection.c */
- applicationCore.unicastCallback = &unicastCallback; /* connection.c */
- applicationCore.forAllConnectedNodes = &forEachConnectedNode; /*
connection.c */
- applicationCore.registerSendCallback = ®isterSendCallback; /*
connection.c */
- applicationCore.unregisterSendCallback = &unregisterSendCallback; /*
connection.c */
+ applicationCore.GNUNET_CORE_connection_send_plaintext =
&GNUNET_CORE_connection_send_plaintext; /* connection.c */
+ applicationCore.unicast = &GNUNET_CORE_connection_unicast; /*
connection.c */
+ applicationCore.GNUNET_CORE_connection_send_using_callback =
&GNUNET_CORE_connection_send_using_callback; /* connection.c */
+ applicationCore.forAllConnectedNodes =
&GNUNET_CORE_connection_iterate_peers; /* connection.c */
+ applicationCore.GNUNET_CORE_connection_register_send_callback =
&GNUNET_CORE_connection_register_send_callback; /* connection.c */
+ applicationCore.GNUNET_CORE_connection_unregister_send_callback =
&GNUNET_CORE_connection_unregister_send_callback; /* connection.c */
- applicationCore.registerSendNotify = ®isterSendNotify;
- applicationCore.unregisterSendNotify = &unregisterSendNotify;
- applicationCore.registerHandler = ®isterp2pHandler; /* handler.c */
- applicationCore.unregisterHandler = &unregisterp2pHandler; /* handler.c */
- applicationCore.registerPlaintextHandler = ®isterPlaintextHandler; /*
handler.c */
- applicationCore.unregisterPlaintextHandler = &unregisterPlaintextHandler;
/* handler.c */
- applicationCore.isHandlerRegistered = &isHandlerRegistered; /* handler.c */
+ applicationCore.GNUNET_CORE_connection_register_send_notification_callback =
+ &GNUNET_CORE_connection_register_send_notification_callback;
+ applicationCore.
+ GNUNET_CORE_connection_unregister_send_notification_callback =
+ &GNUNET_CORE_connection_unregister_send_notification_callback;
+ applicationCore.registerHandler = &GNUNET_CORE_p2p_register_handler; /*
handler.c */
+ applicationCore.unregisterHandler = &GNUNET_CORE_p2p_unregister_handler;
/* handler.c */
+ applicationCore.GNUNET_CORE_plaintext_register_handler =
&GNUNET_CORE_plaintext_register_handler; /* handler.c */
+ applicationCore.GNUNET_CORE_plaintext_unregister_handler =
&GNUNET_CORE_plaintext_unregister_handler; /* handler.c */
+ applicationCore.GNUNET_CORE_p2p_test_handler_registered =
&GNUNET_CORE_p2p_test_handler_registered; /* handler.c */
- applicationCore.offerTSessionFor = &considerTakeover; /* connection.c */
- applicationCore.assignSessionKey = &assignSessionKey; /* connection.c */
- applicationCore.getCurrentSessionKey = &getCurrentSessionKey; /*
connection.c */
- applicationCore.confirmSessionUp = &confirmSessionUp; /* connection.c */
- applicationCore.preferTrafficFrom = &updateTrafficPreference; /*
connection.c */
- applicationCore.queryPeerStatus = &getBandwidthAssignedTo; /*
connection.c */
- applicationCore.disconnectFromPeer = &disconnectFromPeer; /*
connection.c */
+ applicationCore.offerTSessionFor =
&GNUNET_CORE_connection_consider_takeover; /* connection.c */
+ applicationCore.GNUNET_CORE_connection_assign_session_key_to_peer =
&GNUNET_CORE_connection_assign_session_key_to_peer; /* connection.c */
+ applicationCore.GNUNET_CORE_connection_get_session_key_of_peer =
&GNUNET_CORE_connection_get_session_key_of_peer; /* connection.c */
+ applicationCore.GNUNET_CORE_connection_mark_session_as_confirmed =
&GNUNET_CORE_connection_mark_session_as_confirmed; /* connection.c */
+ applicationCore.preferTrafficFrom =
&GNUNET_CORE_connection_update_traffic_preference_for_peer; /*
connection.c */
+ applicationCore.queryPeerStatus =
&GNUNET_CORE_connection_get_bandwidth_assigned_to_peer; /* connection.c */
+ applicationCore.GNUNET_CORE_connection_disconnect_from_peer =
&GNUNET_CORE_connection_disconnect_from_peer; /* connection.c */
- applicationCore.sendValueToClient = &sendTCPResultToClient; /* tcpserver.c
*/
- applicationCore.sendToClient = &sendToClient; /* tcpserver.c */
- applicationCore.registerClientHandler = ®isterCSHandler; /* tcpserver.c
*/
- applicationCore.unregisterClientHandler = &unregisterCSHandler; /*
tcpserver.c */
- applicationCore.registerClientExitHandler = ®isterClientExitHandler;
/* tcpserver.c */
- applicationCore.unregisterClientExitHandler = &unregisterClientExitHandler;
/* tcpserver.c */
- applicationCore.terminateClientConnection = &terminateClientConnection;
/* tcpserver.c */
+ applicationCore.sendValueToClient = &GNUNET_CORE_cs_send_result_to_client;
/* tcpserver.c */
+ applicationCore.GNUNET_CORE_cs_send_to_client =
&GNUNET_CORE_cs_send_to_client; /* tcpserver.c */
+ applicationCore.registerClientHandler = &GNUNET_CORE_register_handler;
/* tcpserver.c */
+ applicationCore.unregisterClientHandler = &GNUNET_CORE_unregister_handler;
/* tcpserver.c */
+ applicationCore.GNUNET_CORE_cs_register_exit_handler =
&GNUNET_CORE_cs_register_exit_handler; /* tcpserver.c */
+ applicationCore.GNUNET_CORE_cs_exit_handler_unregister =
&GNUNET_CORE_cs_exit_handler_unregister; /* tcpserver.c */
+ applicationCore.GNUNET_CORE_cs_terminate_client_connection =
&GNUNET_CORE_cs_terminate_client_connection; /* tcpserver.c */
- applicationCore.injectMessage = &injectMessage; /* handler.c */
- applicationCore.computeIndex = &computeIndex; /* connection.c */
- applicationCore.getConnectionModuleLock = &getConnectionModuleLock; /*
connection.c */
- applicationCore.getSlotCount = &getSlotCount; /* connection.c */
- applicationCore.isSlotUsed = &isSlotUsed; /* connection.c */
- applicationCore.getLastActivityOf = &getLastActivityOf; /*
connection.c */
- applicationCore.assertUnused = &assertUnused; /* connection.c */
+ applicationCore.GNUNET_CORE_p2p_inject_message =
&GNUNET_CORE_p2p_inject_message; /* handler.c */
+ applicationCore.GNUNET_CORE_connection_compute_index_of_peer =
&GNUNET_CORE_connection_compute_index_of_peer; /* connection.c */
+ applicationCore.GNUNET_CORE_connection_get_lock =
&GNUNET_CORE_connection_get_lock; /* connection.c */
+ applicationCore.GNUNET_CORE_connection_get_slot_count =
&GNUNET_CORE_connection_get_slot_count; /* connection.c */
+ applicationCore.GNUNET_CORE_connection_is_slot_used =
&GNUNET_CORE_connection_is_slot_used; /* connection.c */
+ applicationCore.GNUNET_CORE_connection_get_last_activity_of_peer =
&GNUNET_CORE_connection_get_last_activity_of_peer; /* connection.c */
+ applicationCore.GNUNET_CORE_connection_assert_tsession_unused =
&GNUNET_CORE_connection_assert_tsession_unused; /* connection.c */
- applicationCore.sendErrorMessageToClient = &sendTCPErrorToClient; /*
tcpserver.c */
- applicationCore.createClientLogContext = &createClientLogContext; /*
tcpserver.c */
+ applicationCore.sendErrorMessageToClient =
&GNUNET_CORE_cs_send_error_to_client; /* tcpserver.c */
+ applicationCore.GNUNET_CORE_cs_create_client_log_context =
&GNUNET_CORE_cs_create_client_log_context; /* tcpserver.c */
- identity = requestService ("identity");
+ identity = GNUNET_CORE_request_service ("identity");
if (identity == NULL)
return GNUNET_SYSERR;
identity->getPeerIdentity (identity->getPublicPrivateKey (), &myIdentity);
applicationCore.myIdentity = &myIdentity; /* core.c */
- if (initTCPServer (ectx, cfg) != GNUNET_OK)
+ if (GNUNET_CORE_cs_init (ectx, cfg) != GNUNET_OK)
{
- releaseService (identity);
+ GNUNET_CORE_release_service (identity);
return GNUNET_SYSERR;
}
- initHandler (ectx);
+ GNUNET_CORE_p2p_init (ectx);
return GNUNET_OK;
}
@@ -594,15 +598,15 @@
* Shutdown the CORE modules (shuts down all application modules).
*/
void
-doneCore ()
+GNUNET_CORE_done ()
{
ShutdownList *pos;
ShutdownList *prev;
ShutdownList *nxt;
int change;
- doneHandler ();
- releaseService (identity);
+ GNUNET_CORE_p2p_done ();
+ GNUNET_CORE_release_service (identity);
identity = NULL;
/* unload all modules;
@@ -647,7 +651,7 @@
pos->dsoName);
pos = pos->next;
}
- doneTCPServer ();
+ GNUNET_CORE_cs_done ();
}
/* end of core.c */
Modified: GNUnet/src/server/gnunet-peer-info.c
===================================================================
--- GNUnet/src/server/gnunet-peer-info.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/server/gnunet-peer-info.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -184,9 +184,9 @@
"DISABLE",
"YES"));
cron = GNUNET_cron_create (ectx);
- initCore (ectx, cfg, cron, NULL);
- identity = requestService ("identity");
- transport = requestService ("transport");
+ GNUNET_CORE_init (ectx, cfg, cron, NULL);
+ identity = GNUNET_CORE_request_service ("identity");
+ transport = GNUNET_CORE_request_service ("transport");
if (no_resolve != GNUNET_YES)
{
#if HAVE_ADNS
@@ -198,9 +198,9 @@
}
identity->forEachHost (0, /* no timeout */
&printHostInfo, NULL);
- releaseService (identity);
- releaseService (transport);
- doneCore ();
+ GNUNET_CORE_release_service (identity);
+ GNUNET_CORE_release_service (transport);
+ GNUNET_CORE_done ();
GNUNET_cron_destroy (cron);
GNUNET_fini (ectx, cfg);
return 0;
Modified: GNUnet/src/server/gnunet-transport-check.c
===================================================================
--- GNUnet/src/server/gnunet-transport-check.c 2007-12-12 06:59:59 UTC (rev
5873)
+++ GNUnet/src/server/gnunet-transport-check.c 2007-12-12 07:52:18 UTC (rev
5874)
@@ -154,7 +154,9 @@
ok = GNUNET_NO;
ret = GNUNET_NO;
while (ret == GNUNET_NO)
- ret = sendPlaintext (tsession, (char *) noise, ntohs (noise->size));
+ ret =
+ GNUNET_CORE_connection_send_plaintext (tsession, (char *) noise,
+ ntohs (noise->size));
if (ret != GNUNET_OK)
{
fprintf (stderr, _("`%s': Could not send.\n"), tapi->transName);
@@ -300,7 +302,7 @@
GNUNET_free (ping);
/* send ping */
ok = GNUNET_NO;
- if (GNUNET_OK != sendPlaintext (tsession, msg, len))
+ if (GNUNET_OK != GNUNET_CORE_connection_send_plaintext (tsession, msg, len))
{
fprintf (stderr, "Send failed.\n");
GNUNET_free (msg);
@@ -391,7 +393,8 @@
argv,
"gnunet-transport-check",
&cfgFilename, gnunettransportcheckOptions, &ectx, &cfg);
- if ((res == -1) || (GNUNET_OK != changeUser (ectx, cfg)))
+ if ((res == -1)
+ || (GNUNET_OK != GNUNET_CORE_startup_change_user (ectx, cfg)))
{
GNUNET_fini (ectx, cfg);
return -1;
@@ -456,19 +459,20 @@
"BLACKLIST", "");
}
cron = GNUNET_cron_create (ectx);
- if (GNUNET_OK != initCore (ectx, cfg, cron, NULL))
+ if (GNUNET_OK != GNUNET_CORE_init (ectx, cfg, cron, NULL))
{
GNUNET_free (expectedValue);
GNUNET_cron_destroy (cron);
GNUNET_fini (ectx, cfg);
return 1;
}
- initConnection (ectx, cfg, NULL, cron);
- registerPlaintextHandler (GNUNET_P2P_PROTO_NOISE, &noiseHandler);
- enableCoreProcessing ();
- identity = requestService ("identity");
- transport = requestService ("transport");
- pingpong = requestService ("pingpong");
+ GNUNET_CORE_connection_init (ectx, cfg, NULL, cron);
+ GNUNET_CORE_plaintext_register_handler (GNUNET_P2P_PROTO_NOISE,
+ &noiseHandler);
+ GNUNET_CORE_p2p_enable_processing ();
+ identity = GNUNET_CORE_request_service ("identity");
+ transport = GNUNET_CORE_request_service ("transport");
+ pingpong = GNUNET_CORE_request_service ("pingpong");
GNUNET_cron_start (cron);
GNUNET_GC_get_configuration_value_number (cfg,
@@ -479,7 +483,7 @@
res = GNUNET_OK;
if (ping)
{
- bootstrap = requestService ("bootstrap");
+ bootstrap = GNUNET_CORE_request_service ("bootstrap");
stats[0] = 0;
stats[1] = 0;
@@ -488,7 +492,7 @@
printf (_
("\n%d out of %d peers contacted successfully (%d times
transport unavailable).\n"),
stats[2], stats[1], stats[0] - stats[1]);
- releaseService (bootstrap);
+ GNUNET_CORE_release_service (bootstrap);
}
else
{
@@ -496,13 +500,14 @@
transport->forEach (&testTAPI, &res);
}
GNUNET_cron_stop (cron);
- releaseService (identity);
- releaseService (transport);
- releaseService (pingpong);
- disableCoreProcessing ();
- unregisterPlaintextHandler (GNUNET_P2P_PROTO_NOISE, &noiseHandler);
- doneConnection ();
- doneCore ();
+ GNUNET_CORE_release_service (identity);
+ GNUNET_CORE_release_service (transport);
+ GNUNET_CORE_release_service (pingpong);
+ GNUNET_CORE_p2p_disable_processing ();
+ GNUNET_CORE_plaintext_unregister_handler (GNUNET_P2P_PROTO_NOISE,
+ &noiseHandler);
+ GNUNET_CORE_connection_done ();
+ GNUNET_CORE_done ();
GNUNET_free (expectedValue);
GNUNET_cron_destroy (cron);
GNUNET_fini (ectx, cfg);
Modified: GNUnet/src/server/gnunet-update.c
===================================================================
--- GNUnet/src/server/gnunet-update.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/gnunet-update.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -187,8 +187,8 @@
char *topo;
uapi.updateModule = &updateModule;
- uapi.requestService = &requestService;
- uapi.releaseService = &releaseService;
+ uapi.GNUNET_CORE_request_service = &GNUNET_CORE_request_service;
+ uapi.GNUNET_CORE_release_service = &GNUNET_CORE_release_service;
uapi.ectx = ectx;
uapi.cfg = cfg;
@@ -215,7 +215,7 @@
}
GNUNET_free (topo);
cron = GNUNET_cron_create (ectx);
- if (initCore (ectx, cfg, cron, NULL) != GNUNET_OK)
+ if (GNUNET_CORE_init (ectx, cfg, cron, NULL) != GNUNET_OK)
{
GNUNET_GE_LOG (ectx,
GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
@@ -227,7 +227,7 @@
/* enforce filesystem limits */
- capFSQuotaSize (ectx, cfg);
+ GNUNET_CORE_startup_cap_fs_quota_size (ectx, cfg);
/* force update of common modules (used by core) */
updateModule ("transport");
@@ -238,12 +238,12 @@
/* then update active application modules */
updateApplicationModules ();
/* store information about update */
- upToDate (ectx, cfg);
+ GNUNET_CORE_version_mark_as_up_to_date (ectx, cfg);
for (i = 0; i < processedCount; i++)
GNUNET_free (processed[i]);
GNUNET_array_grow (processed, processedCount, 0);
- doneCore ();
+ GNUNET_CORE_done ();
GNUNET_cron_destroy (cron);
}
@@ -290,7 +290,8 @@
argv,
"gnunet-update",
&cfgFilename, gnunetupdateOptions, &ectx, &cfg);
- if ((ret == -1) || (GNUNET_OK != changeUser (ectx, cfg)))
+ if ((ret == -1)
+ || (GNUNET_OK != GNUNET_CORE_startup_change_user (ectx, cfg)))
{
GNUNET_fini (ectx, cfg);
return -1;
Modified: GNUnet/src/server/gnunetd.c
===================================================================
--- GNUnet/src/server/gnunetd.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/gnunetd.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -114,7 +114,7 @@
#ifndef WINDOWS
shc_hup = GNUNET_signal_handler_install (SIGHUP, &reread_config);
#endif
- if (GNUNET_OK != initCore (ectx, cfg, cron, mon))
+ if (GNUNET_OK != GNUNET_CORE_init (ectx, cfg, cron, mon))
{
GNUNET_GE_LOG (ectx,
GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
@@ -131,21 +131,21 @@
}
/* enforce filesystem limits */
- capFSQuotaSize (ectx, cfg);
+ GNUNET_CORE_startup_cap_fs_quota_size (ectx, cfg);
- initConnection (ectx, cfg, mon, cron);
- loadApplicationModules ();
+ GNUNET_CORE_connection_init (ectx, cfg, mon, cron);
+ GNUNET_CORE_load_application_modules ();
if (GNUNET_NO == debug_flag)
GNUNET_terminal_detach_complete (ectx, filedes, GNUNET_YES);
GNUNET_cron_start (cron);
- enableCoreProcessing ();
+ GNUNET_CORE_p2p_enable_processing ();
waitForSignalHandler (ectx);
- disableCoreProcessing ();
+ GNUNET_CORE_p2p_disable_processing ();
GNUNET_cron_stop (cron);
- stopTCPServer ();
- unloadApplicationModules ();
- doneConnection ();
- doneCore ();
+ GNUNET_CORE_stop_cs_server ();
+ GNUNET_CORE_unload_application_modules ();
+ GNUNET_CORE_connection_done ();
+ GNUNET_CORE_done ();
GNUNET_network_monitor_destroy (mon);
#ifndef WINDOWS
GNUNET_signal_handler_uninstall (SIGHUP, &reread_config, shc_hup);
@@ -161,7 +161,7 @@
void WINAPI
ServiceMain (DWORD argc, LPSTR * argv)
{
- win_service_main (gnunet_main);
+ GNUNET_CORE_w32_service_main (gnunet_main);
}
#endif
@@ -221,13 +221,13 @@
return 1;
}
GNUNET_pid_file_write (ectx, cfg, getpid ());
- if (GNUNET_OK != changeUser (ectx, cfg))
+ if (GNUNET_OK != GNUNET_CORE_startup_change_user (ectx, cfg))
{
GNUNET_pid_file_delete (ectx, cfg);
GNUNET_fini (ectx, cfg);
return 1;
}
- if (GNUNET_OK != checkPermissions (ectx, cfg))
+ if (GNUNET_OK != GNUNET_CORE_startup_check_permissions (ectx, cfg))
{
GNUNET_pid_file_delete (ectx, cfg);
GNUNET_fini (ectx, cfg);
@@ -263,8 +263,8 @@
GNUNET_GE_setDefaultContext (ectx);
GNUNET_free (user_log_level);
}
- setFdLimit (ectx, cfg);
- if (GNUNET_OK != checkUpToDate (ectx, cfg))
+ GNUNET_CORE_startup_set_fd_limit (ectx, cfg);
+ if (GNUNET_OK != GNUNET_CORE_version_check_up_to_date (ectx, cfg))
{
GNUNET_GE_LOG (ectx,
GNUNET_GE_USER | GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE,
Modified: GNUnet/src/server/handler.c
===================================================================
--- GNUnet/src/server/handler.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/handler.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -149,7 +149,8 @@
* and updates to the handler list are illegal!
*/
int
-registerp2pHandler (unsigned short type, GNUNET_P2PRequestHandler callback)
+GNUNET_CORE_p2p_register_handler (unsigned short type,
+ GNUNET_P2PRequestHandler callback)
{
unsigned int last;
@@ -192,7 +193,8 @@
* and updates to the handler list are illegal!
*/
int
-unregisterp2pHandler (unsigned short type, GNUNET_P2PRequestHandler callback)
+GNUNET_CORE_p2p_unregister_handler (unsigned short type,
+ GNUNET_P2PRequestHandler callback)
{
unsigned int pos;
unsigned int last;
@@ -245,8 +247,9 @@
* and updates to the handler list are illegal!
*/
int
-registerPlaintextHandler (unsigned short type,
- GNUNET_P2PPlaintextRequestHandler callback)
+GNUNET_CORE_plaintext_register_handler (unsigned short type,
+ GNUNET_P2PPlaintextRequestHandler
+ callback)
{
unsigned int last;
@@ -290,8 +293,9 @@
* and updates to the handler list are illegal!
*/
int
-unregisterPlaintextHandler (unsigned short type,
- GNUNET_P2PPlaintextRequestHandler callback)
+GNUNET_CORE_plaintext_unregister_handler (unsigned short type,
+ GNUNET_P2PPlaintextRequestHandler
+ callback)
{
unsigned int pos;
unsigned int last;
@@ -344,13 +348,14 @@
* and updates to the handler list are illegal!
*/
int
-isHandlerRegistered (unsigned short type, unsigned short handlerType)
+GNUNET_CORE_p2p_test_handler_registered (unsigned short type,
+ unsigned short handlerType)
{
int pos;
int ret;
if (handlerType == 3)
- return isCSHandlerRegistered (type);
+ return GNUNET_CORE_cs_test_handler_registered (type);
if (handlerType > 3)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -389,9 +394,10 @@
* @param session NULL if not available
*/
void
-injectMessage (const GNUNET_PeerIdentity * sender,
- const char *msg,
- unsigned int size, int wasEncrypted, GNUNET_TSession * session)
+GNUNET_CORE_p2p_inject_message (const GNUNET_PeerIdentity * sender,
+ const char *msg,
+ unsigned int size, int wasEncrypted,
+ GNUNET_TSession * session)
{
unsigned int pos;
const GNUNET_MessageHeader *part;
@@ -597,15 +603,20 @@
GNUNET_GE_BREAK (NULL, 0);
return;
}
- ret = checkHeader (sender, (GNUNET_TransportPacket_HEADER *) msg, size);
+ ret =
+ GNUNET_CORE_connection_check_header (sender,
+ (GNUNET_TransportPacket_HEADER *)
+ msg, size);
if (ret == GNUNET_SYSERR)
return; /* message malformed or failed to decrypt */
if ((ret == GNUNET_YES) && (tsession != NULL) && (sender != NULL))
- considerTakeover (sender, tsession);
- injectMessage (sender,
- &msg[sizeof (GNUNET_TransportPacket_HEADER)],
- size - sizeof (GNUNET_TransportPacket_HEADER), ret,
- tsession);
+ GNUNET_CORE_connection_consider_takeover (sender, tsession);
+ GNUNET_CORE_p2p_inject_message (sender,
+ &msg[sizeof
+ (GNUNET_TransportPacket_HEADER)],
+ size -
+ sizeof (GNUNET_TransportPacket_HEADER), ret,
+ tsession);
}
/**
@@ -649,7 +660,7 @@
* (receive implementation).
*/
void
-core_receive (GNUNET_TransportPacket * mp)
+GNUNET_CORE_p2p_receive (GNUNET_TransportPacket * mp)
{
if (threads_running != GNUNET_YES)
{
@@ -769,7 +780,7 @@
* Start processing p2p messages.
*/
void
-enableCoreProcessing ()
+GNUNET_CORE_p2p_enable_processing ()
{
int i;
@@ -787,7 +798,7 @@
* Stop processing (p2p) messages.
*/
void
-disableCoreProcessing ()
+GNUNET_CORE_p2p_disable_processing ()
{
int i;
void *unused;
@@ -813,15 +824,15 @@
* Initialize message handling module.
*/
void
-initHandler (struct GNUNET_GE_Context *e)
+GNUNET_CORE_p2p_init (struct GNUNET_GE_Context *e)
{
int i;
ectx = e;
handlerLock = GNUNET_mutex_create (GNUNET_NO);
- transport = requestService ("transport");
+ transport = GNUNET_CORE_request_service ("transport");
GNUNET_GE_ASSERT (ectx, transport != NULL);
- identity = requestService ("identity");
+ identity = GNUNET_CORE_request_service ("identity");
GNUNET_GE_ASSERT (ectx, identity != NULL);
/* initialize sync mechanisms for message handling threads */
bufferQueueRead_ = GNUNET_semaphore_create (0);
@@ -837,7 +848,7 @@
* Shutdown message handling module.
*/
void
-doneHandler ()
+GNUNET_CORE_p2p_done ()
{
unsigned int i;
@@ -874,9 +885,9 @@
GNUNET_array_grow (plaintextHandlers[i], last, 0);
}
GNUNET_array_grow (plaintextHandlers, plaintextmax_registeredType, 0);
- releaseService (transport);
+ GNUNET_CORE_release_service (transport);
transport = NULL;
- releaseService (identity);
+ GNUNET_CORE_release_service (identity);
identity = NULL;
#if MEASURE_TIME
for (i = 0; i < GNUNET_P2P_PROTO_MAX_USED; i++)
Modified: GNUnet/src/server/handler.h
===================================================================
--- GNUnet/src/server/handler.h 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/handler.h 2007-12-12 07:52:18 UTC (rev 5874)
@@ -33,22 +33,22 @@
* Initialize message handling module (make ready to register
* handlers).
*/
-void initHandler (struct GNUNET_GE_Context *e);
+void GNUNET_CORE_p2p_init (struct GNUNET_GE_Context *e);
/**
* Shutdown message handling module.
*/
-void doneHandler ();
+void GNUNET_CORE_p2p_done (void);
/**
* Start processing messages from the transports.
*/
-void enableCoreProcessing ();
+void GNUNET_CORE_p2p_enable_processing (void);
/**
* Stop processing messages from the transports.
*/
-void disableCoreProcessing ();
+void GNUNET_CORE_p2p_disable_processing (void);
/**
* Handle a message (that was decrypted if needed). Processes the
@@ -57,17 +57,17 @@
* @param wasEncrypted GNUNET_YES if it was encrypted,
* GNUNET_NO if plaintext,
*/
-void injectMessage (const GNUNET_PeerIdentity * sender,
- const char *msg,
- unsigned int size, int wasEncrypted,
- GNUNET_TSession * session);
+void GNUNET_CORE_p2p_inject_message (const GNUNET_PeerIdentity * sender,
+ const char *msg,
+ unsigned int size, int wasEncrypted,
+ GNUNET_TSession * session);
/**
* Processing of a message from the transport layer (receive
* implementation). Detects if the message is encrypted, possibly
- * decrypts and calls injectMessage.
+ * decrypts and calls GNUNET_CORE_p2p_inject_message.
*/
-void core_receive (GNUNET_TransportPacket * mp);
+void GNUNET_CORE_p2p_receive (GNUNET_TransportPacket * mp);
/**
* Register a method as a handler for specific message
@@ -80,8 +80,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is already a
* handler for that type
*/
-int registerp2pHandler (const unsigned short type,
- GNUNET_P2PRequestHandler callback);
+int GNUNET_CORE_p2p_register_handler (const unsigned short type,
+ GNUNET_P2PRequestHandler callback);
/**
@@ -93,8 +93,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is a different
* handler for that type
*/
-int unregisterp2pHandler (const unsigned short type,
- GNUNET_P2PRequestHandler callback);
+int GNUNET_CORE_p2p_unregister_handler (const unsigned short type,
+ GNUNET_P2PRequestHandler callback);
/**
@@ -110,8 +110,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if core threads are running
* and updates to the handler list are illegal!
*/
-int registerPlaintextHandler (const unsigned short type,
- GNUNET_P2PPlaintextRequestHandler callback);
+int GNUNET_CORE_plaintext_register_handler (const unsigned short type,
+ GNUNET_P2PPlaintextRequestHandler
+ callback);
/**
@@ -125,8 +126,9 @@
* handler for that type or if core threads are running
* and updates to the handler list are illegal!
*/
-int unregisterPlaintextHandler (const unsigned short type,
- GNUNET_P2PPlaintextRequestHandler callback);
+int GNUNET_CORE_plaintext_unregister_handler (const unsigned short type,
+ GNUNET_P2PPlaintextRequestHandler
+ callback);
/**
* Is a handler registered for messages of the given type?
@@ -139,7 +141,8 @@
* @return number of handlers registered, 0 for none,
* GNUNET_SYSERR for invalid value of handlerType
*/
-int isHandlerRegistered (unsigned short type, unsigned short handlerType);
+int GNUNET_CORE_p2p_test_handler_registered (unsigned short type,
+ unsigned short handlerType);
#endif
Modified: GNUnet/src/server/startup.c
===================================================================
--- GNUnet/src/server/startup.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/startup.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -51,7 +51,7 @@
* @param sig signal code that causes shutdown, optional
*/
void
-shutdown_gnunetd (struct GNUNET_GC_Configuration *cfg, int sig)
+GNUNET_CORE_shutdown (struct GNUNET_GC_Configuration *cfg, int sig)
{
#ifdef MINGW
if (!cfg || GNUNET_GC_get_configuration_value_yesno (cfg,
@@ -100,14 +100,14 @@
ServiceCtrlHandler (DWORD dwOpcode)
{
if (dwOpcode == SERVICE_CONTROL_STOP)
- shutdown_gnunetd (NULL, dwOpcode);
+ GNUNET_CORE_shutdown (NULL, dwOpcode);
}
/**
* called by gnunetd.c::ServiceMain()
*/
void
-win_service_main (void (*gnunet_main) ())
+GNUNET_CORE_w32_service_main (void (*gnunet_main) ())
{
memset (&theServiceStatus, 0, sizeof (theServiceStatus));
theServiceStatus.dwServiceType = SERVICE_WIN32;
@@ -129,8 +129,8 @@
int
-changeUser (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg)
+GNUNET_CORE_startup_change_user (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *user;
@@ -152,8 +152,8 @@
}
int
-setFdLimit (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg)
+GNUNET_CORE_startup_set_fd_limit (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
unsigned long long limit;
@@ -178,8 +178,8 @@
* @param cfg configuration manager
*/
void
-capFSQuotaSize (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg)
+GNUNET_CORE_startup_cap_fs_quota_size (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
#ifdef WINDOWS
unsigned long long quota, cap;
@@ -255,7 +255,7 @@
#endif
}
-int
+static int
checkPermission (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg,
const char *section,
@@ -296,8 +296,8 @@
#define CHECK(a,b,c,d,e) if (GNUNET_OK != checkPermission(ectx, cfg, a, b, c,
d, e)) return GNUNET_SYSERR;
int
-checkPermissions (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg)
+GNUNET_CORE_startup_check_permissions (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
CHECK ("PATHS", "GNUNETD_HOME", "/var/lib/gnunet", GNUNET_YES, W_OK | X_OK);
CHECK ("GNUNETD", "LOGFILE", "$GNUNETD_HOME/daemon-logs", GNUNET_NO, W_OK);
Modified: GNUnet/src/server/startup.h
===================================================================
--- GNUnet/src/server/startup.h 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/startup.h 2007-12-12 07:52:18 UTC (rev 5874)
@@ -31,14 +31,15 @@
#include "gnunet_util.h"
#include "platform.h"
-int changeUser (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg);
+int GNUNET_CORE_startup_change_user (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
-int setFdLimit (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg);
+int GNUNET_CORE_startup_set_fd_limit (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
-int checkPermissions (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg);
+int GNUNET_CORE_startup_check_permissions (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration
+ *cfg);
/**
* @brief Cap datastore limit to the filesystem's capabilities
@@ -46,19 +47,20 @@
* @param ectx error handler
* @param cfg configuration manager
*/
-void capFSQuotaSize (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg);
+void GNUNET_CORE_startup_cap_fs_quota_size (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration
+ *cfg);
/**
* Shutdown gnunetd
* @param cfg configuration
* @param sig signal code that causes shutdown, optional
*/
-void shutdown_gnunetd (struct GNUNET_GC_Configuration *cfg, int sig);
+void GNUNET_CORE_shutdown (struct GNUNET_GC_Configuration *cfg, int sig);
#ifdef MINGW
-void win_service_main (void (*gnunet_main) ());
+void GNUNET_CORE_w32_service_main (void (*gnunet_main) ());
#endif
#endif
/* end of startup.h */
Modified: GNUnet/src/server/tcpserver.c
===================================================================
--- GNUnet/src/server/tcpserver.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/tcpserver.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -115,13 +115,13 @@
GNUNET_GE_LOG (NULL,
GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
"shutdown request accepted from client\n");
- ret = sendTCPResultToClient (client, GNUNET_OK);
- shutdown_gnunetd (cfg, 0);
+ ret = GNUNET_CORE_cs_send_result_to_client (client, GNUNET_OK);
+ GNUNET_CORE_shutdown (cfg, 0);
return ret;
}
int
-registerClientExitHandler (GNUNET_ClientExitHandler callback)
+GNUNET_CORE_cs_register_exit_handler (GNUNET_ClientExitHandler callback)
{
GNUNET_mutex_lock (handlerlock);
GNUNET_array_grow (exitHandlers, exitHandlerCount, exitHandlerCount + 1);
@@ -131,7 +131,7 @@
}
int
-unregisterClientExitHandler (GNUNET_ClientExitHandler callback)
+GNUNET_CORE_cs_exit_handler_unregister (GNUNET_ClientExitHandler callback)
{
int i;
@@ -197,8 +197,9 @@
* @param force GNUNET_YES if this message MUST be queued
*/
int
-sendToClient (struct GNUNET_ClientHandle *handle,
- const GNUNET_MessageHeader * message, int force)
+GNUNET_CORE_cs_send_to_client (struct GNUNET_ClientHandle *handle,
+ const GNUNET_MessageHeader * message,
+ int force)
{
#if DEBUG_TCPHANDLER
GNUNET_GE_LOG (ectx,
@@ -210,7 +211,7 @@
}
void
-terminateClientConnection (struct GNUNET_ClientHandle *sock)
+GNUNET_CORE_cs_terminate_client_connection (struct GNUNET_ClientHandle *sock)
{
GNUNET_select_disconnect (selector, sock->sock);
}
@@ -357,26 +358,27 @@
}
int
-doneTCPServer ()
+GNUNET_CORE_cs_done ()
{
if (selector != NULL)
- stopTCPServer (); /* just to be sure; used mostly
- for the benefit of gnunet-update
- and other gnunet-tools that are
- not gnunetd */
- unregisterCSHandler (GNUNET_CS_PROTO_SHUTDOWN_REQUEST, &shutdownHandler);
+ GNUNET_CORE_stop_cs_server (); /* just to be sure; used mostly
+ for the benefit of gnunet-update
+ and other gnunet-tools that are
+ not gnunetd */
+ GNUNET_CORE_unregister_handler (GNUNET_CS_PROTO_SHUTDOWN_REQUEST,
+ &shutdownHandler);
GNUNET_array_grow (handlers, max_registeredType, 0);
GNUNET_array_grow (exitHandlers, exitHandlerCount, 0);
GNUNET_free (trustedNetworks_);
return GNUNET_OK;
}
-void __attribute__ ((constructor)) gnunet_tcpserver_ltdl_init ()
+void __attribute__ ((constructor)) GNUNET_CORE_cs_ltdl_init ()
{
handlerlock = GNUNET_mutex_create (GNUNET_YES);
}
-void __attribute__ ((destructor)) gnunet_tcpserver_ltdl_fini ()
+void __attribute__ ((destructor)) GNUNET_CORE_cs_ltdl_fini ()
{
GNUNET_mutex_destroy (handlerlock);
handlerlock = NULL;
@@ -386,7 +388,8 @@
* Initialize the TCP port and listen for incoming client connections.
*/
int
-initTCPServer (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
+GNUNET_CORE_cs_init (struct GNUNET_GE_Context *e,
+ struct GNUNET_GC_Configuration *c)
{
char *ch;
@@ -415,14 +418,14 @@
}
GNUNET_free (ch);
- registerCSHandler (GNUNET_CS_PROTO_SHUTDOWN_REQUEST, &shutdownHandler);
- if ((GNUNET_NO == GNUNET_GC_get_configuration_value_yesno (cfg,
- "TCPSERVER",
- "DISABLE",
- GNUNET_NO)) &&
- (GNUNET_OK != startTCPServer ()))
+ GNUNET_CORE_register_handler (GNUNET_CS_PROTO_SHUTDOWN_REQUEST,
+ &shutdownHandler);
+ if ((GNUNET_NO ==
+ GNUNET_GC_get_configuration_value_yesno (cfg, "TCPSERVER", "DISABLE",
+ GNUNET_NO))
+ && (GNUNET_OK != startTCPServer ()))
{
- doneTCPServer ();
+ GNUNET_CORE_cs_done ();
return GNUNET_SYSERR;
}
return GNUNET_OK;
@@ -432,7 +435,7 @@
* Shutdown the module.
*/
int
-stopTCPServer ()
+GNUNET_CORE_stop_cs_server ()
{
if (selector != NULL)
{
@@ -454,7 +457,8 @@
* handler for that type
*/
int
-registerCSHandler (unsigned short type, GNUNET_ClientRequestHandler callback)
+GNUNET_CORE_register_handler (unsigned short type,
+ GNUNET_ClientRequestHandler callback)
{
GNUNET_mutex_lock (handlerlock);
if (type < max_registeredType)
@@ -490,8 +494,8 @@
* handler for that type
*/
int
-unregisterCSHandler (unsigned short type,
- GNUNET_ClientRequestHandler callback)
+GNUNET_CORE_unregister_handler (unsigned short type,
+ GNUNET_ClientRequestHandler callback)
{
GNUNET_mutex_lock (handlerlock);
if (type < max_registeredType)
@@ -524,14 +528,15 @@
* send successfully
*/
int
-sendTCPResultToClient (struct GNUNET_ClientHandle *sock, int ret)
+GNUNET_CORE_cs_send_result_to_client (struct GNUNET_ClientHandle *sock,
+ int ret)
{
GNUNET_MessageReturnValue rv;
rv.header.size = htons (sizeof (GNUNET_MessageReturnValue));
rv.header.type = htons (GNUNET_CS_PROTO_RETURN_VALUE);
rv.return_value = htonl (ret);
- return sendToClient (sock, &rv.header, GNUNET_YES);
+ return GNUNET_CORE_cs_send_to_client (sock, &rv.header, GNUNET_YES);
}
/**
@@ -543,8 +548,8 @@
* send successfully
*/
int
-sendTCPErrorToClient (struct GNUNET_ClientHandle *sock,
- GNUNET_GE_KIND kind, const char *message)
+GNUNET_CORE_cs_send_error_to_client (struct GNUNET_ClientHandle *sock,
+ GNUNET_GE_KIND kind, const char *message)
{
GNUNET_MessageReturnErrorMessage *rv;
size_t msgLen;
@@ -560,7 +565,7 @@
rv->header.type = htons (GNUNET_CS_PROTO_RETURN_ERROR);
rv->kind = htonl (kind);
memcpy (&rv[1], message, strlen (message));
- ret = sendToClient (sock, &rv->header, GNUNET_YES);
+ ret = GNUNET_CORE_cs_send_to_client (sock, &rv->header, GNUNET_YES);
GNUNET_free (rv);
return ret;
}
@@ -573,7 +578,7 @@
* @return number of registered handlers (0 or 1)
*/
unsigned int
-isCSHandlerRegistered (unsigned short type)
+GNUNET_CORE_cs_test_handler_registered (unsigned short type)
{
GNUNET_mutex_lock (handlerlock);
if (type < max_registeredType)
@@ -602,12 +607,12 @@
logClientLogContext (void *ctx,
GNUNET_GE_KIND kind, const char *date, const char *msg)
{
- sendTCPErrorToClient (ctx, kind, msg);
+ GNUNET_CORE_cs_send_error_to_client (ctx, kind, msg);
}
struct GNUNET_GE_Context *
-createClientLogContext (GNUNET_GE_KIND mask,
- struct GNUNET_ClientHandle *handle)
+GNUNET_CORE_cs_create_client_log_context (GNUNET_GE_KIND mask,
+ struct GNUNET_ClientHandle *handle)
{
return GNUNET_GE_create_context_callback (mask,
&logClientLogContext,
Modified: GNUnet/src/server/tcpserver.h
===================================================================
--- GNUnet/src/server/tcpserver.h 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/tcpserver.h 2007-12-12 07:52:18 UTC (rev 5874)
@@ -33,19 +33,19 @@
* Initialize the TCP port and listen for incoming client connections.
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int initTCPServer (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg);
+int GNUNET_CORE_cs_init (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
/**
* Stop the server (but do not yet destroy the data structures)
*/
-int stopTCPServer (void);
+int GNUNET_CORE_stop_cs_server (void);
/**
* Shutdown the module.
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int doneTCPServer (void);
+int GNUNET_CORE_cs_done (void);
/**
* Register a method as a handler for specific message
@@ -58,8 +58,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is already a
* handler for that type
*/
-int registerCSHandler (unsigned short type,
- GNUNET_ClientRequestHandler callback);
+int GNUNET_CORE_register_handler (unsigned short type,
+ GNUNET_ClientRequestHandler callback);
/**
* Unregister a method as a handler for specific message
@@ -72,12 +72,13 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is no or another
* handler for that type
*/
-int unregisterCSHandler (unsigned short type,
- GNUNET_ClientRequestHandler callback);
+int GNUNET_CORE_unregister_handler (unsigned short type,
+ GNUNET_ClientRequestHandler callback);
-int registerClientExitHandler (GNUNET_ClientExitHandler callback);
+int GNUNET_CORE_cs_register_exit_handler (GNUNET_ClientExitHandler callback);
-int unregisterClientExitHandler (GNUNET_ClientExitHandler callback);
+int GNUNET_CORE_cs_exit_handler_unregister (GNUNET_ClientExitHandler
+ callback);
/**
* Send a message to the client identified by the handle. Note that
@@ -86,8 +87,9 @@
* on the other hand does NOT confirm delivery since the actual
* transfer happens asynchronously.
*/
-int sendToClient (struct GNUNET_ClientHandle *handle,
- const GNUNET_MessageHeader * message, int force);
+int GNUNET_CORE_cs_send_to_client (struct GNUNET_ClientHandle *handle,
+ const GNUNET_MessageHeader * message,
+ int force);
/**
@@ -98,7 +100,8 @@
* @return GNUNET_SYSERR on error, GNUNET_OK if the return value was
* send successfully
*/
-int sendTCPResultToClient (struct GNUNET_ClientHandle *sock, int ret);
+int GNUNET_CORE_cs_send_result_to_client (struct GNUNET_ClientHandle *sock,
+ int ret);
/**
* Send an error message to the caller of a remote call via
@@ -108,10 +111,12 @@
* @return GNUNET_SYSERR on error, GNUNET_OK if the return value was
* send successfully
*/
-int sendTCPErrorToClient (struct GNUNET_ClientHandle *sock,
- GNUNET_GE_KIND kind, const char *message);
+int GNUNET_CORE_cs_send_error_to_client (struct GNUNET_ClientHandle *sock,
+ GNUNET_GE_KIND kind,
+ const char *message);
-void terminateClientConnection (struct GNUNET_ClientHandle *sock);
+void GNUNET_CORE_cs_terminate_client_connection (struct GNUNET_ClientHandle
+ *sock);
/**
* Check if a handler is registered for a given
@@ -120,11 +125,12 @@
* @param type the message type
* @return number of registered handlers (0 or 1)
*/
-unsigned int isCSHandlerRegistered (unsigned short type);
+unsigned int GNUNET_CORE_cs_test_handler_registered (unsigned short type);
-struct GNUNET_GE_Context *createClientLogContext (GNUNET_GE_KIND mask,
- struct GNUNET_ClientHandle
- *handle);
+struct GNUNET_GE_Context
+ *GNUNET_CORE_cs_create_client_log_context (GNUNET_GE_KIND mask,
+ struct GNUNET_ClientHandle
+ *handle);
#endif
/* end of tcpserver.h */
Modified: GNUnet/src/server/version.c
===================================================================
--- GNUnet/src/server/version.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/version.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -126,8 +126,8 @@
* @return GNUNET_OK if we are
*/
int
-checkUpToDate (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg)
+GNUNET_CORE_version_check_up_to_date (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char version[MAX_VS];
int len;
@@ -146,14 +146,14 @@
if (GNUNET_disk_file_test (ectx, fn) != GNUNET_YES)
{
GNUNET_free (fn);
- upToDate (ectx, cfg); /* first start */
+ GNUNET_CORE_version_mark_as_up_to_date (ectx, cfg); /* first start
*/
return GNUNET_OK;
}
len = GNUNET_disk_file_read (ectx, fn, MAX_VS, version);
GNUNET_free (fn);
if (len == -1)
{ /* should never happen -- file should exist */
- upToDate (ectx, cfg); /* first start */
+ GNUNET_CORE_version_mark_as_up_to_date (ectx, cfg); /* first start
*/
return GNUNET_OK;
}
if ((len != strlen (VERSION) + 1 + sizeof (GNUNET_EncName)) ||
@@ -171,7 +171,8 @@
* Writes the version tag
*/
void
-upToDate (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration *cfg)
+GNUNET_CORE_version_mark_as_up_to_date (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char version[MAX_VS];
int len;
Modified: GNUnet/src/server/version.h
===================================================================
--- GNUnet/src/server/version.h 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/server/version.h 2007-12-12 07:52:18 UTC (rev 5874)
@@ -33,13 +33,15 @@
* Check if we are up-to-date.
* @return GNUNET_OK if we are
*/
-int checkUpToDate (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg);
+int GNUNET_CORE_version_check_up_to_date (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration
+ *cfg);
/**
* We are up-to-date.
*/
-void upToDate (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg);
+void GNUNET_CORE_version_mark_as_up_to_date (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration
+ *cfg);
#endif
Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/setup/gtk/wizard_gtk.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -142,7 +142,7 @@
gtk_combo_box_append_text (GTK_COMBO_BOX (cmbNIC), utf8_name);
free (utf8_name);
- defaultNIC = wiz_is_nic_default (editCfg, name, defaultNIC);
+ defaultNIC = GNUNET_GNS_wiz_is_nic_default (editCfg, name, defaultNIC);
if (defaultNIC)
gtk_combo_box_set_active (GTK_COMBO_BOX (cmbNIC), inc->nic_item_count);
@@ -465,7 +465,7 @@
char *gup;
char *bin;
if (doAutoStart && (user_name != NULL))
- if (!wiz_createGroupUser (group_name, user_name))
+ if (!GNUNET_GNS_wiz_create_group_user (group_name, user_name))
{
#ifndef MINGW
showErr (_("Unable to create user account:"), STRERROR (errno));
@@ -473,7 +473,8 @@
return;
}
- if (wiz_autostartService (doAutoStart, user_name, group_name) != GNUNET_OK)
+ if (GNUNET_GNS_wiz_autostart_service (doAutoStart, user_name, group_name) !=
+ GNUNET_OK)
{
#ifndef MINGW
showErr (_("Unable to change startup process:"), STRERROR (errno));
Modified: GNUnet/src/setup/lib/gns.c
===================================================================
--- GNUnet/src/setup/lib/gns.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/setup/lib/gns.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -87,7 +87,7 @@
* @return 0 if the change is ok, -1 if the change must be
* refused
*/
-int
+static int
configChangeListener (void *ctx,
struct GNUNET_GC_Configuration *cfg,
struct GNUNET_GE_Context *ectx,
@@ -96,7 +96,7 @@
struct GNUNET_GNS_Context *g = ctx;
struct GNUNET_GNS_TreeNode *pos;
- pos = tree_lookup (g->root, section, option);
+ pos = GNUNET_GNS_tree_lookup (g->root, section, option);
if (pos == NULL)
{
GNUNET_GE_LOG (g->ectx,
@@ -235,7 +235,8 @@
notify_listeners (g, pos);
/* allow tree to update visibility */
- tree_notify_change (cfg, ¬ify_listeners, g, g->ectx, g->root, pos);
+ GNUNET_GNS_tree_notify_change (cfg, ¬ify_listeners, g, g->ectx, g->root,
+ pos);
return 0;
}
@@ -298,7 +299,7 @@
struct GNUNET_GNS_Context *ctx;
struct GNUNET_GNS_TreeNode *root;
- root = tree_parse (ectx, specification);
+ root = GNUNET_GNS_tree_parse (ectx, specification);
if (root == NULL)
return NULL;
ctx = GNUNET_malloc (sizeof (struct GNUNET_GNS_Context));
Modified: GNUnet/src/setup/lib/tree.c
===================================================================
--- GNUnet/src/setup/lib/tree.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/setup/lib/tree.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -91,8 +91,8 @@
/* **************************** tree API ****************** */
struct GNUNET_GNS_TreeNode *
-tree_lookup (struct GNUNET_GNS_TreeNode *root, const char *section,
- const char *option)
+GNUNET_GNS_tree_lookup (struct GNUNET_GNS_TreeNode *root, const char *section,
+ const char *option)
{
int i;
struct GNUNET_GNS_TreeNode *ret;
@@ -105,7 +105,7 @@
i = 0;
while (root->children[i] != NULL)
{
- ret = tree_lookup (root->children[i], section, option);
+ ret = GNUNET_GNS_tree_lookup (root->children[i], section, option);
if (ret != NULL)
return ret;
i++;
@@ -113,7 +113,7 @@
return NULL;
}
-SCM
+static SCM
get_option (SCM smob, SCM section, SCM option)
{
TC *tc;
@@ -128,7 +128,7 @@
tc = (TC *) SCM_SMOB_DATA (smob);
opt = scm_to_locale_string (option);
sec = scm_to_locale_string (section);
- t = tree_lookup (tc->root, sec, opt);
+ t = GNUNET_GNS_tree_lookup (tc->root, sec, opt);
if (t == NULL)
return SCM_EOL;
switch (t->type & GNUNET_GNS_TYPE_MASK)
@@ -154,7 +154,7 @@
* Change the visibility of an entry in the
* tree (and notify listeners about change).
*/
-SCM
+static SCM
change_visible (SCM smob, SCM section, SCM option, SCM yesno)
{
TC *tc;
@@ -178,7 +178,7 @@
GNUNET_GE_BREAK (NULL, 0);
return SCM_EOL;
}
- t = tree_lookup (tc->root, sec, opt);
+ t = GNUNET_GNS_tree_lookup (tc->root, sec, opt);
if (t != NULL)
{
t->visible = val;
@@ -199,7 +199,7 @@
/**
* Set an option.
*/
-SCM
+static SCM
set_option (SCM smob, SCM section, SCM option, SCM value)
{
TC *tc;
@@ -232,7 +232,7 @@
* maybe list of strings for string values or pair
* min/max for integers
*/
-SCM
+static SCM
build_tree_node (SCM section,
SCM option,
SCM description,
@@ -389,7 +389,8 @@
struct GNUNET_GNS_TreeNode *
-tree_parse (struct GNUNET_GE_Context *ectx, const char *specification)
+GNUNET_GNS_tree_parse (struct GNUNET_GE_Context *ectx,
+ const char *specification)
{
struct GNUNET_GNS_TreeNode *ret;
@@ -414,18 +415,18 @@
/**
* A value in the tree has been changed. Must only
- * be called after "tree_parse" has already been
+ * be called after "GNUNET_GNS_tree_parse" has already been
* executed.
*
* Update visibility (and notify about changes).
*/
void
-tree_notify_change (struct GNUNET_GC_Configuration *cfg,
- VisibilityChangeListener vcl,
- void *ctx,
- struct GNUNET_GE_Context *ectx,
- struct GNUNET_GNS_TreeNode *root,
- struct GNUNET_GNS_TreeNode *change)
+GNUNET_GNS_tree_notify_change (struct GNUNET_GC_Configuration *cfg,
+ VisibilityChangeListener vcl,
+ void *ctx,
+ struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GNS_TreeNode *root,
+ struct GNUNET_GNS_TreeNode *change)
{
TC tc;
@@ -442,7 +443,7 @@
* If not, we'll have to move it into the
* _internal methods.
*/
-void __attribute__ ((constructor)) gns_scheme_init ()
+void __attribute__ ((constructor)) GNUNET_GNS_scheme_init ()
{
#ifdef MINGW
char *oldpath, *env;
@@ -486,7 +487,7 @@
scm_c_define_gsubr ("set-option", 4, 0, 0, &set_option);
}
-void __attribute__ ((destructor)) gns_scheme_fin ()
+void __attribute__ ((destructor)) GNUNET_GNS_scheme_fin ()
{
#ifdef MINGW
ShutdownWinEnv ();
Modified: GNUnet/src/setup/lib/tree.h
===================================================================
--- GNUnet/src/setup/lib/tree.h 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/setup/lib/tree.h 2007-12-12 07:52:18 UTC (rev 5874)
@@ -28,12 +28,14 @@
* Parse the specification file and create the tree.
* Set all values to defaults.
*/
-struct GNUNET_GNS_TreeNode *tree_parse (struct GNUNET_GE_Context *ectx,
- const char *specification);
+struct GNUNET_GNS_TreeNode *GNUNET_GNS_tree_parse (struct GNUNET_GE_Context
+ *ectx,
+ const char *specification);
-struct GNUNET_GNS_TreeNode *tree_lookup (struct GNUNET_GNS_TreeNode *root,
- const char *section,
- const char *option);
+struct GNUNET_GNS_TreeNode *GNUNET_GNS_tree_lookup (struct GNUNET_GNS_TreeNode
+ *root,
+ const char *section,
+ const char *option);
typedef void (*VisibilityChangeListener) (void *ctx,
struct GNUNET_GNS_TreeNode * tree);
@@ -42,9 +44,9 @@
* A value in the tree has been changed.
* Update visibility (and notify about changes).
*/
-void tree_notify_change (struct GNUNET_GC_Configuration *cfg,
- VisibilityChangeListener vcl,
- void *ctx,
- struct GNUNET_GE_Context *ectx,
- struct GNUNET_GNS_TreeNode *root,
- struct GNUNET_GNS_TreeNode *change);
+void GNUNET_GNS_tree_notify_change (struct GNUNET_GC_Configuration *cfg,
+ VisibilityChangeListener vcl,
+ void *ctx,
+ struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GNS_TreeNode *root,
+ struct GNUNET_GNS_TreeNode *change);
Modified: GNUnet/src/setup/lib/wizard_util.c
===================================================================
--- GNUnet/src/setup/lib/wizard_util.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/setup/lib/wizard_util.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -32,8 +32,8 @@
* @brief Determine whether a NIC makes a good default
*/
int
-wiz_is_nic_default (struct GNUNET_GC_Configuration *cfg, const char *name,
- int suggestion)
+GNUNET_GNS_wiz_is_nic_default (struct GNUNET_GC_Configuration *cfg,
+ const char *name, int suggestion)
{
char *nic;
@@ -82,7 +82,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-wiz_autostartService (int doAutoStart, char *username, char *groupname)
+GNUNET_GNS_wiz_autostart_service (int doAutoStart, char *username,
+ char *groupname)
{
int ret;
char *exe;
@@ -154,7 +155,7 @@
* @return 1 on success
*/
int
-wiz_createGroupUser (char *group_name, char *user_name)
+GNUNET_GNS_wiz_create_group_user (char *group_name, char *user_name)
{
int ret;
Modified: GNUnet/src/setup/lib/wizard_util.h
===================================================================
--- GNUnet/src/setup/lib/wizard_util.h 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/setup/lib/wizard_util.h 2007-12-12 07:52:18 UTC (rev 5874)
@@ -27,10 +27,11 @@
#ifndef WIZARD_UTIL_H_
#define WIZARD_UTIL_H_
-int wiz_is_nic_default (struct GNUNET_GC_Configuration *cfg, const char *name,
- int suggestion);
-int wiz_autostartService (int doAutoStart, char *username, char *groupname);
-int wiz_createGroupUser (char *group_name, char *user_name);
+int GNUNET_GNS_wiz_is_nic_default (struct GNUNET_GC_Configuration *cfg,
+ const char *name, int suggestion);
+int GNUNET_GNS_wiz_autostart_service (int doAutoStart, char *username,
+ char *groupname);
+int GNUNET_GNS_wiz_create_group_user (char *group_name, char *user_name);
#endif /*WIZARD_UTIL_H_ */
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/http.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -865,8 +865,9 @@
(GNUNET_OK == upnp->get_ip (port,
"TCP",
&haddr->ip))) ||
- (GNUNET_SYSERR != getPublicIPAddress (coreAPI->cfg,
- coreAPI->ectx, &haddr->ip))))
+ (GNUNET_SYSERR != GNUNET_IP_get_public_ipv4_address (coreAPI->cfg,
+ coreAPI->ectx,
+ &haddr->ip))))
{
GNUNET_free (msg);
GNUNET_GE_LOG (coreAPI->ectx,
@@ -2279,7 +2280,7 @@
"HTTP", "UPNP",
GNUNET_YES) == GNUNET_YES)
{
- upnp = coreAPI->requestService ("upnp");
+ upnp = coreAPI->GNUNET_CORE_request_service ("upnp");
if (upnp == NULL)
{
@@ -2292,7 +2293,7 @@
}
}
- stats = coreAPI->requestService ("stats");
+ stats = coreAPI->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_bytesReceived
@@ -2330,12 +2331,12 @@
GNUNET_GC_detach_change_listener (coreAPI->cfg, &reloadConfiguration, NULL);
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
if (upnp != NULL)
{
- coreAPI->releaseService (upnp);
+ coreAPI->GNUNET_CORE_release_service (upnp);
stats = NULL;
}
GNUNET_free_non_null (filteredNetworks_);
Modified: GNUnet/src/transports/ip.c
===================================================================
--- GNUnet/src/transports/ip.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/ip.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -38,9 +38,9 @@
* @return GNUNET_SYSERR on error, GNUNET_OK on success
*/
int
-getPublicIPAddress (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx,
- GNUNET_IPv4Address * address)
+GNUNET_IP_get_public_ipv4_address (struct GNUNET_GC_Configuration *cfg,
+ struct GNUNET_GE_Context *ectx,
+ GNUNET_IPv4Address * address)
{
static GNUNET_IPv4Address myAddress;
static GNUNET_CronTime last;
@@ -123,8 +123,8 @@
* @return GNUNET_OK if we found an address, GNUNET_SYSERR if not
*/
int
-getIPaddressFromPID (const GNUNET_PeerIdentity * peer,
- void **sa, unsigned int *salen)
+GNUNET_IP_get_address_from_peer_identity (const GNUNET_PeerIdentity * peer,
+ void **sa, unsigned int *salen)
{
struct PICache *cache;
@@ -156,8 +156,8 @@
* us to validate the address).
*/
void
-setIPaddressFromPID (const GNUNET_PeerIdentity * peer,
- const void *sa, unsigned int salen)
+GNUNET_IP_set_address_for_peer_identity (const GNUNET_PeerIdentity * peer,
+ const void *sa, unsigned int salen)
{
struct PICache *next;
@@ -198,12 +198,12 @@
-void __attribute__ ((constructor)) gnunet_ip_ltdl_init ()
+void __attribute__ ((constructor)) GNUNET_IP_ltdl_init ()
{
lock = GNUNET_mutex_create (GNUNET_YES);
}
-void __attribute__ ((destructor)) gnunet_ip_ltdl_fini ()
+void __attribute__ ((destructor)) GNUNET_IP_ltdl_fini ()
{
struct PICache *ppos;
GNUNET_mutex_destroy (lock);
Modified: GNUnet/src/transports/ip.h
===================================================================
--- GNUnet/src/transports/ip.h 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/ip.h 2007-12-12 07:52:18 UTC (rev 5874)
@@ -45,9 +45,9 @@
*
* @return GNUNET_SYSERR on error, GNUNET_OK on success
*/
-int getPublicIPAddress (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx,
- GNUNET_IPv4Address * address);
+int GNUNET_IP_get_public_ipv4_address (struct GNUNET_GC_Configuration *cfg,
+ struct GNUNET_GE_Context *ectx,
+ GNUNET_IPv4Address * address);
/**
* We only have the GNUNET_PeerIdentity. Do we have any
@@ -58,8 +58,9 @@
* @param sa set to the address
* @return GNUNET_OK if we found an address, GNUNET_SYSERR if not
*/
-int getIPaddressFromPID (const GNUNET_PeerIdentity * peer,
- void **sa, unsigned int *salen);
+int GNUNET_IP_get_address_from_peer_identity (const GNUNET_PeerIdentity *
+ peer, void **sa,
+ unsigned int *salen);
/**
* We have accepted a connection from a particular
@@ -69,7 +70,8 @@
* NOT validated (and it may well be impossible for
* us to validate the address).
*/
-void setIPaddressFromPID (const GNUNET_PeerIdentity * peer,
- const void *sa, unsigned int salen);
+void GNUNET_IP_set_address_for_peer_identity (const GNUNET_PeerIdentity *
+ peer, const void *sa,
+ unsigned int salen);
#endif
Modified: GNUnet/src/transports/nat.c
===================================================================
--- GNUnet/src/transports/nat.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/nat.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -50,8 +50,9 @@
GNUNET_IPv4Address addr;
unsigned int anum;
- if (GNUNET_SYSERR == getPublicIPAddress (coreAPI->cfg,
- coreAPI->ectx, &addr))
+ if (GNUNET_SYSERR == GNUNET_IP_get_public_ipv4_address (coreAPI->cfg,
+ coreAPI->ectx,
+ &addr))
return GNUNET_YES; /* kind-of */
anum = ntohl (addr.addr);
if (((anum >= 0x0a000000) && (anum <= 0x0affffff)) || /* 10.x.x.x */
@@ -213,7 +214,8 @@
helloToAddress (const GNUNET_MessageHello * hello,
void **sa, unsigned int *sa_len)
{
- return getIPaddressFromPID (&hello->senderIdentity, sa, sa_len);
+ return GNUNET_IP_get_address_from_peer_identity (&hello->senderIdentity, sa,
+ sa_len);
}
static int
Modified: GNUnet/src/transports/smtp.c
===================================================================
--- GNUnet/src/transports/smtp.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/smtp.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -808,7 +808,7 @@
1200,
SMTP_MESSAGE_SIZE,
SMTP_MESSAGE_SIZE, &mtu);
- stats = coreAPI->requestService ("stats");
+ stats = coreAPI->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_bytesReceived
@@ -829,7 +829,7 @@
GNUNET_GE_ADMIN | GNUNET_GE_BULK |
GNUNET_GE_FATAL, "mkfifo");
GNUNET_free (pipename);
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
return NULL;
}
@@ -875,7 +875,7 @@
GNUNET_free (smtp_server_name);
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
GNUNET_mutex_destroy (lock);
Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/tcp.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -287,7 +287,8 @@
(GNUNET_OK == upnp->get_ip (port,
"TCP",
&haddr->ip))) ||
- (GNUNET_SYSERR != getPublicIPAddress (cfg, ectx, &haddr->ip))))
+ (GNUNET_SYSERR !=
+ GNUNET_IP_get_public_ipv4_address (cfg, ectx, &haddr->ip))))
{
GNUNET_free (msg);
GNUNET_GE_LOG (ectx,
@@ -573,7 +574,7 @@
if (GNUNET_GC_get_configuration_value_yesno (cfg, "TCP", "UPNP", GNUNET_YES)
== GNUNET_YES)
{
- upnp = coreAPI->requestService ("upnp");
+ upnp = coreAPI->GNUNET_CORE_request_service ("upnp");
if (upnp == NULL)
{
@@ -586,7 +587,7 @@
}
}
- stats = coreAPI->requestService ("stats");
+ stats = coreAPI->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_bytesReceived
@@ -618,12 +619,12 @@
GNUNET_GC_detach_change_listener (cfg, &reloadConfiguration, NULL);
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
if (upnp != NULL)
{
- coreAPI->releaseService (upnp);
+ coreAPI->GNUNET_CORE_release_service (upnp);
upnp = NULL;
}
GNUNET_free_non_null (filteredNetworks_);
Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/tcp6.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -524,7 +524,7 @@
return NULL;
}
coreAPI = core;
- stats = coreAPI->requestService ("stats");
+ stats = coreAPI->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_bytesReceived
@@ -554,7 +554,7 @@
donetransport_tcp6 ()
{
GNUNET_GC_detach_change_listener (cfg, &reloadConfiguration, NULL);
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
GNUNET_free_non_null (filteredNetworks_);
GNUNET_mutex_destroy (tcplock);
Modified: GNUnet/src/transports/tcp_helper.c
===================================================================
--- GNUnet/src/transports/tcp_helper.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/tcp_helper.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -145,7 +145,9 @@
GNUNET_mutex_unlock (tcplock);
GNUNET_GE_ASSERT (ectx,
GNUNET_OK ==
- coreAPI->assertUnused (tcpsession->tsession));
+ coreAPI->
+ GNUNET_CORE_connection_assert_tsession_unused
+ (tcpsession->tsession));
GNUNET_mutex_lock (tcplock);
GNUNET_free (tcpsession->tsession);
GNUNET_free (tcpsession);
@@ -265,8 +267,9 @@
tcpSession->sender = welcome->clientIdentity;
tsession->peer = welcome->clientIdentity;
if (tcpSession->accept_addr != NULL)
- setIPaddressFromPID (&welcome->clientIdentity,
- tcpSession->accept_addr, tcpSession->addr_len);
+ GNUNET_IP_set_address_for_peer_identity (&welcome->clientIdentity,
+ tcpSession->accept_addr,
+ tcpSession->addr_len);
}
else
{
Modified: GNUnet/src/transports/test.c
===================================================================
--- GNUnet/src/transports/test.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/test.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -81,7 +81,7 @@
};
static void *
-requestService (const char *name)
+GNUNET_CORE_request_service (const char *name)
{
/* we expect only "stats" to be requested... */
if (0 != strcmp (name, "stats"))
@@ -90,7 +90,7 @@
}
static int
-assertUnused (GNUNET_TSession * tsession)
+GNUNET_CORE_connection_assert_tsession_unused (GNUNET_TSession * tsession)
{
return GNUNET_OK;
}
@@ -248,9 +248,10 @@
api.cron = GNUNET_cron_create (api.ectx);
api.myIdentity = &me;
api.receive = &receive;
- api.requestService = &requestService;
- api.releaseService = NULL; /* not needed */
- api.assertUnused = &assertUnused;
+ api.GNUNET_CORE_request_service = &GNUNET_CORE_request_service;
+ api.GNUNET_CORE_release_service = NULL; /* not needed */
+ api.GNUNET_CORE_connection_assert_tsession_unused =
+ &GNUNET_CORE_connection_assert_tsession_unused;
GNUNET_cron_start (api.cron);
res = GNUNET_OK;
transport = init (&api);
Modified: GNUnet/src/transports/test_repeat.c
===================================================================
--- GNUnet/src/transports/test_repeat.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/test_repeat.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -83,7 +83,7 @@
};
static void *
-requestService (const char *name)
+GNUNET_CORE_request_service (const char *name)
{
/* we expect only "stats" to be requested... */
if (0 != strcmp (name, "stats"))
@@ -92,7 +92,7 @@
}
static int
-assertUnused (GNUNET_TSession * tsession)
+GNUNET_CORE_connection_assert_tsession_unused (GNUNET_TSession * tsession)
{
return GNUNET_OK;
}
@@ -251,9 +251,10 @@
api.cron = GNUNET_cron_create (api.ectx);
api.myIdentity = &me;
api.receive = &receive;
- api.requestService = &requestService;
- api.releaseService = NULL; /* not needed */
- api.assertUnused = &assertUnused;
+ api.GNUNET_CORE_request_service = &GNUNET_CORE_request_service;
+ api.GNUNET_CORE_release_service = NULL; /* not needed */
+ api.GNUNET_CORE_connection_assert_tsession_unused =
+ &GNUNET_CORE_connection_assert_tsession_unused;
GNUNET_cron_start (api.cron);
res = GNUNET_OK;
transport = init (&api);
Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/udp.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -292,7 +292,8 @@
(GNUNET_OK == upnp->get_ip (port,
"UDP",
&haddr->ip))) ||
- (GNUNET_SYSERR != getPublicIPAddress (cfg, ectx, &haddr->ip))))
+ (GNUNET_SYSERR !=
+ GNUNET_IP_get_public_ipv4_address (cfg, ectx, &haddr->ip))))
{
GNUNET_free (msg);
GNUNET_GE_LOG (ectx,
@@ -544,7 +545,7 @@
if (GNUNET_GC_get_configuration_value_yesno (cfg, "UDP", "UPNP", GNUNET_YES)
== GNUNET_YES)
{
- upnp = coreAPI->requestService ("upnp");
+ upnp = coreAPI->GNUNET_CORE_request_service ("upnp");
if (upnp == NULL)
GNUNET_GE_LOG (ectx,
@@ -552,7 +553,7 @@
"The UPnP service could not be loaded. To disable UPnP,
set the "
"configuration option \"UPNP\" in section \"UDP\" to
\"NO\"\n");
}
- stats = coreAPI->requestService ("stats");
+ stats = coreAPI->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_bytesReceived
@@ -587,12 +588,12 @@
{
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
if (upnp != NULL)
{
- coreAPI->releaseService (upnp);
+ coreAPI->GNUNET_CORE_release_service (upnp);
upnp = NULL;
}
GNUNET_mutex_destroy (configLock);
Modified: GNUnet/src/transports/udp6.c
===================================================================
--- GNUnet/src/transports/udp6.c 2007-12-12 06:59:59 UTC (rev 5873)
+++ GNUnet/src/transports/udp6.c 2007-12-12 07:52:18 UTC (rev 5874)
@@ -493,7 +493,7 @@
GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
_("MTU %llu for `%s' is probably too low!\n"), mtu,
"UDP6");
- stats = coreAPI->requestService ("stats");
+ stats = coreAPI->GNUNET_CORE_request_service ("stats");
if (stats != NULL)
{
stat_bytesReceived
@@ -526,7 +526,7 @@
{
if (stats != NULL)
{
- coreAPI->releaseService (stats);
+ coreAPI->GNUNET_CORE_release_service (stats);
stats = NULL;
}
GNUNET_mutex_destroy (configLock);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5874 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/chat applications/datastore applications/dht/module applications/dstore_mysql applications/dstore_sqlite applications/fragmentation applications/fs/ecrs applications/fs/fsui applications/fs/module applications/fs/namespace applications/fs/uritrack applications/gap applications/getoption applications/identity applications/kvstore_sqlite applications/pingpong applications/rpc applications/session applications/sqstore_mysql applications/sqstore_sqlite applications/stats applications/tbench applications/template applications/testbed applications/topology_default applications/tracekit applications/traffic applications/transport applications/vpn include server setup/gtk setup/lib transports,
gnunet <=