[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5867 - in GNUnet/src: applications/advertising application
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r5867 - in GNUnet/src: applications/advertising applications/chat applications/fragmentation applications/getoption applications/rpc applications/stats applications/tbench applications/testbed applications/tracekit applications/traffic include server transports |
|
Date: |
Tue, 11 Dec 2007 22:32:32 -0700 (MST) |
Author: grothoff
Date: 2007-12-11 22:32:31 -0700 (Tue, 11 Dec 2007)
New Revision: 5867
Modified:
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/chat/chat.c
GNUnet/src/applications/chat/chat.h
GNUnet/src/applications/fragmentation/fragmentation.c
GNUnet/src/applications/getoption/clientapi.c
GNUnet/src/applications/getoption/getoption.c
GNUnet/src/applications/getoption/getoption.h
GNUnet/src/applications/rpc/rpc.c
GNUnet/src/applications/stats/clientapi.c
GNUnet/src/applications/stats/statistics.c
GNUnet/src/applications/stats/statistics.h
GNUnet/src/applications/tbench/gnunet-tbench.c
GNUnet/src/applications/testbed/commands.c
GNUnet/src/applications/testbed/testbed.c
GNUnet/src/applications/testbed/testbed.h
GNUnet/src/applications/tracekit/gnunet-tracekit.c
GNUnet/src/applications/tracekit/tracekit.c
GNUnet/src/applications/tracekit/tracekit.h
GNUnet/src/applications/traffic/clientapi.c
GNUnet/src/applications/traffic/traffic.c
GNUnet/src/applications/traffic/traffic.h
GNUnet/src/include/gnunet_core.h
GNUnet/src/include/gnunet_protocols.h
GNUnet/src/server/connection.c
GNUnet/src/server/connection.h
GNUnet/src/transports/tcp_helper.c
GNUnet/src/transports/udp.c
GNUnet/src/transports/udp6.c
Log:
typos
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2007-12-12 05:09:30 UTC
(rev 5866)
+++ GNUnet/src/applications/advertising/advertising.c 2007-12-12 05:32:31 UTC
(rev 5867)
@@ -392,8 +392,8 @@
}
else
{
- GNUNET_GE_ASSERT (ectx, mtu > GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD);
- mtu -= GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD;
+ GNUNET_GE_ASSERT (ectx, mtu > GNUNET_P2P_MESSAGE_OVERHEAD);
+ mtu -= GNUNET_P2P_MESSAGE_OVERHEAD;
}
copy = GNUNET_malloc (GNUNET_sizeof_hello (msg));
memcpy (copy, msg, GNUNET_sizeof_hello (msg));
Modified: GNUnet/src/applications/chat/chat.c
===================================================================
--- GNUnet/src/applications/chat/chat.c 2007-12-12 05:09:30 UTC (rev 5866)
+++ GNUnet/src/applications/chat/chat.c 2007-12-12 05:32:31 UTC (rev 5867)
@@ -125,7 +125,7 @@
static int
csHandleChatRequest (GNUNET_ClientHandle client,
- const CS_MESSAGNUNET_GE_HEADER * message)
+ const CS_MESSAGE_HEADER * message)
{
int i;
int j;
Modified: GNUnet/src/applications/chat/chat.h
===================================================================
--- GNUnet/src/applications/chat/chat.h 2007-12-12 05:09:30 UTC (rev 5866)
+++ GNUnet/src/applications/chat/chat.h 2007-12-12 05:32:31 UTC (rev 5867)
@@ -39,7 +39,7 @@
typedef struct
{
- CS_MESSAGNUNET_GE_HEADER header;
+ CS_MESSAGE_HEADER header;
char nick[CHAT_NICK_LENGTH];
char message[CHAT_MSG_LENGTH];
} CS_chat_MESSAGE;
Modified: GNUnet/src/applications/fragmentation/fragmentation.c
===================================================================
--- GNUnet/src/applications/fragmentation/fragmentation.c 2007-12-12
05:09:30 UTC (rev 5866)
+++ GNUnet/src/applications/fragmentation/fragmentation.c 2007-12-12
05:32:31 UTC (rev 5867)
@@ -485,7 +485,7 @@
/* write first fragment to buf */
frag = (P2P_fragmentation_MESSAGE *) buf;
frag->header.size = htons (len);
- frag->header.type = htons (GNUNET_P2P_PROTO_MESSAGNUNET_GE_FRAGMENT);
+ frag->header.type = htons (GNUNET_P2P_PROTO_MESSAGE_FRAGMENT);
frag->id = id;
frag->off = htons (0);
frag->len = htons (ctx->len);
@@ -501,7 +501,7 @@
mlen = ctx->mtu;
GNUNET_GE_ASSERT (NULL, mlen > sizeof (P2P_fragmentation_MESSAGE));
frag->header.size = htons (mlen);
- frag->header.type = htons (GNUNET_P2P_PROTO_MESSAGNUNET_GE_FRAGMENT);
+ frag->header.type = htons (GNUNET_P2P_PROTO_MESSAGE_FRAGMENT);
frag->id = id;
frag->off = htons (pos);
frag->len = htons (ctx->len);
@@ -590,8 +590,8 @@
GNUNET_GE_LOG (capi->ectx,
GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
_("`%s' registering handler %d\n"), "fragmentation",
- GNUNET_P2P_PROTO_MESSAGNUNET_GE_FRAGMENT);
- capi->registerHandler (GNUNET_P2P_PROTO_MESSAGNUNET_GE_FRAGMENT,
+ GNUNET_P2P_PROTO_MESSAGE_FRAGMENT);
+ capi->registerHandler (GNUNET_P2P_PROTO_MESSAGE_FRAGMENT,
&processFragment);
ret.fragment = &fragment;
@@ -606,7 +606,7 @@
{
int i;
- coreAPI->unregisterHandler (GNUNET_P2P_PROTO_MESSAGNUNET_GE_FRAGMENT,
+ coreAPI->unregisterHandler (GNUNET_P2P_PROTO_MESSAGE_FRAGMENT,
&processFragment);
GNUNET_cron_del_job (coreAPI->cron, &defragmentationPurgeCron,
60 * GNUNET_CRON_SECONDS, NULL);
Modified: GNUnet/src/applications/getoption/clientapi.c
===================================================================
--- GNUnet/src/applications/getoption/clientapi.c 2007-12-12 05:09:30 UTC
(rev 5866)
+++ GNUnet/src/applications/getoption/clientapi.c 2007-12-12 05:32:31 UTC
(rev 5867)
@@ -50,8 +50,8 @@
memset (&req, 0, sizeof (CS_getoption_request_MESSAGE));
req.header.type = htons (GNUNET_CS_PROTO_GET_OPTION_REQUEST);
req.header.size = htons (sizeof (CS_getoption_request_MESSAGE));
- if ((strlen (section) >= CS_getoption_request_MESSAGNUNET_GE_OPT_LEN) ||
- (strlen (option) >= CS_getoption_request_MESSAGNUNET_GE_OPT_LEN))
+ if ((strlen (section) >= CS_getoption_request_MESSAGE_OPT_LEN) ||
+ (strlen (option) >= CS_getoption_request_MESSAGE_OPT_LEN))
return NULL;
strcpy (&req.section[0], section);
strcpy (&req.option[0], option);
Modified: GNUnet/src/applications/getoption/getoption.c
===================================================================
--- GNUnet/src/applications/getoption/getoption.c 2007-12-12 05:09:30 UTC
(rev 5866)
+++ GNUnet/src/applications/getoption/getoption.c 2007-12-12 05:32:31 UTC
(rev 5867)
@@ -45,8 +45,8 @@
if (ntohs (message->size) != sizeof (CS_getoption_request_MESSAGE))
return GNUNET_SYSERR;
req = (CS_getoption_request_MESSAGE *) message;
- req->section[CS_getoption_request_MESSAGNUNET_GE_OPT_LEN - 1] = '\0';
- req->option[CS_getoption_request_MESSAGNUNET_GE_OPT_LEN - 1] = '\0';
+ req->section[CS_getoption_request_MESSAGE_OPT_LEN - 1] = '\0';
+ req->option[CS_getoption_request_MESSAGE_OPT_LEN - 1] = '\0';
val = NULL;
if (GNUNET_NO == GNUNET_GC_have_configuration_value (coreAPI->cfg,
req->section,
Modified: GNUnet/src/applications/getoption/getoption.h
===================================================================
--- GNUnet/src/applications/getoption/getoption.h 2007-12-12 05:09:30 UTC
(rev 5866)
+++ GNUnet/src/applications/getoption/getoption.h 2007-12-12 05:32:31 UTC
(rev 5867)
@@ -21,7 +21,7 @@
#ifndef GETOPTION_H
#define GETOPTION_H
-#define CS_getoption_request_MESSAGNUNET_GE_OPT_LEN 32
+#define CS_getoption_request_MESSAGE_OPT_LEN 32
/**
* Request for option value.
@@ -29,8 +29,8 @@
typedef struct
{
GNUNET_MessageHeader header;
- char section[CS_getoption_request_MESSAGNUNET_GE_OPT_LEN];
- char option[CS_getoption_request_MESSAGNUNET_GE_OPT_LEN];
+ char section[CS_getoption_request_MESSAGE_OPT_LEN];
+ char option[CS_getoption_request_MESSAGE_OPT_LEN];
} CS_getoption_request_MESSAGE;
/**
Modified: GNUnet/src/applications/rpc/rpc.c
===================================================================
--- GNUnet/src/applications/rpc/rpc.c 2007-12-12 05:09:30 UTC (rev 5866)
+++ GNUnet/src/applications/rpc/rpc.c 2007-12-12 05:32:31 UTC (rev 5867)
@@ -548,7 +548,7 @@
* followed by a serialization of argumentCount arguments.
*/
char data[1];
-} P2P_rpc_MESSAGNUNET_GE_GENERIC;
+} P2P_rpc_MESSAGE_GENERIC;
/**
@@ -735,7 +735,7 @@
GNUNET_GE_USER,
"Sending RPC request %p: '%.*s' (expires in
%llums, last attempt %llums ago; attempt %u).\n",
call, ntohs (call->msg->functionNameLength),
- &((P2P_rpc_MESSAGNUNET_GE_GENERIC *) call->msg)->
+ &((P2P_rpc_MESSAGE_GENERIC *) call->msg)->
data[0], call->expirationTime - now,
now - call->lastAttempt, call->attempts);
}
@@ -792,7 +792,7 @@
if (ntohs (req->header.size) < sizeof (P2P_rpc_MESSAGE) + slen)
return NULL; /* invalid! */
ret = GNUNET_malloc (slen + 1);
- memcpy (ret, &((P2P_rpc_MESSAGNUNET_GE_GENERIC *) req)->data[0], slen);
+ memcpy (ret, &((P2P_rpc_MESSAGE_GENERIC *) req)->data[0], slen);
ret[slen] = '\0';
return ret;
}
@@ -811,7 +811,7 @@
return NULL; /* invalid! */
ret =
GNUNET_RPC_parameters_deserialize (&
- ((P2P_rpc_MESSAGNUNET_GE_GENERIC *)
+ ((P2P_rpc_MESSAGE_GENERIC *)
req)->data[slen],
ntohs (req->header.size) -
sizeof (P2P_rpc_MESSAGE) - slen);
@@ -866,10 +866,10 @@
ret->argumentCount = htons (GNUNET_RPC_parameters_count (values));
if (name != NULL)
{
- memcpy (&((P2P_rpc_MESSAGNUNET_GE_GENERIC *) ret)->data[0], name, slen);
+ memcpy (&((P2P_rpc_MESSAGE_GENERIC *) ret)->data[0], name, slen);
}
GNUNET_RPC_parameters_serialize (values,
- &((P2P_rpc_MESSAGNUNET_GE_GENERIC *) ret)->
+ &((P2P_rpc_MESSAGE_GENERIC *) ret)->
data[slen]);
if (name == NULL)
@@ -1110,11 +1110,11 @@
if (NULL != call)
{
GNUNET_RPC_CallParameters *reply;
- P2P_rpc_MESSAGNUNET_GE_GENERIC *gen;
+ P2P_rpc_MESSAGE_GENERIC *gen;
unsigned short error;
RPC_STATUS ("", "received reply", call);
- gen = (P2P_rpc_MESSAGNUNET_GE_GENERIC *) res;
+ gen = (P2P_rpc_MESSAGE_GENERIC *) res;
reply = NULL;
error = ntohs (res->functionNameLength);
Modified: GNUnet/src/applications/stats/clientapi.c
===================================================================
--- GNUnet/src/applications/stats/clientapi.c 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/applications/stats/clientapi.c 2007-12-12 05:32:31 UTC (rev
5867)
@@ -56,7 +56,7 @@
case GNUNET_P2P_PROTO_HANG_UP:
name = "P2P_PROTO_hangup";
break;
- case GNUNET_P2P_PROTO_MESSAGNUNET_GE_FRAGMENT:
+ case GNUNET_P2P_PROTO_MESSAGE_FRAGMENT:
name = "P2P_PROTO_fragment";
break;
case GNUNET_P2P_PROTO_NOISE:
@@ -206,11 +206,11 @@
case GNUNET_CS_PROTO_STATS_STATISTICS:
name = "GNUNET_CS_PROTO_STATS_STATISTICS";
break;
- case GNUNET_CS_PROTO_STATS_GET_CS_MESSAGNUNET_GE_SUPPORTED:
- name = "GNUNET_CS_PROTO_STATS_GET_CS_MESSAGNUNET_GE_SUPPORTED";
+ case GNUNET_CS_PROTO_STATS_GET_CS_MESSAGE_SUPPORTED:
+ name = "GNUNET_CS_PROTO_STATS_GET_CS_MESSAGE_SUPPORTED";
break;
- case GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED:
- name = "GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED";
+ case GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGE_SUPPORTED:
+ name = "GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGE_SUPPORTED";
break;
case GNUNET_CS_PROTO_TBENCH_REQUEST:
@@ -341,7 +341,7 @@
if (mpos +
strlen (&
((char
- *) (((CS_stats_reply_MESSAGNUNET_GE_GENERIC *)
+ *) (((CS_stats_reply_MESSAGE_GENERIC *)
statMsg)->values))[mpos]) + 1 >
ntohs (statMsg->header.size) - sizeof (CS_stats_reply_MESSAGE))
{
@@ -354,14 +354,14 @@
ret =
processor (&
((char
- *) (((CS_stats_reply_MESSAGNUNET_GE_GENERIC *)
+ *) (((CS_stats_reply_MESSAGE_GENERIC *)
statMsg)->values))[mpos],
- GNUNET_ntohll
(((CS_stats_reply_MESSAGNUNET_GE_GENERIC *) statMsg)->values[i]), cls);
+ GNUNET_ntohll (((CS_stats_reply_MESSAGE_GENERIC *)
statMsg)->values[i]), cls);
}
mpos +=
strlen (&
((char
- *) (((CS_stats_reply_MESSAGNUNET_GE_GENERIC *)
+ *) (((CS_stats_reply_MESSAGE_GENERIC *)
statMsg)->values))[mpos]) + 1;
}
count += ntohl (statMsg->statCounters);
@@ -393,7 +393,7 @@
ret = GNUNET_OK;
csStatMsg.header.size = htons (sizeof (CS_stats_get_supported_MESSAGE));
csStatMsg.header.type =
- htons (GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED);
+ htons (GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGE_SUPPORTED);
for (j = 2; j < 4; j++)
{
csStatMsg.handlerType = htons (j);
Modified: GNUnet/src/applications/stats/statistics.c
===================================================================
--- GNUnet/src/applications/stats/statistics.c 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/applications/stats/statistics.c 2007-12-12 05:32:31 UTC (rev
5867)
@@ -314,7 +314,7 @@
end = pos;
/* second pass: copy values and messages to message */
for (pos = start; pos < end; pos++)
- ((CS_stats_reply_MESSAGNUNET_GE_GENERIC *) statMsg)->values[pos -
+ ((CS_stats_reply_MESSAGE_GENERIC *) statMsg)->values[pos -
start] =
GNUNET_htonll (entries[pos].value);
mpos = sizeof (unsigned long long) * (end - start);
@@ -322,7 +322,7 @@
{
memcpy (&
((char
- *) (((CS_stats_reply_MESSAGNUNET_GE_GENERIC *) statMsg))->
+ *) (((CS_stats_reply_MESSAGE_GENERIC *) statMsg))->
values)[mpos], entries[pos].description,
entries[pos].descStrLen + 1);
mpos += entries[pos].descStrLen + 1;
@@ -421,17 +421,17 @@
("`%s' registering client handlers %d %d %d and p2p handler
%d\n"),
"stats", GNUNET_CS_PROTO_TRAFFIC_COUNT,
GNUNET_CS_PROTO_STATS_GET_STATISTICS,
- GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED,
+ GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGE_SUPPORTED,
GNUNET_P2P_PROTO_NOISE);
capi->registerClientHandler (GNUNET_CS_PROTO_STATS_GET_STATISTICS,
&sendStatistics);
capi->
registerClientHandler
- (GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED,
+ (GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGE_SUPPORTED,
&handleMessageSupported);
capi->
registerClientHandler
- (GNUNET_CS_PROTO_STATS_GET_CS_MESSAGNUNET_GE_SUPPORTED,
+ (GNUNET_CS_PROTO_STATS_GET_CS_MESSAGE_SUPPORTED,
&handleMessageSupported);
capi->registerClientHandler (GNUNET_CS_PROTO_TRAFFIC_COUNT,
&processGetConnectionCountRequest);
@@ -461,11 +461,11 @@
&sendStatistics);
coreAPI->
unregisterClientHandler
- (GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED,
+ (GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGE_SUPPORTED,
&handleMessageSupported);
coreAPI->
unregisterClientHandler
- (GNUNET_CS_PROTO_STATS_GET_CS_MESSAGNUNET_GE_SUPPORTED,
+ (GNUNET_CS_PROTO_STATS_GET_CS_MESSAGE_SUPPORTED,
&handleMessageSupported);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_TRAFFIC_COUNT,
&processGetConnectionCountRequest);
Modified: GNUnet/src/applications/stats/statistics.h
===================================================================
--- GNUnet/src/applications/stats/statistics.h 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/applications/stats/statistics.h 2007-12-12 05:32:31 UTC (rev
5867)
@@ -64,7 +64,7 @@
last description is also terminated
by a '\0'; again statCounters entries */
/* char descriptions[0]; */
-} CS_stats_reply_MESSAGNUNET_GE_GENERIC;
+} CS_stats_reply_MESSAGE_GENERIC;
/**
* Query protocol supported message. Contains the type of
Modified: GNUnet/src/applications/tbench/gnunet-tbench.c
===================================================================
--- GNUnet/src/applications/tbench/gnunet-tbench.c 2007-12-12 05:09:30 UTC
(rev 5866)
+++ GNUnet/src/applications/tbench/gnunet-tbench.c 2007-12-12 05:32:31 UTC
(rev 5867)
@@ -30,14 +30,14 @@
#include "gnunet_util.h"
#include "tbench.h"
-#define DEFAULT_MESSAGNUNET_GE_SIZE 10
+#define DEFAULT_MESSAGE_SIZE 10
#define DEFAULT_TIMEOUT (2 * GNUNET_CRON_SECONDS)
#define DEFAULT_SPACING 0
#define OF_HUMAN_READABLE 0
#define OF_GNUPLOT_INPUT 1
-static unsigned long long messageSize = DEFAULT_MESSAGNUNET_GE_SIZE;
+static unsigned long long messageSize = DEFAULT_MESSAGE_SIZE;
static unsigned long long messageCnt = 1;
Modified: GNUnet/src/applications/testbed/commands.c
===================================================================
--- GNUnet/src/applications/testbed/commands.c 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/applications/testbed/commands.c 2007-12-12 05:32:31 UTC (rev
5867)
@@ -118,7 +118,7 @@
msg->header.size = htons (msgsz);
msg->header.type = htons (GNUNET_CS_PROTO_TESTBED_REQUEST);
msg->msgType = htonl (msgType);
- memcpy (&((TESTBED_CS_MESSAGNUNET_GE_GENERIC *) msg)->data[0], arg,
+ memcpy (&((TESTBED_CS_MESSAGE_GENERIC *) msg)->data[0], arg,
argSize);
msgsz = GNUNET_client_connection_write (&nodes[peer].sock, &msg->header);
GNUNET_free (msg);
@@ -218,7 +218,7 @@
hdr = NULL;
if (GNUNET_SYSERR == GNUNET_client_connection_read (&nodes[currindex].sock,
- (CS_MESSAGNUNET_GE_HEADER
+ (CS_MESSAGE_HEADER
**) & hdr))
{
XPRINTF (" peer %s is not responding.\n", nodes[currindex].ips);
@@ -409,7 +409,7 @@
hdr = NULL;
if (GNUNET_SYSERR == GNUNET_client_connection_read (&nodes[currindex].sock,
- (CS_MESSAGNUNET_GE_HEADER
+ (CS_MESSAGE_HEADER
**) & hdr))
{
XPRINTF (" peer %s is not responding.\n", nodes[currindex].ips);
@@ -1006,7 +1006,7 @@
reply = NULL;
if (GNUNET_SYSERR ==
GNUNET_client_connection_read (&nodes[dst].sock,
- (CS_MESSAGNUNET_GE_HEADER **) &
+ (CS_MESSAGE_HEADER **) &
reply))
{
XPRINTF (" peer %s is not responding after %d of %d bytes.\n",
@@ -1019,7 +1019,7 @@
sizeof (TESTBED_OUTPUT_REPLY_MESSAGE);
tmp = GNUNET_malloc (size + 1);
memcpy (tmp,
- &((TESTBED_OUTPUT_REPLY_MESSAGNUNET_GE_GENERIC *) reply)->
+ &((TESTBED_OUTPUT_REPLY_MESSAGE_GENERIC *) reply)->
data[0], size);
tmp[size] = '\0';
XPRINTF ("%s", tmp);
@@ -1310,7 +1310,7 @@
msg->header.header.type = htons (GNUNET_CS_PROTO_TESTBED_REQUEST);
msg->header.msgType = htonl (TESTBED_UPLOAD_FILE);
msg->type = htonl (TESTBED_FILE_DELETE);
- memcpy (((TESTBED_UPLOAD_FILE_MESSAGNUNET_GE_GENERIC *) msg)->buf, argv[2],
+ memcpy (((TESTBED_UPLOAD_FILE_MESSAGE_GENERIC *) msg)->buf, argv[2],
flen);
if (GNUNET_SYSERR ==
@@ -1338,7 +1338,7 @@
return -1;
}
msg->type = htonl (TESTBED_FILE_GNUNET_array_append);
- buf = ((TESTBED_UPLOAD_FILE_MESSAGNUNET_GE_GENERIC *) msg)->buf + flen;
+ buf = ((TESTBED_UPLOAD_FILE_MESSAGE_GENERIC *) msg)->buf + flen;
while ((nbytes = GN_FREAD (buf, 1,
(TESTBED_FILE_BLK_SIZE -
sizeof (TESTBED_UPLOAD_FILE_MESSAGE) - flen),
Modified: GNUnet/src/applications/testbed/testbed.c
===================================================================
--- GNUnet/src/applications/testbed/testbed.c 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/applications/testbed/testbed.c 2007-12-12 05:32:31 UTC (rev
5867)
@@ -231,7 +231,7 @@
}
name =
- STRNDUP (&((TESTBED_LOAD_MODULE_MESSAGNUNET_GE_GENERIC *) msg)->
+ STRNDUP (&((TESTBED_LOAD_MODULE_MESSAGE_GENERIC *) msg)->
modulename[0], size - sizeof (TESTBED_CS_MESSAGE));
if (strlen (name) == 0)
{
@@ -275,7 +275,7 @@
}
name =
- STRNDUP (&((TESTBED_UNLOAD_MODULE_MESSAGNUNET_GE_GENERIC *) msg)->
+ STRNDUP (&((TESTBED_UNLOAD_MODULE_MESSAGE_GENERIC *) msg)->
modulename[0], size - sizeof (TESTBED_CS_MESSAGE));
if (strlen (name) == 0)
{
@@ -401,7 +401,7 @@
for (i = 0; i < count; i++)
{
GNUNET_hash_to_enc (&
- ((TESTBED_ALLOW_CONNECT_MESSAGNUNET_GE_GENERIC
+ ((TESTBED_ALLOW_CONNECT_MESSAGE_GENERIC
*) msg)->peers[i].hashPubKey, &enc);
strcat (value, (char *) &enc);
}
@@ -454,7 +454,7 @@
for (i = 0; i < count; i++)
{
GNUNET_hash_to_enc (&
- ((TESTBED_DENY_CONNECT_MESSAGNUNET_GE_GENERIC *)
+ ((TESTBED_DENY_CONNECT_MESSAGE_GENERIC *)
msg)->peers[i].hashPubKey, &enc);
strcat (value, (char *) &enc);
}
@@ -650,7 +650,7 @@
emsg = (TESTBED_EXEC_MESSAGE *) msg;
size = htons (msg->header.size);
if ((size <= sizeof (TESTBED_CS_MESSAGE)) ||
- (((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *) emsg)->
+ (((TESTBED_EXEC_MESSAGE_GENERIC *) emsg)->
commandLine[size - sizeof (TESTBED_CS_MESSAGE) - 1] != '\0'))
{
GNUNET_GE_LOG (ectx,
@@ -667,11 +667,11 @@
pi = GNUNET_malloc (sizeof (ProcessInfo));
pi->argc = 0;
for (pos = 0; pos < size; pos++)
- if (((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *) emsg)->commandLine[pos] ==
+ if (((TESTBED_EXEC_MESSAGE_GENERIC *) emsg)->commandLine[pos] ==
'\0')
pi->argc++;
mainName =
- GNUNET_strdup (&((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *) emsg)->
+ GNUNET_strdup (&((TESTBED_EXEC_MESSAGE_GENERIC *) emsg)->
commandLine[0]);
clientConfig = NULL;
if (0 == strncmp ("gnunet", mainName, strlen ("gnunet")))
@@ -683,10 +683,10 @@
pi->argv[0] = mainName;
pi->argv[pi->argc] = NULL; /* termination! */
for (pos = size - 2; pos >= 0; pos--)
- if (((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *) emsg)->commandLine[pos] ==
+ if (((TESTBED_EXEC_MESSAGE_GENERIC *) emsg)->commandLine[pos] ==
'\0')
pi->argv[--argc2] =
- GNUNET_strdup (&((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *) emsg)->
+ GNUNET_strdup (&((TESTBED_EXEC_MESSAGE_GENERIC *) emsg)->
commandLine[pos + 1]);
if (clientConfig != NULL)
{
@@ -811,7 +811,7 @@
run = 65532 - sizeof (TESTBED_OUTPUT_REPLY_MESSAGE);
msg->header.header.size
= htons (run + sizeof (TESTBED_OUTPUT_REPLY_MESSAGE));
- memcpy (&((TESTBED_OUTPUT_REPLY_MESSAGNUNET_GE_GENERIC *) msg)->
+ memcpy (&((TESTBED_OUTPUT_REPLY_MESSAGE_GENERIC *) msg)->
data[0], &pi->output[pos], run);
coreAPI->sendToClient (client, &msg->header.header);
pos += run;
@@ -851,7 +851,7 @@
return;
}
end = &((char *) msg)[ntohs (msg->header.header.size)];
- s = filename = ((TESTBED_UPLOAD_FILE_MESSAGNUNET_GE_GENERIC *) msg)->buf;
+ s = filename = ((TESTBED_UPLOAD_FILE_MESSAGE_GENERIC *) msg)->buf;
while ((*s) && (s != end))
{
if (*s == '.' && *(s + 1) == '.')
@@ -898,8 +898,8 @@
strcpy (filename, gnHome);
strcat (filename, DIR_SEPARATOR_STR);
strncat (filename,
- ((TESTBED_UPLOAD_FILE_MESSAGNUNET_GE_GENERIC *) msg)->buf,
- end - ((TESTBED_UPLOAD_FILE_MESSAGNUNET_GE_GENERIC *) msg)->buf);
+ ((TESTBED_UPLOAD_FILE_MESSAGE_GENERIC *) msg)->buf,
+ end - ((TESTBED_UPLOAD_FILE_MESSAGE_GENERIC *) msg)->buf);
if (htonl (msg->type) == TESTBED_FILE_DELETE)
{
if (REMOVE (filename) && errno != ENOENT)
@@ -931,10 +931,10 @@
return;
}
GNUNET_free (filename);
- s = ((TESTBED_UPLOAD_FILE_MESSAGNUNET_GE_GENERIC *) msg)->buf + strlen
(((TESTBED_UPLOAD_FILE_MESSAGNUNET_GE_GENERIC *) msg)->buf) + 1; /* \0
added */
+ s = ((TESTBED_UPLOAD_FILE_MESSAGE_GENERIC *) msg)->buf + strlen
(((TESTBED_UPLOAD_FILE_MESSAGE_GENERIC *) msg)->buf) + 1; /* \0 added */
size = ntohs (msg->header.header.size) -
sizeof (TESTBED_UPLOAD_FILE_MESSAGE) -
- (strlen (((TESTBED_UPLOAD_FILE_MESSAGNUNET_GE_GENERIC *) msg)->buf) + 1);
+ (strlen (((TESTBED_UPLOAD_FILE_MESSAGE_GENERIC *) msg)->buf) + 1);
if (GN_FWRITE (s, 1, size, outfile) != size)
ack = GNUNET_SYSERR;
else
@@ -1023,7 +1023,7 @@
*/
static void
csHandleTestbedRequest (GNUNET_ClientHandle client,
- CS_MESSAGNUNET_GE_HEADER * message)
+ CS_MESSAGE_HEADER * message)
{
TESTBED_CS_MESSAGE *msg;
unsigned short size;
Modified: GNUnet/src/applications/testbed/testbed.h
===================================================================
--- GNUnet/src/applications/testbed/testbed.h 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/applications/testbed/testbed.h 2007-12-12 05:32:31 UTC (rev
5867)
@@ -73,7 +73,7 @@
typedef struct
{
- CS_MESSAGNUNET_GE_HEADER header;
+ CS_MESSAGE_HEADER header;
unsigned int msgType; /* The message types listed above */
} TESTBED_CS_MESSAGE;
@@ -81,7 +81,7 @@
{
TESTBED_CS_MESSAGE testbed_cs_message;
char data[1]; /* Value is dependent on the type field */
-} TESTBED_CS_MESSAGNUNET_GE_GENERIC;
+} TESTBED_CS_MESSAGE_GENERIC;
typedef struct
{
@@ -160,7 +160,7 @@
{
TESTBED_LOAD_MODULE_MESSAGE load_module_message;
char modulename[1];
-} TESTBED_LOAD_MODULE_MESSAGNUNET_GE_GENERIC;
+} TESTBED_LOAD_MODULE_MESSAGE_GENERIC;
typedef struct
{
@@ -171,7 +171,7 @@
{
TESTBED_UNLOAD_MODULE_MESSAGE unload_module_message;
char modulename[1];
-} TESTBED_UNLOAD_MODULE_MESSAGNUNET_GE_GENERIC;
+} TESTBED_UNLOAD_MODULE_MESSAGE_GENERIC;
#define TESTBED_FILE_GNUNET_array_append 1
#define TESTBED_FILE_DELETE 2
@@ -188,7 +188,7 @@
{
TESTBED_UPLOAD_FILE_MESSAGE upload_file_message;
char buf[1];
-} TESTBED_UPLOAD_FILE_MESSAGNUNET_GE_GENERIC;
+} TESTBED_UPLOAD_FILE_MESSAGE_GENERIC;
typedef struct
{
@@ -219,7 +219,7 @@
{
TESTBED_ALLOW_CONNECT_MESSAGE allow_connect_message;
GNUNET_PeerIdentity peers[1];
-} TESTBED_ALLOW_CONNECT_MESSAGNUNET_GE_GENERIC;
+} TESTBED_ALLOW_CONNECT_MESSAGE_GENERIC;
typedef struct
{
@@ -230,7 +230,7 @@
{
TESTBED_DENY_CONNECT_MESSAGE deny_connect_message;
GNUNET_PeerIdentity peers[1];
-} TESTBED_DENY_CONNECT_MESSAGNUNET_GE_GENERIC;
+} TESTBED_DENY_CONNECT_MESSAGE_GENERIC;
typedef struct
{
@@ -241,7 +241,7 @@
{
TESTBED_EXEC_MESSAGE exec_message;
char commandLine[1];
-} TESTBED_EXEC_MESSAGNUNET_GE_GENERIC;
+} TESTBED_EXEC_MESSAGE_GENERIC;
typedef struct
{
@@ -265,6 +265,6 @@
{
TESTBED_OUTPUT_REPLY_MESSAGE output_reply_message;
char data[1];
-} TESTBED_OUTPUT_REPLY_MESSAGNUNET_GE_GENERIC;
+} TESTBED_OUTPUT_REPLY_MESSAGE_GENERIC;
#endif
Modified: GNUnet/src/applications/tracekit/gnunet-tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/gnunet-tracekit.c 2007-12-12 05:09:30 UTC
(rev 5866)
+++ GNUnet/src/applications/tracekit/gnunet-tracekit.c 2007-12-12 05:32:31 UTC
(rev 5867)
@@ -182,7 +182,7 @@
for (j = 0; j < psCount; j++)
if (0 ==
memcmp (&
- ((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC *)
+ ((CS_tracekit_reply_MESSAGE_GENERIC *)
buffer)->peerList[i].hashPubKey,
&peersSeen[j].hashPubKey,
sizeof (GNUNET_HashCode)))
@@ -192,13 +192,13 @@
if (psCount == psSize)
GNUNET_array_grow (peersSeen, psSize, psSize * 2);
memcpy (&peersSeen[psCount++],
- &((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC *)
+ &((CS_tracekit_reply_MESSAGE_GENERIC *)
buffer)->peerList[i].hashPubKey,
sizeof (GNUNET_PeerIdentity));
}
GNUNET_hash_to_enc (&
- ((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC
+ ((CS_tracekit_reply_MESSAGE_GENERIC
*) buffer)->peerList[i].hashPubKey,
&other);
switch (format)
Modified: GNUnet/src/applications/tracekit/tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/tracekit.c 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/applications/tracekit/tracekit.c 2007-12-12 05:32:31 UTC (rev
5867)
@@ -134,9 +134,9 @@
csReply->header.type = htons (GNUNET_CS_PROTO_TRACEKIT_REPLY);
csReply->responderId = reply->responderId;
memcpy (&
- ((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC *) csReply)->
+ ((CS_tracekit_reply_MESSAGE_GENERIC *) csReply)->
peerList[0],
- &((P2P_tracekit_reply_MESSAGNUNET_GE_GENERIC *) reply)->
+ &((P2P_tracekit_reply_MESSAGE_GENERIC *) reply)->
peerList[0], hostCount * sizeof (GNUNET_PeerIdentity));
coreAPI->sendToClient (clients[idx], &csReply->header,
GNUNET_YES);
Modified: GNUnet/src/applications/tracekit/tracekit.h
===================================================================
--- GNUnet/src/applications/tracekit/tracekit.h 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/applications/tracekit/tracekit.h 2007-12-12 05:32:31 UTC (rev
5867)
@@ -98,7 +98,7 @@
* currently connected to.
*/
GNUNET_PeerIdentity peerList[1];
-} P2P_tracekit_reply_MESSAGNUNET_GE_GENERIC;
+} P2P_tracekit_reply_MESSAGE_GENERIC;
typedef struct
@@ -137,6 +137,6 @@
* currently connected to.
*/
GNUNET_PeerIdentity peerList[1];
-} CS_tracekit_reply_MESSAGNUNET_GE_GENERIC;
+} CS_tracekit_reply_MESSAGE_GENERIC;
#endif
Modified: GNUnet/src/applications/traffic/clientapi.c
===================================================================
--- GNUnet/src/applications/traffic/clientapi.c 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/applications/traffic/clientapi.c 2007-12-12 05:32:31 UTC (rev
5867)
@@ -78,7 +78,7 @@
for (i = ntohl (info->count) - 1; i >= 0; i--)
{
const TRAFFIC_COUNTER *tc =
- &((CS_traffic_info_MESSAGNUNET_GE_GENERIC *) info)->counters[i];
+ &((CS_traffic_info_MESSAGE_GENERIC *) info)->counters[i];
if ((tc->flags & GNUNET_TRAFFIC_TYPE_MASK) == direction)
{
*count = ntohl (tc->count);
Modified: GNUnet/src/applications/traffic/traffic.c
===================================================================
--- GNUnet/src/applications/traffic/traffic.c 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/applications/traffic/traffic.c 2007-12-12 05:32:31 UTC (rev
5867)
@@ -44,8 +44,8 @@
/**
* How many time-units back do we keep the history of? (must really
* be <=32 since we use the 32 bit in an unsigned int). The memory
- * impact of this value n is 4 * 3 * MAX_MESSAGNUNET_GE_ID * n, which is for
- * the default of n=32 with the current MAX_MESSAGNUNET_GE_ID being roughly a
+ * impact of this value n is 4 * 3 * MAX_MESSAGE_ID * n, which is for
+ * the default of n=32 with the current MAX_MESSAGE_ID being roughly a
* dozen less than 2k.
*/
#define HISTORY_SIZE 32
@@ -66,7 +66,7 @@
/**
* Of how many peers do we keep track per message type
* about "recent" interactions? The memory impact of
- * this value n is 8 * 3 * MAX_MESSAGNUNET_GE_ID * n. The current
+ * this value n is 8 * 3 * MAX_MESSAGE_ID * n. The current
* number of messages is roughly a dozen, so the memory
* impact is about 200 bytes * n, or for the default
* of n=15 it is 3kb.
@@ -322,11 +322,11 @@
if (counters[i] != NULL)
{
if (counters[i]->send.slots != 0)
- buildSummary (&((CS_traffic_info_MESSAGNUNET_GE_GENERIC *) reply)->
+ buildSummary (&((CS_traffic_info_MESSAGE_GENERIC *) reply)->
counters[count++], &counters[i]->send,
GNUNET_TRAFFIC_TYPE_SENT, countTimeUnits, i);
if (counters[i]->receive.slots != 0)
- buildSummary (&((CS_traffic_info_MESSAGNUNET_GE_GENERIC *) reply)->
+ buildSummary (&((CS_traffic_info_MESSAGE_GENERIC *) reply)->
counters[count++], &counters[i]->receive,
GNUNET_TRAFFIC_TYPE_RECEIVED, countTimeUnits, i);
}
Modified: GNUnet/src/applications/traffic/traffic.h
===================================================================
--- GNUnet/src/applications/traffic/traffic.h 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/applications/traffic/traffic.h 2007-12-12 05:32:31 UTC (rev
5867)
@@ -95,7 +95,7 @@
*/
TRAFFIC_COUNTER counters[1];
-} CS_traffic_info_MESSAGNUNET_GE_GENERIC;
+} CS_traffic_info_MESSAGE_GENERIC;
/**
* Request for CS_traffic_info_MESSAGE.
Modified: GNUnet/src/include/gnunet_core.h
===================================================================
--- GNUnet/src/include/gnunet_core.h 2007-12-12 05:09:30 UTC (rev 5866)
+++ GNUnet/src/include/gnunet_core.h 2007-12-12 05:32:31 UTC (rev 5867)
@@ -69,7 +69,7 @@
* the amount of space available for an unfragmented
* message.
*/
-#define GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD 76
+#define GNUNET_P2P_MESSAGE_OVERHEAD 76
/**
* Opaque handle for a session representation on the transport
@@ -274,7 +274,7 @@
* from the GNUnet core.
*
* @param session the transport session
- * @param msg the message to transmit, should contain MESSAGNUNET_GE_HEADERs
+ * @param msg the message to transmit, should contain MESSAGE_HEADERs
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
int (*sendPlaintext) (GNUNET_TSession * session,
Modified: GNUnet/src/include/gnunet_protocols.h
===================================================================
--- GNUnet/src/include/gnunet_protocols.h 2007-12-12 05:09:30 UTC (rev
5866)
+++ GNUnet/src/include/gnunet_protocols.h 2007-12-12 05:32:31 UTC (rev
5867)
@@ -258,12 +258,12 @@
/**
* client to stats module: is client server message supported
*/
-#define GNUNET_CS_PROTO_STATS_GET_CS_MESSAGNUNET_GE_SUPPORTED 38
+#define GNUNET_CS_PROTO_STATS_GET_CS_MESSAGE_SUPPORTED 38
/**
* client to stats module: is p2p message supported
*/
-#define GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED 39
+#define GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGE_SUPPORTED 39
/* ********** CS TBENCH application messages ********** */
@@ -362,7 +362,7 @@
/**
* Fragmented message.
*/
-#define GNUNET_P2P_PROTO_MESSAGNUNET_GE_FRAGMENT 5
+#define GNUNET_P2P_PROTO_MESSAGE_FRAGMENT 5
/**
* noise, used to fill packets to sizes >1k.
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2007-12-12 05:09:30 UTC (rev 5866)
+++ GNUnet/src/server/connection.c 2007-12-12 05:32:31 UTC (rev 5867)
@@ -3570,7 +3570,7 @@
load_monitor = m;
cron = cm;
GNUNET_GE_ASSERT (ectx,
- GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD ==
+ GNUNET_P2P_MESSAGE_OVERHEAD ==
sizeof (GNUNET_TransportPacket_HEADER));
GNUNET_GE_ASSERT (ectx, sizeof (P2P_hangup_MESSAGE) == 68);
ENTRY ();
@@ -3909,7 +3909,7 @@
* from the GNUnet core.
*
* @param session the transport session
- * @param msg the message to transmit, should contain MESSAGNUNET_GE_HEADERs
+ * @param msg the message to transmit, should contain MESSAGE_HEADERs
* @return GNUNET_OK on success, GNUNET_SYSERR on failure, GNUNET_NO on
temporary failure
*/
int
Modified: GNUnet/src/server/connection.h
===================================================================
--- GNUnet/src/server/connection.h 2007-12-12 05:09:30 UTC (rev 5866)
+++ GNUnet/src/server/connection.h 2007-12-12 05:32:31 UTC (rev 5867)
@@ -118,7 +118,7 @@
* from the GNUnet core.
*
* @param session the transport session
- * @param msg the message to transmit, should contain MESSAGNUNET_GE_HEADERs
+ * @param msg the message to transmit, should contain MESSAGE_HEADERs
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
int sendPlaintext (GNUNET_TSession * tsession, const char *msg,
Modified: GNUnet/src/transports/tcp_helper.c
===================================================================
--- GNUnet/src/transports/tcp_helper.c 2007-12-12 05:09:30 UTC (rev 5866)
+++ GNUnet/src/transports/tcp_helper.c 2007-12-12 05:32:31 UTC (rev 5867)
@@ -28,7 +28,7 @@
/**
* Initial handshake message. Note that the beginning
- * must match the CS_MESSAGNUNET_GE_HEADER since we are using tcpio.
+ * must match the CS_MESSAGE_HEADER since we are using tcpio.
*/
typedef struct
{
Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2007-12-12 05:09:30 UTC (rev 5866)
+++ GNUnet/src/transports/udp.c 2007-12-12 05:32:31 UTC (rev 5867)
@@ -506,7 +506,7 @@
* The default maximum size of each outbound UDP message,
* optimal value for Ethernet (10 or 100 MBit).
*/
-#define MESSAGNUNET_GE_SIZE 1472
+#define MESSAGE_SIZE 1472
/**
* The exported method. Makes the core api available via a global and
@@ -528,12 +528,12 @@
"MTU",
sizeof (UDPMessage)
+
-
GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD
+
GNUNET_P2P_MESSAGE_OVERHEAD
+
sizeof
(GNUNET_MessageHeader) +
32, 65500,
- MESSAGNUNET_GE_SIZE,
+ MESSAGE_SIZE,
&mtu))
{
return NULL;
Modified: GNUnet/src/transports/udp6.c
===================================================================
--- GNUnet/src/transports/udp6.c 2007-12-12 05:09:30 UTC (rev 5866)
+++ GNUnet/src/transports/udp6.c 2007-12-12 05:32:31 UTC (rev 5867)
@@ -457,7 +457,7 @@
* The default maximum size of each outbound UDP6 message,
* optimal value for Ethernet (10 or 100 MBit).
*/
-#define MESSAGNUNET_GE_SIZE 1452
+#define MESSAGE_SIZE 1452
/**
* The exported method. Makes the core api available via a global and
@@ -479,12 +479,12 @@
"UDP6",
"MTU",
sizeof (UDPMessage) +
-
GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD
+
GNUNET_P2P_MESSAGE_OVERHEAD
+
sizeof
(GNUNET_MessageHeader) +
32, 65500,
- MESSAGNUNET_GE_SIZE,
+ MESSAGE_SIZE,
&mtu))
{
return NULL;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5867 - in GNUnet/src: applications/advertising applications/chat applications/fragmentation applications/getoption applications/rpc applications/stats applications/tbench applications/testbed applications/tracekit applications/traffic include server transports,
gnunet <=