[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6216 - in GNUnet/src: applications/chat applications/fs/co
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r6216 - in GNUnet/src: applications/chat applications/fs/collection applications/fs/ecrs applications/fs/fsui applications/fs/gap applications/fs/lib applications/fs/namespace applications/fs/tools include server util/boot util/crypto |
|
Date: |
Sat, 9 Feb 2008 19:45:26 -0700 (MST) |
Author: grothoff
Date: 2008-02-09 19:45:20 -0700 (Sat, 09 Feb 2008)
New Revision: 6216
Modified:
GNUnet/src/applications/chat/chat.c
GNUnet/src/applications/chat/chat.h
GNUnet/src/applications/chat/clientapi.c
GNUnet/src/applications/chat/gnunet-chat.c
GNUnet/src/applications/fs/collection/collectiontest.c
GNUnet/src/applications/fs/ecrs/download.c
GNUnet/src/applications/fs/ecrs/downloadtest.c
GNUnet/src/applications/fs/ecrs/ecrstest.c
GNUnet/src/applications/fs/ecrs/namespacetest.c
GNUnet/src/applications/fs/ecrs/search.c
GNUnet/src/applications/fs/ecrs/searchtest.c
GNUnet/src/applications/fs/ecrs/unindex.c
GNUnet/src/applications/fs/ecrs/uritest.c
GNUnet/src/applications/fs/fsui/search.c
GNUnet/src/applications/fs/fsui/searchtest.c
GNUnet/src/applications/fs/fsui/unindex.c
GNUnet/src/applications/fs/gap/fs.c
GNUnet/src/applications/fs/gap/fs_dht.c
GNUnet/src/applications/fs/gap/gap.c
GNUnet/src/applications/fs/gap/gap.h
GNUnet/src/applications/fs/gap/ondemand.c
GNUnet/src/applications/fs/gap/plan.c
GNUnet/src/applications/fs/lib/fslib.c
GNUnet/src/applications/fs/lib/fslibtest.c
GNUnet/src/applications/fs/namespace/namespace_infotest.c
GNUnet/src/applications/fs/tools/gnunet-search.c
GNUnet/src/include/gnunet_chat_lib.h
GNUnet/src/include/gnunet_ecrs_lib.h
GNUnet/src/include/gnunet_fsui_lib.h
GNUnet/src/include/gnunet_remote_lib.h
GNUnet/src/include/gnunet_util_crypto.h
GNUnet/src/server/connection.c
GNUnet/src/server/connection.h
GNUnet/src/util/boot/startup.c
GNUnet/src/util/crypto/hostkeytest.c
GNUnet/src/util/crypto/locking_gcrypt.c
GNUnet/src/util/crypto/symciphertest.c
GNUnet/src/util/crypto/weakkeytest.c
Log:
formatting
Modified: GNUnet/src/applications/chat/chat.c
===================================================================
--- GNUnet/src/applications/chat/chat.c 2008-02-10 02:44:59 UTC (rev 6215)
+++ GNUnet/src/applications/chat/chat.c 2008-02-10 02:45:20 UTC (rev 6216)
@@ -87,11 +87,11 @@
CS_chat_MESSAGE *cmsg;
GNUNET_HashCode hc;
-
+
char *nick;
char *message_content;
char *room_name;
-
+
int header_size;
unsigned long nick_len;
unsigned long msg_len;
@@ -99,34 +99,35 @@
cmsg = (CS_chat_MESSAGE *) message;
- if (ntohs (message->size) < sizeof (CS_chat_MESSAGE))
+ if (ntohs (message->size) < sizeof (CS_chat_MESSAGE))
{
GNUNET_GE_LOG (ectx,
GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
_("Message received from client is invalid\n"));
- return GNUNET_SYSERR; /* invalid message */
-
+ return GNUNET_SYSERR; /* invalid message */
+
}
-
- header_size = ntohs(cmsg->header.size);
- nick_len = ntohl(cmsg->nick_len);
- msg_len = ntohl(cmsg->msg_len);
- room_size = ntohl(cmsg->nick_len);
-
- nick = GNUNET_malloc(nick_len + 1);
- message_content = GNUNET_malloc(msg_len + 1);
- room_name = GNUNET_malloc(room_size + 1);
-
- memcpy(nick,&cmsg->nick[0],nick_len);
- memcpy(message_content,&cmsg->nick[sizeof(nick)],msg_len);
- memcpy(room_name,&cmsg->nick[sizeof(nick) +
sizeof(message_content)],msg_len);
-
+
+ header_size = ntohs (cmsg->header.size);
+ nick_len = ntohl (cmsg->nick_len);
+ msg_len = ntohl (cmsg->msg_len);
+ room_size = ntohl (cmsg->nick_len);
+
+ nick = GNUNET_malloc (nick_len + 1);
+ message_content = GNUNET_malloc (msg_len + 1);
+ room_name = GNUNET_malloc (room_size + 1);
+
+ memcpy (nick, &cmsg->nick[0], nick_len);
+ memcpy (message_content, &cmsg->nick[sizeof (nick)], msg_len);
+ memcpy (room_name, &cmsg->nick[sizeof (nick) + sizeof (message_content)],
+ msg_len);
+
nick[nick_len] = '\0';
message_content[msg_len] = '\0';
room_name[room_size] = '\0';
-
-
+
+
GNUNET_hash (cmsg, header_size, &hc);
/* check if we have seen this message already */
@@ -143,10 +144,10 @@
broadcastToConnected (message, 5, 1);
cmsg->header.type = htons (GNUNET_CS_PROTO_CHAT_MSG);
for (j = 0; j < clientCount; j++)
- coreAPI->cs_send_to_client (clients[j], &cmsg->header,GNUNET_YES);
+ coreAPI->cs_send_to_client (clients[j], &cmsg->header, GNUNET_YES);
/*pmsg->nick[CHAT_NICK_LENGTH - 1] = '\0';
- pmsg->message[CHAT_MSG_LENGTH - 1] = '\0';*/
-
+ pmsg->message[CHAT_MSG_LENGTH - 1] = '\0'; */
+
/*
GNUNET_GE_LOG(ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
" CHAT: received new message from %s: %s\n",
@@ -170,12 +171,12 @@
char *nick;
char *message_content;
char *room_name;
-
+
int header_size;
unsigned long nick_len;
unsigned long msg_len;
unsigned long room_size;
-
+
pmsg = (P2P_chat_MESSAGE *) message;
cmsg = (CS_chat_MESSAGE *) message;
@@ -184,27 +185,28 @@
GNUNET_GE_LOG (ectx,
GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
_("Message received from client is invalid\n"));
- return GNUNET_SYSERR; /* invalid message */
-
+ return GNUNET_SYSERR; /* invalid message */
+
}
-
- header_size = ntohs(cmsg->header.size);
- nick_len = ntohl(cmsg->nick_len);
- msg_len = ntohl(cmsg->msg_len);
- room_size = ntohl(cmsg->nick_len);
-
- nick = GNUNET_malloc(nick_len + 1);
- message_content = GNUNET_malloc(msg_len + 1);
- room_name = GNUNET_malloc(room_size + 1);
-
- memcpy(nick,&cmsg->nick[0],nick_len);
- memcpy(message_content,&cmsg->nick[sizeof(nick)],msg_len);
- memcpy(room_name,&cmsg->nick[sizeof(nick) +
sizeof(message_content)],msg_len);
-
+
+ header_size = ntohs (cmsg->header.size);
+ nick_len = ntohl (cmsg->nick_len);
+ msg_len = ntohl (cmsg->msg_len);
+ room_size = ntohl (cmsg->nick_len);
+
+ nick = GNUNET_malloc (nick_len + 1);
+ message_content = GNUNET_malloc (msg_len + 1);
+ room_name = GNUNET_malloc (room_size + 1);
+
+ memcpy (nick, &cmsg->nick[0], nick_len);
+ memcpy (message_content, &cmsg->nick[sizeof (nick)], msg_len);
+ memcpy (room_name, &cmsg->nick[sizeof (nick) + sizeof (message_content)],
+ msg_len);
+
nick[nick_len] = '\0';
message_content[msg_len] = '\0';
- room_name[room_size] = '\0';
-
+ room_name[room_size] = '\0';
+
GNUNET_hash (pmsg, header_size, &hc);
GNUNET_mutex_lock (chatMutex);
markSeen (&hc);
@@ -215,7 +217,7 @@
if (clients[i] == client)
j = i;
else
- coreAPI->cs_send_to_client (clients[i], message,GNUNET_YES);
+ coreAPI->cs_send_to_client (clients[i], message, GNUNET_YES);
if (j == -1)
{
if (clientCount == MAX_CLIENTS)
Modified: GNUnet/src/applications/chat/chat.h
===================================================================
--- GNUnet/src/applications/chat/chat.h 2008-02-10 02:44:59 UTC (rev 6215)
+++ GNUnet/src/applications/chat/chat.h 2008-02-10 02:45:20 UTC (rev 6216)
@@ -35,7 +35,7 @@
unsigned long msg_len;
unsigned long room_name_len;
char nick[1];
-
+
} P2P_chat_MESSAGE;
typedef struct
Modified: GNUnet/src/applications/chat/clientapi.c
===================================================================
--- GNUnet/src/applications/chat/clientapi.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/chat/clientapi.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -44,7 +44,7 @@
struct GNUNET_GC_Configuration *cfg;
char *nickname;
-
+
char *room_name;
const GNUNET_RSA_PublicKey *my_public_key;
@@ -98,58 +98,58 @@
const char *memberInfo,
GNUNET_CHAT_MessageCallback callback, void *cls)
{
- CS_chat_MESSAGE *chat_msg;
+ CS_chat_MESSAGE *chat_msg;
GNUNET_MessageHeader csHdr;
struct GNUNET_CHAT_Room *chat_room;
struct GNUNET_ClientServerConnection *sock;
-
+
int ret;
ret = GNUNET_OK;
csHdr.size = htons (sizeof (GNUNET_MessageHeader));
csHdr.type = htons (GNUNET_CS_PROTO_CHAT_MSG);
-
- sock = GNUNET_client_connection_create(ectx,cfg);
-
+
+ sock = GNUNET_client_connection_create (ectx, cfg);
+
if (sock == NULL)
- {
- fprintf (stderr, _("Error establishing connection with gnunetd.\n"));
- ret = GNUNET_SYSERR;
- }
+ {
+ fprintf (stderr, _("Error establishing connection with gnunetd.\n"));
+ ret = GNUNET_SYSERR;
+ }
if (GNUNET_SYSERR == GNUNET_client_connection_write (sock, &csHdr))
- {
- fprintf (stderr, _("Error writing to socket.\n"));
- ret = GNUNET_SYSERR;
- }
-
+ {
+ fprintf (stderr, _("Error writing to socket.\n"));
+ ret = GNUNET_SYSERR;
+ }
+
chat_msg = GNUNET_malloc (sizeof (CS_chat_MESSAGE));
- GNUNET_free(chat_msg);
-
+ GNUNET_free (chat_msg);
+
// connect
// allocate & init room struct
- chat_room = GNUNET_malloc(sizeof(struct GNUNET_CHAT_Room));
- chat_room->nickname = GNUNET_malloc(sizeof(nickname));
- strncpy(chat_room->nickname,nickname,sizeof(nickname));
- chat_room->room_name = GNUNET_malloc(sizeof(room_name));
- strncpy(chat_room->room_name,room_name,sizeof(room_name));
+ chat_room = GNUNET_malloc (sizeof (struct GNUNET_CHAT_Room));
+ chat_room->nickname = GNUNET_malloc (sizeof (nickname));
+ strncpy (chat_room->nickname, nickname, sizeof (nickname));
+ chat_room->room_name = GNUNET_malloc (sizeof (room_name));
+ strncpy (chat_room->room_name, room_name, sizeof (room_name));
chat_room->my_public_key = me;
chat_room->my_private_key = key;
chat_room->callback = callback;
chat_room->callback_cls = cls;
chat_room->ectx = ectx;
chat_room->cfg = cfg;
- chat_room->memberInfo = GNUNET_malloc(sizeof(memberInfo));
- strncpy(chat_room->memberInfo,memberInfo,sizeof(memberInfo));
+ chat_room->memberInfo = GNUNET_malloc (sizeof (memberInfo));
+ strncpy (chat_room->memberInfo, memberInfo, sizeof (memberInfo));
chat_room->sock = sock;
// create pthread
// return room struct
if (ret != GNUNET_OK)
- return NULL;
-
+ return NULL;
+
return chat_room;
}
@@ -162,11 +162,11 @@
// stop thread
// join thread
// free room struct
-
- GNUNET_free(chat_room->nickname);
- GNUNET_free(chat_room->memberInfo);
- GNUNET_client_connection_destroy(chat_room->sock);
-
+
+ GNUNET_free (chat_room->nickname);
+ GNUNET_free (chat_room->memberInfo);
+ GNUNET_client_connection_destroy (chat_room->sock);
+
}
/**
@@ -186,31 +186,37 @@
int ret = GNUNET_OK;
GNUNET_MessageHeader cs_msg_hdr;
CS_chat_MESSAGE *msg_to_send;
-
-
-
- cs_msg_hdr.size = htons (sizeof (GNUNET_MessageHeader) +
sizeof(CS_chat_MESSAGE) + sizeof(room->nickname) + sizeof(message) +
sizeof(room->room_name));
+
+
+
+ cs_msg_hdr.size =
+ htons (sizeof (GNUNET_MessageHeader) + sizeof (CS_chat_MESSAGE) +
+ sizeof (room->nickname) + sizeof (message) +
+ sizeof (room->room_name));
cs_msg_hdr.type = htons (GNUNET_CS_PROTO_CHAT_MSG);
-
- msg_to_send = GNUNET_malloc(ntohl(cs_msg_hdr.size));
-
- msg_to_send->nick_len = htonl(sizeof(room->nickname));
- msg_to_send->msg_len = htonl(sizeof(message));
- msg_to_send->room_name_len = htonl(sizeof(room->room_name));
-
- memcpy(&msg_to_send->nick[0],room->nickname,sizeof(room->nickname));
- memcpy(&msg_to_send->nick[sizeof(room->nickname)],message,sizeof(message));
- memcpy(&msg_to_send->nick[sizeof(room->nickname) +
sizeof(message)],room->room_name,sizeof(room->room_name));
+
+ msg_to_send = GNUNET_malloc (ntohl (cs_msg_hdr.size));
+
+ msg_to_send->nick_len = htonl (sizeof (room->nickname));
+ msg_to_send->msg_len = htonl (sizeof (message));
+ msg_to_send->room_name_len = htonl (sizeof (room->room_name));
+
+ memcpy (&msg_to_send->nick[0], room->nickname, sizeof (room->nickname));
+ memcpy (&msg_to_send->nick[sizeof (room->nickname)], message,
+ sizeof (message));
+ memcpy (&msg_to_send->nick[sizeof (room->nickname) + sizeof (message)],
+ room->room_name, sizeof (room->room_name));
/*msg_to_send->message = message;
- msg_to_send->nick = room->nickname;*/
+ msg_to_send->nick = room->nickname; */
msg_to_send->header = cs_msg_hdr;
-
- if (GNUNET_SYSERR == GNUNET_client_connection_write
(room->sock,&msg_to_send->header))
- {
- fprintf (stderr, _("Error writing to socket.\n"));
- ret = GNUNET_SYSERR;
- }
+ if (GNUNET_SYSERR ==
+ GNUNET_client_connection_write (room->sock, &msg_to_send->header))
+ {
+ fprintf (stderr, _("Error writing to socket.\n"));
+ ret = GNUNET_SYSERR;
+ }
+
return ret;
}
Modified: GNUnet/src/applications/chat/gnunet-chat.c
===================================================================
--- GNUnet/src/applications/chat/gnunet-chat.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/chat/gnunet-chat.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -46,7 +46,7 @@
* All gnunet-chat command line options
*/
static struct GNUNET_CommandLineOption gnunetchatOptions[] = {
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Join a chat on GNUnet.")),
/* -h */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Join a chat on GNUnet.")),
/* -h */
GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
GNUNET_COMMAND_LINE_OPTION_LOGGING, /* -L */
{'n', "nick", "NAME",
@@ -55,7 +55,7 @@
{'r', "room", "NAME",
gettext_noop ("set the chat room to join (requred)"),
1, &GNUNET_getopt_configure_set_string, &room_name},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -127,12 +127,12 @@
GNUNET_RSA_PublicKey *my_pub;
struct GNUNET_RSA_PrivateKey *my_priv;
char *message;
-
+
my_pub = NULL;
- my_priv = GNUNET_RSA_create_key();
- GNUNET_RSA_get_public_key(my_priv,my_pub);
-
- message = GNUNET_malloc(MAX_MESSAGE_LENGTH+1);
+ my_priv = GNUNET_RSA_create_key ();
+ GNUNET_RSA_get_public_key (my_priv, my_pub);
+
+ message = GNUNET_malloc (MAX_MESSAGE_LENGTH + 1);
int ret = GNUNET_OK;
if (GNUNET_SYSERR == GNUNET_init (argc,
@@ -140,7 +140,7 @@
"gnunet-chat [OPTIONS]",
&cfgFilename, gnunetchatOptions, &ectx,
&cfg))
- ret = GNUNET_SYSERR; /* parse error, --help, etc. */
+ ret = GNUNET_SYSERR; /* parse error, --help, etc. */
if (nickname == NULL)
{
fprintf (stderr, _("You must specify a nickname\n"));
@@ -149,7 +149,7 @@
room = GNUNET_CHAT_join_room (ectx,
cfg,
- nickname,room_name,
+ nickname, room_name,
my_pub, my_priv, "", &receive_callback, NULL);
if (room == NULL)
{
@@ -158,19 +158,19 @@
}
/* read messages from command line and send */
- while ((ret == GNUNET_OK)&&(strcmp(message,quit)!=0))
+ while ((ret == GNUNET_OK) && (strcmp (message, quit) != 0))
{
- bzero(message, MAX_MESSAGE_LENGTH+1);
+ bzero (message, MAX_MESSAGE_LENGTH + 1);
if (NULL == fgets (message, MAX_MESSAGE_LENGTH, stdin))
break;
- else if (strncmp(message,quit,sizeof(quit))==0)
+ else if (strncmp (message, quit, sizeof (quit)) == 0)
break;
else
- {
- if(message[strlen(message)-1] == '\n')
- message[strlen(message)-1] = '\0';
- }
+ {
+ if (message[strlen (message) - 1] == '\n')
+ message[strlen (message) - 1] = '\0';
+ }
if (GNUNET_OK != GNUNET_CHAT_send_message (room,
message,
&confirmation_callback,
@@ -180,13 +180,13 @@
{
fprintf (stderr, _("Failed to send message.\n"));
}
-
+
}
-
-
+
+
GNUNET_CHAT_leave_room (room);
- GNUNET_free(room);
- GNUNET_free(message);
+ GNUNET_free (room);
+ GNUNET_free (message);
GNUNET_fini (ectx, cfg);
return GNUNET_OK;
}
Modified: GNUnet/src/applications/fs/collection/collectiontest.c
===================================================================
--- GNUnet/src/applications/fs/collection/collectiontest.c 2008-02-10
02:44:59 UTC (rev 6215)
+++ GNUnet/src/applications/fs/collection/collectiontest.c 2008-02-10
02:45:20 UTC (rev 6216)
@@ -45,7 +45,7 @@
GNUNET_ECRS_FileInfo fi;
char *have;
- GNUNET_disable_entropy_gathering();
+ GNUNET_disable_entropy_gathering ();
cfg = GNUNET_GC_create ();
if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
{
Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/ecrs/download.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -882,8 +882,7 @@
GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS);
if ((rm.head == NULL) &&
((rm.completed == rm.total) ||
- ((rm.total != rm.length) &&
- (rm.completed >= rm.length))))
+ ((rm.total != rm.length) && (rm.completed >= rm.length))))
{
ret = GNUNET_OK;
}
Modified: GNUnet/src/applications/fs/ecrs/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/downloadtest.c 2008-02-10 02:44:59 UTC
(rev 6215)
+++ GNUnet/src/applications/fs/ecrs/downloadtest.c 2008-02-10 02:45:20 UTC
(rev 6216)
@@ -126,7 +126,7 @@
ret = GNUNET_SYSERR;
for (j = SIZE - 16 * 1024; j >= 0; j -= 16 * 1024)
{
- fprintf(stderr, ".");
+ fprintf (stderr, ".");
if (GNUNET_OK == GNUNET_ECRS_file_download_partial (NULL,
cfg,
uri,
@@ -173,7 +173,7 @@
name = makeName (size);
ret =
GNUNET_ECRS_file_unindex (NULL, cfg, name, NULL, NULL, &testTerminate,
- NULL);
+ NULL);
if (0 != UNLINK (name))
ret = GNUNET_SYSERR;
GNUNET_free (name);
@@ -209,13 +209,12 @@
CHECK (sock != NULL);
/* ACTUAL TEST CODE */
- fprintf(stderr, "Uploading...\n");
+ fprintf (stderr, "Uploading...\n");
uri = uploadFile (SIZE);
- CHECK (NULL != uri)
- fprintf(stderr, "Downloading...");
+ CHECK (NULL != uri) fprintf (stderr, "Downloading...");
CHECK (GNUNET_OK == downloadFile (SIZE, uri));
GNUNET_ECRS_uri_destroy (uri);
- fprintf(stderr, "\nUnindexing...\n");
+ fprintf (stderr, "\nUnindexing...\n");
CHECK (GNUNET_OK == unindexFile (SIZE));
fprintf (stderr, "Ok.\n");
Modified: GNUnet/src/applications/fs/ecrs/ecrstest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrstest.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/ecrs/ecrstest.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -145,9 +145,7 @@
myURI = NULL;
ret = GNUNET_ECRS_search (NULL,
cfg,
- *uri,
- 0,
- &searchCB, &myURI, &testTerminate, NULL);
+ *uri, 0, &searchCB, &myURI, &testTerminate, NULL);
GNUNET_ECRS_uri_destroy (*uri);
*uri = myURI;
if ((ret != GNUNET_SYSERR) && (myURI != NULL))
@@ -198,7 +196,7 @@
}
else
{
- fprintf(stderr, "? ");
+ fprintf (stderr, "? ");
}
UNLINK (tmpName);
GNUNET_free (tmpName);
@@ -214,8 +212,8 @@
name = makeName (size);
ret =
- GNUNET_ECRS_file_unindex(NULL, cfg, name, NULL, NULL, &testTerminate,
- NULL);
+ GNUNET_ECRS_file_unindex (NULL, cfg, name, NULL, NULL, &testTerminate,
+ NULL);
if (0 != UNLINK (name))
ret = GNUNET_SYSERR;
GNUNET_free (name);
Modified: GNUnet/src/applications/fs/ecrs/namespacetest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespacetest.c 2008-02-10 02:44:59 UTC
(rev 6215)
+++ GNUnet/src/applications/fs/ecrs/namespacetest.c 2008-02-10 02:45:20 UTC
(rev 6216)
@@ -98,9 +98,7 @@
fprintf (stderr, "Starting namespace search...\n");
CHECK (GNUNET_OK == GNUNET_ECRS_search (NULL,
cfg,
- advURI,
- 1, &spcb,
- uri, NULL, NULL));
+ advURI, 1, &spcb, uri, NULL, NULL));
fprintf (stderr, "Completed namespace search...\n");
CHECK (GNUNET_OK == GNUNET_ECRS_namespace_delete (NULL, cfg, CHECKNAME));
CHECK (GNUNET_SYSERR ==
@@ -118,7 +116,7 @@
pid_t daemon;
int failureCount = 0;
- GNUNET_disable_entropy_gathering();
+ GNUNET_disable_entropy_gathering ();
cfg = GNUNET_GC_create ();
if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
{
Modified: GNUnet/src/applications/fs/ecrs/search.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/search.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/ecrs/search.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -569,9 +569,8 @@
add_search_for_uri (uri, &ctx);
while (((NULL == tt) ||
(GNUNET_OK == tt (ttClosure))) &&
- (GNUNET_NO == GNUNET_shutdown_test ()) &&
- (ctx.aborted == GNUNET_NO))
- GNUNET_thread_sleep (100 * GNUNET_CRON_MILLISECONDS);
+ (GNUNET_NO == GNUNET_shutdown_test ()) && (ctx.aborted == GNUNET_NO))
+ GNUNET_thread_sleep (100 * GNUNET_CRON_MILLISECONDS);
GNUNET_FS_destroy_search_context (ctx.sctx);
while (ctx.queries != NULL)
{
Modified: GNUnet/src/applications/fs/ecrs/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/searchtest.c 2008-02-10 02:44:59 UTC
(rev 6215)
+++ GNUnet/src/applications/fs/ecrs/searchtest.c 2008-02-10 02:45:20 UTC
(rev 6216)
@@ -66,9 +66,7 @@
{
GNUNET_ECRS_search (NULL,
cfg,
- uri,
- 0,
- &searchCB, &resultCount, &testTerminate, NULL);
+ uri, 0, &searchCB, &resultCount, &testTerminate, NULL);
if (resultCount > 0)
return GNUNET_SYSERR;
return GNUNET_OK;
Modified: GNUnet/src/applications/fs/ecrs/unindex.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/unindex.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/ecrs/unindex.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -165,11 +165,11 @@
*/
int
GNUNET_ECRS_file_unindex (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *filename,
- GNUNET_ECRS_UploadProgressCallback upcb,
- void *upcbClosure, GNUNET_ECRS_TestTerminate tt,
- void *ttClosure)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *filename,
+ GNUNET_ECRS_UploadProgressCallback upcb,
+ void *upcbClosure, GNUNET_ECRS_TestTerminate tt,
+ void *ttClosure)
{
unsigned long long filesize;
unsigned long long pos;
Modified: GNUnet/src/applications/fs/ecrs/uritest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uritest.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/ecrs/uritest.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -239,7 +239,7 @@
int failureCount = 0;
int i;
- GNUNET_disable_entropy_gathering();
+ GNUNET_disable_entropy_gathering ();
failureCount += testKeyword ();
failureCount += testLocation ();
for (i = 0; i < 255; i++)
Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/fsui/search.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -202,7 +202,7 @@
testTerminate (void *cls)
{
GNUNET_FSUI_SearchList *pos = cls;
- if (pos->state == GNUNET_FSUI_ACTIVE)
+ if (pos->state == GNUNET_FSUI_ACTIVE)
return GNUNET_OK;
return GNUNET_SYSERR;
}
@@ -226,7 +226,7 @@
GNUNET_GE_IMMEDIATE, mem);
ret =
GNUNET_ECRS_search (ee, pos->ctx->cfg, pos->uri, pos->anonymityLevel,
- &spcb, pos, &testTerminate, pos);
+ &spcb, pos, &testTerminate, pos);
if (ret != GNUNET_OK)
{
const char *error;
@@ -361,8 +361,8 @@
int i;
GNUNET_mutex_lock (ctx->lock);
- if (sl->state == GNUNET_FSUI_ACTIVE)
- GNUNET_FSUI_search_abort(ctx, sl);
+ if (sl->state == GNUNET_FSUI_ACTIVE)
+ GNUNET_FSUI_search_abort (ctx, sl);
prev = NULL;
pos = ctx->activeSearches;
while ((pos != sl) && (pos != NULL))
Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c 2008-02-10 02:44:59 UTC
(rev 6215)
+++ GNUnet/src/applications/fs/fsui/searchtest.c 2008-02-10 02:45:20 UTC
(rev 6216)
@@ -154,8 +154,7 @@
GNUNET_snprintf (keyword, 40, "%s %s %s", keywords[0], _("AND"),
keywords[1]);
luri = GNUNET_ECRS_keyword_string_to_uri (NULL, keyword);
- search =
- GNUNET_FSUI_search_start (ctx, 0, luri);
+ search = GNUNET_FSUI_search_start (ctx, 0, luri);
GNUNET_ECRS_uri_destroy (luri);
uri = NULL;
CHECK (NULL != search);
@@ -194,8 +193,7 @@
"Upload failed to complete -- last event: %u\n",
lastEvent);
}
- CHECK (prog <
- 10000);
+ CHECK (prog < 10000);
GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
if (GNUNET_shutdown_test () == GNUNET_YES)
break;
@@ -205,8 +203,7 @@
while (uri == NULL)
{
prog++;
- CHECK (prog <
- 10000);
+ CHECK (prog < 10000);
GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
}
GNUNET_FSUI_search_abort (ctx, search);
Modified: GNUnet/src/applications/fs/fsui/unindex.c
===================================================================
--- GNUnet/src/applications/fs/fsui/unindex.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/fsui/unindex.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -90,7 +90,7 @@
GNUNET_GE_IMMEDIATE, mem);
ret =
GNUNET_ECRS_file_unindex (ee, utc->ctx->cfg, utc->filename,
- &progressCallback, utc, &tt, utc);
+ &progressCallback, utc, &tt, utc);
if (ret == GNUNET_OK)
{
utc->state = GNUNET_FSUI_COMPLETED;
Modified: GNUnet/src/applications/fs/gap/fs.c
===================================================================
--- GNUnet/src/applications/fs/gap/fs.c 2008-02-10 02:44:59 UTC (rev 6215)
+++ GNUnet/src/applications/fs/gap/fs.c 2008-02-10 02:45:20 UTC (rev 6216)
@@ -288,12 +288,11 @@
type);
#endif
GNUNET_mutex_lock (GNUNET_FS_lock);
- value->type = htonl(GNUNET_ECRS_BLOCKTYPE_ANY);
+ value->type = htonl (GNUNET_ECRS_BLOCKTYPE_ANY);
ret = datastore->get (&query, type,
- &GNUNET_FS_HELPER_complete_value_from_database_callback,
- value);
- if ( (0 < ret) &&
- (value->type != htonl(GNUNET_ECRS_BLOCKTYPE_ANY)) )
+
&GNUNET_FS_HELPER_complete_value_from_database_callback,
+ value);
+ if ((0 < ret) && (value->type != htonl (GNUNET_ECRS_BLOCKTYPE_ANY)))
{
ret = datastore->del (&query, value);
}
@@ -442,18 +441,17 @@
rs = (const CS_fs_request_search_MESSAGE *) req;
type = ntohl (rs->type);
/* try "fast path" avoiding gap/dht if unique reply is locally available */
- if (type == GNUNET_ECRS_BLOCKTYPE_DATA)
+ if (type == GNUNET_ECRS_BLOCKTYPE_DATA)
{
- if ( (1 == datastore->get (&rs->query[0],
- type, &fast_path_processor, sock)) ||
- (1 == datastore->get (&rs->query[0],
- GNUNET_ECRS_BLOCKTYPE_ONDEMAND,
- &fast_path_processor, sock)) )
- return GNUNET_OK;
- }
+ if ((1 == datastore->get (&rs->query[0],
+ type, &fast_path_processor, sock)) ||
+ (1 == datastore->get (&rs->query[0],
+ GNUNET_ECRS_BLOCKTYPE_ONDEMAND,
+ &fast_path_processor, sock)))
+ return GNUNET_OK;
+ }
else
- datastore->get (&rs->query[0],
- type, &fast_path_processor, sock);
+ datastore->get (&rs->query[0], type, &fast_path_processor, sock);
anonymityLevel = ntohl (rs->anonymityLevel);
keyCount =
Modified: GNUnet/src/applications/fs/gap/fs_dht.c
===================================================================
--- GNUnet/src/applications/fs/gap/fs_dht.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/gap/fs_dht.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -233,15 +233,13 @@
static void *
push_thread (void *cls)
{
- while ( (shutdown_requested == GNUNET_NO) &&
- (dht != NULL) &&
- (sqstore != NULL) )
+ while ((shutdown_requested == GNUNET_NO) &&
+ (dht != NULL) && (sqstore != NULL))
{
if (total == 0)
total = 1;
total = sqstore->iterateNonAnonymous (0, &push_callback, NULL);
- if ( (shutdown_requested == GNUNET_NO) &&
- (total == 0) )
+ if ((shutdown_requested == GNUNET_NO) && (total == 0))
GNUNET_thread_sleep (5 * GNUNET_CRON_MINUTES);
}
return NULL;
@@ -259,8 +257,7 @@
if (stats != NULL)
stat_push_count
= stats->create (gettext_noop ("# blocks pushed into DHT"));
- if ( (dht != NULL) &&
- (sqstore != NULL) )
+ if ((dht != NULL) && (sqstore != NULL))
{
shutdown_requested = GNUNET_NO;
thread = GNUNET_thread_create (&push_thread, NULL, 1024 * 128);
@@ -271,7 +268,7 @@
int
GNUNET_FS_DHT_done ()
{
- void * unused;
+ void *unused;
purge_old_records (-1);
if (thread != NULL)
Modified: GNUnet/src/applications/fs/gap/gap.c
===================================================================
--- GNUnet/src/applications/fs/gap/gap.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/gap/gap.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -249,17 +249,15 @@
/* check local data store */
ret = datastore->get (&queries[0], type, datastore_value_processor, rl);
- if ( (type == GNUNET_ECRS_BLOCKTYPE_DATA) &&
- (ret != 1) )
+ if ((type == GNUNET_ECRS_BLOCKTYPE_DATA) && (ret != 1))
ret = datastore->get (&queries[0],
- GNUNET_ECRS_BLOCKTYPE_ONDEMAND,
- datastore_value_processor, rl);
+ GNUNET_ECRS_BLOCKTYPE_ONDEMAND,
+ datastore_value_processor, rl);
/* if not found or not unique, forward */
- if ( (ret != 1) ||
- (type != GNUNET_ECRS_BLOCKTYPE_DATA) )
+ if ((ret != 1) || (type != GNUNET_ECRS_BLOCKTYPE_DATA))
GNUNET_FS_PLAN_request (NULL, peer, rl);
-
+
GNUNET_mutex_unlock (GNUNET_FS_lock);
}
@@ -337,9 +335,9 @@
* (rounded up).
*/
unsigned int
-GNUNET_FS_GAP_get_average_priority()
+GNUNET_FS_GAP_get_average_priority ()
{
- struct RequestList * rl;
+ struct RequestList *rl;
unsigned long long tot;
unsigned int i;
unsigned int active;
@@ -351,12 +349,12 @@
{
rl = table[i];
while (rl != NULL)
- {
+ {
tot += rl->value;
active++;
- rl = rl->next;
+ rl = rl->next;
}
- }
+ }
GNUNET_mutex_unlock (GNUNET_FS_lock);
if (active == 0)
return 0;
@@ -370,42 +368,41 @@
* Remove all of its pending queries.
*/
static void
-cleanup_on_peer_disconnect(const GNUNET_PeerIdentity * peer,
- void * unused)
+cleanup_on_peer_disconnect (const GNUNET_PeerIdentity * peer, void *unused)
{
unsigned int i;
- struct RequestList * rl;
- struct RequestList * prev;
+ struct RequestList *rl;
+ struct RequestList *prev;
PID_INDEX pid;
GNUNET_mutex_lock (GNUNET_FS_lock);
- pid = GNUNET_FS_PT_intern(peer);
- for (i=0;i<table_size;i++)
+ pid = GNUNET_FS_PT_intern (peer);
+ for (i = 0; i < table_size; i++)
{
rl = table[i];
prev = NULL;
while (rl != NULL)
- {
- if (pid == rl->response_target)
- {
- if (prev == NULL)
- table[i] = rl->next;
- else
- prev->next = rl->next;
- GNUNET_FS_SHARED_free_request_list(rl);
- if (prev == NULL)
- rl = table[i];
- else
- rl = prev->next;
- }
- else
- {
- prev = rl;
- rl = rl->next;
- }
- }
+ {
+ if (pid == rl->response_target)
+ {
+ if (prev == NULL)
+ table[i] = rl->next;
+ else
+ prev->next = rl->next;
+ GNUNET_FS_SHARED_free_request_list (rl);
+ if (prev == NULL)
+ rl = table[i];
+ else
+ rl = prev->next;
+ }
+ else
+ {
+ prev = rl;
+ rl = rl->next;
+ }
+ }
}
- GNUNET_FS_PT_change_rc(pid, -1);
+ GNUNET_FS_PT_change_rc (pid, -1);
GNUNET_mutex_unlock (GNUNET_FS_lock);
}
@@ -432,7 +429,9 @@
memset (table, 0, sizeof (struct RequestList *) * table_size);
GNUNET_GE_ASSERT (coreAPI->ectx,
GNUNET_SYSERR !=
- coreAPI->register_notify_peer_disconnect
(&cleanup_on_peer_disconnect, NULL));
+ coreAPI->
+ register_notify_peer_disconnect
+ (&cleanup_on_peer_disconnect, NULL));
cron = GNUNET_cron_create (coreAPI->ectx);
GNUNET_cron_start (cron);
return 0;
@@ -455,7 +454,9 @@
GNUNET_free (table);
GNUNET_GE_ASSERT (coreAPI->ectx,
GNUNET_SYSERR !=
- coreAPI->unregister_notify_peer_disconnect
(&cleanup_on_peer_disconnect, NULL));
+ coreAPI->
+ unregister_notify_peer_disconnect
+ (&cleanup_on_peer_disconnect, NULL));
coreAPI->release_service (datastore);
datastore = NULL;
GNUNET_cron_stop (cron);
Modified: GNUnet/src/applications/fs/gap/gap.h
===================================================================
--- GNUnet/src/applications/fs/gap/gap.h 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/gap/gap.h 2008-02-10 02:45:20 UTC (rev
6216)
@@ -95,7 +95,6 @@
* Compute the average priority of inbound requests
* (rounded up).
*/
-unsigned int
-GNUNET_FS_GAP_get_average_priority(void);
+unsigned int GNUNET_FS_GAP_get_average_priority (void);
#endif
Modified: GNUnet/src/applications/fs/gap/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/gap/ondemand.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/gap/ondemand.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -549,10 +549,11 @@
odb.fileId = *fileId;
/* compute the primary key */
GNUNET_EC_file_block_get_query (block, delta + sizeof (DBlock), &key);
- if ( (0 < datastore->get (&key,
- GNUNET_ECRS_BLOCKTYPE_ONDEMAND,
-
&GNUNET_FS_HELPER_complete_value_from_database_callback, &odb.header)) &&
- (odb.header.expirationTime != 0) )
+ if ((0 < datastore->get (&key,
+ GNUNET_ECRS_BLOCKTYPE_ONDEMAND,
+
&GNUNET_FS_HELPER_complete_value_from_database_callback,
+ &odb.header))
+ && (odb.header.expirationTime != 0))
ret = datastore->del (&key, &odb.header);
else /* not found */
ret = GNUNET_SYSERR;
Modified: GNUnet/src/applications/fs/gap/plan.c
===================================================================
--- GNUnet/src/applications/fs/gap/plan.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/gap/plan.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -303,9 +303,9 @@
if (pos == NULL)
{
if (qpl->tail != NULL)
- qpl->tail->next = entry;
+ qpl->tail->next = entry;
else
- qpl->head = entry;
+ qpl->head = entry;
entry->prev = qpl->tail;
qpl->tail = entry;
}
@@ -353,82 +353,89 @@
rank = GNUNET_malloc (sizeof (struct PeerRankings));
memset (rank, 0, sizeof (struct PeerRankings));
rank->peer = GNUNET_FS_PT_intern (identity);
- rank->reserved_bandwidth = coreAPI->reserve_downstream_bandwidth(identity,
-
GNUNET_GAP_ESTIMATED_DATA_SIZE);
+ rank->reserved_bandwidth = coreAPI->reserve_downstream_bandwidth (identity,
+
GNUNET_GAP_ESTIMATED_DATA_SIZE);
history = NULL;
if (rpc->info != NULL)
{
history = rpc->info->history;
while ((history != NULL) && (history->peer != rank->peer))
history = history->next;
- }
- now = GNUNET_get_time();
- history_score = 0; /* no bias from history */
- if ( (history != NULL) &&
- (history->request_count > 0) )
+ }
+ now = GNUNET_get_time ();
+ history_score = 0; /* no bias from history */
+ if ((history != NULL) && (history->request_count > 0))
{
last = history->last_response_time;
if (last >= now)
- last = now - 1;
+ last = now - 1;
/* the more responses we have in relation
- to the number of requests we sent, the
- higher we score; the score is the more
- significant the more recent the last
- response was */
+ to the number of requests we sent, the
+ higher we score; the score is the more
+ significant the more recent the last
+ response was */
history_score
- = (MAX_GAP_DELAY * history->response_count) / (history->request_count *
(now - last));
+ =
+ (MAX_GAP_DELAY * history->response_count) / (history->request_count *
+ (now - last));
if (history->response_count == 0)
- history_score = - history->request_count *
coreAPI->forAllConnectedNodes(NULL, NULL);
+ history_score =
+ -history->request_count * coreAPI->forAllConnectedNodes (NULL,
+ NULL);
if (history_score > (1 << 30))
- history_score = (1 << 30);
+ history_score = (1 << 30);
}
/* check query proximity */
- proximity_score = GNUNET_hash_distance_u32 (&rpc->request->queries[0],
&identity->hashPubKey);
+ proximity_score =
+ GNUNET_hash_distance_u32 (&rpc->request->queries[0],
+ &identity->hashPubKey);
/* generate score, ttl and priority */
- prio = rpc->request->last_prio_used +
GNUNET_random_u32(GNUNET_RANDOM_QUALITY_WEAK, 2); /* increase over time */
- if ( (history != NULL) &&
- (prio < history->last_good_prio) )
- prio = history->last_good_prio -
GNUNET_random_u32(GNUNET_RANDOM_QUALITY_WEAK, 2); /* fall over time */
+ prio = rpc->request->last_prio_used + GNUNET_random_u32
(GNUNET_RANDOM_QUALITY_WEAK, 2); /* increase over time */
+ if ((history != NULL) && (prio < history->last_good_prio))
+ prio = history->last_good_prio - GNUNET_random_u32
(GNUNET_RANDOM_QUALITY_WEAK, 2); /* fall over time */
if (prio > 1)
{
- allowable_prio = GNUNET_FS_GAP_get_average_priority() + 1;
+ allowable_prio = GNUNET_FS_GAP_get_average_priority () + 1;
if (prio > allowable_prio)
- prio = allowable_prio;
+ prio = allowable_prio;
}
ttl = rpc->request->last_ttl_used;
if (prio > 0)
{
- ttl = (1 << 30); /* bound only by prio */
+ ttl = (1 << 30); /* bound only by prio */
}
else
{
- if (rpc->request->response_client == NULL)
- ttl = 0; /* initiator expiration is always "now" */
- else
- ttl = (int) (((long long) (rpc->request->expiration - now)) /
GNUNET_CRON_SECONDS);
- ttl = ttl - TTL_DECREMENT -
- GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 2 * TTL_DECREMENT);
- if (ttl > 0) /* integer underflow */
- ttl = - (1<<30);
- }
- ttl = GNUNET_FS_HELPER_bound_ttl(ttl, prio);
+ if (rpc->request->response_client == NULL)
+ ttl = 0; /* initiator expiration is always "now" */
+ else
+ ttl =
+ (int) (((long long) (rpc->request->expiration -
+ now)) / GNUNET_CRON_SECONDS);
+ ttl =
+ ttl - TTL_DECREMENT - GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK,
+ 2 * TTL_DECREMENT);
+ if (ttl > 0) /* integer underflow */
+ ttl = -(1 << 30);
+ }
+ ttl = GNUNET_FS_HELPER_bound_ttl (ttl, prio);
rank->prio = prio;
rank->ttl = ttl;
/* compute combined score */
/* open question: any good weights for the scoring? */
score = history_score + rank->reserved_bandwidth - proximity_score;
- if (score <= - (1<<16))
+ if (score <= -(1 << 16))
{
/* would underflow, use lowest legal score */
rank->score = 1;
}
else
{
- rank->score = (unsigned int) ( (1<<16) + score);
- if (rank->score < score) /* integer overflow */
- rank->score = -1; /* max int */
+ rank->score = (unsigned int) ((1 << 16) + score);
+ if (rank->score < score) /* integer overflow */
+ rank->score = -1; /* max int */
}
/* insert into ranking list */
@@ -478,7 +485,7 @@
/* use request type, priority, system load and
entropy of ranking to determine number of peers
to queue */
-
+
/* use biased random selection to select
peers according to ranking; add requests */
total_score = 0;
@@ -496,16 +503,16 @@
{
prob = 1.0 * rank->score / total_score;
if (prob > 0.000000001)
- entropy -= prob * log(prob) / LOG_2;
+ entropy -= prob * log (prob) / LOG_2;
rank = rank->next;
}
if (entropy < 0.001)
- entropy = 0.001; /* should only be possible if we have virtually only one
choice */
- target_count = (unsigned int) ceil(entropy);
+ entropy = 0.001; /* should only be possible if we have
virtually only one choice */
+ target_count = (unsigned int) ceil (entropy);
/* limit target count based on value of the reqeust */
if (target_count > 2 * request->value + 3)
- target_count = 2 * request->value + 3;
+ target_count = 2 * request->value + 3;
if (target_count > total_peers)
target_count = total_peers;
@@ -533,10 +540,10 @@
{
rank = rpc.rankings;
rpc.rankings = rank->next;
- GNUNET_FS_PT_resolve(rank->peer, &peerId);
+ GNUNET_FS_PT_resolve (rank->peer, &peerId);
if (rank->score != 0)
- coreAPI->reserve_downstream_bandwidth(&peerId,
- - rank->reserved_bandwidth);
+ coreAPI->reserve_downstream_bandwidth (&peerId,
+ -rank->reserved_bandwidth);
GNUNET_FS_PT_change_rc (rank->peer, -1);
GNUNET_free (rank);
}
@@ -562,10 +569,9 @@
+ req->bloomfilter_size + (req->key_count - 1) * sizeof (GNUNET_HashCode);
if (size > available)
return 0;
- if ( (prio > req->remaining_value) &&
- (req->response_client == NULL) )
+ if ((prio > req->remaining_value) && (req->response_client == NULL))
prio = req->remaining_value;
- ttl = GNUNET_FS_HELPER_bound_ttl(ttl, prio);
+ ttl = GNUNET_FS_HELPER_bound_ttl (ttl, prio);
msg->header.size = htons (size);
msg->header.type = htons (GNUNET_P2P_PROTO_GAP_QUERY);
msg->type = htonl (req->type);
@@ -581,7 +587,7 @@
(char *) &msg->queries[req->key_count],
req->bloomfilter_size);
req->last_request_time = GNUNET_get_time ();
- req->last_prio_used = prio;
+ req->last_prio_used = prio;
req->last_ttl_used = ttl;
req->remaining_value -= prio;
return size;
@@ -668,7 +674,7 @@
}
static void
-free_client_info_list(struct ClientInfoList * pos)
+free_client_info_list (struct ClientInfoList *pos)
{
struct PeerHistoryList *ph;
@@ -704,7 +710,7 @@
clients = pos->next;
else
prev->next = pos->next;
- free_client_info_list(pos);
+ free_client_info_list (pos);
if (prev == NULL)
pos = clients;
else
@@ -712,7 +718,7 @@
}
else
{
- prev = pos;
+ prev = pos;
pos = pos->next;
}
}
@@ -744,9 +750,9 @@
/**
* Free the given query plan list and all of its entries.
- */
+ */
static void
-free_query_plan_list(struct QueryPlanList * qpl)
+free_query_plan_list (struct QueryPlanList *qpl)
{
struct QueryPlanEntry *el;
struct QueryPlanEntry *pred;
@@ -757,13 +763,13 @@
qpl->head = el->next;
pred = el->request->plan_entries;
if (pred == el)
- el->request->plan_entries = el->plan_entries_next;
+ el->request->plan_entries = el->plan_entries_next;
else
- {
- while (pred->plan_entries_next != el)
- pred = pred->plan_entries_next;
- pred->plan_entries_next = el->plan_entries_next;
- }
+ {
+ while (pred->plan_entries_next != el)
+ pred = pred->plan_entries_next;
+ pred->plan_entries_next = el->plan_entries_next;
+ }
GNUNET_free (el);
}
GNUNET_FS_PT_change_rc (qpl->peer, -1);
@@ -776,34 +782,33 @@
* active requests, that's not our job).
*/
static void
-peer_disconnect_handler(const GNUNET_PeerIdentity * peer,
- void * unused)
+peer_disconnect_handler (const GNUNET_PeerIdentity * peer, void *unused)
{
PID_INDEX pid;
- struct QueryPlanList * qpos;
- struct QueryPlanList * qprev;
- struct ClientInfoList * cpos;
- struct ClientInfoList * cprev;
-
- GNUNET_mutex_lock(GNUNET_FS_lock);
- pid = GNUNET_FS_PT_intern(peer);
+ struct QueryPlanList *qpos;
+ struct QueryPlanList *qprev;
+ struct ClientInfoList *cpos;
+ struct ClientInfoList *cprev;
+
+ GNUNET_mutex_lock (GNUNET_FS_lock);
+ pid = GNUNET_FS_PT_intern (peer);
qprev = NULL;
qpos = queries;
while (qpos != NULL)
{
if (qpos->peer == pid)
- {
- if (qprev != NULL)
- qprev->next = qpos->next;
- else
- queries = qpos->next;
- free_query_plan_list(qpos);
- if (qprev != NULL)
- qpos = qprev->next;
- else
- qpos = queries;
- continue;
- }
+ {
+ if (qprev != NULL)
+ qprev->next = qpos->next;
+ else
+ queries = qpos->next;
+ free_query_plan_list (qpos);
+ if (qprev != NULL)
+ qpos = qprev->next;
+ else
+ qpos = queries;
+ continue;
+ }
qprev = qpos;
qpos = qpos->next;
}
@@ -811,41 +816,42 @@
cpos = clients;
while (cpos != NULL)
{
- if ( (cpos->peer == pid) &&
- (cpos->client == NULL) )
- {
- if (cprev == NULL)
- clients = cpos->next;
+ if ((cpos->peer == pid) && (cpos->client == NULL))
+ {
+ if (cprev == NULL)
+ clients = cpos->next;
else
cprev->next = cpos->next;
- free_client_info_list(cpos);
+ free_client_info_list (cpos);
if (cprev == NULL)
cpos = clients;
else
cpos = cprev->next;
- }
+ }
else
- {
- cprev = cpos;
- cpos = cpos->next;
- }
+ {
+ cprev = cpos;
+ cpos = cpos->next;
+ }
}
- GNUNET_FS_PT_change_rc(pid, -1);
- GNUNET_mutex_unlock(GNUNET_FS_lock);
+ GNUNET_FS_PT_change_rc (pid, -1);
+ GNUNET_mutex_unlock (GNUNET_FS_lock);
}
int
GNUNET_FS_PLAN_init (GNUNET_CoreAPIForPlugins * capi)
{
- LOG_2 = log(2);
+ LOG_2 = log (2);
coreAPI = capi;
GNUNET_GE_ASSERT (capi->ectx,
GNUNET_SYSERR !=
capi->cs_exit_handler_register (&handle_client_exit));
GNUNET_GE_ASSERT (capi->ectx,
GNUNET_SYSERR !=
- capi->register_notify_peer_disconnect
(&peer_disconnect_handler, NULL));
+ capi->
+ register_notify_peer_disconnect (&peer_disconnect_handler,
+ NULL));
GNUNET_GE_ASSERT (coreAPI->ectx,
GNUNET_SYSERR !=
coreAPI->
@@ -865,7 +871,7 @@
{
qpl = queries;
queries = qpl->next;
- free_query_plan_list(qpl);
+ free_query_plan_list (qpl);
}
/* clean up clients */
while (clients != NULL)
@@ -876,7 +882,9 @@
cs_exit_handler_unregister (&handle_client_exit));
GNUNET_GE_ASSERT (coreAPI->ectx,
GNUNET_SYSERR !=
- coreAPI->unregister_notify_peer_disconnect
(&peer_disconnect_handler, NULL));
+ coreAPI->
+ unregister_notify_peer_disconnect
+ (&peer_disconnect_handler, NULL));
GNUNET_GE_ASSERT (coreAPI->ectx,
GNUNET_SYSERR !=
coreAPI->
Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/lib/fslib.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -120,7 +120,7 @@
req = (const CS_fs_request_search_MESSAGE *) &pos[1];
if (GNUNET_OK !=
GNUNET_client_connection_write (ctx->sock, &req->header))
- return GNUNET_SYSERR;
+ return GNUNET_SYSERR;
pos = pos->next;
}
if (GNUNET_SYSERR == GNUNET_client_connection_ensure_connected (ctx->sock))
@@ -203,30 +203,30 @@
memcmp (&query, &req->query[0], sizeof (GNUNET_HashCode)))
{
matched++;
- spos = pos;
- if (unique)
- {
- if (prev == NULL)
- ctx->handles = pos->next;
- else
- prev->next = pos->next;
- if (prev == NULL)
- pos = ctx->handles;
- else
- pos = prev->next;
- }
- else
- {
- prev = pos;
- pos = pos->next;
- }
- if ( (spos->callback != NULL) &&
- (GNUNET_SYSERR == spos->callback (&query,
- value,
- spos->closure, 0)))
+ spos = pos;
+ if (unique)
+ {
+ if (prev == NULL)
+ ctx->handles = pos->next;
+ else
+ prev->next = pos->next;
+ if (prev == NULL)
+ pos = ctx->handles;
+ else
+ pos = prev->next;
+ }
+ else
+ {
+ prev = pos;
+ pos = pos->next;
+ }
+ if ((spos->callback != NULL) &&
+ (GNUNET_SYSERR == spos->callback (&query,
+ value,
+ spos->closure, 0)))
spos->callback = NULL;
- if (unique)
- GNUNET_free(spos);
+ if (unique)
+ GNUNET_free (spos);
}
else
{
@@ -237,10 +237,10 @@
GNUNET_free (value);
#if DEBUG_FSLIB
if (matched == 0)
- GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
- GNUNET_GE_USER,
- "FSLIB: received content but have no pending
request\n");
+ GNUNET_GE_LOG (ctx->ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "FSLIB: received content but have no pending
request\n");
#endif
GNUNET_mutex_unlock (ctx->lock);
}
@@ -364,8 +364,7 @@
GNUNET_mutex_lock (ctx->lock);
ret->next = ctx->handles;
ctx->handles = ret;
- GNUNET_client_connection_write (ctx->sock,
- &req->header);
+ GNUNET_client_connection_write (ctx->sock, &req->header);
GNUNET_mutex_unlock (ctx->lock);
return GNUNET_OK;
}
Modified: GNUnet/src/applications/fs/lib/fslibtest.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslibtest.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/applications/fs/lib/fslibtest.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -123,10 +123,10 @@
static int
searchResultCB (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * value, void * ctx,
- unsigned long long uid)
+ const GNUNET_DatastoreValue * value, void *ctx,
+ unsigned long long uid)
{
- TSC * cls = ctx;
+ TSC *cls = ctx;
GNUNET_HashCode ekey;
GNUNET_DatastoreValue *blk;
GNUNET_DatastoreValue *eblk;
@@ -186,12 +186,9 @@
closure.sem = GNUNET_semaphore_create (0);
now = GNUNET_get_time ();
GNUNET_FS_start_search (ctx,
- NULL,
- GNUNET_ECRS_BLOCKTYPE_DATA,
- 1,
- &query,
- 0,
- &searchResultCB, &closure);
+ NULL,
+ GNUNET_ECRS_BLOCKTYPE_DATA,
+ 1, &query, 0, &searchResultCB, &closure);
GNUNET_cron_add_job (cron, &abortSem, 30 * GNUNET_CRON_SECONDS, 0,
closure.sem);
GNUNET_semaphore_down (closure.sem, GNUNET_YES);
@@ -336,11 +333,9 @@
mainThread = GNUNET_thread_get_self ();
ctx = GNUNET_FS_create_search_context (NULL, cfg, lock);
GNUNET_FS_start_search (ctx,
- NULL,
- GNUNET_ECRS_BLOCKTYPE_ANY,
- 1,
- &query, 0,
- &countCallback, &i);
+ NULL,
+ GNUNET_ECRS_BLOCKTYPE_ANY,
+ 1, &query, 0, &countCallback, &i);
if (i > 0)
GNUNET_thread_sleep (1 * GNUNET_CRON_SECONDS);
GNUNET_thread_release_self (mainThread);
@@ -356,7 +351,7 @@
GNUNET_mutex_destroy (lock);
GNUNET_cron_stop (cron);
GNUNET_cron_destroy (cron);
- GNUNET_free_non_null(block);
+ GNUNET_free_non_null (block);
#if START_DAEMON
GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon));
#endif
Modified: GNUnet/src/applications/fs/namespace/namespace_infotest.c
===================================================================
--- GNUnet/src/applications/fs/namespace/namespace_infotest.c 2008-02-10
02:44:59 UTC (rev 6215)
+++ GNUnet/src/applications/fs/namespace/namespace_infotest.c 2008-02-10
02:45:20 UTC (rev 6216)
@@ -47,7 +47,7 @@
int newVal;
struct GNUNET_GC_Configuration *cfg;
- GNUNET_disable_entropy_gathering();
+ GNUNET_disable_entropy_gathering ();
cfg = GNUNET_GC_create ();
if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
{
Modified: GNUnet/src/applications/fs/tools/gnunet-search.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-search.c 2008-02-10 02:44:59 UTC
(rev 6215)
+++ GNUnet/src/applications/fs/tools/gnunet-search.c 2008-02-10 02:45:20 UTC
(rev 6216)
@@ -187,8 +187,7 @@
return GNUNET_SYSERR;
}
errorCode = 1;
- s = GNUNET_FSUI_search_start (ctx,
- anonymity, uri);
+ s = GNUNET_FSUI_search_start (ctx, anonymity, uri);
GNUNET_ECRS_uri_destroy (uri);
if (s == NULL)
{
Modified: GNUnet/src/include/gnunet_chat_lib.h
===================================================================
--- GNUnet/src/include/gnunet_chat_lib.h 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/include/gnunet_chat_lib.h 2008-02-10 02:45:20 UTC (rev
6216)
@@ -137,13 +137,18 @@
* @param cls argument to callback
* @return NULL on error
*/
-struct GNUNET_CHAT_Room *GNUNET_CHAT_join_room (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *nickname,const char *room_name,
- const GNUNET_RSA_PublicKey * me,
- const struct GNUNET_RSA_PrivateKey *key,
- const char *memberInfo,
- GNUNET_CHAT_MessageCallback callback, void *cls);
+struct GNUNET_CHAT_Room *GNUNET_CHAT_join_room (struct GNUNET_GE_Context
+ *ectx,
+ struct GNUNET_GC_Configuration
+ *cfg, const char *nickname,
+ const char *room_name,
+ const GNUNET_RSA_PublicKey *
+ me,
+ const struct
+ GNUNET_RSA_PrivateKey *key,
+ const char *memberInfo,
+ GNUNET_CHAT_MessageCallback
+ callback, void *cls);
/**
* Leave a chat room.
Modified: GNUnet/src/include/gnunet_ecrs_lib.h
===================================================================
--- GNUnet/src/include/gnunet_ecrs_lib.h 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/include/gnunet_ecrs_lib.h 2008-02-10 02:45:20 UTC (rev
6216)
@@ -586,7 +586,7 @@
*
* @return GNUNET_SYSERR if the unindexing failed (i.e. not indexed)
*/
-int GNUNET_ECRS_file_unindex (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *filename,
GNUNET_ECRS_UploadProgressCallback upcb, void *upcbClosure,
GNUNET_ECRS_TestTerminate tt, void *ttClosure); /* unindex.c */
+int GNUNET_ECRS_file_unindex (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *filename,
GNUNET_ECRS_UploadProgressCallback upcb, void *upcbClosure,
GNUNET_ECRS_TestTerminate tt, void *ttClosure); /* unindex.c */
/**
@@ -694,7 +694,7 @@
* @param uri specifies the search parameters
* @param uri set to the URI of the uploaded file
*/
-int GNUNET_ECRS_search (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const struct GNUNET_ECRS_URI *uri, unsigned int
anonymityLevel, GNUNET_ECRS_SearchResultProcessor spcb, void *spcbClosure,
GNUNET_ECRS_TestTerminate tt, void *ttClosure); /* search.c */
+int GNUNET_ECRS_search (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const struct GNUNET_ECRS_URI *uri, unsigned int
anonymityLevel, GNUNET_ECRS_SearchResultProcessor spcb, void *spcbClosure,
GNUNET_ECRS_TestTerminate tt, void *ttClosure); /* search.c */
/**
* Notification of ECRS to a client about the progress of an insertion
Modified: GNUnet/src/include/gnunet_fsui_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fsui_lib.h 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/include/gnunet_fsui_lib.h 2008-02-10 02:45:20 UTC (rev
6216)
@@ -862,7 +862,7 @@
*
* @return NULL on error
*/
-struct GNUNET_FSUI_SearchList *GNUNET_FSUI_search_start (struct
GNUNET_FSUI_Context *ctx, unsigned int anonymityLevel, const struct
GNUNET_ECRS_URI *uri); /* search.c */
+struct GNUNET_FSUI_SearchList *GNUNET_FSUI_search_start (struct
GNUNET_FSUI_Context *ctx, unsigned int anonymityLevel, const struct
GNUNET_ECRS_URI *uri); /* search.c */
/**
* Abort a search.
Modified: GNUnet/src/include/gnunet_remote_lib.h
===================================================================
--- GNUnet/src/include/gnunet_remote_lib.h 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/include/gnunet_remote_lib.h 2008-02-10 02:45:20 UTC (rev
6216)
@@ -43,13 +43,13 @@
*/
struct GNUNET_remote_host
{
- GNUNET_PeerIdentity identity;
- struct GNUNET_remote_host *next;
-
- char *hostname;
- unsigned long long controlPort;
- pid_t pid;
-
+ GNUNET_PeerIdentity identity;
+ struct GNUNET_remote_host *next;
+
+ char *hostname;
+ unsigned long long controlPort;
+ pid_t pid;
+
};
/**
@@ -63,9 +63,9 @@
* @param username username to use for ssh (assumed to be used with ssh-agent)
*/
int GNUNET_REMOTE_start_daemon (char *gnunetd_home,
- char *localConfigPath, char *configFileName,
- char *remote_config_path, char *ip_address,
- char *username);
+ char *localConfigPath, char *configFileName,
+ char *remote_config_path, char *ip_address,
+ char *username);
int GNUNET_REMOTE_start_daemons (struct GNUNET_GC_Configuration *newcfg,
unsigned long long number_of_daemons);
Modified: GNUnet/src/include/gnunet_util_crypto.h
===================================================================
--- GNUnet/src/include/gnunet_util_crypto.h 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/include/gnunet_util_crypto.h 2008-02-10 02:45:20 UTC (rev
6216)
@@ -429,7 +429,7 @@
* where strong entropy gathering is not desired
* (for example, for hostkey generation).
*/
-void GNUNET_disable_entropy_gathering(void);
+void GNUNET_disable_entropy_gathering (void);
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2008-02-10 02:44:59 UTC (rev 6215)
+++ GNUnet/src/server/connection.c 2008-02-10 02:45:20 UTC (rev 6216)
@@ -4357,7 +4357,7 @@
* @return GNUNET_OK
*/
int
-GNUNET_CORE_connection_register_notify_peer_disconnect
+ GNUNET_CORE_connection_register_notify_peer_disconnect
(GNUNET_NodeIteratorCallback callback, void *cls)
{
struct DisconnectNotificationList *l;
@@ -4380,7 +4380,7 @@
* if this callback is not registered
*/
int
-GNUNET_CORE_connection_unregister_notify_peer_disconnect
+ GNUNET_CORE_connection_unregister_notify_peer_disconnect
(GNUNET_NodeIteratorCallback callback, void *cls)
{
struct DisconnectNotificationList *pos;
Modified: GNUnet/src/server/connection.h
===================================================================
--- GNUnet/src/server/connection.h 2008-02-10 02:44:59 UTC (rev 6215)
+++ GNUnet/src/server/connection.h 2008-02-10 02:45:20 UTC (rev 6216)
@@ -353,8 +353,8 @@
* @return GNUNET_OK
*/
int
-GNUNET_CORE_connection_register_notify_peer_disconnect
-(GNUNET_NodeIteratorCallback callback, void *cls);
+ GNUNET_CORE_connection_register_notify_peer_disconnect
+ (GNUNET_NodeIteratorCallback callback, void *cls);
/**
* Stop calling the given function whenever we get
@@ -364,8 +364,8 @@
* if this callback is not registered
*/
int
-GNUNET_CORE_connection_unregister_notify_peer_disconnect
-(GNUNET_NodeIteratorCallback callback, void *cls);
+ GNUNET_CORE_connection_unregister_notify_peer_disconnect
+ (GNUNET_NodeIteratorCallback callback, void *cls);
/**
Modified: GNUnet/src/util/boot/startup.c
===================================================================
--- GNUnet/src/util/boot/startup.c 2008-02-10 02:44:59 UTC (rev 6215)
+++ GNUnet/src/util/boot/startup.c 2008-02-10 02:45:20 UTC (rev 6216)
@@ -277,8 +277,8 @@
(GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (*cfg,
"TESTING",
"WEAKRANDOM",
- GNUNET_NO)))
- GNUNET_disable_entropy_gathering();
+ GNUNET_NO)))
+ GNUNET_disable_entropy_gathering ();
if (configure_logging (ectx, *cfg) != 0)
return -1;
return i;
Modified: GNUnet/src/util/crypto/hostkeytest.c
===================================================================
--- GNUnet/src/util/crypto/hostkeytest.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/util/crypto/hostkeytest.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -315,7 +315,7 @@
{
int failureCount = 0;
- GNUNET_disable_entropy_gathering();
+ GNUNET_disable_entropy_gathering ();
#if PERF
if (GNUNET_OK != testEncryptPerformance ())
failureCount++;
Modified: GNUnet/src/util/crypto/locking_gcrypt.c
===================================================================
--- GNUnet/src/util/crypto/locking_gcrypt.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/util/crypto/locking_gcrypt.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -95,9 +95,10 @@
* where strong entropy gathering is not desired
* (for example, for hostkey generation).
*/
-void GNUNET_disable_entropy_gathering()
+void
+GNUNET_disable_entropy_gathering ()
{
- gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+ gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
}
Modified: GNUnet/src/util/crypto/symciphertest.c
===================================================================
--- GNUnet/src/util/crypto/symciphertest.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/util/crypto/symciphertest.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -158,7 +158,7 @@
{
int failureCount = 0;
- GNUNET_disable_entropy_gathering();
+ GNUNET_disable_entropy_gathering ();
GNUNET_GE_ASSERT (NULL,
strlen (INITVALUE) >
sizeof (GNUNET_AES_InitializationVector));
Modified: GNUnet/src/util/crypto/weakkeytest.c
===================================================================
--- GNUnet/src/util/crypto/weakkeytest.c 2008-02-10 02:44:59 UTC (rev
6215)
+++ GNUnet/src/util/crypto/weakkeytest.c 2008-02-10 02:45:20 UTC (rev
6216)
@@ -175,7 +175,7 @@
{
int weak_keys;
- GNUNET_disable_entropy_gathering();
+ GNUNET_disable_entropy_gathering ();
if (GENERATE_WEAK_KEYS)
{
weak_keys = getWeakKeys ();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6216 - in GNUnet/src: applications/chat applications/fs/collection applications/fs/ecrs applications/fs/fsui applications/fs/gap applications/fs/lib applications/fs/namespace applications/fs/tools include server util/boot util/crypto,
gnunet <=