[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3190 - in GNUnet/src: applications/advertising application
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3190 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/chat applications/datastore applications/dht/module applications/dht/tools applications/fs/ecrs applications/fs/fsui applications/fs/lib applications/fs/module applications/fs/tools applications/gap applications/identity applications/kvstore_sqlite applications/rpc applications/sqstore_mysql applications/sqstore_sqlite applications/tbench applications/template applications/testbed applications/topology_f2f applications/tracekit applications/traffic applications/vpn server setup transports util/network_client util/os |
|
Date: |
Sun, 30 Jul 2006 20:25:12 -0700 (PDT) |
Author: grothoff
Date: 2006-07-30 20:24:57 -0700 (Sun, 30 Jul 2006)
New Revision: 3190
Modified:
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/advertising/bootstrap.c
GNUnet/src/applications/bootstrap_http/http.c
GNUnet/src/applications/chat/chat.c
GNUnet/src/applications/chat/gnunet-chat.c
GNUnet/src/applications/datastore/datastore.c
GNUnet/src/applications/datastore/prefetch.c
GNUnet/src/applications/dht/module/cs.c
GNUnet/src/applications/dht/module/dht.c
GNUnet/src/applications/dht/tools/dht-join.c
GNUnet/src/applications/dht/tools/dht-query.c
GNUnet/src/applications/dht/tools/dht_api.c
GNUnet/src/applications/fs/ecrs/download.c
GNUnet/src/applications/fs/ecrs/ecrstest.c
GNUnet/src/applications/fs/ecrs/keyspace.c
GNUnet/src/applications/fs/ecrs/meta.c
GNUnet/src/applications/fs/ecrs/namespace.c
GNUnet/src/applications/fs/ecrs/search.c
GNUnet/src/applications/fs/ecrs/upload.c
GNUnet/src/applications/fs/fsui/download.c
GNUnet/src/applications/fs/fsui/file_info.c
GNUnet/src/applications/fs/fsui/fsui.c
GNUnet/src/applications/fs/fsui/helper.c
GNUnet/src/applications/fs/fsui/namespace_info.c
GNUnet/src/applications/fs/fsui/search.c
GNUnet/src/applications/fs/fsui/unindex.c
GNUnet/src/applications/fs/fsui/upload.c
GNUnet/src/applications/fs/lib/fslib.c
GNUnet/src/applications/fs/module/anonymity.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/tools/gnunet-delete.c
GNUnet/src/applications/fs/tools/gnunet-download.c
GNUnet/src/applications/fs/tools/gnunet-insert.c
GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
GNUnet/src/applications/fs/tools/gnunet-search.c
GNUnet/src/applications/fs/tools/gnunet-unindex.c
GNUnet/src/applications/gap/gap.c
GNUnet/src/applications/gap/gaptest.c
GNUnet/src/applications/identity/identity.c
GNUnet/src/applications/kvstore_sqlite/kv_sqlite.c
GNUnet/src/applications/rpc/rpc.c
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/src/applications/sqstore_sqlite/sqlite.c
GNUnet/src/applications/tbench/gnunet-tbench.c
GNUnet/src/applications/tbench/tbench.c
GNUnet/src/applications/template/gnunet-template.c
GNUnet/src/applications/template/template.c
GNUnet/src/applications/testbed/commands.c
GNUnet/src/applications/testbed/gnunet-testbed.c
GNUnet/src/applications/testbed/testbed.c
GNUnet/src/applications/topology_f2f/topology.c
GNUnet/src/applications/tracekit/gnunet-tracekit.c
GNUnet/src/applications/tracekit/tracekit.c
GNUnet/src/applications/traffic/clientapi.c
GNUnet/src/applications/vpn/gnunet-vpn.c
GNUnet/src/applications/vpn/vpn.c
GNUnet/src/server/gnunet-transport-check.c
GNUnet/src/setup/confdata.c
GNUnet/src/setup/glade_support.c
GNUnet/src/setup/gnunet-setup.c
GNUnet/src/setup/gnunet-win-tool.c
GNUnet/src/transports/http.c
GNUnet/src/transports/ip.c
GNUnet/src/transports/ip6.c
GNUnet/src/transports/smtp.c
GNUnet/src/transports/udp6.c
GNUnet/src/util/network_client/tcpio.c
GNUnet/src/util/network_client/tcpiotest.c
GNUnet/src/util/os/semaphoretest.c
Log:
LOG -> GE_LOG
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/advertising/advertising.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -154,16 +154,16 @@
&msg->signature,
&msg->publicKey)) {
EncName enc;
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(&msg->senderIdentity.hashPubKey,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("hello message from `%s' invalid (signature invalid). Dropping.\n"),
(char*)&enc);
return SYSERR; /* message invalid */
}
if ((TIME_T)ntohl(msg->expirationTime) > TIME(NULL) + MAX_HELLO_EXPIRES) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("hello message received invalid (expiration time over limit).
Dropping.\n"));
return SYSERR;
}
@@ -172,7 +172,7 @@
if (stats != NULL)
stats->change(stat_hello_in, 1);
#if DEBUG_ADVERTISING
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
_("hello advertisement for protocol %d received.\n"),
ntohs(msg->protocol));
#endif
@@ -212,7 +212,7 @@
return OK;
} else {
#if DEBUG_ADVERTISING
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"advertised hello differs from prior knowledge,"
" requireing ping-pong confirmation.\n");
#endif
@@ -291,7 +291,7 @@
if (ping == NULL) {
res = SYSERR;
FREE(buffer);
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
_("Could not send hellos+PING, ping buffer full.\n"));
transport->disconnect(tsession);
return SYSERR;
@@ -304,7 +304,7 @@
heloEnd = -2;
}
if (heloEnd <= 0) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("`%s' failed (%d, %u). Will not send PING.\n"),
"getAdvertisedhellos",
heloEnd,
@@ -362,10 +362,10 @@
if (weak_randomi(sd->n) != 0)
return;
#if DEBUG_ADVERTISING
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&hi->hashPubKey,
&other));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Entering `%s' with target `%s'.\n",
__FUNCTION__,
&other);
@@ -400,7 +400,7 @@
NO);
if (NULL == helo) {
#if DEBUG_ADVERTISING
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Exit from `%s' (error: `%s' failed).\n",
__FUNCTION__,
"identity2Helo");
@@ -411,7 +411,7 @@
FREE(helo);
if (tsession == NULL) {
#if DEBUG_ADVERTISING
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Exit from `%s' (%s error).\n",
__FUNCTION__,
"transportConnect");
@@ -426,7 +426,7 @@
P2P_hello_MESSAGE_size(sd->m));
transport->disconnect(tsession);
#if DEBUG_ADVERTISING
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Exit from %s.\n",
__FUNCTION__);
#endif
@@ -460,14 +460,14 @@
if (sd.m == NULL)
return;
#if DEBUG_ADVERTISING
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
_("Advertising my transport %d to selected peers.\n"),
tapi->protocolNumber);
#endif
identity->addHost(sd.m);
if (sd.n < 1) {
if (identity->forEachHost(0, NULL, NULL) == 0)
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Announcing ourselves pointless: "
"no other peers are known to us so far.\n"));
FREE(sd.m);
@@ -570,10 +570,10 @@
if ((TIME_T)ntohl(helo->expirationTime) < now) {
EncName enc;
/* remove hellos that expired */
- IFLOG(LOG_INFO,
+ IFGE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
hash2enc(&peer->hashPubKey,
&enc));
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
_("Removing hello from peer `%s' (expired %ds ago).\n"),
&enc,
now - ntohl(helo->expirationTime));
@@ -749,7 +749,7 @@
= stats->create(gettext_noop("# plaintext PING messages sent"));
}
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("`%s' registering handler %d (plaintext and ciphertext)\n"),
"advertising",
p2p_PROTO_hello);
@@ -768,7 +768,7 @@
NULL);
activeCronJobs += ACJ_ANNOUNCE;
} else {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Network advertisements disabled by configuration!\n"));
}
if (testConfigurationString("NETWORK",
@@ -782,7 +782,7 @@
}
#if DEBUG_ADVERTISING
else
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"hello forwarding disabled!\n");
#endif
Modified: GNUnet/src/applications/advertising/bootstrap.c
===================================================================
--- GNUnet/src/applications/advertising/bootstrap.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/advertising/bootstrap.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -65,7 +65,7 @@
/* select hello by random */
rndidx = weak_randomi(hcq->helosCount);
#if DEBUG_BOOTSTRAP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"%s chose hello %d of %d\n",
__FUNCTION__,
rndidx, hcq->helosCount);
@@ -189,7 +189,7 @@
if (abort_bootstrap != NO)
break;
#if DEBUG_BOOTSTRAP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Starting bootstrap.\n");
#endif
cls.helosLen = 0;
Modified: GNUnet/src/applications/bootstrap_http/http.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/http.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/bootstrap_http/http.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -77,7 +77,7 @@
port = TCP_HTTP_PORT;
if (0 != strncmp(HTTP_URL, url, strlen(HTTP_URL)) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid URL `%s' (must begin with `%s')\n"),
url,
HTTP_URL);
@@ -105,7 +105,7 @@
else {
port = atoi(hostname + curpos + 1);
if (!port) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid port \"%s\" in hostlist specification, trying port
%d.\n"),
TCP_HTTP_PORT);
port = TCP_HTTP_PORT;
@@ -116,7 +116,7 @@
sock = SOCKET(PF_INET, SOCK_STREAM, 0);
if (sock < 0) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: `%s'.\n"),
"socket",
__FILE__, __LINE__,
@@ -128,7 +128,7 @@
/* Do we need to connect through a proxy? */
if (theProxy.sin_addr.s_addr == 0) {
if (OK != GN_getHostByName(hostname, &ip_info)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Could not download list of peer contacts, host `%s' unknown.\n"),
hostname);
FREE(filename);
@@ -151,7 +151,7 @@
if (CONNECT(sock,
(struct sockaddr*)&soaddr,
sizeof(soaddr)) < 0) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("`%s' to `%s' failed at %s:%d with error: %s\n"),
"connect",
hostname,
@@ -177,7 +177,7 @@
command,
curpos);
if (SYSERR == (int)curpos) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("`%s' to `%s' failed at %s:%d with error: %s\n"),
"send",
hostname,
@@ -213,7 +213,7 @@
}
if (curpos < 4) { /* we have not found it */
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Parsing HTTP response for URL `%s' failed.\n"),
url);
closefile(sock);
@@ -248,7 +248,7 @@
}
if (curpos != P2P_hello_MESSAGE_size(helo)) {
if (curpos != 0)
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Parsing hello from `%s' failed.\n"),
url);
break;
@@ -275,12 +275,12 @@
url = getConfigurationString("GNUNETD",
"HOSTLISTURL");
if (url == NULL) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"No hostlist URL specified in configuration, will not bootstrap.\n");
return;
}
#if DEBUG_HTTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Trying to bootstrap with peers from `%s'\n",
url);
#endif
@@ -326,7 +326,7 @@
if (proxy != NULL) {
if (OK != GN_getHostByName(proxy,
&ip)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Could not resolve name of HTTP proxy `%s'. Trying without a
proxy.\n"),
proxy);
theProxy.sin_addr.s_addr = 0;
Modified: GNUnet/src/applications/chat/chat.c
===================================================================
--- GNUnet/src/applications/chat/chat.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/applications/chat/chat.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -83,7 +83,7 @@
HashCode512 hc;
if (ntohs(message->size) != sizeof(P2P_chat_MESSAGE)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Message received from peer is invalid.\n"));
return SYSERR;
}
@@ -111,7 +111,7 @@
pmsg->nick[CHAT_NICK_LENGTH-1] = '\0';
pmsg->message[CHAT_MSG_LENGTH-1] = '\0';
/*
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
" CHAT: received new message from %s: %s\n",
&pmsg->nick[0],
&pmsg->message[0]);
@@ -130,7 +130,7 @@
HashCode512 hc;
if (ntohs(message->size) != sizeof(CS_chat_MESSAGE)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Message received from client is invalid\n"));
return SYSERR; /* invalid message */
}
@@ -152,11 +152,11 @@
message);
if (j == -1) {
if (clientCount == MAX_CLIENTS)
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Maximum number of chat clients reached.\n"));
else {
clients[clientCount++] = client;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("Now %d of %d chat clients at this node.\n"),
clientCount, MAX_CLIENTS);
}
@@ -173,7 +173,7 @@
MUTEX_LOCK(&chatMutex);
for (i=0;i<clientCount;i++)
if (clients[i] == client) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Chat client exits.\n");
clients[i] = clients[--clientCount];
break;
@@ -193,7 +193,7 @@
MUTEX_CREATE(&chatMutex);
clientCount = 0;
coreAPI = capi;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("`%s' registering handlers %d and %d\n"),
"chat",
P2P_PROTO_chat_MSG,
Modified: GNUnet/src/applications/chat/gnunet-chat.c
===================================================================
--- GNUnet/src/applications/chat/gnunet-chat.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/chat/gnunet-chat.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -89,7 +89,7 @@
return SYSERR;
}
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return -1;
} /* end of parsing commandline */
Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/datastore/datastore.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -86,10 +86,10 @@
#if DEBUG_DATASTORE
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Datastore availability pre-test failed for `%s'.\n",
&enc);
#endif
@@ -111,10 +111,10 @@
int i;
if (! testAvailable(query)) {
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(query,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Availability test failed for `%s' at %s:%d.\n"),
&enc,
__FILE__, __LINE__);
@@ -127,18 +127,18 @@
available += ntohl(value->size);
}
#if DEBUG_DATASTORE
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Deleted `%s' from database.\n",
&enc);
#endif
} else {
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(query,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Database failed to delete `%s'.\n"),
&enc);
}
@@ -161,7 +161,7 @@
/* check if we have enough space / priority */
if ( (available < ntohl(value->size) ) &&
(minPriority > ntohl(value->prio)) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
"Datastore full (%llu/%llu) and content priority too low to kick out
other content. Refusing put.\n",
sq->getSize(),
quota);
@@ -247,7 +247,7 @@
return OK;
}
#if DEBUG_DATASTORE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Migration: available %llu (need %u), min priority %u have %u\n",
available, ntohl(value->size),
minPriority,
Modified: GNUnet/src/applications/datastore/prefetch.c
===================================================================
--- GNUnet/src/applications/datastore/prefetch.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/datastore/prefetch.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -102,7 +102,7 @@
}
}
#if DEBUG_PREFETCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Adding content to prefetch buffer (%u)\n",
rCBPos);
#endif
@@ -190,13 +190,13 @@
if (minIdx == -1) {
MUTEX_UNLOCK(&lock);
#if DEBUG_PREFETCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Failed to find content in prefetch buffer\n");
#endif
return SYSERR;
}
#if DEBUG_PREFETCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Found content in prefetch buffer (%u)\n",
minIdx);
#endif
Modified: GNUnet/src/applications/dht/module/cs.c
===================================================================
--- GNUnet/src/applications/dht/module/cs.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/dht/module/cs.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -442,7 +442,7 @@
}
}
MUTEX_UNLOCK(&csLock);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("`%s' failed: table not found!\n"),
"CS_DHT_LEAVE");
return sendAck(client,
@@ -454,7 +454,7 @@
DHT_CLIENT_PUT_RECORD * record = cls;
int i;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Signaling client put completion: %d\n",
record->replicas);
MUTEX_LOCK(&csLock);
@@ -462,7 +462,7 @@
if (OK != sendAck(record->client,
&record->table,
record->replicas)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("`%s' failed. Terminating connection to client.\n"),
"sendAck");
coreAPI->terminateClientConnection(record->client);
@@ -519,7 +519,7 @@
putRecordsSize+1);
putRecords[putRecordsSize-1] = ptr;
MUTEX_UNLOCK(&csLock);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Starting DHT put\n");
ptr->put_record = dhtAPI->put_start(&req->table,
&req->key,
@@ -538,7 +538,7 @@
if (OK != sendAck(record->client,
&record->table,
record->replicas)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("sendAck failed. Terminating connection to client.\n"));
coreAPI->terminateClientConnection(record->client);
}
@@ -647,7 +647,7 @@
memcpy(&msg[1],
value,
ntohl(value->size));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' processes reply '%.*s'\n",
__FUNCTION__,
ntohl(value->size) - sizeof(DataContainer),
@@ -657,7 +657,7 @@
msg->header.type = htons(CS_PROTO_dht_REPLY_GET);
if (OK != coreAPI->sendToClient(record->client,
&msg->header)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("`%s' failed. Terminating connection to client.\n"),
"sendToClient");
coreAPI->terminateClientConnection(record->client);
@@ -675,7 +675,7 @@
if (OK != sendAck(record->client,
&record->table,
SYSERR)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("`%s' failed. Terminating connection to client.\n"),
"sendAck");
coreAPI->terminateClientConnection(record->client);
@@ -684,7 +684,7 @@
if (OK != sendAck(record->client,
&record->table,
record->count)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("`%s' failed. Terminating connection to client.\n"),
"sendAck");
coreAPI->terminateClientConnection(record->client);
@@ -804,7 +804,7 @@
}
}
MUTEX_UNLOCK(&csLock);
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Failed to deliver `%s' message.\n"),
"CS_dht_reply_ack_MESSAGE");
return SYSERR; /* failed to signal */
@@ -857,7 +857,7 @@
}
}
MUTEX_UNLOCK(&csLock);
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Failed to deliver `%s' message.\n"),
"CS_dht_reply_results_MESSAGE");
return SYSERR; /* failed to deliver */
@@ -946,7 +946,7 @@
if (dhtAPI == NULL)
return SYSERR;
coreAPI = capi;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"DHT registering client handlers: "
"%d %d %d %d %d %d %d\n",
CS_PROTO_dht_REQUEST_JOIN,
@@ -991,7 +991,7 @@
int status;
status = OK;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"DHT: shutdown\n");
if (OK != coreAPI->unregisterClientHandler(CS_PROTO_dht_REQUEST_JOIN,
&csJoin))
Modified: GNUnet/src/applications/dht/module/dht.c
===================================================================
--- GNUnet/src/applications/dht/module/dht.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/dht/module/dht.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -692,7 +692,7 @@
unsigned int i;
MUTEX_LOCK(lock);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"DHT ROUTING TABLE:\n");
for (i=0;i<bucketCount;i++) {
if (buckets[i].peers != NULL) {
@@ -711,7 +711,7 @@
hash2enc(&pos->tables[j],
&tabs[j]);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"[%4d: %3d-%3d]: %s with %u tables (%s, %s, %s)\n",
i,
buckets[i].bstart, buckets[i].bend,
@@ -724,7 +724,7 @@
}
}
}
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"DHT ROUTING TABLE END\n");
MUTEX_UNLOCK(lock);
}
@@ -826,7 +826,7 @@
&enc1);
hash2enc(&coreAPI->myIdentity->hashPubKey,
&enc2);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Bit-distance from `%s' to this peer `%s' is %u bit.\n",
&enc1,
&enc2,
@@ -842,7 +842,7 @@
return &buckets[i];
} else {
#if DEBUG_DHT
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
"Index %d not in range for bucket %d which is [%d,%d[\n",
index,
i,
@@ -939,10 +939,10 @@
(void**)&data)) {
tableCount = dataLength / sizeof(DHT_TableId);
if (tableCount * sizeof(DHT_TableId) != dataLength) {
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(&responder->hashPubKey,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Malformed optional field `%s' received from peer `%s'.\n"),
"tables",
&enc);
@@ -952,10 +952,10 @@
cronTime(&now);
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&responder->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"updating routing table after learning about peer `%s' who provides %d
tables.\n",
&enc,
tableCount);
@@ -966,10 +966,10 @@
pos = findPeerInfo(responder);
bucket = findBucket(responder);
if (bucket == NULL) {
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(&responder->hashPubKey,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Could not find peer `%s' in routing table!\n"),
&enc);
}
@@ -1011,19 +1011,19 @@
}
if (pos == NULL) {
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&responder->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"routing table full, not adding peer `%s'.\n",
&enc);
#endif
} else {
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&responder->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"adding peer `%s' to routing table.\n",
&enc);
#endif
@@ -1113,10 +1113,10 @@
"peer",
&dataLength,
(void**) &value)) {
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(&responder->hashPubKey,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Received malformed response to `%s' from peer `%s'.\n"),
"DHT_findNode",
&enc);
@@ -1128,10 +1128,10 @@
the peer will automatically trigger the ping_reply_handler
which will in turn trigger create_find_nodes_rpc) */
if ( (dataLength % sizeof(PeerIdentity)) != 0) {
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(&responder->hashPubKey,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Received malformed response to `%s' from peer `%s'.\n"),
"DHT_findNode",
&enc);
@@ -1142,17 +1142,17 @@
msg = (PeerIdentity*) &value[pos];
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&responder->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"processing PeerID received from peer `%s' in response to `%s' RPC.\n",
&enc,
"DHT_findNode");
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&msg->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"sending RPC `%s' to learn more about peer `%s'.\n",
"DHT_ping",
&enc);
@@ -1178,10 +1178,10 @@
#if DEBUG_DHT
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&peer->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"sending RPC `%s' to peer `%s'.\n",
"DHT_find_nodes",
&enc);
@@ -1263,10 +1263,10 @@
}
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&responder->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"peer `%s' supports table in question, considering the peer for list of
%d-best matches.\n",
&enc,
ALPHA);
@@ -1297,10 +1297,10 @@
#if DEBUG_DHT
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&identity->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"sending RPC `%s' to peer `%s'.\n",
"DHT_ping",
&enc);
@@ -1362,10 +1362,10 @@
#if DEBUG_DHT
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(table,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"searching local table for peers supporting table `%s'.\n",
&enc);
#endif
@@ -1383,10 +1383,10 @@
#if DEBUG_DHT
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&pos->id.hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"local table search showed peer `%s' is supporting the table.\n",
&enc);
#endif
@@ -1428,10 +1428,10 @@
max = RPC_paramCount(results);
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&responder->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"peer `%s' responded to RPC `%s' with %u results.\n",
&enc,
"DHT_findvalue",
@@ -1443,7 +1443,7 @@
if (value == NULL) {
hash2enc(&responder->hashPubKey,
&enc);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid response to `%s' from peer `%s'.\n"),
"DHT_findValue",
&enc);
@@ -1477,10 +1477,10 @@
EncName enc;
ENTER();
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&peer->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"sending RPC `%s' to peer `%s'.\n",
"DHT_findvalue",
&enc);
@@ -1585,13 +1585,13 @@
int res;
ENTER();
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&keys[0],
&enc));
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(table,
&enc2));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"performing `%s' operation on key `%s' and table `%s'.\n",
"DHT_GET",
&enc,
@@ -1599,7 +1599,7 @@
#endif
if (timeout > 1 * cronHOURS) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("`%s' called with timeout above 1 hour (bug?)\n"),
__FUNCTION__);
timeout = 1 * cronHOURS;
@@ -1630,10 +1630,10 @@
if (ltd != NULL) {
PeerIdentity * hosts;
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(table,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"I participate in the table `%s' for the `%s' operation.\n",
&enc,
"DHT_GET");
@@ -1671,10 +1671,10 @@
(DataProcessor)&getLocalResultCallback,
ret);
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&keys[0],
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"local datastore lookup for key `%s' resulted in %d results.\n",
&enc,
res);
@@ -1689,10 +1689,10 @@
if (! hostIdentityEquals(coreAPI->myIdentity,
&hosts[i])) {
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&hosts[i].hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"sending RPC `%s' to peer `%s' that also participates in the
table.\n",
"DHT_GET",
&enc);
@@ -1704,10 +1704,10 @@
}
} else {
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(table,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"I do not participate in the table `%s', finding %d other nodes that
do.\n",
&enc,
ALPHA);
@@ -1751,7 +1751,7 @@
resultsFound = record->resultsFound;
FREE(record);
#if DEBUG_DHT
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' operation completed with %d results.\n",
"DHT_GET",
resultsFound);
@@ -1785,11 +1785,11 @@
dataLength = ntohl(cont->size) - sizeof(DataContainer);
if ( (dataLength % sizeof(PeerIdentity)) != 0) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Response size was %d, expected multile of %d\n",
dataLength,
sizeof(PeerIdentity));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid response to `%s'.\n"),
"DHT_findValue");
return SYSERR;
@@ -1841,10 +1841,10 @@
EncName enc;
ENTER();
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(table,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"function `%s' called to look for nodes participating in table `%s'.\n",
__FUNCTION__,
&enc);
@@ -1868,7 +1868,7 @@
(PeerIdentity*) fnc->matches,
ALPHA);
#if DEBUG_DHT
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"found %d participating nodes in local routing table.\n",
fnc->k);
#endif
@@ -1887,7 +1887,7 @@
if (equalsHashCode512(table,
&masterTableId)) {
#if DEBUG_DHT
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"broadcasting RPC ping to find other peers for master table.\n");
#endif
/* No or too few other DHT peers known, search
@@ -1897,10 +1897,10 @@
fnc);
} else {
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(table,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"performing RPC `%s' to find other peers participating in table
`%s'.\n",
"DHT_findValue",
&enc);
@@ -1989,7 +1989,7 @@
the peer will automatically trigger the ping_reply_handler
which will in turn trigger create_find_nodes_rpc) */
if ( (dataLength % sizeof(PeerIdentity)) != 0) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Malformed response to `%s' on master table.\n"),
"DHT_findValue");
return SYSERR;
@@ -1999,10 +1999,10 @@
msg = &value[pos];
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&msg->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"master table returned peer `%s' in `%s' operation.\n",
&enc,
"DHT_findValue");
@@ -2066,7 +2066,7 @@
ENTER();
hash2enc(table,
&enc);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' called to find %d nodes that participate in table `%s'.\n",
__FUNCTION__,
k,
@@ -2097,7 +2097,7 @@
closure);
if (found == k) {
#if DEBUG_DHT
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' found %d nodes in local table, no remote requests needed.\n",
__FUNCTION__,
k);
@@ -2118,7 +2118,7 @@
/* findKNodes_start called for masterTable. That should not happen! */
} else {
#if DEBUG_DHT
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' sends request to find %d in master table.\n",
__FUNCTION__,
k);
@@ -2203,7 +2203,7 @@
MUTEX_UNLOCK(&record->lock);
hash2enc(&responder->hashPubKey,
&enc);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid response to `%s' from `%s'\n"),
"DHT_put",
&enc);
@@ -2229,10 +2229,10 @@
#if DEBUG_DHT
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&peer->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"sending RPC `%s' to peer `%s'.\n",
"DHT_store",
&enc);
@@ -2323,20 +2323,20 @@
}
ENTER();
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(table,
&enc2));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"performing `%s' operation on key `%s' and table `%s'.\n",
"DHT_PUT",
&enc,
&enc2);
#endif
if (timeout > 1 * cronHOURS) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("`%s' called with timeout above 1 hour (bug?)\n"),
__FUNCTION__);
timeout = 1 * cronHOURS;
@@ -2362,10 +2362,10 @@
if (ltd != NULL) {
PeerIdentity * hosts;
#if DEBUG_DHT
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(table,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"I participate in the table `%s' for the `%s' operation.\n",
&enc,
"DHT_PUT");
@@ -2503,7 +2503,7 @@
MUTEX_UNLOCK(&record->lock);
hash2enc(&responder->hashPubKey,
&enc);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid response to `%s' from `%s'\n"),
"DHT_remove",
&enc);
@@ -2531,10 +2531,10 @@
EncName enc;
ENTER();
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&peer->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"sending RPC `%s' to peer `%s'.\n",
"DHT_remove",
&enc);
@@ -2609,7 +2609,7 @@
unsigned int count;
if (timeout > 1 * cronHOURS) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("`%s' called with timeout above 1 hour (bug?)\n"),
__FUNCTION__);
timeout = 1 * cronHOURS;
@@ -2826,10 +2826,10 @@
#if DEBUG_DHT
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&sender->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received RPC `%s' from peer `%s'.\n",
"DHT_ping",
&enc);
@@ -2877,7 +2877,7 @@
&dataLength,
(void**) &table)) ||
(dataLength != sizeof(DHT_TableId)) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Received invalid RPC `%s'.\n"),
"DHT_findNode");
return;
@@ -3017,7 +3017,7 @@
&dataLength,
(void**) &type)) ||
(dataLength != sizeof(unsigned int)) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Received invalid RPC `%s'.\n"),
"DHT_findValue");
return;
@@ -3144,7 +3144,7 @@
(dataLength != sizeof(unsigned long long)) ||
((NULL == (value = RPC_paramDataContainerByName(arguments,
"value")))) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Received invalid RPC `%s'.\n"),
"DHT_store");
return;
@@ -3156,7 +3156,7 @@
MUTEX_LOCK(lock);
ltd = getLocalTableData(table);
if (ltd == NULL) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("RPC for `%s' received for table that we do not participate in!\n"),
"DHT_store");
}
@@ -3278,7 +3278,7 @@
&dataLength,
(void**) &timeout)) ||
(dataLength != sizeof(unsigned long long)) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Received invalid RPC `%s'.\n"),
"DHT_remove");
return;
@@ -3292,7 +3292,7 @@
MUTEX_LOCK(lock);
ltd = getLocalTableData(table);
if (ltd == NULL) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("RPC for `%s' received for table that we do not participate in!\n"),
"DHT_removed");
}
@@ -3504,10 +3504,10 @@
EncName enc;
ENTER();
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&pos->id.hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"sending RPC `%s' to peer `%s'.\n",
"DHT_ping",
&enc);
Modified: GNUnet/src/applications/dht/tools/dht-join.c
===================================================================
--- GNUnet/src/applications/dht/tools/dht-join.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/dht/tools/dht-join.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -81,7 +81,7 @@
case 'm': {
unsigned int max;
if (1 != sscanf(GNoptarg, "%ud", &max)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-m");
return SYSERR;
@@ -104,14 +104,14 @@
verbose++;
break;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"),
c);
return SYSERR;
} /* end of parsing commandline */
} /* while (1) */
if (argc - GNoptind != 0)
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Superflous arguments (ignored).\n"));
return OK;
}
@@ -232,7 +232,7 @@
initializeShutdownHandlers();
if (OK != DHT_LIB_join(&myStore,
&table)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Error joining DHT.\n"));
destroy_blockstore_memory((Blockstore*)myStore.closure);
doneShutdownHandlers();
@@ -246,7 +246,7 @@
/* shutdown */
if (OK != DHT_LIB_leave(&table)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Error leaving DHT.\n"));
destroy_blockstore_memory((Blockstore*)myStore.closure);
doneShutdownHandlers();
Modified: GNUnet/src/applications/dht/tools/dht-query.c
===================================================================
--- GNUnet/src/applications/dht/tools/dht-query.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/dht/tools/dht-query.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -80,7 +80,7 @@
case 'T': {
unsigned int max;
if (1 != sscanf(GNoptarg, "%ud", &max)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-T");
return SYSERR;
@@ -95,14 +95,14 @@
printf("dht-query v0.0.1\n");
return SYSERR;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"),
c);
return SYSERR;
} /* end of parsing commandline */
} /* while (1) */
if (argc - GNoptind == 0) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("No commands specified.\n"));
printHelp();
return SYSERR;
@@ -131,7 +131,7 @@
hash(key,
strlen(key),
&hc);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Issuing '%s(%s)' command.\n",
"get", key);
ret = DHT_LIB_get(&table,
@@ -161,7 +161,7 @@
dc->size = htonl(strlen(value)
+ sizeof(DataContainer));
memcpy(&dc[1], value, strlen(value));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Issuing '%s(%s,%s)' command.\n",
"put", key, value);
if (OK == DHT_LIB_put(&table,
@@ -193,7 +193,7 @@
dc->size = htonl(strlen(value)
+ sizeof(DataContainer));
memcpy(&dc[1], value, strlen(value));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Issuing '%s(%s,%s)' command.\n",
"remove", key, value);
if (OK == DHT_LIB_remove(&table,
Modified: GNUnet/src/applications/dht/tools/dht_api.c
===================================================================
--- GNUnet/src/applications/dht/tools/dht_api.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/dht/tools/dht_api.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -80,7 +80,7 @@
* return the status, otherwise SYSERR.
*/
static int checkACK(CS_MESSAGE_HEADER * reply) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"received ACK from gnunetd\n");
if ( (sizeof(CS_dht_reply_ack_MESSAGE) == ntohs(reply->size)) &&
(CS_PROTO_dht_REPLY_ACK == ntohs(reply->type)) )
@@ -96,7 +96,7 @@
int value) {
CS_dht_reply_ack_MESSAGE msg;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"sending ACK to gnunetd\n");
msg.header.size = htons(sizeof(CS_dht_reply_ack_MESSAGE));
msg.header.type = htons(CS_PROTO_dht_REPLY_ACK);
@@ -123,7 +123,7 @@
ntohl(value->size));
if (OK != writeToSocket(list->sock,
&reply->header)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Failed to send `%s'. Closing connection.\n"),
"CS_dht_reply_results_MESSAGE");
MUTEX_LOCK(&list->lock);
@@ -186,7 +186,7 @@
buffer = NULL;
while (OK == readFromSocket(list->sock,
&buffer)) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received message of type %d from gnunetd\n",
ntohs(buffer->type));
@@ -197,7 +197,7 @@
int keyCount;
if (sizeof(CS_dht_request_get_MESSAGE) != ntohs(buffer->size)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Received invalid `%s' request (size %d)\n"),
"GET",
ntohs(buffer->size));
@@ -210,7 +210,7 @@
req = (CS_dht_request_get_MESSAGE*) buffer;
if (! equalsHashCode512(&req->table,
&list->table)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Received invalid `%s' request (wrong table)\n"),
"GET");
MUTEX_LOCK(&list->lock);
@@ -232,7 +232,7 @@
(OK != sendAck(list->sock,
&list->table,
resCount)) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Failed to send `%s'. Closing connection.\n"),
"ACK");
MUTEX_LOCK(&list->lock);
@@ -249,7 +249,7 @@
DataContainer * value;
if (sizeof(CS_dht_request_put_MESSAGE) > ntohs(buffer->size)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Received invalid `%s' request (size %d)\n"),
"PUT",
ntohs(buffer->size));
@@ -262,7 +262,7 @@
req = (CS_dht_request_put_MESSAGE*) buffer;
if (! equalsHashCode512(&req->table,
&list->table)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Received invalid `%s' request (wrong table)\n"),
"PUT");
MUTEX_LOCK(&list->lock);
@@ -285,7 +285,7 @@
&req->key,
value,
ntohl(req->priority)))) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Failed to send `%s'. Closing connection.\n"),
"ACK");
MUTEX_LOCK(&list->lock);
@@ -303,7 +303,7 @@
DataContainer * value;
if (sizeof(CS_dht_request_remove_MESSAGE) > ntohs(buffer->size)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Received invalid `%s' request (size %d)\n"),
"REMOVE",
ntohs(buffer->size));
@@ -316,7 +316,7 @@
req = (CS_dht_request_remove_MESSAGE*) buffer;
if (! equalsHashCode512(&req->table,
&list->table)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Received invalid `%s' request (wrong table)\n"),
"REMOVE");
MUTEX_LOCK(&list->lock);
@@ -339,7 +339,7 @@
list->store->del(list->store->closure,
&req->key,
value))) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Failed to send `%s'. Closing connection.\n"),
"ACK");
MUTEX_LOCK(&list->lock);
@@ -356,7 +356,7 @@
int resCount;
if (sizeof(CS_dht_request_iterate_MESSAGE) != ntohs(buffer->size)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Received invalid `%s' request (size %d)\n"),
"ITERATE",
ntohs(buffer->size));
@@ -373,7 +373,7 @@
if (OK != sendAck(list->sock,
&list->table,
resCount)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Failed to send `%s'. Closing connection.\n"),
"ACK");
MUTEX_LOCK(&list->lock);
@@ -386,7 +386,7 @@
default:
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Received unknown request type %d at %s:%d\n"),
ntohs(buffer->type),
__FILE__, __LINE__);
@@ -426,7 +426,7 @@
for (i=0;i<tableCount;i++)
if (equalsHashCode512(&tables[i]->table,
table)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("This client already participates in the given DHT!\n"));
MUTEX_UNLOCK(&lock);
return SYSERR;
@@ -494,7 +494,7 @@
}
MUTEX_UNLOCK(&lock);
if (list == NULL) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Cannot leave DHT: table not known!\n"));
return SYSERR; /* no such table! */
}
@@ -516,17 +516,17 @@
if (OK == checkACK(reply))
ret = OK;
else
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("gnunetd signaled error in response to `%s' message\n"),
"CS_dht_request_leave_MESSAGE");
FREE(reply);
} else {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Failed to receive response to `%s' message from gnunetd\n"),
"CS_dht_request_leave_MESSAGE");
}
} else {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Failed to send `%s' message to gnunetd\n"),
"CS_dht_request_leave_MESSAGE");
}
@@ -618,7 +618,7 @@
}
if ( (sizeof(CS_dht_reply_results_MESSAGE) > ntohs(reply->size)) ||
(CS_PROTO_dht_REPLY_GET != ntohs(reply->type)) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Unexpected reply to `%s' operation.\n"),
"GET");
releaseClientSocket(sock);
@@ -666,7 +666,7 @@
CS_MESSAGE_HEADER * reply;
int ret;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"DHT_LIB_put called with value '%.*s'\n",
ntohl(value->size),
&value[1]);
Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/ecrs/download.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -121,7 +121,7 @@
strcat(fn, ".A");
fn[strlen(fn)-1]+=i;
if (0 != UNLINK(fn))
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Could not unlink temporary file `%s': %s\n"),
fn, STRERROR(errno));
FREE(fn);
@@ -218,7 +218,7 @@
len);
MUTEX_UNLOCK(&this->lock);
#ifdef DEBUG_DOWNLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"IOC read at level %u offset %llu wanted %u got %d\n",
level,
pos,
@@ -253,7 +253,7 @@
buf,
len);
if (ret != len) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Write(%d, %p, %d) failed: %s\n"),
this->handles[level],
buf,
@@ -262,7 +262,7 @@
}
MUTEX_UNLOCK(&this->lock);
#ifdef DEBUG_DOWNLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"IOC write at level %u offset %llu writes %u\n",
level,
pos,
@@ -455,7 +455,7 @@
rm->ssthresh
= 65535;
#ifdef DEBUG_DOWNLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"created request manager %p\n",
rm);
#endif
@@ -473,7 +473,7 @@
int i;
#ifdef DEBUG_DOWNLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"destroying request manager %p\n",
rm);
#endif
@@ -524,10 +524,10 @@
#if DEBUG_DOWNLOAD
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&node->chk.query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Queuing request (query: %s)\n",
&enc);
#endif
@@ -626,7 +626,7 @@
> node->ctx->total)
ret = (unsigned int) (node->ctx->total - node->offset);
#if DEBUG_DOWNLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Node at offset %llu and level %d has size %u\n",
node->offset,
node->level,
@@ -645,7 +645,7 @@
if (ret * rsize < epos - spos)
ret++; /* need to round up! */
#if DEBUG_DOWNLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Node at offset %llu and level %d has size %u\n",
node->offset,
node->level,
@@ -794,7 +794,7 @@
ret = NO;
FREE(data);
#ifdef DEBUG_DOWNLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Checked presence of block at %llu level %u. Result: %s\n",
node->offset,
node->level,
@@ -899,10 +899,10 @@
#if DEBUG_DOWNLOAD
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Receiving reply to query `%s'\n",
&enc);
#endif
@@ -931,7 +931,7 @@
node);
FREE(data);
GE_BREAK(ectx, 0);
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Decrypted content does not match key. "
"This is either a bug or a maliciously inserted "
"file. Download aborted.\n"));
@@ -1062,10 +1062,10 @@
}
#if DEBUG_DOWNLOAD
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&entry->node->chk.query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Starting FS search for %s:%llu:%u `%s'\n",
entry->node->ctx->ioc->filename,
entry->node->offset,
@@ -1105,10 +1105,10 @@
if ( (0 == (entry->tries % MAX_TRIES)) &&
(entry->tries > 0) ) {
EncName enc;
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(&entry->node->chk.key,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Content `%s' seems to be not available on the network (tried %u
times).\n"),
&enc,
entry->tries);
@@ -1212,7 +1212,7 @@
cron_t minSleep;
#if DEBUG_DOWNLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' running for file `%s'\n",
__FUNCTION__,
filename);
@@ -1238,7 +1238,7 @@
ntohll(fid.file_length),
filename)) {
#if DEBUG_DOWNLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' aborted for file `%s'\n",
__FUNCTION__,
filename);
@@ -1279,7 +1279,7 @@
ret = OK;
} else {
#if 0
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
"Download ends prematurely: %d %llu == %llu %d TT: %d\n",
rm->requestListIndex,
ctx.completed,
@@ -1295,7 +1295,7 @@
else
freeIOC(&ioc, NO); /* aborted */
#if DEBUG_DOWNLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' terminating for file `%s' with result %s\n",
__FUNCTION__,
filename,
Modified: GNUnet/src/applications/fs/ecrs/ecrstest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrstest.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/ecrs/ecrstest.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -139,7 +139,7 @@
char * tmp;
tmp = ECRS_uriToString(fi->uri);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Search found URI `%s'\n",
tmp);
FREE(tmp);
@@ -184,7 +184,7 @@
char * tmp;
tmp = ECRS_uriToString(uri);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Starting download of `%s'\n",
tmp);
FREE(tmp);
Modified: GNUnet/src/applications/fs/ecrs/keyspace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/keyspace.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/ecrs/keyspace.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -72,7 +72,7 @@
if (size < sizeof(KBlock))
return SYSERR;
kb = (KBlock*) &value[1];
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
ECRS_decryptInPlace(key,
@@ -211,10 +211,10 @@
strlen(keywords[i]),
&key);
#if DEBUG_KEYSPACE
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&key,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Encrypting KBlock with key %s.\n",
&enc);
#endif
Modified: GNUnet/src/applications/fs/ecrs/meta.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/meta.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/ecrs/meta.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -769,7 +769,7 @@
(0 != strcmp(mime, mimeMap[i][0])) )
i++;
if (mimeMap[i][1] == NULL)
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Did not find mime type `%s' in extension list.\n",
mime);
mime = mimeMap[i][1];
@@ -838,7 +838,7 @@
if (0 != STAT(renameTo,
&filestat)) {
if (0 != RENAME(filename, renameTo))
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Renaming of file `%s' to `%s' failed: %s\n"),
filename,
renameTo,
@@ -846,7 +846,7 @@
else
ret = STRDUP(renameTo);
} else {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Could not rename file `%s' to `%s': file exists\n"),
filename,
renameTo);
Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -129,7 +129,7 @@
}
fileName = getPseudonymFileName(name);
if (1 == readFile(fileName, 1, &tmp)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Cannot create pseudonym `%s', file `%s' exists.\n"),
name,
fileName);
@@ -303,7 +303,7 @@
return SYSERR;
}
if (len < 2) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("File `%s' does not contain a pseudonym.\n"),
fileName);
FREE(fileName);
@@ -314,7 +314,7 @@
FREE(fileName);
hke = (PrivateKeyEncoded*) dst;
if ( ntohs(hke->len) != len ) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Format of pseudonym `%s' is invalid.\n"),
name);
FREE(hke);
@@ -379,7 +379,7 @@
return NULL;
}
if (len < 2) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("File `%s' does not contain a pseudonym.\n"),
fileName);
FREE(fileName);
@@ -390,7 +390,7 @@
FREE(fileName);
hke = (PrivateKeyEncoded*) dst;
if ( ntohs(hke->len) != len ) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Format of pseudonym `%s' is invalid.\n"),
name);
FREE(hke);
@@ -524,7 +524,7 @@
return OK;
}
if (len < 2) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("File `%s' does not contain a pseudonym.\n"),
fileName);
FREE(fileName);
@@ -534,7 +534,7 @@
len = readFile(fileName, len, dst);
hke = (PrivateKeyEncoded*) dst;
if ( ntohs(hke->len) != len ) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Format of file `%s' is invalid.\n"),
fileName);
FREE(hke);
@@ -544,7 +544,7 @@
hk = decodePrivateKey(hke);
FREE(hke);
if (hk == NULL) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Format of file `%s' is invalid.\n"),
fileName);
FREE(fileName);
Modified: GNUnet/src/applications/fs/ecrs/search.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/search.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/ecrs/search.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -156,7 +156,7 @@
SendQueriesContext * sqc) {
switch (uri->type) {
case chk:
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("CHK URI not allowed for search.\n"));
break;
case sks: {
@@ -185,7 +185,7 @@
int i;
#if DEBUG_SEARCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Computing queries (this may take a while).\n");
#endif
for (i=0;i<uri->data.ksk.keywordCount;i++) {
@@ -206,13 +206,13 @@
freePrivateKey(pk);
}
#if DEBUG_SEARCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Queries ready.\n");
#endif
break;
}
case loc:
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("LOC URI not allowed for search.\n"));
break;
default:
@@ -326,7 +326,7 @@
type = ntohl(value->type);
size = ntohl(value->size) - sizeof(Datastore_Value);
#if DEBUG_SEARCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Search received reply of type %u and size %u.\n",
type, size);
#endif
@@ -360,10 +360,10 @@
kb = MALLOC(size);
memcpy(kb, &value[1], size);
#if DEBUG_SEARCH
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&ps->decryptKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Decrypting KBlock with key %s.\n",
&enc);
#endif
@@ -594,7 +594,7 @@
ps->priority = new_priority;
ps->lastTransmission = now;
#if DEBUG_SEARCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"ECRS initiating FS search with timeout %llus and priority %u.\n",
(ps->timeout - now) / cronSECONDS,
ps->priority);
Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/ecrs/upload.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -74,10 +74,10 @@
size,
&ichk.query);
#if DEBUG_UPLOAD
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&ichk.query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Query for current iblock at level %u is %s\n",
level,
&enc);
@@ -98,10 +98,10 @@
}
value->prio = htonl(prio);
#if DEBUG_UPLOAD
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&ichk.query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Publishing block (query: %s)\n",
&enc);
#endif
@@ -172,24 +172,24 @@
if (isDirectory(filename)) {
GE_BREAK(ectx, 0);
/* Should not happen */
- LOG(LOG_ERROR, "Cannot upload file `%s', it seems to be a directory!",
filename);
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, "Cannot upload file `%s', it
seems to be a directory!", filename);
return SYSERR;
}
if (0 == assertIsFile(filename)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' is not a file.\n"),
filename);
return SYSERR;
}
if (OK != getFileSize(filename,
&filesize)) {
- LOG(LOG_ERROR, _("Cannot get size of file `%s'"), filename);
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("Cannot get size of file
`%s'"), filename);
return SYSERR;
}
sock = getClientSocket();
if (sock == NULL) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Failed to connect to gnunetd."));
return SYSERR;
}
@@ -199,7 +199,7 @@
if (doIndex) {
if (SYSERR == getFileHash(filename,
&fileId)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Cannot hash `%s'.\n"),
filename);
releaseClientSocket(sock);
@@ -217,13 +217,13 @@
switch (FS_initIndex(sock, &fileId, filename)) {
case SYSERR:
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Initialization for indexing file `%s' failed.\n"),
filename);
releaseClientSocket(sock);
return SYSERR;
case NO:
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Indexing file `%s' failed. Trying to insert file...\n"),
filename);
doIndex = YES;
@@ -290,10 +290,10 @@
size + sizeof(DBlock),
&chk.query);
#if DEBUG_UPLOAD
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&chk.query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Query for current block of size %u is %s\n",
size,
&enc);
@@ -303,7 +303,7 @@
&fileId,
dblock,
pos)) {
- LOG(LOG_ERROR, _("Indexing data failed at
position %i.\n"), pos);
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Indexing data failed at position %i.\n"), pos);
goto FAILURE;
}
} else {
@@ -341,7 +341,7 @@
if (OK != tt(ttClosure))
goto FAILURE;
#if DEBUG_UPLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Tree depth is %u, walking up tree.\n",
treedepth);
#endif
@@ -350,7 +350,7 @@
GNUNET_ASSERT(size < MAX_BUFFER_SIZE);
if (size == sizeof(DBlock)) {
#if DEBUG_UPLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Level %u is empty\n",
i);
#endif
@@ -361,7 +361,7 @@
size,
&chk.key);
#if DEBUG_UPLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Computing query for %u bytes content.\n",
size);
#endif
@@ -369,10 +369,10 @@
size,
&chk.query);
#if DEBUG_UPLOAD
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&chk.query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Query for current block at level %u is `%s'.\n",
i,
&enc);
@@ -402,10 +402,10 @@
iblocks[i] = NULL;
}
#if DEBUG_UPLOAD
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&chk.query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Query for top block is %s\n",
&enc);
#endif
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/fsui/download.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -97,7 +97,7 @@
strcat(fullName, filename);
FREE(filename);
#if DEBUG_DTM
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Starting recursive download of `%s'\n",
fullName);
#endif
@@ -201,7 +201,7 @@
unsigned long long totalBytes;
#if DEBUG_DTM
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Download thread for `%s' started...\n",
dl->filename);
#endif
@@ -219,7 +219,7 @@
totalBytes = ECRS_fileSize(dl->uri);
} else {
#if DEBUG_DTM
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Download thread for `%s' failed (aborted or error)!\n",
dl->filename);
#endif
@@ -332,7 +332,7 @@
}
dl = cls;
#if DEBUG_DTM
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Download thread for `%s' terminated (%s)...\n",
dl->filename,
ret == OK ? "COMPLETED" : "ABORTED");
@@ -430,7 +430,7 @@
return NO;
#if DEBUG_DTM
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Download thread manager investigates pending downlod of file `%s'
(%u/%u downloads)\n",
list->filename,
list->ctx->activeDownloadThreads,
@@ -444,7 +444,7 @@
( (list->total > list->completed) ||
(list->total == 0) ) ) {
#if DEBUG_DTM
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Download thread manager starts downlod of file `%s'\n",
list->filename);
#endif
@@ -465,7 +465,7 @@
< list->ctx->activeDownloadThreads) &&
(list->state == FSUI_DOWNLOAD_ACTIVE) ) {
#if DEBUG_DTM
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Download thread manager aborts active download of file `%s' (%u/%u
downloads)\n",
list->filename,
list->ctx->activeDownloadThreads,
@@ -486,7 +486,7 @@
(list->state == FSUI_DOWNLOAD_ABORTED) ||
(list->state == FSUI_DOWNLOAD_ERROR) ) {
#if DEBUG_DTM
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Download thread manager collects inactive download of file `%s'\n",
list->filename);
#endif
@@ -560,7 +560,7 @@
FSUI_DownloadList * prev;
unsigned int backup;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSUI_stopDownload called.\n");
GNUNET_ASSERT(filename != NULL);
MUTEX_LOCK(&ctx->lock);
@@ -578,7 +578,7 @@
freeDownloadList(dl);
ctx->threadPoolSize = backup;
MUTEX_UNLOCK(&ctx->lock);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSUI_stopDownload completed successfully.\n");
return OK;
}
@@ -586,7 +586,7 @@
dl = dl->next;
}
MUTEX_UNLOCK(&ctx->lock);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSUI_stopDownload failed to locate download.\n");
return SYSERR;
}
Modified: GNUnet/src/applications/fs/fsui/file_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/file_info.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/fsui/file_info.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -89,7 +89,7 @@
(ntohl(*status) != YES) ) {
FREENONNULL(status);
#if DEBUG_FILE_INFO
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("Collecting file identifiers disabled.\n"));
#endif
return NO;
@@ -279,7 +279,7 @@
IPC_SEMAPHORE_FREE(sem);
return rval;
FORMATERROR:
- LOG(LOG_WARNING, _("Deleted corrupt URI database in `%s'."), STATE_NAME);
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER, _("Deleted corrupt URI database
in `%s'."), STATE_NAME);
if(0 != MUNMAP(result, buf.st_size))
LOG_FILE_STRERROR(LOG_WARNING, "munmap", fn);
CLOSE(fd);
Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/fsui/fsui.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -167,7 +167,7 @@
ctx,
ret);
#if DEBUG_PERSISTENCE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSUI persistence: restoring download `%s': %s (%llu, %llu)\n",
ret->filename,
ret->finished == YES ? "finished" : "pending",
@@ -185,7 +185,7 @@
}
FREE(ret);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("FSUI persistence: error restoring download\n"));
return NULL;
}
@@ -232,7 +232,7 @@
return;
}
#if DEBUG_PERSISTENCE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Serializing download state of download `%s': %s (%llu, %llu)\n",
list->filename,
list->finished == YES ? "finished" : "pending",
@@ -342,7 +342,7 @@
dpos = ctx->activeDownloads.child;
#if DEBUG_PERSISTENCE
if (dpos != NULL)
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Download thread manager schedules pending downloads...\n");
#endif
while (dpos != NULL) {
@@ -392,11 +392,11 @@
if (doResume) {
ret->ipc = IPC_SEMAPHORE_NEW(fn,
1);
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
"Getting IPC lock for FSUI (%s).\n",
fn);
IPC_SEMAPHORE_DOWN(ret->ipc);
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
"Aquired IPC lock.\n");
fd = -1;
strcat(fn, ".res");
@@ -586,7 +586,7 @@
= ret;
/* start search thread! */
#if DEBUG_PERSISTENCE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSUI persistence: restarting search\n");
#endif
if (0 != PTHREAD_CREATE(&list->handle,
@@ -634,7 +634,7 @@
list->sizeResultsReceived,
0);
WARN:
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("FSUI state file `%s' had syntax error at offset %u.\n"),
fn,
lseek(fd, 0, SEEK_CUR));
@@ -678,7 +678,7 @@
int fd;
int big;
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
"FSUI shutdown. This may take a while.\n");
FSUI_publishCollectionNow(ctx);
@@ -722,12 +722,12 @@
8); /* magic */
}
#if DEBUG_PERSISTENCE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Serializing FSUI state...\n");
#endif
} else {
#if DEBUG_PERSISTENCE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"NOT serializing FSUI state...\n");
#endif
fd = -1;
@@ -832,7 +832,7 @@
}
if (fd != -1) {
#if DEBUG_PERSISTENCE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Serializing FSUI state done.\n");
#endif
CLOSE(fd);
@@ -848,7 +848,7 @@
MUTEX_DESTROY(&ctx->lock);
FREE(ctx->name);
FREE(ctx);
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
"FSUI shutdown complete.\n");
}
Modified: GNUnet/src/applications/fs/fsui/helper.c
===================================================================
--- GNUnet/src/applications/fs/fsui/helper.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/fsui/helper.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -63,7 +63,7 @@
if (num_Words == 0) {
FREENONNULL(searchString);
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("No keywords specified!\n"));
return NULL;
}
Modified: GNUnet/src/applications/fs/fsui/namespace_info.c
===================================================================
--- GNUnet/src/applications/fs/fsui/namespace_info.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/fs/fsui/namespace_info.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -579,7 +579,7 @@
&lastInterval,
&lastTime)) ) {
if (lastInterval != updateInterval) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Publication interval for periodic publication changed."));
}
/* try to compute tid and/or
@@ -600,7 +600,7 @@
&tid);
}
if (creationTime > cronTime(NULL) + 7 * cronDAYS) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Publishing update for periodically updated "
"content more than a week ahead of schedule.\n"));
}
Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/fsui/search.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -118,7 +118,7 @@
if (ECRS_equalsUri(fi->uri,
pos->resultsReceived[i].uri)) {
#if DEBUG_SEARCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received search result that I have seen before.\n");
#endif
return OK; /* seen before */
@@ -127,7 +127,7 @@
if (key == NULL) {
GE_BREAK(ectx, 0);
#if DEBUG_SEARCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received search result without key to decrypt.\n");
#endif
return SYSERR;
@@ -140,14 +140,14 @@
if (equalsHashCode512(key,
&rp->matchingKeys[j])) {
#if DEBUG_SEARCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received search result that I have seen before (missing
keyword to show client).\n");
#endif
return OK;
}
if (rp->matchingKeyCount + 1 == pos->numberOfURIKeys) {
#if DEBUG_SEARCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received search result (showing client)!\n");
#endif
GROW(rp->matchingKeys,
@@ -169,7 +169,7 @@
rp->matchingKeyCount+1);
rp->matchingKeys[rp->matchingKeyCount-1] = *key;
#if DEBUG_SEARCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received search result (waiting for more %u keys before showing
client).\n",
pos->numberOfURIKeys - rp->matchingKeyCount);
#endif
@@ -190,14 +190,14 @@
1);
rp->matchingKeys[0] = *key;
#if DEBUG_SEARCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received search result (waiting for %u more keys before showing
client).\n",
pos->numberOfURIKeys - rp->matchingKeyCount);
#endif
return OK;
} else {
#if DEBUG_SEARCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received search result (showing client)!\n");
#endif
processResult(fi,
@@ -241,7 +241,7 @@
while (pos != NULL) {
if (ECRS_equalsUri(uri,
pos->uri)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("This search is already pending!\n"));
GE_BREAK(ectx, 0);
MUTEX_UNLOCK(&ctx->lock);
Modified: GNUnet/src/applications/fs/fsui/unindex.c
===================================================================
--- GNUnet/src/applications/fs/fsui/unindex.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/fsui/unindex.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -89,7 +89,7 @@
FREE(utc->filename);
utc->tl->isDone = YES;
FREE(utc);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSUI unindexThread exits.\n");
return NULL;
}
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/fsui/upload.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -467,7 +467,7 @@
inboundFN);
}
#if DEBUG_UPLOAD
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Adding URI to keyspace.\n");
#endif
keywordUri = ECRS_metaDataToUri(utc->meta);
Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/lib/fslib.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -67,7 +67,7 @@
if (OK == readFromSocket(ctx->sock,
&hdr)) {
#if DEBUG_FSLIB
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSLIB: received message from gnunetd\n");
#endif
delay = 100 * cronMILLIS;
@@ -121,12 +121,12 @@
MUTEX_UNLOCK(ctx->lock);
#if DEBUG_FSLIB
if (matched == 0)
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSLIB: received content but have no pending request\n");
#endif
} else {
#if DEBUG_FSLIB
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSLIB: error communicating with gnunetd; sleeping for %ums\n",
delay);
#endif
@@ -200,7 +200,7 @@
ret = MALLOC(sizeof(SEARCH_HANDLE));
#if DEBUG_FSLIB
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSLIB: start search (%p)\n",
ret);
#endif
@@ -226,10 +226,10 @@
ctx->handles[ctx->handleCount++] = ret;
MUTEX_UNLOCK(ctx->lock);
#if DEBUG_FSLIB
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&req->query[0],
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSLIB: initiating search for `%s' of type %u\n",
&enc,
type);
@@ -241,7 +241,7 @@
return NULL;
}
#if DEBUG_FSLIB
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSLIB: search started (%p)\n",
ret);
#endif
@@ -256,7 +256,7 @@
int i;
#if DEBUG_FSLIB
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSLIB: stop search (%p)\n",
handle);
#endif
@@ -272,7 +272,7 @@
MUTEX_UNLOCK(ctx->lock);
FREE(handle->req);
#if DEBUG_FSLIB
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FSLIB: search stopped (%p)\n",
handle);
#endif
@@ -357,7 +357,7 @@
memcpy(&ri[1], fn, fnSize);
#if DEBUG_FSLIB
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Sending index initialization request to gnunetd\n");
#endif
if (OK != writeToSocket(sock,
@@ -367,7 +367,7 @@
}
FREE(ri);
#if DEBUG_FSLIB
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Waiting for confirmation of index initialization request by gnunetd\n");
#endif
if (OK != readTCPResult(sock,
@@ -405,7 +405,7 @@
&block[1],
size);
#if DEBUG_FSLIB
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Sending index request to gnunetd\n");
#endif
if (OK != writeToSocket(sock,
@@ -415,7 +415,7 @@
}
FREE(ri);
#if DEBUG_FSLIB
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Waiting for confirmation of index request by gnunetd\n");
#endif
if (OK != readTCPResult(sock,
Modified: GNUnet/src/applications/fs/module/anonymity.c
===================================================================
--- GNUnet/src/applications/fs/module/anonymity.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/fs/module/anonymity.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -61,13 +61,13 @@
&peers,
&sizes,
&timevect)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Failed to get traffic stats.\n"));
return SYSERR;
}
if (level > 1000) {
if (peers < level / 1000) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Not enough cover traffic to satisfy anonymity requirements (%u, %u
peers). "
"Result dropped.\n",
level,
@@ -75,7 +75,7 @@
return SYSERR;
}
if (count < level % 1000) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Not enough cover traffic to satisfy anonymity requirements (%u, %u
messages). "
"Result dropped.\n",
level,
@@ -84,7 +84,7 @@
}
} else {
if (count < level) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Not enough cover traffic to satisfy anonymity requirements (%u, %u
messages). "
"Result dropped.\n",
level,
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/fs/module/fs.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -188,10 +188,10 @@
}
processResponse(query, dv);
#if DEBUG_FS
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FS received GAP-PUT request (query: `%s')\n",
&enc);
#endif
@@ -210,10 +210,10 @@
#if DEBUG_FS
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Found reply to query `%s'.\n",
&enc);
#endif
@@ -252,10 +252,10 @@
}
rs = (CS_fs_request_search_MESSAGE*) req;
#if DEBUG_FS
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&rs->query[0],
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FS received QUERY STOP (query: `%s')\n",
&enc);
#endif
@@ -308,10 +308,10 @@
type = getTypeOfBlock(ntohs(ri->header.size) -
sizeof(CS_fs_request_insert_MESSAGE),
(const DBlock*) &ri[1]);
#if DEBUG_FS
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FS received REQUEST INSERT (query: `%s', type: %u, priority %u)\n",
&enc,
type,
@@ -398,7 +398,7 @@
FREE(fn);
#if DEBUG_FS
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Sending confirmation (%s) of index initialization request to client\n",
ret == OK ? "success" : "failure");
#endif
@@ -430,7 +430,7 @@
ntohs(ri->header.size) -
sizeof(CS_fs_request_index_MESSAGE),
(const DBlock*) &ri[1]);
#if DEBUG_FS
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Sending confirmation (%s) of index request to client\n",
ret == OK ? "success" : "failure");
#endif
@@ -454,7 +454,7 @@
&comp[1],
ntohl(value->size) - sizeof(Datastore_Value))) ) {
#if DEBUG_FS
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' found value that does not match (%u, %u).\n",
__FUNCTION__,
ntohl(comp->size),
@@ -464,7 +464,7 @@
}
*comp = *value; /* make copy! */
#if DEBUG_FS
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' found value that matches.\n",
__FUNCTION__);
#endif
@@ -511,10 +511,10 @@
return SYSERR;
}
#if DEBUG_FS
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FS received REQUEST DELETE (query: `%s', type: %u)\n",
&enc,
type);
@@ -531,7 +531,7 @@
MUTEX_UNLOCK(&lock);
FREE(value);
#if DEBUG_FS
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Sending confirmation (%s) of delete request to client\n",
ret != SYSERR ? "success" : "failure");
#endif
@@ -553,7 +553,7 @@
}
ru = (CS_fs_request_unindex_MESSAGE*) req;
#if DEBUG_FS
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FS received REQUEST UNINDEX\n");
#endif
ret = ONDEMAND_unindex(datastore,
@@ -578,7 +578,7 @@
}
ru = (RequestTestindex*) req;
#if DEBUG_FS
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FS received REQUEST TESTINDEXED\n");
#endif
ret = ONDEMAND_testindexed(datastore,
@@ -594,7 +594,7 @@
static int csHandleRequestGetAvgPriority(ClientHandle sock,
const CS_MESSAGE_HEADER * req) {
#if DEBUG_FS
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FS received REQUEST GETAVGPRIORITY\n");
#endif
return coreAPI->sendValueToClient(sock,
@@ -632,10 +632,10 @@
EncName enc;
#if DEBUG_FS
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Converting reply for query `%s' for gap.\n",
&enc);
#endif
@@ -656,20 +656,20 @@
ggc->keyCount,
ggc->keys);
if (ret == SYSERR) {
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(key,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
"Converting reply for query `%s' for gap failed (datum not
applicable).\n",
&enc);
FREENONNULL(xvalue);
return SYSERR; /* no query will ever match */
}
if (ret == NO) {
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(key,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
"Converting reply for query `%s' for gap failed (type not
applicable).\n",
&enc);
FREENONNULL(xvalue);
@@ -689,10 +689,10 @@
refuse to hand out data that requires
anonymity! */
FREENONNULL(xvalue);
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(key,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
"Converting reply for query `%s' for gap failed (insufficient cover
traffic).\n",
&enc);
return OK;
@@ -745,10 +745,10 @@
#if DEBUG_FS
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&keys[0],
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"GAP requests content for `%s' of type %u\n",
&enc,
type);
@@ -906,10 +906,10 @@
GGC myClosure;
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&keys[0],
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"DHT requests content for %s of type %u\n",
&enc,
type);
@@ -1087,10 +1087,10 @@
}
rs = (const CS_fs_request_search_MESSAGE*) req;
#if DEBUG_FS
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&rs->query[0],
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FS received QUERY START (query: `%s', ttl %llu, priority %u, anonymity
%u)\n",
&enc,
ntohll(rs->expiration) - cronTime(NULL),
@@ -1114,7 +1114,7 @@
&done);
if (done == YES) {
#if DEBUG_FS
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"FS successfully took GAP shortcut for `%s'.\n",
&enc);
#endif
@@ -1180,7 +1180,7 @@
&dht_table);
if (getConfigurationInt("FS",
"QUOTA") <= 0) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("You must specify a postive number for `%s' in the configuration in
section `%s'.\n"),
"QUOTA", "FS");
return SYSERR;
@@ -1229,7 +1229,7 @@
dht->join(&dsDht, &dht_table);
}
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"),
"fs",
CS_PROTO_gap_QUERY_START,
@@ -1277,10 +1277,10 @@
doneMigration();
if (dht != NULL) {
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
"Leaving DHT (this may take a while).");
dht->leave(&dht_table);
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
"Leaving DHT complete.");
}
Modified: GNUnet/src/applications/fs/module/migration.c
===================================================================
--- GNUnet/src/applications/fs/module/migration.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/fs/module/migration.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -125,7 +125,7 @@
0)) {
MUTEX_UNLOCK(&lock);
#if DEBUG_MIGRATION
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Migration: random lookup in datastore failed.\n");
#endif
return 0;
@@ -150,7 +150,7 @@
if (size > padding) {
MUTEX_UNLOCK(&lock);
#if DEBUG_MIGRATION
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Available content of size %u too big for available space (%u)\n",
size,
padding);
@@ -184,13 +184,13 @@
padding);
FREE(gw);
#if DEBUG_MIGRATION
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"gap's tryMigrate returned %u\n",
ret);
#endif
} else {
#if DEBUG_MIGRATION
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Migration: anonymity requirements not satisfied.\n");
#endif
}
Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/fs/module/ondemand.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -185,7 +185,7 @@
/* not sym-linked, write content to offset! */
#if DEBUG_ONDEMAND
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Storing on-demand encoded data in `%s'.\n",
fn);
#endif
@@ -245,9 +245,9 @@
#endif
#if DEBUG_ONDEMAND
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&key, &enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Storing on-demand content for query `%s'\n",
&enc);
#endif
@@ -301,7 +301,7 @@
#if DEBUG_ONDEMAND
hash2enc(query,
&enc);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("Indexed file disappeared, deleting block for query `%s'\n"),
&enc);
#endif
@@ -389,7 +389,7 @@
len*2);
if (ret != -1) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Because the file `%s' has been unavailable for 3 days"
" it got removed from your share. Please unindex files
before"
" deleting them as the index now contains invalid
references!\n"),
@@ -463,7 +463,7 @@
FREE(db);
FREE(fn);
if (ret == SYSERR) {
- LOG(LOG_ERROR, "Indexed content does not match its hash.\n");
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, "Indexed content does not match
its hash.\n");
asyncDelete(datastore, dbv, query);
return SYSERR;
}
@@ -511,7 +511,7 @@
&comp[1],
ntohl(value->size) - sizeof(Datastore_Value))) ) {
#if DEBUG_ONDEMAND
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' found value that does not match (%u, %u).\n",
__FUNCTION__,
ntohl(comp->size),
@@ -521,7 +521,7 @@
}
*comp = *value; /* make copy! */
#if DEBUG_ONDEMAND
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"`%s' found value that matches.\n",
__FUNCTION__);
#endif
@@ -555,7 +555,7 @@
fn = getOnDemandFile(fileId);
#if DEBUG_ONDEMAND
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Removing on-demand encoded data stored in `%s'.\n",
fn);
#endif
@@ -610,10 +610,10 @@
else /* not found */
ret = SYSERR;
if (ret == SYSERR) {
- IFLOG(LOG_WARNING,
+ IFGE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
hash2enc(&key,
&enc));
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Unindexed ODB block `%s' from offset %llu already missing from
datastore.\n"),
&enc,
pos);
Modified: GNUnet/src/applications/fs/module/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/module/querymanager.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/fs/module/querymanager.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -145,7 +145,7 @@
GNUNET_ASSERT(ntohl(value->size) > sizeof(Datastore_Value));
matchCount = 0;
#if DEBUG_QUERYMANAGER
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
#endif
@@ -165,7 +165,7 @@
&value[1],
ntohl(value->size) - sizeof(Datastore_Value));
#if DEBUG_QUERYMANAGER
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Sending reply for `%s' to client waiting in slot %u.\n",
&enc,
i);
@@ -177,7 +177,7 @@
}
#if DEBUG_QUERYMANAGER && 0
if (matchCount == 0) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Reply `%s' did not match any request.\n",
&enc);
}
Modified: GNUnet/src/applications/fs/tools/gnunet-delete.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-delete.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/fs/tools/gnunet-delete.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -107,7 +107,7 @@
printhelp();
return SYSERR;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return SYSERR;
} /* end of parsing commandline */
@@ -145,7 +145,7 @@
&printstatus,
&beVerbose);
if (ok != OK) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Error deleting file `%s'.\n",
filename);
printf(_("Error deleting file %s.\n"
Modified: GNUnet/src/applications/fs/tools/gnunet-download.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-download.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/fs/tools/gnunet-download.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -92,7 +92,7 @@
unsigned int receivePolicy;
if (1 != sscanf(GNoptarg, "%ud", &receivePolicy)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-a");
return -1;
@@ -126,13 +126,13 @@
"YES"));
break;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return SYSERR;
} /* end of parsing commandline */
} /* while (1) */
if (argc - GNoptind != 1) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Not enough arguments. "
"You must specify a GNUnet file URI\n"));
printhelp();
@@ -233,7 +233,7 @@
if ( (NULL == uri) ||
(! (ECRS_isLocationUri(uri) ||
ECRS_isFileUri(uri)) ) ) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("URI `%s' invalid for gnunet-download.\n"),
fstring);
FREE(fstring);
@@ -249,7 +249,7 @@
strlen(ECRS_FILE_INFIX));
filename = expandFileName(&fstring[strlen(ECRS_URI_PREFIX)+
strlen(ECRS_FILE_INFIX)]);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"No filename specified, using `%s' instead (for now).\n",
filename);
try_rename = YES;
Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -311,7 +311,7 @@
if (1 != sscanf(GNoptarg,
"%ud",
&receivePolicy)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-a");
return -1;
@@ -340,7 +340,7 @@
case 'i': {
unsigned int interval;
if (1 != sscanf(GNoptarg, "%ud", &interval)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a positive number to the `%s' option.\n"),
"-i");
return -1;
@@ -457,7 +457,7 @@
if (1 != sscanf(GNoptarg,
"%ud",
&contentPriority)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-p");
return SYSERR;
@@ -528,7 +528,7 @@
AFS_VERSION);
return SYSERR;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return SYSERR;
} /* end of parsing commandline */
Modified: GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -116,7 +116,7 @@
if (1 != sscanf(GNoptarg,
"%ud",
&receivePolicy)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-a");
return -1;
@@ -228,16 +228,16 @@
VERSION);
return SYSERR;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return SYSERR;
} /* end of parsing commandline */
}
if (GNoptind < argc) {
while (GNoptind < argc)
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid argument: `%s'\n"), argv[GNoptind++]);
- LOG(LOG_FATAL,
+ GE_LOG(ectx, GE_FATAL | GE_IMMEDIATE | GE_USER,
_("Invalid arguments. Exiting.\n"));
return SYSERR;
}
Modified: GNUnet/src/applications/fs/tools/gnunet-search.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-search.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/fs/tools/gnunet-search.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -163,7 +163,7 @@
if (1 != sscanf(GNoptarg,
"%ud",
&receivePolicy)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-a");
return -1;
@@ -179,7 +179,7 @@
case 'm': {
unsigned int max;
if (1 != sscanf(GNoptarg, "%ud", &max)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-m");
return SYSERR;
@@ -200,7 +200,7 @@
case 't': {
unsigned int timeout;
if (1 != sscanf(GNoptarg, "%ud", &timeout)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-t");
return SYSERR;
@@ -217,13 +217,13 @@
AFS_VERSION);
return SYSERR;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return SYSERR;
} /* end of parsing commandline */
} /* while (1) */
if (argc - GNoptind <= 0) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Not enough arguments. "
"You must specify a keyword or identifier.\n"));
printhelp();
Modified: GNUnet/src/applications/fs/tools/gnunet-unindex.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-unindex.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/fs/tools/gnunet-unindex.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -136,7 +136,7 @@
AFS_VERSION);
return SYSERR;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return SYSERR;
} /* end of parsing commandline */
Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/applications/gap/gap.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -488,7 +488,7 @@
ranking = 0; /* no chance for blocked peers */
idx = getIndex(id);
#if DEBUG_GAP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Ranking for %u: %u\n",
idx,
ranking);
@@ -529,12 +529,12 @@
if (getBit(qr, getIndex(id)) == 1) {
#if DEBUG_GAP
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&peer->hashPubKey,
&encp);
hash2enc(&qr->msg->queries[0],
&encq));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Sending query `%s' to `%s'\n",
&encq,
&encp);
@@ -770,10 +770,10 @@
#if DEBUG_GAP
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(primaryKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Gap queues reply to query `%s' for later use.\n",
&enc);
#endif
@@ -790,14 +790,14 @@
if (! equalsHashCode512(&ite->primaryKey,
primaryKey) ) {
#if DEBUG_GAP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"GAP: Dropping reply, routing table has no query associated with it
(anymore)\n");
#endif
return NO; /* we don't care for the reply (anymore) */
}
if (YES == ite->successful_local_lookup_in_delay_loop) {
#if DEBUG_GAP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"GAP: Dropping reply, found reply locally during delay\n");
#endif
return NO; /* wow, really bad concurrent DB lookup and processing for
@@ -890,10 +890,10 @@
#if DEBUG__GAP
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"GAP: Queueing query '%s' in slot %p\n",
&enc,
ite);
@@ -1281,10 +1281,10 @@
resolve_pid(ite->destination[j],
&recv);
#if DEBUG_GAP
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&recv.hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"GAP sending reply to `%s'\n",
&enc);
#endif
@@ -1441,10 +1441,10 @@
doForward = NO;
#if DEBUG_GAP
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&query->queries[0],
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"GAP is executing request for `%s':%s%s (%d)\n",
&enc,
doForward ? " forwarding" : "",
@@ -1556,11 +1556,11 @@
#if DEBUG_GAP
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
if (host != NULL)
hash2enc(&host->hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"GAP received content from `%s'\n",
(host != NULL) ? (const char*)&enc : "myself");
#endif
@@ -1609,11 +1609,11 @@
if (ret == SYSERR) {
EncName enc;
- IFLOG(LOG_ERROR,
+ IFGE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
if (host != NULL)
hash2enc(&host->hashPubKey,
&enc));
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("GAP received invalid content from `%s'\n"),
(host != NULL) ? (const char*)&enc : _("myself"));
GE_BREAK(ectx, 0);
@@ -1787,7 +1787,7 @@
anonymityLevel--;
if (traffic == NULL) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Cover traffic requested but traffic service not loaded. Rejecting
request.\n"));
return SYSERR;
}
@@ -1798,24 +1798,24 @@
&peers,
&sizes,
&timevect)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Failed to get traffic stats.\n"));
return SYSERR;
}
if (anonymityLevel > 1000) {
if (peers < anonymityLevel / 1000) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Cannot satisfy desired level of anonymity, ignoring
request.\n"));
return SYSERR;
}
if (count < anonymityLevel % 1000) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Cannot satisfy desired level of anonymity, ignoring
request.\n"));
return SYSERR;
}
} else {
if (count < anonymityLevel) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Cannot satisfy desired level of anonymity, ignoring
request.\n"));
return SYSERR;
}
@@ -1930,11 +1930,11 @@
(getNetworkLoadUp() >= hardUpLimit) ) ) {
#if DEBUG_GAP
if (sender != NULL) {
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&sender->hashPubKey,
&enc));
}
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Dropping query from %s, this peer is too busy.\n",
sender == NULL ? "localhost" : (char*)&enc);
#endif
@@ -1983,10 +1983,10 @@
policy = evaluateQuery(sender,
&prio);
#if DEBUG_GAP
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&qmsg->queries[0],
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received GAP query `%s'.\n",
&enc);
#endif
@@ -1996,11 +1996,11 @@
FREE(qmsg);
#if DEBUG_GAP
if (sender != NULL) {
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&sender->hashPubKey,
&enc));
}
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Dropping query from %s, policy decided that this peer is too busy.\n",
sender == NULL ? "localhost" : (const char*) &enc);
#endif
@@ -2108,7 +2108,7 @@
GNUNET_ASSERT(topology != NULL);
traffic = coreAPI->requestService("traffic");
if (traffic == NULL) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Traffic service failed to load; gap cannot ensure cover-traffic
availability.\n"));
}
random_qsel = weak_randomi(0xFFFF);
@@ -2139,7 +2139,7 @@
2 * cronMINUTES,
NULL);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("`%s' registering handlers %d %d\n"),
"gap",
P2P_PROTO_gap_QUERY,
Modified: GNUnet/src/applications/gap/gaptest.c
===================================================================
--- GNUnet/src/applications/gap/gaptest.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/gap/gaptest.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -147,7 +147,7 @@
char * tmp;
tmp = ECRS_uriToString(fi->uri);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Search found URI `%s'\n",
tmp);
FREE(tmp);
@@ -192,7 +192,7 @@
char * tmp;
tmp = ECRS_uriToString(uri);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Starting download of `%s'\n",
tmp);
FREE(tmp);
Modified: GNUnet/src/applications/identity/identity.c
===================================================================
--- GNUnet/src/applications/identity/identity.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/identity/identity.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -871,7 +871,7 @@
return SYSERR;
}
#if DEBUG_IDENTITY
- IFLOG(LOG_INFO,
+ IFGE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
hash2enc(&identity->hashPubKey,
&enc));
GE_LOG(ectx,
Modified: GNUnet/src/applications/kvstore_sqlite/kv_sqlite.c
===================================================================
--- GNUnet/src/applications/kvstore_sqlite/kv_sqlite.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/kvstore_sqlite/kv_sqlite.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -260,7 +260,7 @@
/* Open database */
if (sqlite3_open(db->fn, &dbh->dbh) != SQLITE_OK) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Unable to initialize SQLite KVStore.\n"));
FREE(db->fn);
@@ -308,7 +308,7 @@
unsigned int idx;
#if DEBUG_SQLITE
- LOG(LOG_DEBUG, "SQLite KVStore: closing database\n");
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, "SQLite KVStore: closing
database\n");
#endif
for (idx = 0; idx < databases; idx++)
@@ -673,7 +673,7 @@
static KVstore_ServiceAPI api;
#if DEBUG_SQLITE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite: initializing database\n");
#endif
@@ -697,7 +697,7 @@
void release_module_kvstore_sqlite() {
sqlite_shutdown();
#if DEBUG_SQLITE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite KVStore: database shutdown\n");
#endif
Modified: GNUnet/src/applications/rpc/rpc.c
===================================================================
--- GNUnet/src/applications/rpc/rpc.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/applications/rpc/rpc.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -63,7 +63,7 @@
#if DEBUG_RPC_CLIENT
-#define RPC_STATUS(a,b,c) LOG(LOG_DEBUG, "RPC: `%s' (%p) %s at %s\n", a, c, b,
__FUNCTION__);
+#define RPC_STATUS(a,b,c) GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, "RPC:
`%s' (%p) %s at %s\n", a, c, b, __FUNCTION__);
#else
#define RPC_STATUS(a,b,c)
#endif
@@ -125,7 +125,7 @@
while (rrpc != NULL) {
if (0 == strcmp(rrpc->name, name)) {
MUTEX_UNLOCK (rpcLock);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("%s::%s - RPC %s:%p could not be registered:"
" another callback is already using this name (%p)\n"),
__FILE__, __FUNCTION__,
@@ -139,7 +139,7 @@
rrpc->callback = callback;
rrpc->async_callback = NULL;
vectorInsertLast(list_of_callbacks, rrpc);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"%s::%s - Registered RPC %d: %s\n",
__FILE__, __FUNCTION__,
vectorSize(list_of_callbacks), name);
@@ -165,7 +165,7 @@
while (rrpc != NULL) {
if (0 == strcmp(rrpc->name, name)) {
MUTEX_UNLOCK (rpcLock);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("%s::%s - RPC %s:%p could not be registered:"
" another callback is already using this name (%p)\n"),
__FILE__, __FUNCTION__,
@@ -179,7 +179,7 @@
rrpc->callback = NULL;
rrpc->async_callback = callback;
vectorInsertLast(list_of_callbacks, rrpc);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"%s::%s - Registered asynchronous RPC %d: %s\n",
__FILE__, __FUNCTION__,
vectorSize(list_of_callbacks), name);
@@ -207,7 +207,7 @@
if (0 == strcmp(rrpc->name, name)) {
if ( (rrpc->callback != callback) &&
(callback != NULL) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("%s::%s - RPC %s:%p could not be unregistered:"
" another callback registered under that name: %p\n"),
__FILE__, __FUNCTION__,
@@ -219,7 +219,7 @@
FREE(rrpc->name);
FREE(rrpc);
MUTEX_UNLOCK(rpcLock);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"%s::%s - Unregistered RPC %s\n",
__FILE__, __FUNCTION__,
name);
@@ -228,7 +228,7 @@
rrpc = vectorGetNext(list_of_callbacks);
}
MUTEX_UNLOCK(rpcLock);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("%s::%s - RPC %s:%p could not be unregistered: not found\n"),
__FILE__, __FUNCTION__,
name, callback);
@@ -254,7 +254,7 @@
if (0 == strcmp(rrpc->name, name)) {
if ( (rrpc->async_callback != callback) &&
(callback != NULL) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("%s::%s - RPC %s:%p could not be unregistered:"
" another callback registered under that name: %p\n"),
__FILE__, __FUNCTION__,
@@ -266,7 +266,7 @@
FREE(rrpc->name);
FREE(rrpc);
MUTEX_UNLOCK(rpcLock);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"%s::%s - Unregistered asynchronous RPC %s\n",
__FILE__, __FUNCTION__,
name);
@@ -275,7 +275,7 @@
rrpc = vectorGetNext(list_of_callbacks);
}
MUTEX_UNLOCK(rpcLock);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("%s::%s - async RPC %s:%p could not be unregistered: not found\n"),
__FILE__, __FUNCTION__,
name, callback);
@@ -632,7 +632,7 @@
MUTEX_LOCK(rpcLock);
if (now > call->expirationTime) {
#if DEBUG_RPC
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Completed RPC %p (timeout).\n",
call);
#endif
@@ -669,7 +669,7 @@
ntohs(call->msg->header.type)));
#if DEBUG_RPC
if (ntohs(call->msg->header.type) == P2P_PROTO_rpc_REQ) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Sending RPC request %p: '%.*s' (expires in %llums, last attempt
%llums ago; attempt %u).\n",
call,
ntohs(call->msg->functionNameLength),
@@ -678,7 +678,7 @@
now - call->lastAttempt,
call->attempts);
} else {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Sending RPC reply %p (expires in %llums, last attempt %llums ago,
attempt %u).\n",
call,
call->expirationTime - now,
@@ -875,7 +875,7 @@
req = (P2P_rpc_MESSAGE *) message;
sq = ntohl(req->sequenceNumber);
#if DEBUG_RPC
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received RPC request with id %u.\n",
sq);
#endif
@@ -908,14 +908,14 @@
}
RPC_STATUS("", "received duplicate request", calls);
calls->expirationTime = cronTime(NULL) + MAX_RPC_TIMEOUT;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Dropping RPC request %u, duplicate.\n",
sq);
MUTEX_UNLOCK(rpcLock);
return OK; /* seen before */
}
if (minSQ > sq) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Dropping RPC request %u, sequence number too old (current minimum is
%u).\n",
sq,
minSQ);
@@ -932,7 +932,7 @@
if (argumentValues != NULL)
RPC_paramFree(argumentValues);
MUTEX_UNLOCK(rpcLock);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Dropping RPC request %u: message malformed.\n"));
return SYSERR; /* message malformed */
}
@@ -998,14 +998,14 @@
if ( (ntohs(message->type) != P2P_PROTO_rpc_RES) ||
(ntohs(message->size) < sizeof(P2P_rpc_MESSAGE)) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid message of type %u received. Dropping.\n"),
ntohs(message->type));
return SYSERR;
}
res = (P2P_rpc_MESSAGE *) message;
#if DEBUG_RPC
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received RPC reply with id %u.\n",
ntohl(res->sequenceNumber));
#endif
@@ -1088,7 +1088,7 @@
ack = (RPC_ACK_Message*) message;
#if DEBUG_RPC
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received RPC ACK with id %u.\n",
ntohl(ack->sequenceNumber));
#endif
@@ -1124,7 +1124,7 @@
pi->averageResponseTime *= 2;
}
#if DEBUG_RPC
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"ACK is a duplicate (or invalid).\n");
#endif
}
@@ -1263,7 +1263,7 @@
RPC_Record * ret;
if (timeout > 1 * cronHOURS) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("`%s' called with timeout above 1 hour (bug?)\n"),
__FUNCTION__);
timeout = 1 * cronHOURS;
@@ -1384,7 +1384,7 @@
while(vectorSize(list_of_callbacks) > 0) {
RegisteredRPC * rpc;
rpc = (RegisteredRPC*) vectorRemoveLast(list_of_callbacks);
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("RPC not unregistered: %s:%p\n"),
rpc->name, rpc->callback);
FREE(rpc->name);
@@ -1410,7 +1410,7 @@
incomingCalls = vectorNew(16);
outgoingCalls = vectorNew(16);
list_of_callbacks = vectorNew(16);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("`%s' registering handlers %d %d %d\n"),
"rpc",
P2P_PROTO_rpc_REQ,
@@ -1431,7 +1431,7 @@
rvalue = SYSERR;
if (rvalue == SYSERR) {
release_module_rpc();
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Failed to initialize `%s' service.\n"),
"rpc");
return NULL;
@@ -1459,14 +1459,14 @@
unsigned int dl;
char * data;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"RPC callback invoked!\n");
if ( (OK == RPC_paramValueByName(arguments,
"command",
&dl,
(void**)&data)) &&
(strncmp("Hello", data, dl) == 0) ) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"RPC callback received Hello command!\n");
RPC_paramAdd(results,
"response",
@@ -1487,10 +1487,10 @@
(void**)&reply)) ||
(strncmp("Hello RPC World",
reply, dl) != 0) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("RPC async reply invalid.\n"));
} else
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"RPC async reply received.\n");
}
@@ -1505,7 +1505,7 @@
RPC_Record * record;
Semaphore * sign;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"RPC testcase starting\n");
rpcAPI = capi->requestService("rpc");
if (rpcAPI == NULL) {
@@ -1558,7 +1558,7 @@
RPC_paramFree(rets);
gnunet_util_sleep(1 * cronSECONDS);
if (RPC_ERROR_OK != rpcAPI->RPC_stop(record))
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("async RPC reply not received.\n"));
if (OK != rpcAPI->RPC_unregister("testFunction",
@@ -1570,7 +1570,7 @@
GE_BREAK(ectx, 0);
ret = SYSERR;
}
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"RPC testcase completed with status %s\n",
ret == OK ? "SUCCESS" : "FAILURE");
return ret;
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -219,7 +219,7 @@
(lens[6] != contentSize) ) {
char scratch[512];
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid data in %s. Trying to fix (by deletion).\n"),
_("mysql datastore"));
SNPRINTF(scratch,
@@ -382,7 +382,7 @@
mysql_stmt_prepare(dbhI->deleteg,
DELETE_GENERIC_SAMPLE,
strlen(DELETE_GENERIC_SAMPLE)) ) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_prepare",
__FILE__, __LINE__,
@@ -694,10 +694,10 @@
return iterateLowPriority(type, iter, closure);
#if DEBUG_MYSQL
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"MySQL looks for `%s' of type %u\n",
&enc,
type);
@@ -721,7 +721,7 @@
GNUNET_ASSERT(mysql_stmt_param_count(stmt) <= 2);
sql_res = mysql_stmt_result_metadata(stmt);
if (! sql_res) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_result_metadata",
__FILE__, __LINE__,
@@ -736,7 +736,7 @@
}
if (mysql_stmt_bind_param(stmt,
dbh->sbind)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_bind_param",
__FILE__, __LINE__,
@@ -745,7 +745,7 @@
return SYSERR;
}
if (mysql_stmt_execute(stmt)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_execute",
__FILE__, __LINE__,
@@ -769,7 +769,7 @@
dbh->bind[6].buffer_length = MAX_DATUM_SIZE;
if (mysql_stmt_bind_result(stmt,
dbh->bind)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_bind_result",
__FILE__, __LINE__,
@@ -779,7 +779,7 @@
return SYSERR;
}
if (mysql_stmt_store_result(stmt)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_store_result",
__FILE__, __LINE__,
@@ -796,7 +796,7 @@
char scratch[512];
mysql_free_result(sql_res);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid data in %s. Trying to fix (by deletion).\n"),
_("mysql datastore"));
SNPRINTF(scratch,
@@ -819,7 +819,7 @@
datum->anonymityLevel = htonl(level);
datum->expirationTime = htonll(expiration);
#if DEBUG_MYSQL
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Found in database block with type %u.\n",
ntohl(*(int*)&datum[1]));
#endif
@@ -833,7 +833,7 @@
datasize = MAX_DATUM_SIZE;
}
if (mysql_stmt_errno(stmt)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_fetch",
__FILE__, __LINE__,
@@ -844,17 +844,17 @@
MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
#if DEBUG_MYSQL
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(query,
&enc));
if (count > 0) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"MySQL found %d results for `%s' of type %u.\n",
count,
&enc,
type);
} else {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"MySQL iteration aborted looking for `%s' of type %u.\n",
&enc,
type);
@@ -898,10 +898,10 @@
expiration = ntohll(value->expirationTime);
#if DEBUG_MYSQL
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Storing in database block with type %u and key %s.\n",
type,
&enc);
@@ -918,7 +918,7 @@
if (mysql_stmt_bind_param(dbh->insert,
dbh->bind)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_bind_param",
__FILE__, __LINE__,
@@ -928,7 +928,7 @@
}
if (mysql_stmt_execute(dbh->insert)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_execute",
__FILE__, __LINE__,
@@ -962,10 +962,10 @@
#if DEBUG_MYSQL
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"MySQL is executing deletion request for content of query `%s' and type
%u\n",
&enc,
value == NULL ? 0 : ntohl(value->type));
@@ -1000,7 +1000,7 @@
}
if (mysql_stmt_bind_param(stmt,
dbh->dbind)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_bind_param",
__FILE__, __LINE__,
@@ -1009,7 +1009,7 @@
return SYSERR;
}
if (mysql_stmt_execute(stmt)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_execute",
__FILE__, __LINE__,
@@ -1020,7 +1020,7 @@
count = mysql_stmt_affected_rows(stmt);
MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
#if DEBUG_MYSQL
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"MySQL DELETE operation affected %d rows.\n",
count);
#endif
@@ -1049,7 +1049,7 @@
GNUNET_ASSERT(mysql_stmt_param_count(dbh->update) <= 3);
if (mysql_stmt_bind_param(dbh->update,
dbh->ubind)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_bind_param",
__FILE__, __LINE__,
@@ -1063,7 +1063,7 @@
* at all in this context.)
*/
if (mysql_stmt_execute(dbh->update)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("`%s' failed at %s:%d with error: %s\n"),
"mysql_stmt_execute",
__FILE__, __LINE__,
@@ -1103,7 +1103,7 @@
int rows = mysql_num_fields(sql_res);
sql_row = mysql_fetch_row(sql_res);
if (sql_row == NULL) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Query `%s' had no results.\n"),
"SHOW TABLE STATUS LIKE 'gn070'");
MUTEX_UNLOCK(&dbh->DATABASE_Lock_);
@@ -1201,7 +1201,7 @@
#ifdef WINDOWS
FREE(home_dir);
#endif
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("Trying to use file `%s' for MySQL configuration.\n"),
cnffile);
fp = FOPEN(cnffile, "r");
@@ -1219,7 +1219,7 @@
if (OK != iopen(dbh, YES)) {
FREE(cnffile);
FREE(dbh);
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Failed to load MySQL database module. Check that MySQL is running
and configured properly!\n"));
dbh = NULL;
return NULL;
Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -135,7 +135,7 @@
/* Open database and precompile statements */
if (sqlite3_open(db->fn, &ret->dbh) != SQLITE_OK) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Unable to initialize SQLite.\n"));
FREE(db->fn);
@@ -267,7 +267,7 @@
if (contentSize < 0) {
sqlite3_stmt * stmt;
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid data in %s. Trying to fix (by deletion).\n"),
_("sqlite datastore"));
if (sq_prepare("DELETE FROM gn070 WHERE size < ?", &stmt) == SQLITE_OK) {
@@ -285,7 +285,7 @@
sqlite3_column_bytes(stmt, 6) != contentSize) {
sqlite3_stmt * stmt;
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid data in %s. Trying to fix (by deletion).\n"),
_("sqlite datastore"));
if (sq_prepare("DELETE FROM gn070 WHERE NOT ((LENGTH(hash) = ?) AND (size
= LENGTH(value) + ?))",
@@ -595,7 +595,7 @@
unsigned int idx;
#if DEBUG_SQLITE
- LOG(LOG_DEBUG, "SQLite: closing database\n");
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, "SQLite: closing database\n");
#endif
if (! db)
return;
@@ -657,10 +657,10 @@
#if DEBUG_SQLITE
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite: retrieving content `%s'\n",
&enc);
#endif
@@ -716,7 +716,7 @@
continue;
#if DEBUG_SQLITE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Found in database block with type %u.\n",
ntohl(*(int*)&((&datum->value)[1])));
#endif
@@ -748,7 +748,7 @@
MUTEX_UNLOCK(&db->DATABASE_Lock_);
#if DEBUG_SQLITE
- LOG(LOG_DEBUG, "SQLite: done reading content\n");
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, "SQLite: done reading
content\n");
#endif
return count;
@@ -772,10 +772,10 @@
#if DEBUG_SQLITE
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Storing in database block with type %u, key `%s' and priority %u.\n",
ntohl(*(int*)&value[1]),
&enc,
@@ -827,7 +827,7 @@
MUTEX_UNLOCK(&db->DATABASE_Lock_);
#if DEBUG_SQLITE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite: done writing content\n");
#endif
@@ -852,10 +852,10 @@
#if DEBUG_SQLITE
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite: deleting block with key `%s'\n",
&enc);
#endif
@@ -946,7 +946,7 @@
MUTEX_UNLOCK(&db->DATABASE_Lock_);
#if DEBUG_SQLITE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite: %d block(s) deleted\n",
deleted);
#endif
@@ -967,10 +967,10 @@
#if DEBUG_SQLITE
EncName enc;
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(key,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite: updating block with key `%s'\n",
&enc);
#endif
@@ -1004,7 +1004,7 @@
MUTEX_UNLOCK(&db->DATABASE_Lock_);
#if DEBUG_SQLITE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite: block updated\n");
#endif
@@ -1020,7 +1020,7 @@
sqliteHandle *dbh;
#if DEBUG_SQLITE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite: initializing database\n");
#endif
@@ -1090,7 +1090,7 @@
coreAPI->releaseService(stats);
sqlite_shutdown();
#if DEBUG_SQLITE
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SQLite: database shutdown\n");
#endif
coreAPI = NULL;
Modified: GNUnet/src/applications/tbench/gnunet-tbench.c
===================================================================
--- GNUnet/src/applications/tbench/gnunet-tbench.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/tbench/gnunet-tbench.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -120,7 +120,7 @@
if(1 != sscanf(GNoptarg,
"%ud",
&messageIterations)){
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-i");
return SYSERR;
@@ -130,7 +130,7 @@
if(1 != sscanf(GNoptarg,
"%ud",
&messageCnt)){
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-n");
return SYSERR;
@@ -143,7 +143,7 @@
if(1 != sscanf(GNoptarg,
"%ud",
&messageSize)){
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-s");
return SYSERR;
@@ -153,7 +153,7 @@
if(1 != sscanf(GNoptarg,
"%ud",
&messageTrainSize)){
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-S");
return SYSERR;
@@ -163,7 +163,7 @@
if(1 != SSCANF(GNoptarg,
"%llud",
&messageTimeOut)){
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-t");
return SYSERR;
@@ -178,14 +178,14 @@
if(1 != SSCANF(GNoptarg,
"%llud",
&messageSpacing)){
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-X");
return SYSERR;
}
break;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return -1;
} /* end of parsing commandline */
Modified: GNUnet/src/applications/tbench/tbench.c
===================================================================
--- GNUnet/src/applications/tbench/tbench.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/tbench/tbench.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -112,7 +112,7 @@
} else {
results->duplicateCount++;
#if DEBUG_TBENCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received duplicate message %u from iteration %u\n",
lastPacketNumber,
currIteration);
@@ -145,7 +145,7 @@
}
#if DEBUG_TBENCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received request %u from iteration %u/%u\n",
htonl(msg->packetNum),
htonl(msg->iterationNum),
@@ -183,7 +183,7 @@
return SYSERR;
}
#if DEBUG_TBENCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received response %u from iteration %u/%u\n",
htonl(pmsg->packetNum),
htonl(pmsg->iterationNum),
@@ -200,7 +200,7 @@
SEMAPHORE_UP(postsem);
} else {
#if DEBUG_TBENCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received message %u from iteration %u too late (now at iteration
%u)\n",
ntohl(pmsg->packetNum),
ntohl(pmsg->iterationNum),
@@ -317,7 +317,7 @@
p2p->packetNum = htonl(packetNum);
#if DEBUG_TBENCH
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Sending message %u of size %u in iteration %u\n",
packetNum,
size,
Modified: GNUnet/src/applications/template/gnunet-template.c
===================================================================
--- GNUnet/src/applications/template/gnunet-template.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/template/gnunet-template.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -83,7 +83,7 @@
TEMPLATE_VERSION);
return SYSERR;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return -1;
} /* end of parsing commandline */
Modified: GNUnet/src/applications/template/template.c
===================================================================
--- GNUnet/src/applications/template/template.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/template/template.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -57,7 +57,7 @@
client = NULL;
coreAPI = capi;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("`%s' registering client handler %d and %d\n"),
"template",
CS_PROTO_MAX_USED,
Modified: GNUnet/src/applications/testbed/commands.c
===================================================================
--- GNUnet/src/applications/testbed/commands.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/testbed/commands.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -346,7 +346,7 @@
sargv[6] = NULL; /* last argument */
execvp("ssh",
sargv);
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
" execvp failed: %s\n",
STRERROR(errno));
exit(-1);
@@ -1557,7 +1557,7 @@
hostname[k] = '\0';
#if DEBUG_TESTBED
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
" Trying to download a hostlist from %s\n",
reg);
#endif
Modified: GNUnet/src/applications/testbed/gnunet-testbed.c
===================================================================
--- GNUnet/src/applications/testbed/gnunet-testbed.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/testbed/gnunet-testbed.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -121,7 +121,7 @@
return SYSERR;
}
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return -1;
} /* end of parsing commandline */
@@ -179,7 +179,7 @@
sizeof(soaddr));
if ( (res < 0) &&
(errno != EINPROGRESS) ) {
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
_("Cannot connect to LOOPBACK port %d: %s\n"),
PORT,
STRERROR(errno));
@@ -321,7 +321,7 @@
CREATE_SOCKET:
while ( (ssock = SOCKET(PF_INET, SOCK_STREAM, 0)) < 0) {
LOG_STRERROR(LOG_ERROR, "socket");
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("No client service started. Trying again in 30 seconds.\n"));
sleep(30);
}
@@ -344,7 +344,7 @@
if (BIND(ssock,
(struct sockaddr*)&serverAddr,
sizeof(serverAddr)) < 0) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Error (%s) binding the TCP listener to "
"port %d. No proxy service started.\nTrying "
"again in %d seconds...\n"),
@@ -411,7 +411,7 @@
&clientAddr.sin_addr,
sizeof(struct in_addr));
if (NO == isWhitelisted(ipaddr)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Rejected unauthorized connection from %u.%u.%u.%u.\n"),
PRIP(ntohl(*(int*)&clientAddr.sin_addr)));
closefile(sock);
@@ -542,7 +542,7 @@
return SYSERR;
}
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return -1;
} /* end of parsing commandline */
Modified: GNUnet/src/applications/testbed/testbed.c
===================================================================
--- GNUnet/src/applications/testbed/testbed.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/testbed/testbed.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -46,7 +46,7 @@
static void sendAcknowledgement(ClientHandle client,
int ack) {
if (OK != coreAPI->sendValueToClient(client, ack)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Could not send acknowledgement back to client.\n"));
}
}
@@ -56,7 +56,7 @@
*/
static void tb_undefined(ClientHandle client,
TESTBED_CS_MESSAGE * msg) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Received unknown testbed message of type %u.\n"),
ntohl(msg->msgType));
}
@@ -70,18 +70,18 @@
TESTBED_ADD_PEER_MESSAGE * hm
= (TESTBED_ADD_PEER_MESSAGE*) msg;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
" tb_ADD_PEER\n");
if (sizeof(TESTBED_ADD_PEER_MESSAGE) >
ntohs(msg->header.size) ) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("size of `%s' message is too short. Ignoring.\n"),
"ADD_PEER");
return;
}
if (P2P_hello_MESSAGE_size(&hm->helo) !=
ntohs(msg->header.size) - sizeof(TESTBED_CS_MESSAGE) ) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("size of `%s' message is wrong. Ignoring.\n"),
"_ADD_PEER");
return;
@@ -133,7 +133,7 @@
proto,
NO);
if (NULL == helo) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("TESTBED could not generate hello message for protocol %u\n"),
proto);
sendAcknowledgement(client, SYSERR);
@@ -151,7 +151,7 @@
ntohs(helo->header.size));
coreAPI->sendToClient(client,
&reply->header.header);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"%s: returning from sendToClient\n",
__FUNCTION__);
FREE(helo);
@@ -188,7 +188,7 @@
*/
static void tb_SET_BW(ClientHandle client,
TESTBED_SET_BW_MESSAGE * msg) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"gnunet-testbed: tb_SET_BW\n");
setConfigurationInt("LOAD",
"MAXNETDOWNBPSTOTAL",
@@ -211,7 +211,7 @@
size = ntohs(msg->header.size);
if (size <= sizeof(TESTBED_CS_MESSAGE) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("received invalid `%s' message\n"),
"LOAD_MODULE");
return;
@@ -227,14 +227,14 @@
name = STRNDUP(&((TESTBED_LOAD_MODULE_MESSAGE_GENERIC*)msg)->modulename[0],
size - sizeof(TESTBED_CS_MESSAGE));
if (strlen(name) == 0) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("received invalid `%s' message (empty module name)\n"),
"LOAD_MODULE");
return;
}
ok = coreAPI->loadApplicationModule(name);
if (ok != OK)
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("loading module `%s' failed. Notifying client.\n"),
name);
FREE(name);
@@ -252,7 +252,7 @@
size = ntohs(msg->header.size);
if (size <= sizeof(TESTBED_CS_MESSAGE) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("received invalid `%s' message\n"),
"UNLOAD_MODULE");
return;
@@ -267,14 +267,14 @@
name = STRNDUP(&((TESTBED_UNLOAD_MODULE_MESSAGE_GENERIC*)msg)->modulename[0],
size - sizeof(TESTBED_CS_MESSAGE));
if (strlen(name) == 0) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("received invalid `%s' message (empty module name)\n"),
"UNLOAD_MODULE");
return;
}
ok = coreAPI->unloadApplicationModule(name);
if (ok != OK)
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("unloading module failed. Notifying client.\n"));
FREE(name);
sendAcknowledgement(client, ok);
@@ -355,14 +355,14 @@
size = ntohs(msg->header.header.size);
if (size <= sizeof(TESTBED_CS_MESSAGE) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("received invalid `%s' message\n"),
"ALLOW_CONNECT");
return;
}
count = (size - sizeof(TESTBED_CS_MESSAGE)) / sizeof(PeerIdentity);
if (count * sizeof(PeerIdentity) + sizeof(TESTBED_CS_MESSAGE) != size) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("received invalid `%s' message\n"),
"ALLOW_CONNECT");
return;
@@ -399,14 +399,14 @@
size = ntohs(msg->header.header.size);
if (size <= sizeof(TESTBED_CS_MESSAGE) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("received invalid `%s' message\n"),
"DENY_CONNECT");
return;
}
count = (size - sizeof(TESTBED_CS_MESSAGE)) / sizeof(PeerIdentity);
if (count * sizeof(PeerIdentity) + sizeof(TESTBED_CS_MESSAGE) != size) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("received invalid `%s' message\n"),
"DENY_CONNECT");
return;
@@ -500,12 +500,12 @@
MUTEX_UNLOCK(&lock);
return -1;
}
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"exec'ing: %s with %d arguments\n",
pi->argv[0],
pi->argc-1);
for (i=1;i<pi->argc;i++)
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"exec argument %d is %s\n",
i, pi->argv[i]);
tmp = getConfigurationString("TESTBED",
@@ -621,7 +621,7 @@
size = htons(msg->header.size);
if ( (size <= sizeof(TESTBED_CS_MESSAGE)) ||
(((TESTBED_EXEC_MESSAGE_GENERIC*)emsg)->commandLine[size-sizeof(TESTBED_CS_MESSAGE)-1]
!= '\0') ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("received invalid `%s' message: %s.\n"),
"EXEC",
(size <= sizeof(TESTBED_CS_MESSAGE))
@@ -800,10 +800,10 @@
char * tmp;
FILE *outfile;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"tb_UPLOAD_FILE\n");
if (sizeof(TESTBED_UPLOAD_FILE_MESSAGE) > ntohs(msg->header.header.size)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("size of `%s' message is too short. Ignoring.\n"),
"UPLOAD_FILE");
sendAcknowledgement(client, SYSERR);
@@ -813,7 +813,7 @@
s = filename = ((TESTBED_UPLOAD_FILE_MESSAGE_GENERIC*)msg)->buf;
while ( (*s) && (s != end) ) {
if (*s == '.' && *(s+1) == '.') {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("\'..\' is not allowed in file name (%s).\n"),
filename);
return;
@@ -822,14 +822,14 @@
}
if (s == filename) {
/* filename empty, not allowed! */
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Empty filename for UPLOAD_FILE message is invalid!\n"));
sendAcknowledgement(client, SYSERR);
return;
}
if (s == end) {
/* filename empty, not allowed! */
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Filename for UPLOAD_FILE message is not null-terminated
(invalid!)\n"));
sendAcknowledgement(client, SYSERR);
return;
@@ -837,7 +837,7 @@
tmp = getConfigurationString("TESTBED",
"UPLOAD-DIR");
if (tmp == NULL) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Upload refused!"));
sendAcknowledgement(client, SYSERR);
return;
@@ -863,7 +863,7 @@
return;
}
if (htonl(msg->type) != TESTBED_FILE_APPEND) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Invalid message received at %s:%d."),
__FILE__,
__LINE__);
@@ -976,12 +976,12 @@
unsigned int id;
#if DEBUG_TESTBED
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TESTBED handleTestbedRequest\n");
#endif
size = ntohs(message->size);
if (size < sizeof(TESTBED_CS_MESSAGE)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("received invalid testbed message of size %u\n"),
size);
return;
@@ -991,14 +991,14 @@
if (id < TESTBED_MAX_MSG) {
if ( (handlers[id].expectedSize == 0) ||
(handlers[id].expectedSize == size) ) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TESTBED received message of type %u.\n",
id);
handlers[id].handler(client, msg);
} else {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Received testbed message of type %u but unexpected size %u,
expected %u\n"),
id,
size,
@@ -1041,7 +1041,7 @@
reg = getConfigurationString("TESTBED",
"REGISTERURL");
if (reg == NULL) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("No testbed URL given, not registered.\n"));
return;
}
@@ -1050,7 +1050,7 @@
"HTTP-PROXY");
if (proxy != NULL) {
if (OK != GN_getHostByName(proxy, &ip_info)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Could not resolve name of HTTP proxy `%s'.\n"),
proxy);
theProxy.sin_addr.s_addr = 0;
@@ -1075,7 +1075,7 @@
if (0 != strncmp(HTTP_URL,
reg,
strlen(HTTP_URL)) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Invalid URL `%s' (must begin with `%s')\n"),
reg,
HTTP_URL);
@@ -1114,7 +1114,7 @@
}
port = strtol(pstring, &buffer, 10);
if ( (port < 0) || (port > 65536) ) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Malformed http URL: `%s' at `%s'. Testbed-client not
registered.\n"),
reg,
buffer);
@@ -1128,7 +1128,7 @@
hostname[k] = '\0';
#if DEBUG_TESTBED
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
"Trying to (un)register testbed client at %s\n",
reg);
#endif
@@ -1150,7 +1150,7 @@
/* no proxy */
if (OK != GN_getHostByName(hostname,
&ip_info)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Could not register testbed, host `%s' unknown\n"),
hostname);
FREE(reg);
@@ -1173,7 +1173,7 @@
if (CONNECT(sock,
(struct sockaddr*)&soaddr,
sizeof(soaddr)) < 0) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Failed to send HTTP request to host `%s': %s\n"),
hostname,
STRERROR(errno));
@@ -1226,7 +1226,7 @@
command,
curpos);
if (SYSERR == (int)curpos) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Failed so send HTTP request `%s' to host `%s': %s\n"),
command,
hostname,
@@ -1265,11 +1265,11 @@
}
closefile(sock);
if (curpos < 4) { /* invalid response */
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Exit register (error: no http response read).\n"));
}
#if DEBUG_TESTBED
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
"Exit register (%d seconds before timeout)\n",
(int)(start + 300 * cronSECONDS - cronTime(NULL))/cronSECONDS);
#endif
@@ -1344,7 +1344,7 @@
return SYSERR;
MUTEX_CREATE(&lock);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TESTBED registering handler %d!\n",
CS_PROTO_testbed_REQUEST);
coreAPI = capi;
@@ -1384,7 +1384,7 @@
httpRegister("shutdown");
MUTEX_DESTROY(&lock);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TESTBED unregistering handler %d\n",
CS_PROTO_testbed_REQUEST);
coreAPI->unregisterClientHandler(CS_PROTO_testbed_REQUEST,
Modified: GNUnet/src/applications/topology_f2f/topology.c
===================================================================
--- GNUnet/src/applications/topology_f2f/topology.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/topology_f2f/topology.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -193,7 +193,7 @@
}
hash2enc(&indexMatch.match.hashPubKey,
&enc);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Topology: trying to connect to `%s'.\n",
&enc);
coreAPI->unicast(&indexMatch.match,
@@ -216,7 +216,7 @@
hash2enc(&hostId->hashPubKey,
&enc);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Received pong from `%s', telling core that peer is still alive.\n",
(char*)&enc);
#endif
@@ -252,7 +252,7 @@
#if DEBUG_TOPOLOGY
hash2enc(&hi->hashPubKey,
&enc);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Sending ping to `%s' to prevent connection timeout.\n",
(char*)&enc);
#endif
@@ -319,7 +319,7 @@
tmp = getConfigurationString("F2F",
"FRIENDS");
if (tmp == NULL) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Need to have list of friends in configuration under `%s' in section
`%s'.\n"),
"FRIENDS",
"F2F");
@@ -338,7 +338,7 @@
}
data = MALLOC(size);
if (size != readFile(fn, size, data)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Failed to read friends list from `%s'\n"),
fn);
FREE(fn);
@@ -354,7 +354,7 @@
&data[pos],
sizeof(EncName));
if (! isspace(enc.encoding[sizeof(EncName)-1])) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Syntax error in topology specification, skipping bytes.\n"));
continue;
}
@@ -366,7 +366,7 @@
friendCount+1);
friends[friendCount-1].hashPubKey = hc;
} else {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Syntax error in topology specification, skipping bytes `%s'.\n"),
&enc);
}
Modified: GNUnet/src/applications/tracekit/gnunet-tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/gnunet-tracekit.c 2006-07-31 03:21:49 UTC
(rev 3189)
+++ GNUnet/src/applications/tracekit/gnunet-tracekit.c 2006-07-31 03:24:57 UTC
(rev 3190)
@@ -69,7 +69,7 @@
case 'D': {
unsigned int depth;
if (1 != sscanf(GNoptarg, "%ud", &depth)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-D");
return SYSERR;
@@ -83,7 +83,7 @@
case 'F': {
unsigned int format;
if (1 != sscanf(GNoptarg, "%ud", &format)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-F");
return SYSERR;
@@ -118,7 +118,7 @@
case 'P': {
unsigned int prio;
if (1 != sscanf(GNoptarg, "%ud", &prio)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-P");
return SYSERR;
@@ -132,7 +132,7 @@
case 'W': {
unsigned int wait;
if (1 != sscanf(GNoptarg, "%ud", &wait)) {
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("You must pass a number to the `%s' option.\n"),
"-W");
return SYSERR;
@@ -149,7 +149,7 @@
TRACEKIT_VERSION);
return SYSERR;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return SYSERR;
} /* end of parsing commandline */
@@ -359,7 +359,7 @@
return 0; /* parse error, --help, etc. */
sock = getClientSocket();
if (sock == NULL) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Could not connect to gnunetd.\n"));
return -1;
}
@@ -383,7 +383,7 @@
"PRIORITY"));
if (SYSERR == writeToSocket(sock,
&probe.header)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Could not send request to gnunetd.\n"));
return -1;
}
Modified: GNUnet/src/applications/tracekit/tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/tracekit.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/tracekit/tracekit.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -58,7 +58,7 @@
hostCount =
(ntohs(message->size)-sizeof(P2P_tracekit_reply_MESSAGE))/sizeof(PeerIdentity);
if (ntohs(message->size) !=
sizeof(P2P_tracekit_reply_MESSAGE)+hostCount*sizeof(PeerIdentity)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Received invalid `%s' message from `%s'.\n"),
"P2P_tracekit_probe_MESSAGE",
&sen);
@@ -67,7 +67,7 @@
reply = (P2P_tracekit_reply_MESSAGE*)message;
hash2enc(&reply->initiatorId.hashPubKey,
&initiator);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT: Sending reply back to initiator `%s'.\n",
&initiator);
MUTEX_LOCK(&lock);
@@ -77,7 +77,7 @@
if ( (routeTable[i]->timestamp ==
(TIME_T)ntohl(reply->initiatorTimestamp)) &&
(equalsHashCode512(&routeTable[i]->initiator.hashPubKey,
&reply->initiatorId.hashPubKey) ) ) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT: found matching entry in routing table\n");
if (equalsHashCode512(&coreAPI->myIdentity->hashPubKey,
&routeTable[i]->replyTo.hashPubKey) ) {
@@ -85,14 +85,14 @@
CS_tracekit_reply_MESSAGE * csReply;
idx = ntohl(reply->clientId);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT: I am initiator, sending to client.\n");
if (idx >= clientCount) {
GE_BREAK(ectx, 0);
continue; /* discard */
}
if (clients[idx] == NULL) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT: received response on slot %u, but client already
exited.\n",
idx);
continue; /* discard */
@@ -117,7 +117,7 @@
hash2enc(&routeTable[i]->replyTo.hashPubKey,
&hop);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT: forwarding to next hop `%s'\n",
&hop);
coreAPI->unicast(&routeTable[i]->replyTo,
@@ -182,18 +182,18 @@
&sen);
if (ntohs(message->size) !=
sizeof(P2P_tracekit_probe_MESSAGE)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Received invalid `%s' message from `%s'.\n"),
"P2P_tracekit_probe_MESSAGE",
&sen);
return SYSERR;
}
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT: received probe\n");
TIME(&now);
msg = (P2P_tracekit_probe_MESSAGE*) message;
if ((TIME_T)ntohl(msg->timestamp) > 3600 + now) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT: probe has timestamp in the far future (%d > %d), dropping\n",
ntohl(msg->timestamp),
3600 + now);
@@ -209,7 +209,7 @@
if ( (routeTable[i]->timestamp == (TIME_T)ntohl(msg->timestamp)) &&
equalsHashCode512(&routeTable[i]->initiator.hashPubKey,
&msg->initiatorId.hashPubKey) ) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT-PROBE %d from `%s' received twice (slot %d), ignored\n",
ntohl(msg->timestamp),
&init,
@@ -239,7 +239,7 @@
}
if (sel == -1) {
MUTEX_UNLOCK(&lock);
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
_("TRACEKIT: routing table full, trace request dropped\n"));
return OK;
}
@@ -254,7 +254,7 @@
routeTable[sel]->replyTo
= *sender;
MUTEX_UNLOCK(&lock);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT-PROBE started at %d by peer `%s' received, processing in slot
%d with %u hops\n",
ntohl(msg->timestamp),
&init,
@@ -320,14 +320,14 @@
CS_tracekit_probe_MESSAGE * csProbe;
P2P_tracekit_probe_MESSAGE p2pProbe;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT: client sends probe request\n");
/* build probe, broadcast */
csProbe = (CS_tracekit_probe_MESSAGE*) message;
if (ntohs(csProbe->header.size) !=
sizeof(CS_tracekit_probe_MESSAGE) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("TRACEKIT: received invalid `%s' message\n"),
"CS_tracekit_probe_MESSAGE");
return SYSERR;
@@ -354,7 +354,7 @@
}
clients[idx] = client;
MUTEX_UNLOCK(&lock);
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT: client joins in slot %u.\n",
idx);
@@ -384,7 +384,7 @@
MUTEX_LOCK(&lock);
for (i=0;i<clientCount;i++)
if (clients[i] == c) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT: client in slot %u exits.\n",
i);
clients[i] = NULL;
@@ -407,7 +407,7 @@
MUTEX_CREATE(&lock);
coreAPI = capi;
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"TRACEKIT registering handlers %d %d and %d\n",
P2P_PROTO_tracekit_PROBE,
P2P_PROTO_tracekit_REPLY,
Modified: GNUnet/src/applications/traffic/clientapi.c
===================================================================
--- GNUnet/src/applications/traffic/clientapi.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/traffic/clientapi.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -63,14 +63,14 @@
= htonl(timeframe);
if (SYSERR == writeToSocket(sock,
&req.header)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Failed to query gnunetd about traffic conditions.\n"));
return SYSERR;
}
info = NULL;
if (SYSERR == readFromSocket(sock,
(CS_MESSAGE_HEADER**)&info)) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Did not receive reply from gnunetd about traffic conditions.\n"));
return SYSERR;
}
Modified: GNUnet/src/applications/vpn/gnunet-vpn.c
===================================================================
--- GNUnet/src/applications/vpn/gnunet-vpn.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/applications/vpn/gnunet-vpn.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -85,7 +85,7 @@
TEMPLATE_VERSION);
return SYSERR;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
_("Use --help to get a list of options.\n"));
return -1;
} /* end of parsing commandline */
Modified: GNUnet/src/applications/vpn/vpn.c
===================================================================
--- GNUnet/src/applications/vpn/vpn.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/applications/vpn/vpn.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -397,11 +397,11 @@
static int valid_incoming(int len, struct tun_pi* tp, struct ip6_hdr* fp) {
char info[100];
if (len > (65535 - sizeof(struct tun_pi))) {
- LOG(LOG_ERROR, _("RFC4193 Frame length %d is too big for
GNUnet!\n"), len);
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("RFC4193 Frame
length %d is too big for GNUnet!\n"), len);
return NO;
}
if (len < sizeof(struct tun_pi)) {
- LOG(LOG_ERROR, _("RFC4193 Frame length %d too small\n"), len);
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("RFC4193 Frame
length %d too small\n"), len);
return NO;
}
if ((ntohs(tp->proto) == ETH_P_IP) && (((struct iphdr*)fp)->version ==
4)) {
@@ -411,7 +411,7 @@
VLOG "-> GNUnet(%d) : %s\n", len - sizeof(struct tun_pi), info);
return YES;
}
- LOG(LOG_ERROR, _("RFC4193 Ethertype %x and IP version %x do not
match!\n"),
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("RFC4193 Ethertype %x and
IP version %x do not match!\n"),
ntohs(tp->proto), ((struct iphdr*)fp)->version);
return NO;
}
@@ -471,11 +471,11 @@
int i, used, fd, id = 0;
- LOG(LOG_DEBUG, _("RFC4193 Going to try and make a tunnel in slot
%d\n"), n);
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("RFC4193 Going to try
and make a tunnel in slot %d\n"), n);
fd = open("/dev/net/tun", O_RDWR);
if (fd < 0) {
- LOG(LOG_ERROR, _("Cannot open tunnel device because of %s"),
strerror(fd));
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("Cannot open
tunnel device because of %s"), strerror(fd));
DIE_STRERROR("open");
}
memset(&ifr, 0, sizeof(ifr));
@@ -502,7 +502,7 @@
used = 0;
for (i = 0; i < entries1; i++) {
if ((store1+i)->id == id) {
- LOG(LOG_DEBUG, _("RFC4193 Create skips gnu%d as
we are already using it\n"), id);
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("RFC4193 Create skips gnu%d as we are already using it\n"), id);
id++;
used = 1;
}
@@ -510,11 +510,11 @@
if (used == 0) {
sprintf(ifr.ifr_name, "gnu%d", id);
if ( ioctl(fd, TUNSETIFF, (void *) &ifr) < 0) {
- LOG(LOG_ERROR, _("Cannot set tunnel name to %s
because of %s\n"), ifr.ifr_name, strerror(errno));
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Cannot set tunnel name to %s because of %s\n"), ifr.ifr_name,
strerror(errno));
id++;
used = 1;
} else {
- LOG(LOG_ERROR, _("Configured tunnel name to
%s\n"), ifr.ifr_name);
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Configured tunnel name to %s\n"), ifr.ifr_name);
}
}
} while (used);
@@ -544,7 +544,7 @@
/* Run some system commands to set it up... */
/* sprintf(cmd, "sudo ifconfig %s up", name);
- * LOG(LOG_DEBUG, _("RFC4193 Calling %s\n"), cmd);
+ * GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("RFC4193 Calling
%s\n"), cmd);
* system(cmd);
*/
@@ -552,23 +552,23 @@
/* not needed, we already have the iface name ... strncpy(ifr.ifr_name,
name, IFNAMSIZ); */
if (ioctl(admin_fd, SIOCGIFFLAGS, &ifr) < 0) {
- LOG(LOG_ERROR, _("Cannot get socket flags for gnu%d because
%s\n"), id, strerror(errno));
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("Cannot get socket
flags for gnu%d because %s\n"), id, strerror(errno));
} else {
ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
if (ioctl(admin_fd, SIOCSIFFLAGS, &ifr) < 0) {
- LOG(LOG_ERROR, _("Cannot set socket flags for gnu%d
because %s\n"), id, strerror(errno));
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("Cannot
set socket flags for gnu%d because %s\n"), id, strerror(errno));
}
}
/* Seems to go better with lower mtu, aka system("sudo ifconfig %s mtu
1280") */
ifr.ifr_mtu = 1280;
if (ioctl(admin_fd, SIOCSIFMTU, &ifr) < 0) {
- LOG(LOG_ERROR, _("Cannot set MTU for gnu%d because %s\n"), id,
strerror(errno));
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("Cannot set MTU
for gnu%d because %s\n"), id, strerror(errno));
}
/* lets add an IP address... aka "sudo ifconfig %s add %s:%04x::1/64" */
if (ioctl(admin_fd, SIOCGIFINDEX, &ifr) < 0) {
- LOG(LOG_ERROR, _("Cannot get interface index for gnu%d because
%s\n"), id, strerror(errno));
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("Cannot get
interface index for gnu%d because %s\n"), id, strerror(errno));
} else {
/* note to self... htons(64) = kernel oops. */
(store1+n)->ifindex = ifr.ifr_ifindex;
@@ -576,7 +576,7 @@
ifr6.ifr6_ifindex = ifr.ifr_ifindex;
id2net(&ifr6.ifr6_addr, coreAPI->myIdentity);
ifr6.ifr6_addr.s6_addr16[3] = htons(n+VC_START);
- LOG(LOG_DEBUG, _("IPv6 ifaddr gnu%d -
%x:%x:%x:%x:%x:%x:%x:%x/%d\n"),
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("IPv6 ifaddr
gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"),
id,
ntohs(ifr6.ifr6_addr.s6_addr16[0]),
ntohs(ifr6.ifr6_addr.s6_addr16[1]),
@@ -588,7 +588,7 @@
ntohs(ifr6.ifr6_addr.s6_addr16[7]),
ifr6.ifr6_prefixlen);
if (ioctl(admin_fd, SIOCSIFADDR, &ifr6) < 0) {
- LOG(LOG_ERROR, _("Cannot set interface IPv6 address for
gnu%d because %s\n"), id, strerror(errno));
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("Cannot
set interface IPv6 address for gnu%d because %s\n"), id, strerror(errno));
}
/* lets add a route to the peer, aka "sudo route -A inet6 add
%s::/48 dev %s" */
@@ -599,7 +599,7 @@
rt.rtmsg_flags = RTF_UP;
rt.rtmsg_metric = 1; /* how many hops to owner of public key
*/
rt.rtmsg_dst_len = 48; /* network prefix len is 48 by standard
*/
- LOG(LOG_DEBUG, _("IPv6 route gnu%d - destination
%x:%x:%x:%x:%x:%x:%x:%x/%d\n"),
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("IPv6 route
gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"),
id,
ntohs(rt.rtmsg_dst.s6_addr16[0]),
ntohs(rt.rtmsg_dst.s6_addr16[1]),
@@ -611,7 +611,7 @@
ntohs(rt.rtmsg_dst.s6_addr16[7]),
rt.rtmsg_dst_len);
if (ioctl(admin_fd, SIOCADDRT, &rt) < 0) {
- LOG(LOG_ERROR, _("Cannot add route IPv6 address for
gnu%s because %s\n"), id, strerror(errno));
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("Cannot
add route IPv6 address for gnu%s because %s\n"), id, strerror(errno));
}
}
}
@@ -625,7 +625,7 @@
tunnel_info* rstore1;
int rcapacity1;
- /* LOG(LOG_DEBUG, _("RFC4193 Going to checkensure peer %x then\n"),
them->hashPubKey.bits[0]); */
+ /* GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("RFC4193 Going to
checkensure peer %x then\n"), them->hashPubKey.bits[0]); */
/* first entry in array will be known as gnu0 */
/* if a tunnel is already setup, we don't setup another */
@@ -643,7 +643,7 @@
if (rcapacity1 > capacity1) {
rstore1 = REALLOC(store1, rcapacity1);
if (rstore1 == NULL) {
- LOG(LOG_ERROR, _("RFC4193 We have run out of memory and
so I can't store a tunnel for this peer.\n"));
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER, _("RFC4193
We have run out of memory and so I can't store a tunnel for this peer.\n"));
entries1--;
return;
}
@@ -651,7 +651,7 @@
capacity1 = rcapacity1;
}
- /* LOG(LOG_DEBUG, _("RFC4193 Extending array for new tunnel\n")); */
+ /* GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("RFC4193 Extending
array for new tunnel\n")); */
setup_tunnel((entries1 - 1), them);
}
@@ -689,7 +689,7 @@
tp = ((struct tun_pi*)fp)-1;
gp = ((P2P_MESSAGE_HEADER*)fp)-1;
running = 1;
- LOG(LOG_DEBUG, _("RFC4193 Thread running (frame %d tunnel %d f2f %d)
...\n"), fp, tp, gp);
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("RFC4193 Thread running
(frame %d tunnel %d f2f %d) ...\n"), fp, tp, gp);
MUTEX_LOCK(&lock);
while (running) {
@@ -751,7 +751,7 @@
for (i = 0; i < entries1; i++) {
if (((store1+i)->active) > 0) {
if
(identity->isBlacklistedStrict(&((store1+i)->peer))) {
- LOG(LOG_INFO, _("RFC4193 ---
whitelist of peer %x\n"),
+ GE_LOG(ectx, GE_INFO |
GE_REQUEST | GE_USER, _("RFC4193 --- whitelist of peer %x\n"),
(store1+i)->peer.hashPubKey.bits[0]);
identity->whitelistHost(&((store1+i)->peer));
}
@@ -760,7 +760,7 @@
* they have never used VPN, and they have
disconnected...
*/
/* if (((store1+i)->active) == 0) {
- * LOG(LOG_INFO, _("RFC4193 --- dropping
connection %x\n"), i);
+ * GE_LOG(ectx, GE_INFO | GE_REQUEST |
GE_USER, _("RFC4193 --- dropping connection %x\n"), i);
* close( (store1+i)->fd );
* *(store1+i) = *(store1+(entries1-1));
* entries1--;
@@ -769,7 +769,7 @@
}
}
}
- LOG(LOG_DEBUG, _("RFC4193 Thread exiting\n"));
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("RFC4193 Thread
exiting\n"));
MUTEX_UNLOCK(&lock);
return NULL;
}
@@ -809,20 +809,20 @@
case 6:
tp->proto = htons(ETH_P_IPV6);
if ( ntohs(fp->ip6_src.s6_addr16[0]) < 0xFD00 )
{
- LOG(LOG_DEBUG, _("VPN IP src not
anonymous. drop..\n"));
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST |
GE_USER, _("VPN IP src not anonymous. drop..\n"));
return OK;
}
if ( ntohs(fp->ip6_dst.s6_addr16[0]) < 0xFD00 )
{
- LOG(LOG_DEBUG, _("VPN IP not anonymous,
drop.\n"));
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST |
GE_USER, _("VPN IP not anonymous, drop.\n"));
return OK;
}
break;
case 4:
tp->proto = htons(ETH_P_IP);
- LOG(LOG_DEBUG, _("VPN Received, not anonymous,
drop.\n"));
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("VPN Received, not anonymous, drop.\n"));
return OK;
default:
- LOG(LOG_ERROR, _("VPN Received unknown IP
version %d...\n"), ((struct iphdr*)fp)->version);
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("VPN Received unknown IP version %d...\n"), ((struct iphdr*)fp)->version);
return OK;
}
@@ -851,7 +851,7 @@
/* do not normally get here... but checkensure so any future
packets could be routed... */
checkensure_peer(sender, NULL);
MUTEX_UNLOCK(&lock);
- LOG(LOG_DEBUG, _("Could not write the tunnelled IP to the OS...
Did to setup a tunnel?\n"));
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("Could not
write the tunnelled IP to the OS... Did to setup a tunnel?\n"));
return OK;
case p2p_PROTO_PONG:
MUTEX_LOCK(&lock);
@@ -866,7 +866,7 @@
for (i = 0; i < entries1; i++) {
if ((((store1+i)->fd) > 0) && isEqual(sender,
&((store1+i)->peer))) {
if (((store1+i)->active) == 0) {
- LOG(LOG_INFO, _("RFC4193 -- non-vpn
node hangs up. close down gnu%d (%d in %d)\n"),
+ GE_LOG(ectx, GE_INFO | GE_REQUEST |
GE_USER, _("RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"),
(store1+i)->id, i, entries1);
close( (store1+i)->fd );
@@ -995,7 +995,7 @@
cprintf(c, "\n");
MUTEX_LOCK(&lock);
/* make sure realised table can take the new routes - if it wont, abort
now! */
- LOG(LOG_DEBUG, _("realise alloc ram\n"));
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("realise alloc ram\n"));
if (route_entries > realised_entries) {
reqcapacity = sizeof(route_info) * route_entries;
if (reqcapacity > realised_capacity) {
@@ -1010,7 +1010,7 @@
}
}
/* add routes that are in the new table but not the old */
- LOG(LOG_DEBUG, _("realise add routes\n"));
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("realise add
routes\n"));
for (i = 0; i < route_entries; i++) {
found = 0;
for (j = 0; j < realised_entries; j++) {
@@ -1055,7 +1055,7 @@
}
}
cprintf(c, "Removing routes\n");
- LOG(LOG_DEBUG, _("realise pull routes\n"));
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("realise pull
routes\n"));
/* pull routes that are in the old table but not the new */
for (i = 0; i < realised_entries; i++) {
found = 0;
@@ -1101,7 +1101,7 @@
}
}
cprintf(c, "Copying table\n");
- LOG(LOG_DEBUG, _("realise copy table\n"));
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("realise copy
table\n"));
realised_entries = route_entries;
memcpy(realised_store,route_store, sizeof(route_info) * route_entries);
@@ -1321,8 +1321,8 @@
system("sudo setpcaps cap_net_admin+eip `pidof gnunetd`");
admin_fd = socket(AF_INET6, SOCK_DGRAM, 0);
- LOG(LOG_DEBUG, _("`%s' initialising RFC4913 module %d and %d\n"),
"template", CS_PROTO_MAX_USED, P2P_PROTO_MAX_USED);
- LOG(LOG_DEBUG, _("RFC4193 my First 4 hex digits of host id are %x\n"),
capi->myIdentity->hashPubKey.bits[0]);
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("`%s' initialising
RFC4913 module %d and %d\n"), "template", CS_PROTO_MAX_USED,
P2P_PROTO_MAX_USED);
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, _("RFC4193 my First 4 hex
digits of host id are %x\n"), capi->myIdentity->hashPubKey.bits[0]);
/* core calls us to receive messages */
/* get a PONG = peer is online */
@@ -1380,7 +1380,7 @@
coreAPI->unregisterClientHandler(CS_PROTO_VPN_MSG, &csHandle);
coreAPI->unregisterClientExitHandler(&clientExitHandler);
- LOG(LOG_INFO, _("RFC4193 Waiting for tun thread to end\n"));
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER, _("RFC4193 Waiting for tun
thread to end\n"));
running = 0;
/* thread should wake up and exit */
@@ -1391,7 +1391,7 @@
/* wait for it to exit */
PTHREAD_JOIN(&tunThreadInfo, &returnval);
- LOG(LOG_INFO, _("RFC4193 The tun thread has ended\n"));
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER, _("RFC4193 The tun thread
has ended\n"));
coreAPI->releaseService(identity);
identity = NULL;
@@ -1402,7 +1402,7 @@
/* bye bye TUNTAP ... */
for (i = 0; i < entries1; i++) {
if (((store1+i)->fd) != 0) {
- LOG(LOG_DEBUG, _("RFC4193 Closing tunnel %d fd %d\n"),
i, (store1+i)->fd);
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("RFC4193 Closing tunnel %d fd %d\n"), i, (store1+i)->fd);
close((store1+i)->fd);
(store1+i)->fd = 0;
}
Modified: GNUnet/src/server/gnunet-transport-check.c
===================================================================
--- GNUnet/src/server/gnunet-transport-check.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/server/gnunet-transport-check.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -304,7 +304,7 @@
fprintf(stderr, ".");
/* check: received pong? */
#if DEBUG_TRANSPORT_CHECK
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Waiting for PONG\n");
#endif
terminate = NO;
Modified: GNUnet/src/setup/confdata.c
===================================================================
--- GNUnet/src/setup/confdata.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/setup/confdata.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -89,7 +89,7 @@
sym->flags &= ~SYMBOL_NEW;
}
else {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("%s: symbol value `%s' invalid for %s\n"),
name,
val,
Modified: GNUnet/src/setup/glade_support.c
===================================================================
--- GNUnet/src/setup/glade_support.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/setup/glade_support.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -71,7 +71,7 @@
"",
handler_name);
if (method == NULL) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("Failed to find handler for `%s'\n"),
handler_name);
return;
Modified: GNUnet/src/setup/gnunet-setup.c
===================================================================
--- GNUnet/src/setup/gnunet-setup.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/setup/gnunet-setup.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -103,7 +103,7 @@
break;
}
default:
- LOG(LOG_FAILURE, _("Use --help to get a list of options.\n"));
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER, _("Use --help to get a
list of options.\n"));
cont = SYSERR;
} /* end of parsing commandline */
}
@@ -173,10 +173,10 @@
FREENONNULL(setConfigurationString("GNUNET-SETUP",
"OPERATION", argv[GNoptind++]));
if(GNoptind < argc) {
- LOG(LOG_WARNING, _("Invalid arguments: "));
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER, _("Invalid arguments: "));
while(GNoptind < argc)
- LOG(LOG_WARNING, "%s ", argv[GNoptind++]);
- LOG(LOG_FATAL, _("Invalid arguments. Exiting.\n"));
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER, "%s ", argv[GNoptind++]);
+ GE_LOG(ectx, GE_FATAL | GE_IMMEDIATE | GE_USER, _("Invalid arguments.
Exiting.\n"));
FREE(filename);
return SYSERR;
}
@@ -220,7 +220,7 @@
operation = getConfigurationString("GNUNET-SETUP", "OPERATION");
if (operation == NULL) {
operation = STRDUP("");
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("No interface specified, using default\n"));
def = YES;
}
Modified: GNUnet/src/setup/gnunet-win-tool.c
===================================================================
--- GNUnet/src/setup/gnunet-win-tool.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/setup/gnunet-win-tool.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -373,7 +373,7 @@
strcpy(hashFile, GNoptarg);
break;
default:
- LOG(LOG_FAILURE,
+ GE_LOG(ectx, GE_ERROR | GE_IMMEDIATE | GE_USER,
"Unknown option %c. Aborting.\n"\
"Use --help to get a list of options.\n",
c);
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/transports/http.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -475,7 +475,7 @@
(len == 0) )
continue;
#if DEBUG_HTTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"http receiving chunk of %u bytes\n",
len);
#endif
@@ -568,7 +568,7 @@
}
}
#if DEBUG_HTTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Got message of %u out of %u bytes\n",
httpSession->rpos,
httpSession->rsize);
@@ -577,7 +577,7 @@
(httpSession->rpos != httpSession->rsize) ) {
/* only have partial message yet */
#if DEBUG_HTTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Got partial message of %u out of %u bytes\n",
httpSession->rpos,
httpSession->rsize);
@@ -597,7 +597,7 @@
welcome = (HTTPWelcome*) &httpSession->rbuff[0];
if ( (ntohs(welcome->version) != 0) ||
(ntohs(welcome->size) != sizeof(HTTPWelcome)) ) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Expected welcome on http connection, got garbage. Closing
connection.\n"));
httpDisconnect(tsession);
return SYSERR;
@@ -605,10 +605,10 @@
httpSession->expectingWelcome = NO;
httpSession->sender = welcome->clientIdentity;
#if DEBUG_HTTP
- IFLOG(LOG_DEBUG,
+ IFGE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
hash2enc(&httpSession->sender.hashPubKey,
&enc));
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Http welcome message from peer `%s' received.\n",
&enc);
#endif
@@ -645,7 +645,7 @@
httpSession->rsize = 0;
httpSession->rpos = 0;
#if DEBUG_HTTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"http transport received %d bytes, forwarding to core.\n",
mp->size);
#endif
@@ -748,7 +748,7 @@
http_sock = -1; /* prevent us from error'ing all the time */
}
} else
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"HTTP server socket not open!\n");
if (http_pipe[0] != -1) {
if (-1 != FSTAT(http_pipe[0], &buf)) {
@@ -813,7 +813,7 @@
sizeof(struct in_addr));
if (YES == isBlacklisted(ipaddr)) {
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
_("%s: Rejected connection from blacklisted "
"address %u.%u.%u.%u.\n"),
"HTTP",
@@ -821,7 +821,7 @@
closefile(sock);
} else {
#if DEBUG_HTTP
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
"Accepted connection from %u.%u.%u.%u.\n",
PRIP(ntohl(*(int*)&clientAddr.sin_addr)));
#endif
@@ -949,7 +949,7 @@
return SYSERR;
if (httpSession->sock == -1) {
#if DEBUG_HTTP
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
"httpDirectSend called, but socket is closed\n");
#endif
return SYSERR;
@@ -1009,7 +1009,7 @@
len += ssize;
incrementBytesSent(len);
#if DEBUG_HTTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"http sending chunk of %u bytes\n",
ssize);
#endif
@@ -1088,7 +1088,7 @@
port = getGNUnetHTTPPort();
if (0 == port) {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"HTTP port is 0, will only send using HTTP.\n");
return NULL; /* HTTP transport is configured SEND-only! */
}
@@ -1097,12 +1097,12 @@
if (SYSERR == getPublicIPAddress(&haddr->ip)) {
FREE(msg);
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("HTTP: Could not determine my public IP address.\n"));
return NULL;
}
#if DEBUG_HTTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"HTTP uses IP address %u.%u.%u.%u.\n",
PRIP(ntohl(*(int*)&haddr->ip)));
#endif
@@ -1135,7 +1135,7 @@
return SYSERR;
haddr = (HostAddress*) &helo[1];
#if DEBUG_HTTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Creating HTTP connection to %u.%u.%u.%u:%u.\n",
PRIP(ntohl(*(int*)&haddr->ip.addr)),
ntohs(haddr->port));
@@ -1173,7 +1173,7 @@
sizeof(soaddr));
if ( (i < 0) &&
(errno != EINPROGRESS) ) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Cannot connect to %u.%u.%u.%u:%u: %s\n"),
PRIP(ntohl(*(int*)&haddr->ip)),
ntohs(haddr->port),
@@ -1320,7 +1320,7 @@
serverAddr.sin_addr.s_addr = htonl(INADDR_ANY);
serverAddr.sin_port = htons(getGNUnetHTTPPort());
#if DEBUG_HTTP
- LOG(LOG_INFO,
+ GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
"starting %s peer server on port %d\n",
"http",
ntohs(serverAddr.sin_port));
@@ -1329,7 +1329,7 @@
(struct sockaddr *) &serverAddr,
sizeof(serverAddr)) < 0) {
LOG_STRERROR(LOG_ERROR, "bind");
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Could not bind the HTTP listener to port %d. "
"No transport service started.\n"),
getGNUnetHTTPPort());
@@ -1451,7 +1451,7 @@
if (proxy != NULL) {
if (OK != GN_getHostByName(proxy,
&ip)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Could not resolve name of HTTP proxy `%s'.\n"),
proxy);
theProxy.sin_addr.s_addr = 0;
Modified: GNUnet/src/transports/ip.c
===================================================================
--- GNUnet/src/transports/ip.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/transports/ip.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -222,7 +222,7 @@
if (! iAddrCount)
{
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Could not find an IP address for "
"interface `%s'.\n"),
interfaces);
@@ -232,7 +232,7 @@
return SYSERR;
}
else if (iAddrCount > 1)
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("There is more than one IP address specified"
" for interface `%s'.\nGNUnet will "
"use %u.%u.%u.%u.\n"),
@@ -253,7 +253,7 @@
s = SOCKET(PF_INET, SOCK_STREAM, 0);
pHost = GETHOSTBYNAME("www.example.com");
if (! pHost) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Could not resolve `%s' to "
"determine our IP address: %s\n"),
"www.example.com",
@@ -285,7 +285,7 @@
identity->addr = theHost.sin_addr.S_un.S_addr;
}
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
_("GNUnet now uses the IP address %u.%u.%u.%u.\n"),
PRIP(ntohl(identity->addr)));
Modified: GNUnet/src/transports/ip6.c
===================================================================
--- GNUnet/src/transports/ip6.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/transports/ip6.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -54,7 +54,7 @@
"gethostname");
return SYSERR;
}
- /* LOG(LOG_DEBUG,
+ /* GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
" looking up $HOSTNAME (%s) to obtain local IP\n",
hostname); */
Modified: GNUnet/src/transports/smtp.c
===================================================================
--- GNUnet/src/transports/smtp.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/transports/smtp.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -204,14 +204,14 @@
unsigned int ret=0;
#define CHECK_CRLF while (data[i] == '\r' || data[i] == '\n') {\
- LOG(LOG_DEBUG, "ignoring CR/LF\n"); \
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"ignoring CR/LF\n"); \
i++; \
if (i >= len) goto END; \
}
*output = MALLOC((len * 3 / 4) + 8);
#if DEBUG_SMTP
- LOG(LOG_DEBUG, "base64_decode decoding len=%d\n", len);
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER, "base64_decode decoding
len=%d\n", len);
#endif
for (i = 0; i < len; ++i) {
CHECK_CRLF;
@@ -489,10 +489,10 @@
mp = (SMTPMessage*)&out[size-sizeof(SMTPMessage)];
if (ntohs(mp->size) != size) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Received malformed message via SMTP (size mismatch).\n"));
#if DEBUG_SMTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Size returned by base64=%d, in the msg=%d.\n",
size,
ntohl(mp->size));
@@ -507,7 +507,7 @@
&mp->sender,
sizeof(PeerIdentity));
#if DEBUG_SMTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SMTP message passed to the core.\n");
#endif
@@ -516,7 +516,7 @@
}
END:
#if DEBUG_SMTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"SMTP message processed.\n");
#endif
if (fdes != NULL)
@@ -548,7 +548,7 @@
return SYSERR; /* obviously invalid */
} else {
#if DEBUG_SMTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Verified SMTP helo from `%s'.\n",
&maddr->senderAddress[0]);
#endif
@@ -575,7 +575,7 @@
if (email == NULL) {
static int once;
if (once == 0) {
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
"No email-address specified, cannot create SMTP advertisement.\n");
once = 1;
}
@@ -584,14 +584,14 @@
filter = getConfigurationString("SMTP",
"FILTER");
if (filter == NULL) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("No filter for E-mail specified, cannot create SMTP
advertisement.\n"));
FREE(email);
return NULL;
}
if (strlen(filter) > FILTER_STRING_SIZE) {
filter[FILTER_STRING_SIZE] = '\0';
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("SMTP filter string to long, capped to `%s'\n"),
filter);
}
@@ -704,13 +704,13 @@
size);
ebody = NULL;
#if DEBUG_SMTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Base64-encoding %d byte message.\n",
ssize);
#endif
ssize = base64_encode(msg, ssize, &ebody);
#if DEBUG_SMTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Base64-encoded message size is %d bytes.\n",
ssize);
#endif
@@ -765,7 +765,7 @@
res = OK;
MUTEX_UNLOCK(&smtpLock);
if (res != OK)
- LOG(LOG_WARNING,
+ GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
_("Sending E-mail to `%s' failed.\n"),
&haddr->senderAddress[0]);
incrementBytesSent(ssize);
@@ -810,13 +810,13 @@
return SYSERR;
}
#if DEBUG_SMTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Checking SMTP server.\n");
#endif
/* read welcome from SMTP server */
if (SYSERR == readSMTPLine(smtp_sock,
"220 ")) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("SMTP server send unexpected response at %s:%d.\n"),
__FILE__, __LINE__);
closefile(smtp_sock);
@@ -832,26 +832,26 @@
"EMAIL");
if (email == NULL) {
#if DEBUG_SMTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"No email-address specified, will not advertise SMTP address.\n");
#endif
return OK;
}
FREE(email);
} else {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("SMTP server failed to respond with 250 confirmation code to `%s'
request.\n"),
"helo");
return OK;
}
} else {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("Failed to send `%s' request to SMTP server.\n"),
"helo");
return OK;
}
#if DEBUG_SMTP
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"creating listen thread\n");
#endif
if (0 != PTHREAD_CREATE(&dispatchThread,
@@ -933,7 +933,7 @@
if (mtu == 0)
mtu = MESSAGE_SIZE;
if (mtu < 1200)
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
_("MTU for `%s' is probably too low (fragmentation not
implemented!)\n"),
"SMTP");
if (mtu > MESSAGE_SIZE)
Modified: GNUnet/src/transports/udp6.c
===================================================================
--- GNUnet/src/transports/udp6.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/transports/udp6.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -177,7 +177,7 @@
else {
#if DEBUG_UDP6
char inet6[INET6_ADDRSTRLEN];
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Verified UDP6 helo from %u.%u.%u.%u:%u.\n",
inet_ntop(AF_INET6,
&haddr->senderIP,
Modified: GNUnet/src/util/network_client/tcpio.c
===================================================================
--- GNUnet/src/util/network_client/tcpio.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/util/network_client/tcpio.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -323,7 +323,7 @@
return SYSERR;
}
#if DEBUG_TCPIO
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
"Successfully received %d bytes from TCP socket.\n",
size);
#endif
Modified: GNUnet/src/util/network_client/tcpiotest.c
===================================================================
--- GNUnet/src/util/network_client/tcpiotest.c 2006-07-31 03:21:49 UTC (rev
3189)
+++ GNUnet/src/util/network_client/tcpiotest.c 2006-07-31 03:24:57 UTC (rev
3190)
@@ -15,7 +15,7 @@
listenerPort = getGNUnetPort();
/* create the socket */
while ( (listenerFD = SOCKET(PF_INET, SOCK_STREAM, 0)) < 0) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
"ERROR opening socket (%s). "
"No client service started. "
"Trying again in 30 seconds.\n",
@@ -41,7 +41,7 @@
if (BIND (listenerFD,
(struct sockaddr *) &serverAddr,
sizeof(serverAddr)) < 0) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
"ERROR (%s) binding the TCP listener to port %d. "
"Test failed. Is gnunetd running?\n",
STRERROR(errno),
@@ -51,7 +51,7 @@
/* start listening for new connections */
if (0 != LISTEN(listenerFD, 5)) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
" listen failed: %s\n",
STRERROR(errno));
return -1;
@@ -71,7 +71,7 @@
(struct sockaddr *)&clientAddr,
&lenOfIncomingAddr);
if (incomingFD < 0) {
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
"ERROR accepting new connection (%s).\n",
STRERROR(errno));
continue;
Modified: GNUnet/src/util/os/semaphoretest.c
===================================================================
--- GNUnet/src/util/os/semaphoretest.c 2006-07-31 03:21:49 UTC (rev 3189)
+++ GNUnet/src/util/os/semaphoretest.c 2006-07-31 03:24:57 UTC (rev 3190)
@@ -117,10 +117,10 @@
if (me == 0) {
exit(ret);
} else {
- LOG(LOG_DEBUG,
+ GE_LOG(ectx, GE_DEBUG | GE_REQUEST | GE_USER,
" waiting for other process to exit.\n");
if (-1 == waitpid(me, &j, 0))
- LOG(LOG_ERROR,
+ GE_LOG(ectx, GE_ERROR | GE_BULK | GE_USER,
" waitpid failed: %s\n",
STRERROR(errno));
if ((! WIFEXITED(j)) || WEXITSTATUS(j) == 1)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3190 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/chat applications/datastore applications/dht/module applications/dht/tools applications/fs/ecrs applications/fs/fsui applications/fs/lib applications/fs/module applications/fs/tools applications/gap applications/identity applications/kvstore_sqlite applications/rpc applications/sqstore_mysql applications/sqstore_sqlite applications/tbench applications/template applications/testbed applications/topology_f2f applications/tracekit applications/traffic applications/vpn server setup transports util/network_client util/os,
grothoff <=