[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r5761 - in GNUnet/src: applications/advertising application
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r5761 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/chat applications/datastore applications/dht/module applications/dht/tools applications/dstore applications/fragmentation applications/fs applications/fs/collection applications/fs/ecrs applications/fs/fsui applications/fs/lib applications/fs/module applications/fs/namespace applications/fs/tools applications/fs/uritrack applications/gap applications/getoption applications/identity applications/kvstore_sqlite applications/pingpong applications/rpc applications/session applications/sqstore_mysql applications/sqstore_sqlite applications/state applications/stats applications/tbench applications/template applications/testbed applications/testing applications/topology_default applications/topology_f2f applications/tracekit applications/traffic applications/transport applications/vpn include server setup setup/gtk setup/lib setup/ncurses setup/text transports transports/upnp util/boot util/config util/config_impl util/containers util/cron util/crypto util/disk util/error util/getopt util/loggers util/network util/network_client util/os util/string util/threads util/win |
|
Date: |
Sun, 25 Nov 2007 05:07:32 -0700 (MST) |
Author: grothoff
Date: 2007-11-25 05:07:29 -0700 (Sun, 25 Nov 2007)
New Revision: 5761
Modified:
GNUnet/src/applications/advertising/advertising.c
GNUnet/src/applications/advertising/advertising_test.c
GNUnet/src/applications/advertising/bootstrap.c
GNUnet/src/applications/bootstrap_http/http.c
GNUnet/src/applications/bootstrap_http/httptest.c
GNUnet/src/applications/chat/chat.c
GNUnet/src/applications/chat/gnunet-chat.c
GNUnet/src/applications/datastore/datastore.c
GNUnet/src/applications/datastore/filter.c
GNUnet/src/applications/datastore/filter.h
GNUnet/src/applications/datastore/prefetch.c
GNUnet/src/applications/datastore/prefetch.h
GNUnet/src/applications/dht/module/cs.c
GNUnet/src/applications/dht/module/dstore.c
GNUnet/src/applications/dht/module/dstore.h
GNUnet/src/applications/dht/module/routing.c
GNUnet/src/applications/dht/module/routing.h
GNUnet/src/applications/dht/module/service.c
GNUnet/src/applications/dht/module/table.c
GNUnet/src/applications/dht/tools/dht-query.c
GNUnet/src/applications/dht/tools/dht_api.c
GNUnet/src/applications/dht/tools/dhttest.c
GNUnet/src/applications/dht/tools/dhttest2.c
GNUnet/src/applications/dstore/dstore.c
GNUnet/src/applications/fragmentation/fragmentation.c
GNUnet/src/applications/fragmentation/fragmentationtest.c
GNUnet/src/applications/fs/collection/collection.c
GNUnet/src/applications/fs/collection/collectiontest.c
GNUnet/src/applications/fs/ecrs/directory.c
GNUnet/src/applications/fs/ecrs/directorytest.c
GNUnet/src/applications/fs/ecrs/download.c
GNUnet/src/applications/fs/ecrs/downloadtest.c
GNUnet/src/applications/fs/ecrs/ecrs.c
GNUnet/src/applications/fs/ecrs/ecrs.h
GNUnet/src/applications/fs/ecrs/ecrstest.c
GNUnet/src/applications/fs/ecrs/helper.c
GNUnet/src/applications/fs/ecrs/indexinfo.c
GNUnet/src/applications/fs/ecrs/keyspace.c
GNUnet/src/applications/fs/ecrs/meta.c
GNUnet/src/applications/fs/ecrs/metatest.c
GNUnet/src/applications/fs/ecrs/metatest2.c
GNUnet/src/applications/fs/ecrs/namespace.c
GNUnet/src/applications/fs/ecrs/namespacetest.c
GNUnet/src/applications/fs/ecrs/parser.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/upload.c
GNUnet/src/applications/fs/ecrs/uri.c
GNUnet/src/applications/fs/ecrs/uritest.c
GNUnet/src/applications/fs/ecrs_core.c
GNUnet/src/applications/fs/ecrs_core_test.c
GNUnet/src/applications/fs/fsui/deserialize.c
GNUnet/src/applications/fs/fsui/download.c
GNUnet/src/applications/fs/fsui/downloadtest.c
GNUnet/src/applications/fs/fsui/fsui-loader.c
GNUnet/src/applications/fs/fsui/fsui.c
GNUnet/src/applications/fs/fsui/fsuitest.c
GNUnet/src/applications/fs/fsui/fsuitest2.c
GNUnet/src/applications/fs/fsui/search.c
GNUnet/src/applications/fs/fsui/searchtest.c
GNUnet/src/applications/fs/fsui/serialize.c
GNUnet/src/applications/fs/fsui/serializetest.c
GNUnet/src/applications/fs/fsui/serializetest2.c
GNUnet/src/applications/fs/fsui/serializetest3.c
GNUnet/src/applications/fs/fsui/serializetest4.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/lib/fslibtest.c
GNUnet/src/applications/fs/module/anonymity.c
GNUnet/src/applications/fs/module/anonymity.h
GNUnet/src/applications/fs/module/dht_push.h
GNUnet/src/applications/fs/module/fs.c
GNUnet/src/applications/fs/module/migration.c
GNUnet/src/applications/fs/module/ondemand.c
GNUnet/src/applications/fs/module/querymanager.c
GNUnet/src/applications/fs/namespace/namespace_info.c
GNUnet/src/applications/fs/namespace/namespace_infotest.c
GNUnet/src/applications/fs/tools/gnunet-directory.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/fs/uritrack/callbacks.c
GNUnet/src/applications/fs/uritrack/file_info.c
GNUnet/src/applications/fs/uritrack/tracktest.c
GNUnet/src/applications/fs/uritrack/uri_info.c
GNUnet/src/applications/gap/gap.c
GNUnet/src/applications/gap/gaptest.c
GNUnet/src/applications/gap/gaptest2.c
GNUnet/src/applications/gap/gaptest3.c
GNUnet/src/applications/gap/pid_table.h
GNUnet/src/applications/getoption/clientapi.c
GNUnet/src/applications/getoption/getoption.c
GNUnet/src/applications/identity/hostkey.c
GNUnet/src/applications/identity/hostkey.h
GNUnet/src/applications/identity/identity.c
GNUnet/src/applications/kvstore_sqlite/kv_sqlite.c
GNUnet/src/applications/pingpong/pingpong.c
GNUnet/src/applications/rpc/parameters.c
GNUnet/src/applications/rpc/parameterstest.c
GNUnet/src/applications/rpc/rpc.c
GNUnet/src/applications/session/connect.c
GNUnet/src/applications/session/sessiontest.c
GNUnet/src/applications/session/sessiontest2.c
GNUnet/src/applications/session/sessiontest_http.c
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/src/applications/sqstore_mysql/mysqltest.c
GNUnet/src/applications/sqstore_mysql/mysqltest2.c
GNUnet/src/applications/sqstore_sqlite/sqlite.c
GNUnet/src/applications/sqstore_sqlite/sqlitetest.c
GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c
GNUnet/src/applications/state/state.c
GNUnet/src/applications/stats/clientapi.c
GNUnet/src/applications/stats/gnunet-stats.c
GNUnet/src/applications/stats/sqstats.c
GNUnet/src/applications/stats/statistics.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/testing/testing.c
GNUnet/src/applications/topology_default/topology.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/traffic.c
GNUnet/src/applications/transport/transport.c
GNUnet/src/applications/vpn/gnunet-vpn.c
GNUnet/src/applications/vpn/vpn.c
GNUnet/src/include/ecrs_core.h
GNUnet/src/include/gnunet_blockstore.h
GNUnet/src/include/gnunet_bootstrap_service.h
GNUnet/src/include/gnunet_chat_lib.h
GNUnet/src/include/gnunet_collection_lib.h
GNUnet/src/include/gnunet_core.h
GNUnet/src/include/gnunet_datastore_service.h
GNUnet/src/include/gnunet_dht_lib.h
GNUnet/src/include/gnunet_dht_service.h
GNUnet/src/include/gnunet_dstore_service.h
GNUnet/src/include/gnunet_ecrs_lib.h
GNUnet/src/include/gnunet_fs_lib.h
GNUnet/src/include/gnunet_fsui_lib.h
GNUnet/src/include/gnunet_gap_service.h
GNUnet/src/include/gnunet_getoption_lib.h
GNUnet/src/include/gnunet_identity_lib.h
GNUnet/src/include/gnunet_identity_service.h
GNUnet/src/include/gnunet_kvstore_service.h
GNUnet/src/include/gnunet_namespace_lib.h
GNUnet/src/include/gnunet_peerinfo_lib.h
GNUnet/src/include/gnunet_protocols.h
GNUnet/src/include/gnunet_rpc_lib.h
GNUnet/src/include/gnunet_rpc_service.h
GNUnet/src/include/gnunet_setup_lib.h
GNUnet/src/include/gnunet_sqstore_service.h
GNUnet/src/include/gnunet_state_service.h
GNUnet/src/include/gnunet_stats_lib.h
GNUnet/src/include/gnunet_testing_lib.h
GNUnet/src/include/gnunet_transport.h
GNUnet/src/include/gnunet_transport_service.h
GNUnet/src/include/gnunet_uritrack_lib.h
GNUnet/src/include/gnunet_util_boot.h
GNUnet/src/include/gnunet_util_config.h
GNUnet/src/include/gnunet_util_containers.h
GNUnet/src/include/gnunet_util_disk.h
GNUnet/src/include/gnunet_util_error.h
GNUnet/src/include/gnunet_util_error_loggers.h
GNUnet/src/include/gnunet_util_network.h
GNUnet/src/include/gnunet_util_os.h
GNUnet/src/include/gnunet_util_string.h
GNUnet/src/server/connection.c
GNUnet/src/server/connection.h
GNUnet/src/server/core.c
GNUnet/src/server/gnunet-peer-info.c
GNUnet/src/server/gnunet-transport-check.c
GNUnet/src/server/gnunet-update.c
GNUnet/src/server/gnunetd.c
GNUnet/src/server/handler.c
GNUnet/src/server/handler.h
GNUnet/src/server/startup.c
GNUnet/src/server/startup.h
GNUnet/src/server/tcpserver.c
GNUnet/src/server/tcpserver.h
GNUnet/src/server/version.c
GNUnet/src/server/version.h
GNUnet/src/setup/gnunet-setup.c
GNUnet/src/setup/gnunet-win-tool.c
GNUnet/src/setup/gtk/gconf.c
GNUnet/src/setup/gtk/glade_support.c
GNUnet/src/setup/gtk/ngconf.c
GNUnet/src/setup/gtk/wizard_gtk.c
GNUnet/src/setup/lib/gns.c
GNUnet/src/setup/lib/tree.c
GNUnet/src/setup/lib/tree.h
GNUnet/src/setup/lib/wizard_util.c
GNUnet/src/setup/ncurses/mconf.c
GNUnet/src/setup/ncurses/wizard_curs.c
GNUnet/src/setup/text/conf.c
GNUnet/src/transports/http.c
GNUnet/src/transports/ip.c
GNUnet/src/transports/ip6.c
GNUnet/src/transports/nat.c
GNUnet/src/transports/smtp.c
GNUnet/src/transports/tcp.c
GNUnet/src/transports/tcp6.c
GNUnet/src/transports/tcp_helper.c
GNUnet/src/transports/test.c
GNUnet/src/transports/test_repeat.c
GNUnet/src/transports/udp.c
GNUnet/src/transports/udp6.c
GNUnet/src/transports/udp_helper.c
GNUnet/src/transports/upnp/error.c
GNUnet/src/transports/upnp/upnp.c
GNUnet/src/transports/upnp/upnptest.c
GNUnet/src/util/boot/startup.c
GNUnet/src/util/config/config.c
GNUnet/src/util/config/configtest.c
GNUnet/src/util/config_impl/configtest.c
GNUnet/src/util/containers/bloomfilter.c
GNUnet/src/util/cron/cron.c
GNUnet/src/util/crypto/hashing.c
GNUnet/src/util/crypto/hostkey_gcrypt.c
GNUnet/src/util/crypto/kblockkey.c
GNUnet/src/util/crypto/symcipher_gcrypt.c
GNUnet/src/util/crypto/symciphertest.c
GNUnet/src/util/disk/storage.c
GNUnet/src/util/error/error.c
GNUnet/src/util/getopt/getopt.c
GNUnet/src/util/getopt/setoption.c
GNUnet/src/util/loggers/file.c
GNUnet/src/util/loggers/memory.c
GNUnet/src/util/loggers/smtp.c
GNUnet/src/util/network/io.c
GNUnet/src/util/network/ip.c
GNUnet/src/util/network/ipcheck.c
GNUnet/src/util/network/select.c
GNUnet/src/util/network_client/tcpio.c
GNUnet/src/util/network_client/tcpiotest.c
GNUnet/src/util/os/console.c
GNUnet/src/util/os/cpustatus.c
GNUnet/src/util/os/daemon.c
GNUnet/src/util/os/daemontest.c
GNUnet/src/util/os/dso.c
GNUnet/src/util/os/installpath.c
GNUnet/src/util/os/osconfig.c
GNUnet/src/util/os/priority.c
GNUnet/src/util/os/semaphore.c
GNUnet/src/util/os/semaphoretest.c
GNUnet/src/util/os/statuscalls.c
GNUnet/src/util/os/statuscallstest.c
GNUnet/src/util/os/user.c
GNUnet/src/util/string/string.c
GNUnet/src/util/string/xmalloc.c
GNUnet/src/util/threads/mutex.c
GNUnet/src/util/threads/pthread.c
GNUnet/src/util/threads/semaphore.c
GNUnet/src/util/win/winproc.c
Log:
whitespace-and-indentation
Modified: GNUnet/src/applications/advertising/advertising.c
===================================================================
--- GNUnet/src/applications/advertising/advertising.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/advertising/advertising.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -189,10 +189,10 @@
GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
GNUNET_hash_to_enc (&msg->senderIdentity.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("HELLO message from `%s' has an invalid signature.
Dropping.\n"),
- (char *) &enc);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("HELLO message from `%s' has an invalid signature.
Dropping.\n"),
+ (char *) &enc);
GNUNET_GE_BREAK_OP (ectx, 0);
return GNUNET_SYSERR; /* message invalid */
}
@@ -200,9 +200,9 @@
GNUNET_get_time_int32 (NULL) + GNUNET_MAX_HELLO_EXPIRES)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("HELLO message has expiration too far in the future.
Dropping.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("HELLO message has expiration too far in the future.
Dropping.\n"));
GNUNET_GE_BREAK_OP (ectx, 0);
return GNUNET_SYSERR;
}
@@ -213,9 +213,9 @@
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
GNUNET_hash_to_enc (&msg->senderIdentity.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Transport verification of HELLO message from `%s' failed
(%u).\n",
- &enc, ntohs (msg->protocol));
+ GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Transport verification of HELLO message from `%s' failed
(%u).\n",
+ &enc, ntohs (msg->protocol));
#endif
return GNUNET_OK; /* not good, but do process rest of message */
}
@@ -226,9 +226,9 @@
GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&msg->senderIdentity.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HELLO advertisement from `%s' for protocol %d received.\n",
- &enc, ntohs (msg->protocol));
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HELLO advertisement from `%s' for protocol %d received.\n",
+ &enc, ntohs (msg->protocol));
#endif
if (ntohs (msg->protocol) == GNUNET_TRANSPORT_PROTOCOL_NUMBER_NAT)
{
@@ -250,9 +250,9 @@
GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&msg->senderIdentity.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HELLO advertisement from `%s' for NAT, no verification
required.\n",
- &enc);
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HELLO advertisement from `%s' for NAT, no verification
required.\n",
+ &enc);
#endif
return GNUNET_OK;
}
@@ -283,25 +283,26 @@
GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&msg->senderIdentity.hashPubKey,
&enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "HELLO advertisement from `%s' for protocol %d updates old
advertisement, no verification required.\n",
- &enc, ntohs (msg->protocol));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HELLO advertisement from `%s' for protocol %d
updates old advertisement, no verification required.\n",
+ &enc, ntohs (msg->protocol));
#endif
return GNUNET_OK;
}
#if DEBUG_ADVERTISING
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HELLO advertisement differs from prior knowledge,"
- " requireing ping-pong confirmation.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HELLO advertisement differs from prior knowledge,"
+ " requireing ping-pong confirmation.\n");
#endif
GNUNET_free (copy);
}
if (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (coreAPI->cfg,
- "GNUNETD",
- "PRIVATE-NETWORK",
- GNUNET_NO))
+ "GNUNETD",
+ "PRIVATE-NETWORK",
+ GNUNET_NO))
{
/* the option 'PRIVATE-NETWORK' can be used
to limit the connections of this peer to
@@ -319,8 +320,8 @@
editing :-). */
#if DEBUG_ADVERTISING
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Private network, discarding unknown advertisements\n");
+ GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Private network, discarding unknown advertisements\n");
#endif
return GNUNET_SYSERR;
}
@@ -348,13 +349,14 @@
hello-ing by ourselves. */
#if DEBUG_ADVERTISING
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Not enough resources to verify HELLO message at this time (%u *
%u < %u * 10)\n",
- (unsigned int) ((now - lasthelloMsg) / GNUNET_CRON_SECONDS),
- (unsigned int) GNUNET_network_monitor_get_limit (coreAPI->
- load_monitor,
-
GNUNET_ND_DOWNLOAD),
- (unsigned int) GNUNET_sizeof_hello (msg));
+ GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Not enough resources to verify HELLO message at this
time (%u * %u < %u * 10)\n",
+ (unsigned int) ((now - lasthelloMsg) /
+ GNUNET_CRON_SECONDS),
+ (unsigned int)
+ GNUNET_network_monitor_get_limit (coreAPI->load_monitor,
+ GNUNET_ND_DOWNLOAD),
+ (unsigned int) GNUNET_sizeof_hello (msg));
#endif
if (stats != NULL)
stats->change (stat_hello_discard, 1);
@@ -374,8 +376,9 @@
GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&msg->senderIdentity.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Failed to connect to `%s'. Verification failed.\n", &enc);
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Failed to connect to `%s'. Verification failed.\n",
+ &enc);
#endif
return GNUNET_SYSERR; /* could not connect */
}
@@ -400,8 +403,8 @@
{
res = GNUNET_SYSERR;
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("Could not send HELLO+PING, ping buffer full.\n"));
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("Could not send HELLO+PING, ping buffer full.\n"));
transport->disconnect (tsession, __FILE__);
if (stats != NULL)
stats->change (stat_hello_ping_busy, 1);
@@ -421,9 +424,9 @@
if (helloEnd <= 0)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Failed to create an advertisement for this peer. Will not send
PING.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Failed to create an advertisement for this peer. Will
not send PING.\n"));
GNUNET_free (buffer);
if (stats != NULL)
stats->change (stat_hello_noselfad, 1);
@@ -433,9 +436,9 @@
GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&msg->senderIdentity.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Failed to connect advertisement for myself. Verification
failed.\n",
- &enc);
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Failed to connect advertisement for myself.
Verification failed.\n",
+ &enc);
#endif
return GNUNET_SYSERR;
}
@@ -456,9 +459,9 @@
GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&msg->senderIdentity.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Failed to transmit advertisement for myself. Verification
failed.\n",
- &enc);
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Failed to transmit advertisement for myself.
Verification failed.\n",
+ &enc);
#endif
res = GNUNET_SYSERR;
}
@@ -508,8 +511,8 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&hi->hashPubKey, &other));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Entering `%s' with target `%s'.\n", __FUNCTION__, &other);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Entering `%s' with target `%s'.\n", __FUNCTION__, &other);
#endif
if (0 == memcmp (hi, coreAPI->myIdentity, sizeof (GNUNET_PeerIdentity)))
return GNUNET_OK; /* never advertise to myself... */
@@ -537,9 +540,10 @@
if (NULL == hello)
{
#if DEBUG_ADVERTISING
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Exit from `%s' (error: `%s' failed).\n",
- __FUNCTION__, "identity2Hello");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Exit from `%s' (error: `%s' failed).\n", __FUNCTION__,
+ "identity2Hello");
#endif
return GNUNET_OK;
}
@@ -549,9 +553,9 @@
{
#if DEBUG_ADVERTISING
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Exit from `%s' (%s error).\n",
- __FUNCTION__, "transportConnect");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Exit from `%s' (%s error).\n",
+ __FUNCTION__, "transportConnect");
#endif
return GNUNET_OK; /* could not connect */
}
@@ -563,7 +567,8 @@
transport->disconnect (tsession, __FILE__);
#if DEBUG_ADVERTISING
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "Exit from
%s.\n", __FUNCTION__);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Exit from %s.\n", __FUNCTION__);
#endif
return GNUNET_OK;
}
@@ -592,18 +597,18 @@
return;
#if DEBUG_ADVERTISING
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("Advertising my transport %d to selected peers.\n"),
- tapi->protocolNumber);
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_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)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Announcing ourselves pointless: "
- "no other peers are known to us so far.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Announcing ourselves pointless: "
+ "no other peers are known to us so far.\n"));
GNUNET_free (sd.m);
return; /* no point in trying... */
}
@@ -691,9 +696,9 @@
GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&peer->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Removing HELLO from peer `%s' (expired %ds ago).\n",
- &enc, now - ntohl (hello->expirationTime));
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Removing HELLO from peer `%s' (expired %ds ago).\n",
+ &enc, now - ntohl (hello->expirationTime));
#endif
identity->delHostFromKnown (peer, protocol);
GNUNET_free (hello);
@@ -760,7 +765,8 @@
*/
static int
phelloHandler (const GNUNET_PeerIdentity * sender,
- const GNUNET_MessageHeader * message, GNUNET_TSession * session)
+ const GNUNET_MessageHeader * message,
+ GNUNET_TSession * session)
{
receivedhello (sender, message);
return GNUNET_OK;
@@ -782,9 +788,9 @@
if (ACJ_ANNOUNCE == (activeCronJobs & ACJ_ANNOUNCE))
{
if (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg,
- "NETWORK",
-
"DISABLE-ADVERTISEMENTS",
- GNUNET_NO))
+ "NETWORK",
+
"DISABLE-ADVERTISEMENTS",
+ GNUNET_NO))
GNUNET_cron_del_job (coreAPI->cron,
&broadcasthello, HELLO_BROADCAST_FREQUENCY,
NULL);
@@ -793,9 +799,9 @@
else
{
if (GNUNET_YES != GNUNET_GC_get_configuration_value_yesno (cfg,
- "NETWORK",
-
"DISABLE-ADVERTISEMENTS",
- GNUNET_NO))
+ "NETWORK",
+
"DISABLE-ADVERTISEMENTS",
+ GNUNET_NO))
GNUNET_cron_add_job (coreAPI->cron,
&broadcasthello,
15 * GNUNET_CRON_SECONDS,
@@ -805,9 +811,9 @@
if (ACJ_FORWARD == (activeCronJobs & ACJ_FORWARD))
{
if (GNUNET_YES != GNUNET_GC_get_configuration_value_yesno (cfg,
- "NETWORK",
- "HELLOEXCHANGE",
- GNUNET_YES))
+ "NETWORK",
+
"HELLOEXCHANGE",
+ GNUNET_YES))
{
GNUNET_cron_del_job (coreAPI->cron, &forwardhello,
HELLO_FORWARD_FREQUENCY, NULL); /* seven minutes: exchange */
}
@@ -816,9 +822,9 @@
else
{
if (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg,
- "NETWORK",
- "HELLOEXCHANGE",
- GNUNET_YES))
+ "NETWORK",
+
"HELLOEXCHANGE",
+ GNUNET_YES))
{
GNUNET_cron_add_job (coreAPI->cron,
&forwardhello,
@@ -917,24 +923,26 @@
}
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("`%s' registering handler %d (plaintext and ciphertext)\n"),
- "advertising", GNUNET_P2P_PROTO_HELLO);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _
+ ("`%s' registering handler %d (plaintext and ciphertext)\n"),
+ "advertising", GNUNET_P2P_PROTO_HELLO);
capi->registerHandler (GNUNET_P2P_PROTO_HELLO, &ehelloHandler);
capi->registerPlaintextHandler (GNUNET_P2P_PROTO_HELLO, &phelloHandler);
if (0 != GNUNET_GC_attach_change_listener (capi->cfg,
- &configurationUpdateCallback, NULL))
+ &configurationUpdateCallback,
+ NULL))
GNUNET_GE_BREAK (capi->ectx, 0);
startBootstrap (capi);
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "advertising",
- _
- ("ensures that this peer
is known by other"
- " peers and discovers
other peers")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+
"advertising",
+ _
+ ("ensures
that this peer is known by other"
+ " peers
and discovers other peers")));
return GNUNET_OK;
}
@@ -946,7 +954,7 @@
{
stopBootstrap ();
GNUNET_GC_detach_change_listener (coreAPI->cfg,
- &configurationUpdateCallback, NULL);
+ &configurationUpdateCallback, NULL);
if (ACJ_ANNOUNCE == (activeCronJobs & ACJ_ANNOUNCE))
{
GNUNET_cron_del_job (coreAPI->cron,
@@ -959,7 +967,8 @@
activeCronJobs -= ACJ_FORWARD;
}
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_HELLO, &ehelloHandler);
- coreAPI->unregisterPlaintextHandler (GNUNET_P2P_PROTO_HELLO, &phelloHandler);
+ coreAPI->unregisterPlaintextHandler (GNUNET_P2P_PROTO_HELLO,
+ &phelloHandler);
coreAPI->releaseService (transport);
transport = NULL;
coreAPI->releaseService (identity);
Modified: GNUnet/src/applications/advertising/advertising_test.c
===================================================================
--- GNUnet/src/applications/advertising/advertising_test.c 2007-11-25
12:06:33 UTC (rev 5760)
+++ GNUnet/src/applications/advertising/advertising_test.c 2007-11-25
12:07:29 UTC (rev 5761)
@@ -119,7 +119,8 @@
{
GNUNET_snprintf (buf, 128, "localhost:%u", 2087 + i * 10);
GNUNET_GC_set_configuration_value_string (cfg,
- ectx, "NETWORK", "HOST", buf);
+ ectx, "NETWORK", "HOST",
+ buf);
sock = GNUNET_client_connection_create (NULL, cfg);
GNUNET_STATS_get_statistics (NULL, sock, &countConnections, &have);
GNUNET_client_connection_destroy (sock);
Modified: GNUnet/src/applications/advertising/bootstrap.c
===================================================================
--- GNUnet/src/applications/advertising/bootstrap.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/advertising/bootstrap.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -79,9 +79,9 @@
GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, hcq->hellosCount);
#if DEBUG_BOOTSTRAP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "%s chose hello %d of %d\n",
- __FUNCTION__, rndidx, hcq->hellosCount);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "%s chose hello %d of %d\n",
+ __FUNCTION__, rndidx, hcq->hellosCount);
#endif
msg = (GNUNET_MessageHello *) hcq->hellos[rndidx];
hcq->hellos[rndidx] = hcq->hellos[hcq->hellosCount - 1];
@@ -205,8 +205,9 @@
if (GNUNET_YES == hlc.do_shutdown)
break;
#if DEBUG_BOOTSTRAP
- GNUNET_GE_LOG (coreAPI->ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Starting bootstrap.\n");
+ GNUNET_GE_LOG (coreAPI->ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Starting bootstrap.\n");
#endif
hlc.hellosLen = 0;
hlc.hellosCount = 0;
Modified: GNUnet/src/applications/bootstrap_http/http.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/http.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/bootstrap_http/http.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -105,9 +105,10 @@
(GNUNET_sizeof_hello (hello) >= GNUNET_MAX_BUFFER_SIZE))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Bootstrap data obtained from `%s' is invalid.\n"),
- bctx->url);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _("Bootstrap data obtained from `%s' is invalid.\n"),
+ bctx->url);
return 0; /* Error: invalid format! */
}
if (stats != NULL)
@@ -168,13 +169,13 @@
}
url = NULL;
if (0 != GNUNET_GC_get_configuration_value_string (coreAPI->cfg,
- "GNUNETD",
- "HOSTLISTURL", "", &url))
+ "GNUNETD",
+ "HOSTLISTURL", "", &url))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("No hostlist URL specified in configuration, will not
bootstrap.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("No hostlist URL specified in configuration, will not
bootstrap.\n"));
GNUNET_free (url);
curl_easy_cleanup (curl);
return;
@@ -214,12 +215,14 @@
pos--;
}
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER, _("Bootstrapping
using `%s'.\n"), url);
+ GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Bootstrapping using `%s'.\n"), url);
bctx.url = url;
bctx.total = 0;
proxy = NULL;
GNUNET_GC_get_configuration_value_string (coreAPI->cfg,
- "GNUNETD", "HTTP-PROXY", "", &proxy);
+ "GNUNETD", "HTTP-PROXY", "",
+ &proxy);
CURL_EASY_SETOPT (curl, CURLOPT_WRITEFUNCTION, &downloadHostlistHelper);
CURL_EASY_SETOPT (curl, CURLOPT_WRITEDATA, &bctx);
if (ret != CURLE_OK)
@@ -227,8 +230,8 @@
CURL_EASY_SETOPT (curl, CURLOPT_FAILONERROR, 1);
CURL_EASY_SETOPT (curl, CURLOPT_URL, &url[pos]);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Trying to download hostlist from `%s'\n"), &url[pos]);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Trying to download hostlist from `%s'\n"), &url[pos]);
if (strlen (proxy) > 0)
CURL_EASY_SETOPT (curl, CURLOPT_PROXY, proxy);
CURL_EASY_SETOPT (curl, CURLOPT_BUFFERSIZE, 1024); /* a bit more than one
HELLO */
@@ -250,10 +253,10 @@
if (mret != CURLM_OK)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_add_handle",
- __FILE__, __LINE__, curl_multi_strerror (mret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
+ "curl_multi_add_handle", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
goto cleanup;
}
while ((GNUNET_YES == termTest (targ))
@@ -267,10 +270,10 @@
if (mret != CURLM_OK)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_fdset",
- __FILE__, __LINE__, curl_multi_strerror (mret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
+ "curl_multi_fdset", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
goto cleanup;
}
/* use timeout of 1s in case that SELECT is not interrupted by
@@ -298,12 +301,12 @@
case CURLMSG_DONE:
if (msg->data.result != CURLE_OK)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_perform",
- __FILE__,
- __LINE__,
- curl_easy_strerror (msg->data.result));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("%s failed at %s:%d: `%s'\n"),
+ "curl_multi_perform", __FILE__,
+ __LINE__,
+ curl_easy_strerror (msg->data.result));
break;
default:
break;
@@ -318,10 +321,10 @@
if ((mret != CURLM_OK) && (mret != CURLM_CALL_MULTI_PERFORM))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_perform",
- __FILE__, __LINE__, curl_multi_strerror (mret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
+ "curl_multi_perform", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
goto cleanup;
}
if (running == 0)
@@ -331,34 +334,34 @@
if (mret != CURLM_OK)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_remove_handle",
- __FILE__, __LINE__, curl_multi_strerror (mret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
+ "curl_multi_remove_handle", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
goto cleanup;
}
#else
ret = curl_easy_perform (curl);
if (ret != CURLE_OK)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_easy_perform",
- __FILE__, __LINE__, curl_easy_strerror (ret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
+ "curl_easy_perform", __FILE__, __LINE__,
+ curl_easy_strerror (ret));
#endif
curl_easy_cleanup (curl);
#if USE_MULTI
mret = curl_multi_cleanup (multi);
if (mret != CURLM_OK)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_cleanup",
- __FILE__, __LINE__, curl_multi_strerror (mret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
+ "curl_multi_cleanup", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
#endif
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Downloaded %llu bytes from `%s'.\n"), bctx.total, url);
+ GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Downloaded %llu bytes from `%s'.\n"), bctx.total, url);
GNUNET_free (url);
GNUNET_free (proxy);
curl_global_cleanup ();
Modified: GNUnet/src/applications/bootstrap_http/httptest.c
===================================================================
--- GNUnet/src/applications/bootstrap_http/httptest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/bootstrap_http/httptest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -34,7 +34,8 @@
void release_module_bootstrap ();
-GNUNET_Bootstrap_ServiceAPI *provide_module_bootstrap
(GNUNET_CoreAPIForPlugins * capi);
+GNUNET_Bootstrap_ServiceAPI
+ *provide_module_bootstrap (GNUNET_CoreAPIForPlugins * capi);
static void *
rs (const char *name)
@@ -89,10 +90,10 @@
count = 0;
cfg = GNUNET_GC_create ();
GNUNET_GC_set_configuration_value_string (cfg,
- NULL,
- "GNUNETD",
- "HOSTLISTURL",
- "http://gnunet.org/hostlist";);
+ NULL,
+ "GNUNETD",
+ "HOSTLISTURL",
+ "http://gnunet.org/hostlist";);
memset (&capi, 0, sizeof (GNUNET_CoreAPIForPlugins));
capi.cfg = cfg;
capi.requestService = &rs;
Modified: GNUnet/src/applications/chat/chat.c
===================================================================
--- GNUnet/src/applications/chat/chat.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/applications/chat/chat.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -70,7 +70,8 @@
bcc.message = message;
bcc.prio = prio;
bcc.delay = delay;
- coreAPI->forAllConnectedNodes ((GNUNET_NodeIteratorCallback) bccHelper,
&bcc);
+ coreAPI->forAllConnectedNodes ((GNUNET_NodeIteratorCallback) bccHelper,
+ &bcc);
}
static int
@@ -85,8 +86,9 @@
if (ntohs (message->size) != sizeof (P2P_chat_MESSAGE))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Message received from peer is invalid.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Message received from peer is invalid.\n"));
return GNUNET_SYSERR;
}
pmsg = (P2P_chat_MESSAGE *) message;
@@ -122,7 +124,8 @@
}
static int
-csHandleChatRequest (GNUNET_ClientHandle client, const
CS_MESSAGNUNET_GE_HEADER * message)
+csHandleChatRequest (GNUNET_ClientHandle client,
+ const CS_MESSAGNUNET_GE_HEADER * message)
{
int i;
int j;
@@ -132,8 +135,9 @@
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"));
+ 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 */
}
pmsg = (P2P_chat_MESSAGE *) message;
@@ -152,14 +156,16 @@
if (j == -1)
{
if (clientCount == MAX_CLIENTS)
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Maximum number of chat clients reached.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Maximum number of chat clients reached.\n"));
else
{
clients[clientCount++] = client;
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- _("Now %d of %d chat clients at this node.\n"),
- clientCount, MAX_CLIENTS);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("Now %d of %d chat clients at this node.\n"),
+ clientCount, MAX_CLIENTS);
}
}
/* forward to all other nodes in the network */
@@ -177,8 +183,9 @@
for (i = 0; i < clientCount; i++)
if (clients[i] == client)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Chat client exits.\n");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Chat client exits.\n");
clients[i] = clients[--clientCount];
break;
}
@@ -195,13 +202,14 @@
{
int ok = GNUNET_OK;
- GNUNET_GE_ASSERT (ectx, sizeof (P2P_chat_MESSAGE) == sizeof
(CS_chat_MESSAGE));
+ GNUNET_GE_ASSERT (ectx,
+ sizeof (P2P_chat_MESSAGE) == sizeof (CS_chat_MESSAGE));
GNUNET_mutex_create (&chatMutex);
clientCount = 0;
coreAPI = capi;
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("`%s' registering handlers %d and %d\n"),
- "chat", GNUNET_P2P_PROTO_CHAT_MSG, GNUNET_CS_PROTO_CHAT_MSG);
+ _("`%s' registering handlers %d and %d\n"),
+ "chat", GNUNET_P2P_PROTO_CHAT_MSG, GNUNET_CS_PROTO_CHAT_MSG);
if (GNUNET_SYSERR ==
capi->registerHandler (GNUNET_P2P_PROTO_CHAT_MSG, &handleChatMSG))
@@ -214,12 +222,12 @@
ok = GNUNET_SYSERR;
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "chat",
- _
- ("enables P2P-chat
(incomplete)")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "chat",
+ _
+ ("enables
P2P-chat (incomplete)")));
return ok;
}
@@ -228,7 +236,8 @@
{
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_CHAT_MSG, &handleChatMSG);
coreAPI->unregisterClientExitHandler (&chatClientExitHandler);
- coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_CHAT_MSG,
&csHandleChatRequest);
+ coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_CHAT_MSG,
+ &csHandleChatRequest);
GNUNET_mutex_destroy (&chatMutex);
coreAPI = NULL;
}
Modified: GNUnet/src/applications/chat/gnunet-chat.c
===================================================================
--- GNUnet/src/applications/chat/gnunet-chat.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/chat/gnunet-chat.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -51,7 +51,7 @@
{'r', "room", "NAME",
gettext_noop ("set the chat room to join (requred)"),
1, &GNUNET_getopt_configure_set_string, &roomname},
- COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
GNUNET_COMMAND_LINE_OPTION_END,
};
Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/datastore/datastore.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -116,10 +116,12 @@
GNUNET_EncName enc;
IF_GELOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (query,
- &enc));
- GNUNET_GE_LOG (coreAPI->ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Datastore availability pre-test failed for `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ GNUNET_hash_to_enc (query, &enc));
+ GNUNET_GE_LOG (coreAPI->ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Datastore availability pre-test failed for `%s'.\n",
+ &enc);
#endif
if (stats != NULL)
stats->change (stat_filtered, 1);
@@ -160,11 +162,12 @@
if (!testAvailable (query))
{
IF_GELOG (coreAPI->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
GNUNET_hash_to_enc (query,
- &enc));
- GNUNET_GE_LOG (coreAPI->ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Availability test failed for `%s' at %s:%d.\n"), &enc,
- __FILE__, __LINE__);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ GNUNET_hash_to_enc (query, &enc));
+ GNUNET_GE_LOG (coreAPI->ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Availability test failed for `%s' at %s:%d.\n"), &enc,
+ __FILE__, __LINE__);
return 0;
}
ok = sq->get (query, ntohl (value->type), &deleteCB, (void *) value);
@@ -195,17 +198,17 @@
if (GNUNET_ntohll (value->expirationTime) < GNUNET_get_time ())
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received content for put already expired!\n");
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received content for put already expired!\n");
return GNUNET_NO;
}
if ((available < ntohl (value->size)) &&
(minPriority > ntohl (value->prio) + comp_priority ()))
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Datastore full (%llu/%llu) and content priority too low to kick
out other content. Refusing put.\n",
- sq->getSize (), quota);
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Datastore full (%llu/%llu) and content priority too low
to kick out other content. Refusing put.\n",
+ sq->getSize (), quota);
return GNUNET_NO; /* new content has such a low priority that
we should not even bother! */
}
@@ -236,7 +239,8 @@
static int
checkExists (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * value, void *cls, unsigned long
long uid)
+ const GNUNET_DatastoreValue * value, void *cls,
+ unsigned long long uid)
{
CE *ce = cls;
@@ -291,10 +295,10 @@
comp_prio = comp_priority ();
#if DEBUG_DATASTORE
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Migration: available %llu (need %u), min priority %u have %u\n",
- available, ntohl (value->size), minPriority,
- ntohl (value->prio) + comp_prio);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Migration: available %llu (need %u), min priority %u have
%u\n",
+ available, ntohl (value->size), minPriority,
+ ntohl (value->prio) + comp_prio);
#endif
/* check if we have enough space / priority */
if ((available < ntohl (value->size)) &&
@@ -360,9 +364,11 @@
available = quota - sq->getSize ();
if ((available < 0) || (available < MIN_GNUNET_free))
{
- sq->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
&freeSpaceExpired, NULL);
+ sq->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
+ &freeSpaceExpired, NULL);
if ((available < 0) || (available < MIN_GNUNET_free))
- sq->iterateLowPriority (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
&freeSpaceLow, NULL);
+ sq->iterateLowPriority (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
+ &freeSpaceLow, NULL);
}
else
{
@@ -384,11 +390,12 @@
char *fsdir;
if (-1 == GNUNET_GC_get_configuration_value_number (capi->cfg,
- "FS",
- "QUOTA",
- 0,
- ((unsigned long long) -1) /
- 1024 / 1024, 1024, &lquota))
+ "FS",
+ "QUOTA",
+ 0,
+ ((unsigned long long)
+ -1) / 1024 / 1024,
+ 1024, &lquota))
{
GNUNET_GE_BREAK (capi->ectx, 0);
return NULL; /* OOPS */
@@ -417,8 +424,10 @@
else
{
GNUNET_GE_LOG (capi->ectx,
- GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_ERROR |
GNUNET_GE_BULK,
- _("Failed to load state service. Trying to do without.\n"));
+ GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_ERROR |
+ GNUNET_GE_BULK,
+ _
+ ("Failed to load state service. Trying to do
without.\n"));
}
sq = capi->requestService ("sqstore");
if (sq == NULL)
@@ -447,10 +456,10 @@
}
fsdir = NULL;
GNUNET_GC_get_configuration_value_filename (capi->cfg,
- "FS",
- "DIR",
- GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
"/data/fs/",
- &fsdir);
+ "FS",
+ "DIR",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
+ "/data/fs/", &fsdir);
/* just in case dir does not exist ... */
GNUNET_disk_directory_create (NULL, fsdir);
if (0 == STAT (fsdir, &sbuf))
@@ -524,11 +533,12 @@
GNUNET_State_ServiceAPI *state;
if (-1 == GNUNET_GC_get_configuration_value_number (uapi->cfg,
- "FS",
- "QUOTA",
- 0,
- ((unsigned long long) -1) /
- 1024 / 1024, 1024, "a))
+ "FS",
+ "QUOTA",
+ 0,
+ ((unsigned long long)
+ -1) / 1024 / 1024,
+ 1024, "a))
return; /* OOPS */
state = uapi->requestService ("state");
lq = NULL;
@@ -555,9 +565,10 @@
else
{
GNUNET_GE_LOG (uapi->ectx,
- GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_ERROR |
GNUNET_GE_BULK,
- _
- ("Failed to load sqstore service. Check your
configuration!\n"));
+ GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_ERROR |
+ GNUNET_GE_BULK,
+ _
+ ("Failed to load sqstore service. Check your
configuration!\n"));
}
sq = NULL;
doneFilters ();
Modified: GNUnet/src/applications/datastore/filter.c
===================================================================
--- GNUnet/src/applications/datastore/filter.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/datastore/filter.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -36,17 +36,18 @@
static struct GNUNET_BloomFilter *filter;
static char *
-getFilterName (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+getFilterName (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *fn;
char *bf;
fn = NULL;
if (-1 == GNUNET_GC_get_configuration_value_filename (cfg,
- "FS",
- "DIR",
-
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY "/fs",
- &fn))
+ "FS",
+ "DIR",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
+ "/fs", &fn))
return NULL;
if (GNUNET_OK != GNUNET_disk_directory_create (ectx, fn))
{
@@ -61,18 +62,20 @@
}
int
-initFilters (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+initFilters (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *bf;
unsigned long long quota; /* in kb */
unsigned int bf_size;
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "FS",
- "QUOTA",
- 0,
- ((unsigned long long) -1) /
- 1024 / 1024, 1024, "a))
+ "FS",
+ "QUOTA",
+ 0,
+ ((unsigned long long)
+ -1) / 1024 / 1024,
+ 1024, "a))
return GNUNET_SYSERR;
quota *= 1024;
bf_size = quota / 32; /* 8 bit per entry, 1 bit per 32 kb in DB */
@@ -94,7 +97,8 @@
}
void
-deleteFilter (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+deleteFilter (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *fn;
Modified: GNUnet/src/applications/datastore/filter.h
===================================================================
--- GNUnet/src/applications/datastore/filter.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/datastore/filter.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -28,11 +28,13 @@
#include "gnunet_util.h"
-int initFilters (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg);
+int initFilters (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
void doneFilters (void);
-void deleteFilter (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg);
+void deleteFilter (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
void makeAvailable (const GNUNET_HashCode * key);
Modified: GNUnet/src/applications/datastore/prefetch.c
===================================================================
--- GNUnet/src/applications/datastore/prefetch.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/datastore/prefetch.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -65,7 +65,8 @@
static int
acquire (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * value, void *closure, unsigned long
long uid)
+ const GNUNET_DatastoreValue * value, void *closure,
+ unsigned long long uid)
{
if (doneSignal)
return GNUNET_SYSERR;
@@ -131,7 +132,8 @@
void
initPrefetch (struct GNUNET_GE_Context *e,
- struct GNUNET_GC_Configuration *c, GNUNET_SQstore_ServiceAPI * s)
+ struct GNUNET_GC_Configuration *c,
+ GNUNET_SQstore_ServiceAPI * s)
{
ectx = e;
cfg = c;
@@ -142,8 +144,8 @@
gather_thread = GNUNET_thread_create (&rcbAcquire, NULL, 64 * 1024);
if (gather_thread == NULL)
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- "pthread_create");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER
+ | GNUNET_GE_IMMEDIATE, "pthread_create");
}
void
Modified: GNUnet/src/applications/datastore/prefetch.h
===================================================================
--- GNUnet/src/applications/datastore/prefetch.h 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/datastore/prefetch.h 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -34,7 +34,8 @@
* Initialize the migration module.
*/
void initPrefetch (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
GNUNET_SQstore_ServiceAPI * sq);
+ struct GNUNET_GC_Configuration *cfg,
+ GNUNET_SQstore_ServiceAPI * sq);
void donePrefetch (void);
Modified: GNUnet/src/applications/dht/module/cs.c
===================================================================
--- GNUnet/src/applications/dht/module/cs.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/dht/module/cs.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -67,7 +67,8 @@
* CS handler for inserting <key,value>-pair into DHT-table.
*/
static int
-csPut (struct GNUNET_ClientHandle *client, const GNUNET_MessageHeader *
message)
+csPut (struct GNUNET_ClientHandle *client,
+ const GNUNET_MessageHeader * message)
{
const CS_dht_request_put_MESSAGE *req;
unsigned int size;
@@ -82,9 +83,9 @@
GNUNET_GE_ASSERT (NULL, size < GNUNET_MAX_BUFFER_SIZE);
#if DEBUG_CS
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' at %s:%d processes put '%.*s'\n",
- __FUNCTION__, __FILE__, __LINE__, size, &req[1]);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "`%s' at %s:%d processes put '%.*s'\n",
+ __FUNCTION__, __FILE__, __LINE__, size, &req[1]);
#endif
dhtAPI->put (&req->key, ntohl (req->type), size, GNUNET_ntohll (req->expire)
+ GNUNET_get_time (), /* convert to absolute time */
(const char *) &req[1]);
@@ -99,7 +100,8 @@
CS_dht_request_put_MESSAGE *msg;
size_t n;
- GNUNET_GE_ASSERT (NULL, ntohl (value->size) >= sizeof
(GNUNET_DataContainer));
+ GNUNET_GE_ASSERT (NULL,
+ ntohl (value->size) >= sizeof (GNUNET_DataContainer));
n =
sizeof (CS_dht_request_put_MESSAGE) + ntohl (value->size) -
sizeof (GNUNET_DataContainer);
@@ -113,22 +115,25 @@
msg->header.type = htons (GNUNET_CS_PROTO_DHT_REQUEST_PUT);
msg->expire = 0; /* unknown */
msg->key = *key;
- memcpy (&msg[1], &value[1], ntohl (value->size) - sizeof
(GNUNET_DataContainer));
+ memcpy (&msg[1], &value[1],
+ ntohl (value->size) - sizeof (GNUNET_DataContainer));
#if DEBUG_CS
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' at %s:%d processes reply '%.*s'\n",
- __FUNCTION__,
- __FILE__,
- __LINE__, ntohl (value->size) - sizeof (GNUNET_DataContainer),
&value[1]);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "`%s' at %s:%d processes reply '%.*s'\n",
+ __FUNCTION__,
+ __FILE__,
+ __LINE__,
+ ntohl (value->size) - sizeof (GNUNET_DataContainer),
+ &value[1]);
#endif
if (GNUNET_OK !=
coreAPI->sendToClient (record->client, &msg->header, GNUNET_YES))
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
- _("`%s' failed. Terminating connection to client.\n"),
- "sendToClient");
+ GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
+ _("`%s' failed. Terminating connection to client.\n"),
+ "sendToClient");
coreAPI->terminateClientConnection (record->client);
}
GNUNET_free (msg);
@@ -164,7 +169,8 @@
* CS handler for inserting <key,value>-pair into DHT-table.
*/
static int
-csGet (struct GNUNET_ClientHandle *client, const GNUNET_MessageHeader *
message)
+csGet (struct GNUNET_ClientHandle *client,
+ const GNUNET_MessageHeader * message)
{
const CS_dht_request_get_MESSAGE *get;
DHT_CLIENT_GET_RECORD *cpc;
@@ -176,8 +182,9 @@
}
#if DEBUG_CS
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' at %s:%d processes get\n", __FUNCTION__, __FILE__, __LINE__);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "`%s' at %s:%d processes get\n", __FUNCTION__, __FILE__,
+ __LINE__);
#endif
get = (const CS_dht_request_get_MESSAGE *) message;
cpc = GNUNET_malloc (sizeof (DHT_CLIENT_GET_RECORD));
@@ -231,26 +238,27 @@
return GNUNET_SYSERR;
coreAPI = capi;
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("`%s' registering client handlers: %d %d\n"),
- "dht", GNUNET_CS_PROTO_DHT_REQUEST_PUT,
GNUNET_CS_PROTO_DHT_REQUEST_GET);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("`%s' registering client handlers: %d %d\n"),
+ "dht", GNUNET_CS_PROTO_DHT_REQUEST_PUT,
+ GNUNET_CS_PROTO_DHT_REQUEST_GET);
status = GNUNET_OK;
lock = GNUNET_mutex_create (GNUNET_NO);
- if (GNUNET_SYSERR == capi->registerClientHandler
(GNUNET_CS_PROTO_DHT_REQUEST_PUT,
- &csPut))
+ if (GNUNET_SYSERR ==
+ capi->registerClientHandler (GNUNET_CS_PROTO_DHT_REQUEST_PUT, &csPut))
status = GNUNET_SYSERR;
- if (GNUNET_SYSERR == capi->registerClientHandler
(GNUNET_CS_PROTO_DHT_REQUEST_GET,
- &csGet))
+ if (GNUNET_SYSERR ==
+ capi->registerClientHandler (GNUNET_CS_PROTO_DHT_REQUEST_GET, &csGet))
status = GNUNET_SYSERR;
if (GNUNET_SYSERR == capi->registerClientExitHandler (&csClientExit))
status = GNUNET_SYSERR;
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "dht",
- gettext_noop
- ("Enables efficient
non-anonymous routing")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "dht",
+ gettext_noop
+ ("Enables
efficient non-anonymous routing")));
return status;
}
@@ -263,12 +271,16 @@
int status;
status = GNUNET_OK;
- GNUNET_GE_LOG (coreAPI->ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER, "DHT: shutdown\n");
- if (GNUNET_OK != coreAPI->unregisterClientHandler
(GNUNET_CS_PROTO_DHT_REQUEST_PUT,
- &csPut))
+ GNUNET_GE_LOG (coreAPI->ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "DHT: shutdown\n");
+ if (GNUNET_OK !=
+ coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_DHT_REQUEST_PUT,
+ &csPut))
status = GNUNET_SYSERR;
- if (GNUNET_OK != coreAPI->unregisterClientHandler
(GNUNET_CS_PROTO_DHT_REQUEST_GET,
- &csGet))
+ if (GNUNET_OK !=
+ coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_DHT_REQUEST_GET,
+ &csGet))
status = GNUNET_SYSERR;
if (GNUNET_OK != coreAPI->unregisterClientExitHandler (&csClientExit))
status = GNUNET_SYSERR;
Modified: GNUnet/src/applications/dht/module/dstore.c
===================================================================
--- GNUnet/src/applications/dht/module/dstore.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/dht/module/dstore.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -58,9 +58,10 @@
{
#if DEBUG_DSTORE
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Content already expired (%llu < %llu), will not keep.\n",
- discard_time, GNUNET_get_time ());
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Content already expired (%llu < %llu), will not keep.\n",
+ discard_time, GNUNET_get_time ());
#endif
return;
}
Modified: GNUnet/src/applications/dht/module/dstore.h
===================================================================
--- GNUnet/src/applications/dht/module/dstore.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/dht/module/dstore.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -35,7 +35,8 @@
* @return total number of results found
*/
int dht_store_get (const GNUNET_HashCode * key,
- unsigned int type, GNUNET_ResultProcessor handler, void
*cls);
+ unsigned int type, GNUNET_ResultProcessor handler,
+ void *cls);
/**
* Store the given data in the local datastore.
Modified: GNUnet/src/applications/dht/module/routing.c
===================================================================
--- GNUnet/src/applications/dht/module/routing.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/dht/module/routing.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -279,8 +279,9 @@
{
#if DEBUG_ROUTING
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- "Routing result to other peer\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Routing result to other peer\n");
#endif
coreAPI->unicast (&pos->source, &result->header, 0, /*
FIXME: priority */
5 * GNUNET_CRON_SECONDS); /* FIXME */
@@ -291,8 +292,9 @@
{
#if DEBUG_ROUTING
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- "Routing result to local client\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Routing result to local client\n");
#endif
pos->receiver (key, type, size, data, pos->receiver_closure);
if (stats != NULL)
@@ -304,9 +306,9 @@
GNUNET_mutex_unlock (lock);
#if DEBUG_ROUTING
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Routed result to %u out of %u pending requests\n",
- routed, tracked);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "Routed result to %u out of %u pending requests\n",
+ routed, tracked);
#endif
if (cls == NULL)
GNUNET_free (result);
@@ -317,7 +319,8 @@
*/
static int
addRoute (const GNUNET_PeerIdentity * sender,
- GNUNET_ResultProcessor handler, void *cls, const DHT_GET_MESSAGE *
get)
+ GNUNET_ResultProcessor handler, void *cls,
+ const DHT_GET_MESSAGE * get)
{
DHTQueryRecord *q;
unsigned int i;
@@ -399,8 +402,8 @@
pos->receiver_closure = cls;
#if DEBUG_ROUTING
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Tracking request in slot %u\n", rt_pos);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "Tracking request in slot %u\n", rt_pos);
#endif
rt_pos = (rt_pos + 1) % rt_size;
GNUNET_mutex_unlock (lock);
@@ -442,8 +445,8 @@
#if DEBUG_ROUTING
GNUNET_hash_to_enc (&get->key, &enc);
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Received DHT GET for key `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "Received DHT GET for key `%s'.\n", &enc);
#endif
if (stats != NULL)
stats->change (stat_get_requests_received, 1);
@@ -454,9 +457,10 @@
{
#if DEBUG_ROUTING
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Found %d results locally, will not route GET any further\n",
- total);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Found %d results locally, will not route GET any
further\n",
+ total);
#endif
return GNUNET_OK;
}
@@ -521,8 +525,8 @@
#if DEBUG_ROUTING
GNUNET_hash_to_enc (&put->key, &enc);
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Received DHT PUT for key `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "Received DHT PUT for key `%s'.\n", &enc);
#endif
store = 0;
for (i = 0; i < PUT_TRIES; i++)
@@ -545,11 +549,12 @@
now = GNUNET_get_time ();
#if DEBUG_ROUTING
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Decided to cache data `%.*s' locally until %llu (for %llu
ms)\n",
- ntohs (put->header.size) - sizeof (DHT_PUT_MESSAGE),
- &put[1], GNUNET_ntohll (put->timeout) + now,
- GNUNET_ntohll (put->timeout));
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Decided to cache data `%.*s' locally until %llu (for
%llu ms)\n",
+ ntohs (put->header.size) - sizeof (DHT_PUT_MESSAGE),
+ &put[1], GNUNET_ntohll (put->timeout) + now,
+ GNUNET_ntohll (put->timeout));
#endif
dht_store_put (ntohl (put->type),
&put->key,
@@ -561,9 +566,11 @@
{
#if DEBUG_ROUTING
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Decided NOT to cache data `%.*s' locally\n",
- ntohs (put->header.size) - sizeof (DHT_PUT_MESSAGE), &put[1]);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Decided NOT to cache data `%.*s' locally\n",
+ ntohs (put->header.size) - sizeof (DHT_PUT_MESSAGE),
+ &put[1]);
#endif
}
return GNUNET_OK;
@@ -592,8 +599,8 @@
#if DEBUG_ROUTING
GNUNET_hash_to_enc (&result->key, &enc);
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Received DHT RESULT for key `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "Received DHT RESULT for key `%s'.\n", &enc);
#endif
routeResult (&result->key,
ntohl (result->type),
@@ -728,9 +735,9 @@
coreAPI = capi;
rts = 65536;
GNUNET_GC_get_configuration_value_number (coreAPI->cfg,
- "DHT",
- "TABLESIZE",
- 128, 1024 * 1024, 1024, &rts);
+ "DHT",
+ "TABLESIZE",
+ 128, 1024 * 1024, 1024, &rts);
GNUNET_array_grow (records, rt_size, rts);
lock = GNUNET_mutex_create (GNUNET_NO);
stats = capi->requestService ("stats");
@@ -748,9 +755,10 @@
stats->create (gettext_noop ("# dht results received"));
}
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("`%s' registering p2p handlers: %d %d %d\n"),
- "dht", GNUNET_P2P_PROTO_DHT_GET, GNUNET_P2P_PROTO_DHT_PUT,
GNUNET_P2P_PROTO_DHT_RESULT);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("`%s' registering p2p handlers: %d %d %d\n"),
+ "dht", GNUNET_P2P_PROTO_DHT_GET, GNUNET_P2P_PROTO_DHT_PUT,
+ GNUNET_P2P_PROTO_DHT_RESULT);
coreAPI->registerHandler (GNUNET_P2P_PROTO_DHT_GET, &handleGet);
coreAPI->registerHandler (GNUNET_P2P_PROTO_DHT_PUT, &handlePut);
coreAPI->registerHandler (GNUNET_P2P_PROTO_DHT_RESULT, &handleResult);
Modified: GNUnet/src/applications/dht/module/routing.h
===================================================================
--- GNUnet/src/applications/dht/module/routing.h 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/dht/module/routing.h 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -36,14 +36,16 @@
* Start a DHT get operation.
*/
void dht_get_start (const GNUNET_HashCode * key,
- unsigned int type, GNUNET_ResultProcessor handler, void
*cls);
+ unsigned int type, GNUNET_ResultProcessor handler,
+ void *cls);
/**
* Stop a DHT get operation (prevents calls to
* the given iterator).
*/
void dht_get_stop (const GNUNET_HashCode * key,
- unsigned int type, GNUNET_ResultProcessor handler, void
*cls);
+ unsigned int type, GNUNET_ResultProcessor handler,
+ void *cls);
/**
* Perform a DHT put operation. Note that PUT operations always
Modified: GNUnet/src/applications/dht/module/service.c
===================================================================
--- GNUnet/src/applications/dht/module/service.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/dht/module/service.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -122,7 +122,8 @@
GNUNET_CronTime timeout,
GNUNET_DataProcessor callback,
void *cls,
- GNUNET_DHT_OperationCompleteCallback callbackComplete,
void *closure)
+ GNUNET_DHT_OperationCompleteCallback callbackComplete,
+ void *closure)
{
struct GNUNET_DHT_GetHandle *ret;
Modified: GNUnet/src/applications/dht/module/table.c
===================================================================
--- GNUnet/src/applications/dht/module/table.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/dht/module/table.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -599,7 +599,9 @@
if (NULL != findPeerEntryInBucket (bucket, peer))
return; /* already have this peer in buckets */
/* do we know how to contact this peer? */
- hello = identity->identity2Hello (peer,
GNUNET_TRANSPORT_PROTOCOL_NUMBER_ANY, GNUNET_NO);
+ hello =
+ identity->identity2Hello (peer, GNUNET_TRANSPORT_PROTOCOL_NUMBER_ANY,
+ GNUNET_NO);
if (hello == NULL)
{
/* if identity not known, ask sender for HELLO of other peer */
@@ -691,7 +693,9 @@
if (NULL == findBucketFor (&ask->peer))
return GNUNET_OK;
hello =
- identity->identity2Hello (&ask->peer,
GNUNET_TRANSPORT_PROTOCOL_NUMBER_ANY, GNUNET_NO);
+ identity->identity2Hello (&ask->peer,
+ GNUNET_TRANSPORT_PROTOCOL_NUMBER_ANY,
+ GNUNET_NO);
if (hello == NULL)
return GNUNET_OK;
coreAPI->unicast (sender, &hello->header, 0, 5 * GNUNET_CRON_SECONDS);
@@ -758,8 +762,10 @@
unsigned int i;
unsigned int j;
- coreAPI->unregisterHandler (GNUNET_P2P_PROTO_DHT_DISCOVERY,
&handleDiscovery);
- coreAPI->unregisterHandler (GNUNET_P2P_PROTO_DHT_ASK_HELLO, &handleAskHello);
+ coreAPI->unregisterHandler (GNUNET_P2P_PROTO_DHT_DISCOVERY,
+ &handleDiscovery);
+ coreAPI->unregisterHandler (GNUNET_P2P_PROTO_DHT_ASK_HELLO,
+ &handleAskHello);
GNUNET_cron_del_job (coreAPI->cron, &maintain_dht_job, MAINTAIN_FREQUENCY,
NULL);
if (stats != NULL)
Modified: GNUnet/src/applications/dht/tools/dht-query.c
===================================================================
--- GNUnet/src/applications/dht/tools/dht-query.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/dht/tools/dht-query.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -48,15 +48,15 @@
* All gnunet-dht-query command line options
*/
static struct GNUNET_CommandLineOption gnunetqueryOptions[] = {
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Query (get KEY, put KEY
VALUE) DHT table.")), /* -h */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Query (get KEY, put KEY
VALUE) DHT table.")), /* -h */
GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
GNUNET_COMMAND_LINE_OPTION_LOGGING, /* -L */
{'T', "timeout", "TIME",
gettext_noop
("allow TIME ms to process a GET command or expire PUT content after ms
TIME"),
1, &GNUNET_getopt_configure_set_ulong, &timeout},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -83,15 +83,15 @@
GNUNET_hash (key, strlen (key), &hc);
#if DEBUG_DHT_QUERY
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Issuing '%s(%s)' command.\n", "get", key);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Issuing '%s(%s)' command.\n", "get", key);
#endif
if (timeout == 0)
timeout = 30 * GNUNET_CRON_SECONDS;
ret = GNUNET_DHT_get (cfg,
- ectx,
- GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- &hc, timeout, &printCallback, (void *) key);
+ ectx,
+ GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &hc, timeout, &printCallback, (void *) key);
if (ret == 0)
printf (_("%s(%s) operation returned no results.\n"), "get", key);
}
@@ -109,13 +109,13 @@
memcpy (&dc[1], value, strlen (value));
#if DEBUG_DHT_QUERY
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("Issuing '%s(%s,%s)' command.\n"), "put", key, value);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("Issuing '%s(%s,%s)' command.\n"), "put", key, value);
#endif
if (timeout == 0)
timeout = 30 * GNUNET_CRON_MINUTES;
- if (GNUNET_OK == GNUNET_DHT_put (cfg, ectx, &hc,
GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING, timeout + GNUNET_get_time (),
/* convert to absolute time */
- dc))
+ if (GNUNET_OK == GNUNET_DHT_put (cfg, ectx, &hc,
GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING, timeout + GNUNET_get_time (),
/* convert to absolute time */
+ dc))
{
printf (_("'%s(%s,%s)' succeeded\n"), "put", key, value);
}
Modified: GNUnet/src/applications/dht/tools/dht_api.c
===================================================================
--- GNUnet/src/applications/dht/tools/dht_api.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/dht/tools/dht_api.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -102,7 +102,9 @@
/* re-use "expire" field of the reply (which is 0 anyway)
for the header of GNUNET_DataContainer (which fits) to avoid
copying -- go C pointer arithmetic! */
- cont = (GNUNET_DataContainer *) & ((char *) &put[1])[-sizeof
(GNUNET_DataContainer)];
+ cont =
+ (GNUNET_DataContainer *) & ((char *)
+ &put[1])[-sizeof (GNUNET_DataContainer)];
size = ntohs (reply->size) - sizeof (CS_dht_request_put_MESSAGE);
cont->size = htonl (size + sizeof (GNUNET_DataContainer));
if ((info->processor != NULL) &&
@@ -138,10 +140,11 @@
*/
int
GNUNET_DHT_get (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx,
- unsigned int type,
- const GNUNET_HashCode * key,
- GNUNET_CronTime timeout, GNUNET_DataProcessor processor, void
*closure)
+ struct GNUNET_GE_Context *ectx,
+ unsigned int type,
+ const GNUNET_HashCode * key,
+ GNUNET_CronTime timeout, GNUNET_DataProcessor processor,
+ void *closure)
{
struct GNUNET_ClientServerConnection *sock;
CS_dht_request_get_MESSAGE req;
@@ -203,10 +206,10 @@
*/
int
GNUNET_DHT_put (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx,
- const GNUNET_HashCode * key,
- unsigned int type, GNUNET_CronTime expire,
- const GNUNET_DataContainer * value)
+ struct GNUNET_GE_Context *ectx,
+ const GNUNET_HashCode * key,
+ unsigned int type, GNUNET_CronTime expire,
+ const GNUNET_DataContainer * value)
{
struct GNUNET_ClientServerConnection *sock;
CS_dht_request_put_MESSAGE *req;
@@ -216,29 +219,32 @@
now = GNUNET_get_time ();
if (expire < now)
{
- GNUNET_GE_BREAK (ectx, 0); /* content already expired!? */
+ GNUNET_GE_BREAK (ectx, 0); /* content already expired!? */
return GNUNET_SYSERR;
}
#if DEBUG_DHT_API
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "DHT_LIB_put called with value '%.*s'\n",
- ntohl (value->size), &value[1]);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "DHT_LIB_put called with value '%.*s'\n",
+ ntohl (value->size), &value[1]);
#endif
sock = GNUNET_client_connection_create (ectx, cfg);
if (sock == NULL)
return GNUNET_SYSERR;
- GNUNET_GE_ASSERT (NULL, ntohl (value->size) >= sizeof
(GNUNET_DataContainer));
- req = GNUNET_malloc (sizeof (CS_dht_request_put_MESSAGE) +
- ntohl (value->size) - sizeof (GNUNET_DataContainer));
- req->header.size
- = htons (sizeof (CS_dht_request_put_MESSAGE) +
- ntohl (value->size) - sizeof (GNUNET_DataContainer));
+ GNUNET_GE_ASSERT (NULL,
+ ntohl (value->size) >= sizeof (GNUNET_DataContainer));
+ req =
+ GNUNET_malloc (sizeof (CS_dht_request_put_MESSAGE) + ntohl (value->size) -
+ sizeof (GNUNET_DataContainer));
+ req->header.size =
+ htons (sizeof (CS_dht_request_put_MESSAGE) + ntohl (value->size) -
+ sizeof (GNUNET_DataContainer));
req->header.type = htons (GNUNET_CS_PROTO_DHT_REQUEST_PUT);
req->key = *key;
req->type = htonl (type);
req->expire = GNUNET_htonll (expire - now); /* convert to relative time */
- memcpy (&req[1], &value[1], ntohl (value->size) - sizeof
(GNUNET_DataContainer));
+ memcpy (&req[1], &value[1],
+ ntohl (value->size) - sizeof (GNUNET_DataContainer));
ret = GNUNET_client_connection_write (sock, &req->header);
GNUNET_client_connection_destroy (sock);
GNUNET_free (req);
Modified: GNUnet/src/applications/dht/tools/dhttest.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/dht/tools/dhttest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -107,7 +107,8 @@
/* wait for some DHT's to find each other! */
sock = GNUNET_client_connection_create (NULL, cfg);
left = 30; /* how many iterations should we wait? */
- while (GNUNET_OK == GNUNET_STATS_get_statistics (NULL, sock,
&waitForConnect, NULL))
+ while (GNUNET_OK ==
+ GNUNET_STATS_get_statistics (NULL, sock, &waitForConnect, NULL))
{
printf ("Waiting for peers to DHT-connect (%u iterations left)...\n",
left);
@@ -129,18 +130,20 @@
for (i = 0; i < NUM_PEERS; i++)
{
GNUNET_snprintf (buf, 128, "localhost:%u", 2087 + i * 10);
- GNUNET_GC_set_configuration_value_string (cfg, ectx, "NETWORK", "HOST",
buf);
+ GNUNET_GC_set_configuration_value_string (cfg, ectx, "NETWORK", "HOST",
+ buf);
GNUNET_hash (buf, 4, &key);
value = GNUNET_malloc (8);
value->size = ntohl (8);
memset (&value[1], 'A' + i, 4);
CHECK (GNUNET_OK == GNUNET_DHT_put (cfg,
- ectx,
- &key,
-
GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- GNUNET_get_time () +
- 15 * GNUNET_CRON_MINUTES * NUM_ROUNDS *
- NUM_PEERS * NUM_PEERS, value));
+ ectx,
+ &key,
+
GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ GNUNET_get_time () +
+ 15 * GNUNET_CRON_MINUTES *
+ NUM_ROUNDS * NUM_PEERS * NUM_PEERS,
+ value));
}
/* get loops */
@@ -151,18 +154,19 @@
{
GNUNET_snprintf (buf, 128, "localhost:%u", 2087 + i * 10);
GNUNET_GC_set_configuration_value_string (cfg,
- ectx, "NETWORK", "HOST", buf);
+ ectx, "NETWORK", "HOST",
+ buf);
for (j = 0; j < NUM_PEERS; j++)
{
GNUNET_snprintf (buf, 128, "localhost:%u", 2087 + j * 10);
GNUNET_hash (buf, 4, &key);
fprintf (stderr, "Peer %d gets key %d", i, j);
if (0 < GNUNET_DHT_get (cfg,
- ectx,
-
GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- &key,
- (NUM_ROUNDS - k) * GNUNET_CRON_SECONDS,
- NULL, NULL))
+ ectx,
+
GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key,
+ (NUM_ROUNDS - k) * GNUNET_CRON_SECONDS,
+ NULL, NULL))
{
fprintf (stderr, " - found!\n");
found++;
Modified: GNUnet/src/applications/dht/tools/dhttest2.c
===================================================================
--- GNUnet/src/applications/dht/tools/dhttest2.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/dht/tools/dhttest2.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -99,7 +99,8 @@
/* wait for DHT's to find each other! */
sock = GNUNET_client_connection_create (NULL, cfg);
left = 30; /* how many iterations should we wait? */
- while (GNUNET_OK == GNUNET_STATS_get_statistics (NULL, sock,
&waitForConnect, NULL))
+ while (GNUNET_OK ==
+ GNUNET_STATS_get_statistics (NULL, sock, &waitForConnect, NULL))
{
printf ("Waiting for peers to DHT-connect (%u iterations left)...\n",
left);
@@ -119,13 +120,15 @@
/* switch to peer2 */
GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST", "localhost:12087");
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:12087");
/* verify that peer2 also sees the other DHT! */
ok = 0;
sock = GNUNET_client_connection_create (NULL, cfg);
left = 30; /* how many iterations should we wait? */
- while (GNUNET_OK == GNUNET_STATS_get_statistics (NULL, sock,
&waitForConnect, NULL))
+ while (GNUNET_OK ==
+ GNUNET_STATS_get_statistics (NULL, sock, &waitForConnect, NULL))
{
printf ("Waiting for peers to DHT-connect (%u iterations left)...\n",
left);
@@ -146,8 +149,9 @@
/* switch to peer1 */
GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST", "localhost:2087");
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:2087");
/* actual test code */
GNUNET_hash ("key2", 4, &key);
@@ -156,52 +160,54 @@
memset (&value[1], 'A', 4);
printf ("Peer1 stores key2\n");
CHECK (GNUNET_OK == GNUNET_DHT_put (cfg,
- ectx,
- &key,
-
GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- GNUNET_get_time () +
- 5 * GNUNET_CRON_MINUTES, value));
+ ectx,
+ &key,
+
GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ GNUNET_get_time () +
+ 5 * GNUNET_CRON_MINUTES, value));
printf ("Peer1 gets key2\n");
CHECK (1 == GNUNET_DHT_get (cfg,
- ectx,
- GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- &key, 2 * GNUNET_CRON_SECONDS, NULL, NULL));
+ ectx,
+ GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key, 2 * GNUNET_CRON_SECONDS, NULL, NULL));
/* switch to peer2 */
GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST", "localhost:12087");
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:12087");
GNUNET_hash ("key", 3, &key);
value = GNUNET_malloc (8);
value->size = ntohl (8);
memset (&value[1], 'B', 4);
printf ("Peer2 stores key.\n");
CHECK (GNUNET_OK == GNUNET_DHT_put (cfg,
- ectx,
- &key,
-
GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- GNUNET_get_time () +
- 5 * GNUNET_CRON_MINUTES, value));
+ ectx,
+ &key,
+
GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ GNUNET_get_time () +
+ 5 * GNUNET_CRON_MINUTES, value));
printf ("Peer2 gets key.\n");
CHECK (1 == GNUNET_DHT_get (cfg,
- ectx,
- GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- &key, 2 * GNUNET_CRON_SECONDS, NULL, NULL));
+ ectx,
+ GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key, 2 * GNUNET_CRON_SECONDS, NULL, NULL));
GNUNET_hash ("key2", 4, &key);
printf ("Peer2 gets key2.\n");
CHECK (1 == GNUNET_DHT_get (cfg,
- ectx,
- GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- &key, 30 * GNUNET_CRON_SECONDS, NULL, NULL));
+ ectx,
+ GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key, 30 * GNUNET_CRON_SECONDS, NULL, NULL));
/* switch to peer1 */
GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST", "localhost:2087");
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:2087");
printf ("Peer1 gets key\n");
CHECK (1 == GNUNET_DHT_get (cfg,
- ectx,
- GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
- &key, 30 * GNUNET_CRON_SECONDS, NULL, NULL));
+ ectx,
+ GNUNET_GNUNET_ECRS_BLOCKTYPE_DHT_STRING2STRING,
+ &key, 30 * GNUNET_CRON_SECONDS, NULL, NULL));
/* end of actual test code */
FAILURE:
Modified: GNUnet/src/applications/dstore/dstore.c
===================================================================
--- GNUnet/src/applications/dstore/dstore.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/dstore/dstore.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -176,9 +176,9 @@
return GNUNET_OK; /* we seem to be about 10% off */
#if DEBUG_DSTORE
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "DStore above qutoa (have %llu, allowed %llu), will delete some
data.\n",
- payload, quota);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "DStore above qutoa (have %llu, allowed %llu), will delete
some data.\n",
+ payload, quota);
#endif
stmt = NULL;
dstmt = NULL;
@@ -191,9 +191,9 @@
&dstmt) != SQLITE_OK))
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sq_prepare", __FILE__, __LINE__, sqlite3_errmsg (dbh));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "sq_prepare", __FILE__, __LINE__, sqlite3_errmsg (dbh));
GNUNET_GE_BREAK (NULL, 0);
if (dstmt != NULL)
sqlite3_finalize (dstmt);
@@ -211,7 +211,8 @@
dputtime = sqlite3_column_int64 (stmt, 2);
dexpire = sqlite3_column_int64 (stmt, 3);
GNUNET_GE_BREAK (NULL,
- sqlite3_column_bytes (stmt, 4) == sizeof (GNUNET_HashCode));
+ sqlite3_column_bytes (stmt,
+ 4) == sizeof (GNUNET_HashCode));
GNUNET_GE_BREAK (NULL, dsize == sqlite3_column_bytes (stmt, 5));
memcpy (&dkey, sqlite3_column_blob (stmt, 4), sizeof (GNUNET_HashCode));
if (dsize >= MAX_CONTENT_SIZE)
@@ -232,28 +233,31 @@
if ((err = sqlite3_step (dstmt)) != SQLITE_DONE)
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sqlite3_step", __FILE__, __LINE__, sqlite3_errmsg (dbh));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "sqlite3_step", __FILE__, __LINE__,
+ sqlite3_errmsg (dbh));
sqlite3_reset (dstmt);
- GNUNET_GE_BREAK (NULL, 0); /* should delete but cannot!? */
+ GNUNET_GE_BREAK (NULL, 0); /* should delete but cannot!? */
break;
}
payload -= (dsize + OVERHEAD);
#if DEBUG_DSTORE
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Deleting %u bytes decreases DStore payload to %llu out of
%llu\n",
- dsize, payload, quota);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Deleting %u bytes decreases DStore payload to %llu out
of %llu\n",
+ dsize, payload, quota);
#endif
sqlite3_reset (dstmt);
}
if (err != SQLITE_DONE)
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sqlite3_step", __FILE__, __LINE__, sqlite3_errmsg (dbh));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "sqlite3_step", __FILE__, __LINE__,
+ sqlite3_errmsg (dbh));
}
GNUNET_free (dcontent);
sqlite3_finalize (dstmt);
@@ -262,9 +266,9 @@
{
/* we seem to be about 10% off */
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
- "Failed to delete content to drop below quota (bug?).\n",
- payload, quota);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
+ "Failed to delete content to drop below quota (bug?).\n",
+ payload, quota);
return GNUNET_SYSERR;
}
return GNUNET_OK;
@@ -295,8 +299,8 @@
}
#if DEBUG_DSTORE
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "dstore processes put `%.*s\n", size, data);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "dstore processes put `%.*s\n", size, data);
#endif
/* first try UPDATE */
@@ -306,9 +310,9 @@
&stmt) != SQLITE_OK)
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sq_prepare", __FILE__, __LINE__, sqlite3_errmsg (dbh));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "sq_prepare", __FILE__, __LINE__, sqlite3_errmsg (dbh));
sqlite3_close (dbh);
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
@@ -324,9 +328,10 @@
sqlite3_bind_blob (stmt, 6, data, size, SQLITE_TRANSIENT)))
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sqlite3_bind_xxx", __FILE__, __LINE__, sqlite3_errmsg (dbh));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "sqlite3_bind_xxx", __FILE__, __LINE__,
+ sqlite3_errmsg (dbh));
sqlite3_finalize (stmt);
sqlite3_close (dbh);
GNUNET_mutex_unlock (lock);
@@ -335,9 +340,10 @@
if (SQLITE_DONE != sqlite3_step (stmt))
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sqlite3_step", __FILE__, __LINE__, sqlite3_errmsg (dbh));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "sqlite3_step", __FILE__, __LINE__,
+ sqlite3_errmsg (dbh));
sqlite3_finalize (stmt);
sqlite3_close (dbh);
GNUNET_mutex_unlock (lock);
@@ -366,9 +372,9 @@
"VALUES (?, ?, ?, ?, ?, ?)", &stmt) != SQLITE_OK)
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sq_prepare", __FILE__, __LINE__, sqlite3_errmsg (dbh));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "sq_prepare", __FILE__, __LINE__, sqlite3_errmsg (dbh));
sqlite3_close (dbh);
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
@@ -385,26 +391,26 @@
{
if (SQLITE_DONE != sqlite3_step (stmt))
LOG_SQLITE (dbh,
- GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "sqlite3_step");
+ GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "sqlite3_step");
else
payload += size + OVERHEAD;
if (SQLITE_OK != sqlite3_finalize (stmt))
LOG_SQLITE (dbh,
- GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "sqlite3_finalize");
+ GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "sqlite3_finalize");
}
else
{
LOG_SQLITE (dbh,
- GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "sqlite3_bind_xxx");
+ GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "sqlite3_bind_xxx");
}
#if DEBUG_DSTORE
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Storing %u bytes increases DStore payload to %llu out of %llu\n",
- size, payload, quota);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "Storing %u bytes increases DStore payload to %llu out of
%llu\n",
+ size, payload, quota);
#endif
checkQuota (dbh);
sqlite3_close (dbh);
@@ -449,7 +455,8 @@
}
#if DEBUG_DSTORE
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER, "dstore
processes get\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "dstore processes get\n");
#endif
now = GNUNET_get_time ();
if (sq_prepare (dbh,
@@ -457,9 +464,9 @@
&stmt) != SQLITE_OK)
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _("`%s' failed at %s:%d with error: %s\n"),
- "sq_prepare", __FILE__, __LINE__, sqlite3_errmsg (dbh));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "sq_prepare", __FILE__, __LINE__, sqlite3_errmsg (dbh));
sqlite3_close (dbh);
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
@@ -495,8 +502,8 @@
#if DEBUG_SQLITE
GNUNET_GE_LOG (capi->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "SQLite Dstore: initializing database\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "SQLite Dstore: initializing database\n");
#endif
if (GNUNET_OK != db_reset ())
{
@@ -510,7 +517,8 @@
api.get = &d_get;
api.put = &d_put;
GNUNET_GC_get_configuration_value_number (coreAPI->cfg,
- "DSTORE", "QUOTA", 1, 1024, 1, "a);
+ "DSTORE", "QUOTA", 1, 1024, 1,
+ "a);
if (quota == 0) /* error */
quota = 1;
quota *= 1024 * 1024;
@@ -553,8 +561,8 @@
}
#if DEBUG_SQLITE
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "SQLite Dstore: database shutdown\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "SQLite Dstore: database shutdown\n");
#endif
GNUNET_mutex_destroy (lock);
coreAPI = NULL;
Modified: GNUnet/src/applications/fragmentation/fragmentation.c
===================================================================
--- GNUnet/src/applications/fragmentation/fragmentation.c 2007-11-25
12:06:33 UTC (rev 5760)
+++ GNUnet/src/applications/fragmentation/fragmentation.c 2007-11-25
12:07:29 UTC (rev 5761)
@@ -300,8 +300,9 @@
if (end <= ntohs (packet->off))
{
GNUNET_GE_LOG (NULL,
- GNUNET_GE_DEVELOPER | GNUNET_GE_DEBUG | GNUNET_GE_BULK,
- "Received invalid fragment at %s:%d\n", __FILE__, __LINE__);
+ GNUNET_GE_DEVELOPER | GNUNET_GE_DEBUG | GNUNET_GE_BULK,
+ "Received invalid fragment at %s:%d\n", __FILE__,
+ __LINE__);
return GNUNET_SYSERR; /* yuck! integer overflow! */
}
@@ -586,10 +587,12 @@
&defragmentationPurgeCron,
60 * GNUNET_CRON_SECONDS, 60 * GNUNET_CRON_SECONDS,
NULL);
- 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,
&processFragment);
+ 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,
+ &processFragment);
ret.fragment = &fragment;
return &ret;
@@ -603,10 +606,10 @@
{
int i;
- coreAPI->unregisterHandler (GNUNET_P2P_PROTO_MESSAGNUNET_GE_FRAGMENT,
&processFragment);
- GNUNET_cron_del_job (coreAPI->cron,
- &defragmentationPurgeCron, 60 * GNUNET_CRON_SECONDS,
- NULL);
+ coreAPI->unregisterHandler (GNUNET_P2P_PROTO_MESSAGNUNET_GE_FRAGMENT,
+ &processFragment);
+ GNUNET_cron_del_job (coreAPI->cron, &defragmentationPurgeCron,
+ 60 * GNUNET_CRON_SECONDS, NULL);
for (i = 0; i < DEFRAG_BUCKET_COUNT; i++)
{
FC *pos = defragmentationCache[i];
Modified: GNUnet/src/applications/fragmentation/fragmentationtest.c
===================================================================
--- GNUnet/src/applications/fragmentation/fragmentationtest.c 2007-11-25
12:06:33 UTC (rev 5760)
+++ GNUnet/src/applications/fragmentation/fragmentationtest.c 2007-11-25
12:07:29 UTC (rev 5761)
@@ -60,7 +60,8 @@
const unsigned int len, int wasEncrypted, GNUNET_TSession * ts)
{
GNUNET_GE_ASSERT (NULL,
- 0 == memcmp (sender, &mySender, sizeof (GNUNET_PeerIdentity)));
+ 0 == memcmp (sender, &mySender,
+ sizeof (GNUNET_PeerIdentity)));
myMsg = resultBuffer;
memcpy (resultBuffer, msg, len);
myMsgLen = len;
@@ -367,13 +368,15 @@
/* ************* driver ****************** */
static int
-registerp2pHandler (const unsigned short type, GNUNET_P2PRequestHandler
callback)
+registerp2pHandler (const unsigned short type,
+ GNUNET_P2PRequestHandler callback)
{
return GNUNET_OK;
}
static int
-unregisterp2pHandler (const unsigned short type, GNUNET_P2PRequestHandler
callback)
+unregisterp2pHandler (const unsigned short type,
+ GNUNET_P2PRequestHandler callback)
{
return GNUNET_OK;
}
Modified: GNUnet/src/applications/fs/collection/collection.c
===================================================================
--- GNUnet/src/applications/fs/collection/collection.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/collection/collection.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -137,9 +137,10 @@
char *fnBase;
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY, &fnBase);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &fnBase);
fn = GNUNET_malloc (strlen (fnBase) + strlen (COLLECTION) + 4);
strcpy (fn, fnBase);
GNUNET_disk_directory_create (ectx, fn);
@@ -153,7 +154,8 @@
* Initialize collection module.
*/
void
-GNUNET_CO_init (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
+GNUNET_CO_init (struct GNUNET_GE_Context *e,
+ struct GNUNET_GC_Configuration *c)
{
char *fn;
int len;
@@ -202,8 +204,9 @@
if (buf == MAP_FAILED)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER
| GNUNET_GE_BULK,
- "mmap", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "mmap",
+ fn);
CLOSE (fd);
GNUNET_free (fn);
return;
@@ -331,11 +334,13 @@
return;
/* write collection data */
- mlen = GNUNET_ECRS_meta_data_get_serialized_size (collectionData->meta,
GNUNET_NO);
+ mlen =
+ GNUNET_ECRS_meta_data_get_serialized_size (collectionData->meta,
+ GNUNET_NO);
buf = GNUNET_malloc (mlen);
if (mlen != GNUNET_ECRS_meta_data_serialize (ectx,
- collectionData->meta, buf, mlen,
- GNUNET_NO))
+ collectionData->meta, buf,
+ mlen, GNUNET_NO))
{
GNUNET_GE_BREAK (ectx, 0);
GNUNET_free (buf);
@@ -348,8 +353,9 @@
if (fd == -1)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_ERROR
| GNUNET_GE_BULK,
- "open", fn);
+ GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_ERROR | GNUNET_GE_BULK, "open",
+ fn);
GNUNET_free (fn);
GNUNET_free (buf);
return;
@@ -366,11 +372,14 @@
GNUNET_free (buf);
for (i = 0; i < collectionData->file_count; i++)
{
- mlen = GNUNET_ECRS_meta_data_get_serialized_size
(collectionData->files[i].meta, GNUNET_NO);
+ mlen =
+ GNUNET_ECRS_meta_data_get_serialized_size (collectionData->files[i].
+ meta, GNUNET_NO);
buf = GNUNET_malloc (mlen);
if (mlen != GNUNET_ECRS_meta_data_serialize (ectx,
- collectionData->files[i].meta,
- buf, mlen, GNUNET_NO))
+ collectionData->files[i].
+ meta, buf, mlen,
+ GNUNET_NO))
{
GNUNET_GE_BREAK (ectx, 0);
GNUNET_free (buf);
@@ -415,9 +424,10 @@
*/
int
GNUNET_CO_collection_start (unsigned int anonymityLevel,
- unsigned int prio,
- GNUNET_Int32Time updateInterval,
- const char *name, const struct GNUNET_ECRS_MetaData *meta)
+ unsigned int prio,
+ GNUNET_Int32Time updateInterval,
+ const char *name,
+ const struct GNUNET_ECRS_MetaData *meta)
{
struct GNUNET_ECRS_URI *advertisement;
struct GNUNET_ECRS_URI *rootURI;
@@ -425,21 +435,21 @@
GNUNET_Int32Time now;
GNUNET_mutex_lock (lock);
- GNUNET_CO_collection_stop (); /* cancel old collection */
+ GNUNET_CO_collection_stop (); /* cancel old collection */
GNUNET_GE_ASSERT (ectx, name != NULL);
advertisement = GNUNET_ECRS_keyword_string_to_uri (ectx, COLLECTION);
GNUNET_GE_ASSERT (ectx, advertisement != NULL);
GNUNET_get_time_int32 (&now);
GNUNET_create_random_hash (&nextId);
rootURI = GNUNET_ECRS_namespace_create (ectx,
- cfg,
- name,
- meta,
- anonymityLevel,
- prio,
- GNUNET_get_time () +
- COLLECTION_ADV_LIFETIME, advertisement,
- &nextId);
+ cfg,
+ name,
+ meta,
+ anonymityLevel,
+ prio,
+ GNUNET_get_time () +
+ COLLECTION_ADV_LIFETIME,
+ advertisement, &nextId);
if (rootURI == NULL)
{
GNUNET_ECRS_uri_destroy (advertisement);
@@ -549,7 +559,8 @@
return;
}
GNUNET_get_time_int32 (&now);
- if ((ntohl (collectionData->data.updateInterval) !=
GNUNET_ECRS_SBLOCK_UPDATE_NONE)
+ if ((ntohl (collectionData->data.updateInterval) !=
+ GNUNET_ECRS_SBLOCK_UPDATE_NONE)
&& (ntohl (collectionData->data.updateInterval) !=
GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC)
&& (ntohl (collectionData->data.lastPublication) +
@@ -558,7 +569,8 @@
GNUNET_mutex_unlock (lock);
return;
}
- if ((ntohl (collectionData->data.updateInterval) !=
GNUNET_ECRS_SBLOCK_UPDATE_NONE)
+ if ((ntohl (collectionData->data.updateInterval) !=
+ GNUNET_ECRS_SBLOCK_UPDATE_NONE)
&& (ntohl (collectionData->data.updateInterval) !=
GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC))
{
@@ -577,22 +589,29 @@
fd = mkstemp (tmpName);
if (fd == -1)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "mkstemp");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "mkstemp");
GNUNET_free (tmpName);
GNUNET_mutex_unlock (lock);
return;
}
dirData = NULL;
GNUNET_GE_ASSERT (ectx,
- GNUNET_OK == GNUNET_ECRS_directory_create (ectx,
- &dirData,
- &dirLen,
- collectionData->file_count,
- collectionData->files,
- collectionData->meta));
+ GNUNET_OK == GNUNET_ECRS_directory_create (ectx,
+ &dirData,
+ &dirLen,
+ collectionData->
+ file_count,
+ collectionData->
+ files,
+ collectionData->
+ meta));
if (-1 == WRITE (fd, dirData, dirLen))
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "write");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "write");
GNUNET_free (tmpName);
GNUNET_free (dirData);
GNUNET_mutex_unlock (lock);
@@ -601,12 +620,13 @@
GNUNET_free (dirData);
CLOSE (fd);
if (GNUNET_OK != GNUNET_ECRS_file_upload (ectx, cfg, tmpName, GNUNET_NO,
/* indexing */
- ntohl (collectionData->data.
- anonymityLevel),
- ntohl (collectionData->data.priority),
- GNUNET_get_time () +
- COLLECTION_ADV_LIFETIME, NULL, NULL, NULL,
- NULL, &directoryURI))
+ ntohl (collectionData->data.
+ anonymityLevel),
+ ntohl (collectionData->data.
+ priority),
+ GNUNET_get_time () +
+ COLLECTION_ADV_LIFETIME, NULL,
+ NULL, NULL, NULL, &directoryURI))
{
UNLINK (tmpName);
GNUNET_free (tmpName);
@@ -616,16 +636,20 @@
UNLINK (tmpName);
GNUNET_free (tmpName);
uri = GNUNET_ECRS_namespace_add_content (ectx,
- cfg,
- collectionData->name,
- ntohl (collectionData->data.anonymityLevel),
- ntohl (collectionData->data.priority),
- GNUNET_get_time () + COLLECTION_ADV_LIFETIME,
- now,
- ntohl (collectionData->data.updateInterval),
- &collectionData->data.lastId,
- &collectionData->data.nextId,
- directoryURI, collectionData->meta);
+ cfg,
+ collectionData->name,
+ ntohl (collectionData->data.
+ anonymityLevel),
+ ntohl (collectionData->data.
+ priority),
+ GNUNET_get_time () +
+ COLLECTION_ADV_LIFETIME, now,
+ ntohl (collectionData->data.
+ updateInterval),
+ &collectionData->data.lastId,
+ &collectionData->data.nextId,
+ directoryURI,
+ collectionData->meta);
if (uri != NULL)
{
collectionData->data.lastPublication = htonl (now);
@@ -682,7 +706,8 @@
fc.meta = GNUNET_ECRS_meta_data_duplicate (fi->meta);
GNUNET_array_append (collectionData->files, collectionData->file_count, fc);
collectionData->changed = GNUNET_YES;
- if (ntohl (collectionData->data.updateInterval) ==
GNUNET_ECRS_SBLOCK_UPDATE_NONE)
+ if (ntohl (collectionData->data.updateInterval) ==
+ GNUNET_ECRS_SBLOCK_UPDATE_NONE)
GNUNET_CO_collection_publish_now ();
GNUNET_mutex_unlock (lock);
}
Modified: GNUnet/src/applications/fs/collection/collectiontest.c
===================================================================
--- GNUnet/src/applications/fs/collection/collectiontest.c 2007-11-25
12:06:33 UTC (rev 5760)
+++ GNUnet/src/applications/fs/collection/collectiontest.c 2007-11-25
12:07:29 UTC (rev 5761)
@@ -75,7 +75,7 @@
GNUNET_ECRS_namespace_delete (NULL, cfg, "test-collection");
CHECK (NULL == GNUNET_CO_collection_get_name ());
CHECK (GNUNET_OK == GNUNET_CO_collection_start (1, 100, 60, /* 60s */
- "test-collection", meta));
+ "test-collection", meta));
have = GNUNET_CO_collection_get_name ();
CHECK (NULL != have);
CHECK (0 == strcmp (have, "test-collection"));
@@ -83,7 +83,7 @@
fi.meta = meta;
fi.uri =
GNUNET_ECRS_string_to_uri (NULL,
-
"gnunet://ecrs/chk/0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0");
+
"gnunet://ecrs/chk/0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0");
GNUNET_CO_collection_add_item (&fi);
GNUNET_ECRS_uri_destroy (fi.uri);
GNUNET_CO_done ();
Modified: GNUnet/src/applications/fs/ecrs/directory.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/directory.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/directory.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -51,10 +51,11 @@
*/
int
GNUNET_ECRS_directory_list_contents (struct GNUNET_GE_Context *ectx,
- const char *data,
- unsigned long long len,
- struct GNUNET_ECRS_MetaData **md,
- GNUNET_ECRS_SearchResultProcessor spcb, void *spcbClosure)
+ const char *data,
+ unsigned long long len,
+ struct GNUNET_ECRS_MetaData **md,
+ GNUNET_ECRS_SearchResultProcessor spcb,
+ void *spcbClosure)
{
unsigned long long pos;
unsigned long long align;
@@ -74,8 +75,9 @@
if (mdSize > len - 8 - sizeof (unsigned int))
return GNUNET_SYSERR; /* invalid size */
*md = GNUNET_ECRS_meta_data_deserialize (ectx,
- &data[8 + sizeof (unsigned int)],
- mdSize);
+ &data[8 +
+ sizeof (unsigned int)],
+ mdSize);
if (*md == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -260,10 +262,11 @@
*/
int
GNUNET_ECRS_directory_create (struct GNUNET_GE_Context *ectx,
- char **data,
- unsigned long long *len,
- unsigned int count,
- const GNUNET_ECRS_FileInfo * fis, struct
GNUNET_ECRS_MetaData *meta)
+ char **data,
+ unsigned long long *len,
+ unsigned int count,
+ const GNUNET_ECRS_FileInfo * fis,
+ struct GNUNET_ECRS_MetaData *meta)
{
int i;
int j;
@@ -285,7 +288,9 @@
}
ucs = GNUNET_malloc (sizeof (char *) * count);
size = 8 + sizeof (unsigned int);
- size += GNUNET_ECRS_meta_data_get_serialized_size (meta,
GNUNET_ECRS_SERIALIZE_FULL);
+ size +=
+ GNUNET_ECRS_meta_data_get_serialized_size (meta,
+ GNUNET_ECRS_SERIALIZE_FULL);
sizes = GNUNET_malloc (count * sizeof (unsigned long long));
perm = GNUNET_malloc (count * sizeof (int));
for (i = 0; i < count; i++)
@@ -293,7 +298,9 @@
perm[i] = i;
ucs[i] = GNUNET_ECRS_uri_to_string (fis[i].uri);
GNUNET_GE_ASSERT (ectx, ucs[i] != NULL);
- psize = GNUNET_ECRS_meta_data_get_serialized_size (fis[i].meta,
GNUNET_ECRS_SERIALIZE_FULL);
+ psize =
+ GNUNET_ECRS_meta_data_get_serialized_size (fis[i].meta,
+ GNUNET_ECRS_SERIALIZE_FULL);
if (psize == -1)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -324,10 +331,11 @@
memcpy (*data, GNUNET_DIRECTORY_MAGIC, 8);
ret = GNUNET_ECRS_meta_data_serialize (ectx,
- meta,
- &(*data)[pos + sizeof (unsigned int)],
- size - pos - sizeof (unsigned int),
- GNUNET_ECRS_SERIALIZE_FULL);
+ meta,
+ &(*data)[pos +
+ sizeof (unsigned int)],
+ size - pos - sizeof (unsigned int),
+ GNUNET_ECRS_SERIALIZE_FULL);
GNUNET_GE_ASSERT (ectx, ret != GNUNET_SYSERR);
ret = htonl (ret);
memcpy (&(*data)[pos], &ret, sizeof (unsigned int));
@@ -344,10 +352,12 @@
pos += strlen (ucs[i]) + 1;
GNUNET_free (ucs[i]);
ret = GNUNET_ECRS_meta_data_serialize (ectx,
- fis[i].meta,
- &(*data)[pos + sizeof (unsigned int)],
- size - pos - sizeof (unsigned int),
- GNUNET_ECRS_SERIALIZE_FULL);
+ fis[i].meta,
+ &(*data)[pos +
+ sizeof (unsigned int)],
+ size - pos -
+ sizeof (unsigned int),
+ GNUNET_ECRS_SERIALIZE_FULL);
GNUNET_GE_ASSERT (ectx, ret != GNUNET_SYSERR);
ret = htonl (ret);
memcpy (&(*data)[pos], &ret, sizeof (unsigned int));
Modified: GNUnet/src/applications/fs/ecrs/directorytest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/directorytest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/ecrs/directorytest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -49,7 +49,7 @@
for (i = 0; i < p->max; i++)
{
if (GNUNET_ECRS_meta_data_test_equal (p->fi[i].meta,
- fi->meta) &&
+ fi->meta) &&
GNUNET_ECRS_uri_test_equal (p->fi[i].uri, fi->uri))
{
p->pos++;
@@ -84,8 +84,9 @@
{
GNUNET_snprintf (txt, 128, "%u -- %u\n", p, q);
GNUNET_ECRS_meta_data_inser (fis[p].meta,
- q % EXTRACTOR_getHighestKeywordTypeNumber (),
- txt);
+ q %
+ EXTRACTOR_getHighestKeywordTypeNumber
+ (), txt);
}
GNUNET_snprintf (uri,
512,
@@ -107,7 +108,8 @@
meta = GNUNET_ECRS_meta_data_create ();
GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_TITLE, "A title");
GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_AUTHOR, "An author");
- if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL, &data, &dlen, i, fis,
meta))
+ if (GNUNET_OK !=
+ GNUNET_ECRS_directory_create (NULL, &data, &dlen, i, fis, meta))
{
GNUNET_ECRS_meta_data_destroy (meta);
for (p = 0; p < i; p++)
@@ -120,7 +122,9 @@
}
cls.pos = 0;
cls.fi = fis;
- if (i != GNUNET_ECRS_directory_list_contents (NULL, data, dlen, &meta2,
&processor, &cls))
+ if (i !=
+ GNUNET_ECRS_directory_list_contents (NULL, data, dlen, &meta2,
+ &processor, &cls))
{
printf ("expected %u\n", i);
ret = 1;
Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/download.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -127,9 +127,10 @@
fn[strlen (fn) - 1] += i;
if (0 != UNLINK (fn))
GNUNET_GE_LOG (this->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Could not unlink temporary file `%s': %s\n"),
- fn, STRERROR (errno));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _("Could not unlink temporary file `%s': %s\n"),
+ fn, STRERROR (errno));
GNUNET_free (fn);
}
}
@@ -169,8 +170,8 @@
if (truncate (filename, filesize) != 0)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "truncate", filename);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "truncate", filename);
return GNUNET_SYSERR;
}
}
@@ -232,9 +233,9 @@
GNUNET_mutex_unlock (this->lock);
#if DEBUG_DOWNLOAD
GNUNET_GE_LOG (this->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "IOC read at level %u offset %llu wanted %u got %d\n",
- level, pos, len, ret);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "IOC read at level %u offset %llu wanted %u got %d\n",
+ level, pos, len, ret);
#endif
return ret;
}
@@ -267,15 +268,16 @@
if (ret != len)
{
GNUNET_GE_LOG (this->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Write(%d, %p, %d) failed: %s\n"),
- this->handles[level], buf, len, STRERROR (errno));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Write(%d, %p, %d) failed: %s\n"),
+ this->handles[level], buf, len, STRERROR (errno));
}
GNUNET_mutex_unlock (this->lock);
#if DEBUG_DOWNLOAD
GNUNET_GE_LOG (this->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "IOC write at level %u offset %llu writes %u\n", level, pos, len);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "IOC write at level %u offset %llu writes %u\n", level, pos,
+ len);
#endif
return ret;
}
@@ -452,7 +454,8 @@
* @return NULL on error
*/
static RequestManager *
-createRequestManager (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg)
+createRequestManager (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
RequestManager *rm;
@@ -487,8 +490,8 @@
rm->ssthresh = 65535;
#if DEBUG_DOWNLOAD
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "created request manager %p\n", rm);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "created request manager %p\n", rm);
#endif
return rm;
}
@@ -507,8 +510,8 @@
#if DEBUG_DOWNLOAD
GNUNET_GE_LOG (rm->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "destroying request manager %p\n", rm);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "destroying request manager %p\n", rm);
#endif
GNUNET_mutex_lock (rm->lock);
/* cannot hold lock during shutdown since
@@ -571,8 +574,8 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&node->chk.query, &enc));
GNUNET_GE_LOG (rm->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Queuing request (query: %s)\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Queuing request (query: %s)\n", &enc);
#endif
GNUNET_GE_ASSERT (rm->ectx, node != NULL);
@@ -632,7 +635,7 @@
}
}
GNUNET_mutex_unlock (rm->lock);
- GNUNET_GE_BREAK (rm->ectx, 0); /* uh uh - at least a memory leak... */
+ GNUNET_GE_BREAK (rm->ectx, 0); /* uh uh - at least a memory leak... */
}
@@ -678,9 +681,9 @@
ret = (unsigned int) (node->ctx->total - node->offset);
#if DEBUG_DOWNLOAD
GNUNET_GE_LOG (node->ctx->rm->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Node at offset %llu and level %d has size %u\n",
- node->offset, node->level, ret);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Node at offset %llu and level %d has size %u\n",
+ node->offset, node->level, ret);
#endif
return ret;
}
@@ -696,9 +699,9 @@
ret++; /* need to round up! */
#if DEBUG_DOWNLOAD
GNUNET_GE_LOG (node->ctx->rm->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Node at offset %llu and level %d has size %u\n",
- node->offset, node->level, ret * sizeof (CHK));
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Node at offset %llu and level %d has size %u\n",
+ node->offset, node->level, ret * sizeof (CHK));
#endif
return ret * sizeof (CHK);
}
@@ -865,9 +868,9 @@
GNUNET_free (data);
#if DEBUG_DOWNLOAD
GNUNET_GE_LOG (node->ctx->rm->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Checked presence of block at %llu level %u. Result: %s\n",
- node->offset, node->level, ret == GNUNET_YES ? "YES" : "NO");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Checked presence of block at %llu level %u. Result: %s\n",
+ node->offset, node->level, ret == GNUNET_YES ? "YES" : "NO");
#endif
return ret;
@@ -916,7 +919,7 @@
GNUNET_GE_ASSERT (ectx, child->offset < node->ctx->total);
child->level = node->level - 1;
GNUNET_GE_ASSERT (ectx, (child->level != 0) ||
- ((child->offset % DBLOCK_SIZE) == 0));
+ ((child->offset % DBLOCK_SIZE) == 0));
if (GNUNET_NO == checkPresent (child))
addRequest (node->ctx->rm, child);
else
@@ -942,7 +945,8 @@
GNUNET_AES_InitializationVector iv;
GNUNET_AES_SessionKey skey;
- GNUNET_GE_ASSERT (NULL, (data != NULL) && (hashcode != NULL) && (result !=
NULL));
+ GNUNET_GE_ASSERT (NULL, (data != NULL) && (hashcode != NULL)
+ && (result != NULL));
/* get key and init value from the GNUNET_hash code */
GNUNET_hash_to_AES_key (hashcode, &skey, &iv);
return GNUNET_AES_decrypt (&skey, data, size, &iv, result);
@@ -964,7 +968,8 @@
*/
static int
nodeReceive (const GNUNET_HashCode * query,
- const GNUNET_DatastoreValue * reply, void *cls, unsigned long
long uid)
+ const GNUNET_DatastoreValue * reply, void *cls,
+ unsigned long long uid)
{
NodeClosure *node = cls;
struct GNUNET_GE_Context *ectx = node->ctx->rm->ectx;
@@ -978,10 +983,11 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (query, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Receiving reply to query `%s'\n", &enc);
+ "Receiving reply to query `%s'\n", &enc);
#endif
GNUNET_GE_ASSERT (ectx,
- 0 == memcmp (query, &node->chk.query, sizeof (GNUNET_HashCode)));
+ 0 == memcmp (query, &node->chk.query,
+ sizeof (GNUNET_HashCode)));
size = ntohl (reply->size) - sizeof (GNUNET_DatastoreValue);
if ((size <= sizeof (DBlock)) ||
(size - sizeof (DBlock) != getNodeSize (node)))
@@ -1001,9 +1007,9 @@
GNUNET_free (data);
GNUNET_GE_BREAK (ectx, 0);
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Decrypted content does not match key. "
- "This is either a bug or a maliciously inserted "
- "file. Download aborted.\n"));
+ _("Decrypted content does not match key. "
+ "This is either a bug or a maliciously inserted "
+ "file. Download aborted.\n"));
node->ctx->rm->abortFlag = GNUNET_YES;
return GNUNET_SYSERR;
}
@@ -1011,7 +1017,8 @@
node->level, node->offset, data, size))
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "WRITE");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "WRITE");
node->ctx->rm->abortFlag = GNUNET_YES;
return GNUNET_SYSERR;
}
@@ -1032,7 +1039,8 @@
requestManagerEndgame (node->ctx->rm);
}
}
- GNUNET_GE_ASSERT (node->ctx->rm->ectx, node->ctx->rm->requestThread != NULL);
+ GNUNET_GE_ASSERT (node->ctx->rm->ectx,
+ node->ctx->rm->requestThread != NULL);
GNUNET_thread_stop_sleep (node->ctx->rm->requestThread);
GNUNET_free (data);
GNUNET_free (node);
@@ -1148,22 +1156,22 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&entry->node->chk.query, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Starting FS search for %s:%llu:%u `%s'\n",
- entry->node->ctx->ioc->filename,
- entry->node->offset, entry->node->level, &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Starting FS search for %s:%llu:%u `%s'\n",
+ entry->node->ctx->ioc->filename,
+ entry->node->offset, entry->node->level, &enc);
#endif
if (entry->searchHandle != NULL)
GNUNET_FS_stop_search (rm->sctx, entry->searchHandle);
entry->searchHandle
= GNUNET_FS_start_search (rm->sctx,
- rm->have_target == GNUNET_NO ? NULL : &rm->target,
- GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA,
- 1,
- &entry->node->chk.query,
- entry->node->ctx->anonymityLevel,
- priority, timeout, &nodeReceive, entry->node);
+ rm->have_target ==
+ GNUNET_NO ? NULL : &rm->target,
+ GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA, 1,
+ &entry->node->chk.query,
+ entry->node->ctx->anonymityLevel, priority,
+ timeout, &nodeReceive, entry->node);
if (entry->searchHandle != NULL)
{
entry->lastPriority = priority;
@@ -1192,10 +1200,10 @@
GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
GNUNET_hash_to_enc (&entry->node->chk.key, &enc));
GNUNET_GE_LOG (rm->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Content `%s' seems to be not available on the network (tried
%u times).\n"),
- &enc, entry->tries);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Content `%s' seems to be not available on the network
(tried %u times).\n"),
+ &enc, entry->tries);
}
}
@@ -1294,22 +1302,22 @@
*/
int
GNUNET_ECRS_file_download (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const struct GNUNET_ECRS_URI *uri,
- const char *filename,
- unsigned int anonymityLevel,
- GNUNET_ECRS_DownloadProgressCallback dpcb,
- void *dpcbClosure, GNUNET_ECRS_TestTerminate tt, void
*ttClosure)
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri,
+ const char *filename,
+ unsigned int anonymityLevel,
+ GNUNET_ECRS_DownloadProgressCallback dpcb,
+ void *dpcbClosure, GNUNET_ECRS_TestTerminate tt,
+ void *ttClosure)
{
return GNUNET_ECRS_file_download_partial (ectx,
- cfg,
- uri,
- filename,
- 0,
- GNUNET_ECRS_uri_get_file_siz (uri),
- anonymityLevel,
- GNUNET_NO, dpcb, dpcbClosure, tt,
- ttClosure);
+ cfg,
+ uri,
+ filename,
+ 0,
+ GNUNET_ECRS_uri_get_file_siz
+ (uri), anonymityLevel, GNUNET_NO,
+ dpcb, dpcbClosure, tt, ttClosure);
}
@@ -1334,16 +1342,17 @@
*/
int
GNUNET_ECRS_file_download_partial (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const struct GNUNET_ECRS_URI *uri,
- const char *filename,
- unsigned long long offset,
- unsigned long long length,
- unsigned int anonymityLevel,
- int no_temporaries,
- GNUNET_ECRS_DownloadProgressCallback dpcb,
- void *dpcbClosure,
- GNUNET_ECRS_TestTerminate tt, void *ttClosure)
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri,
+ const char *filename,
+ unsigned long long offset,
+ unsigned long long length,
+ unsigned int anonymityLevel,
+ int no_temporaries,
+ GNUNET_ECRS_DownloadProgressCallback dpcb,
+ void *dpcbClosure,
+ GNUNET_ECRS_TestTerminate tt,
+ void *ttClosure)
{
IOContext ioc;
RequestManager *rm;
@@ -1359,8 +1368,8 @@
#if DEBUG_DOWNLOAD
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' running for file `%s'\n", __FUNCTION__, filename);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "`%s' running for file `%s'\n", __FUNCTION__, filename);
#endif
GNUNET_GE_ASSERT (ectx, filename != NULL);
if ((filename[strlen (filename) - 1] == '/') ||
@@ -1437,8 +1446,8 @@
{
#if DEBUG_DOWNLOAD
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' aborted for file `%s'\n", __FUNCTION__, realFN);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "`%s' aborted for file `%s'\n", __FUNCTION__, realFN);
#endif
GNUNET_free (realFN);
return GNUNET_SYSERR;
@@ -1497,10 +1506,10 @@
{
#if 0
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Download ends prematurely: %d %llu == %llu %d TT: %d\n",
- rm->requestListIndex,
- ctx.completed, ctx.total, rm->abortFlag, tt (ttClosure));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Download ends prematurely: %d %llu == %llu %d TT: %d\n",
+ rm->requestListIndex,
+ ctx.completed, ctx.total, rm->abortFlag, tt (ttClosure));
#endif
ret = GNUNET_SYSERR;
}
@@ -1515,8 +1524,8 @@
if (0 != UNLINK (realFN))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "unlink", realFN);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "unlink", realFN);
}
else
{ /* delete empty directories */
@@ -1541,10 +1550,10 @@
}
#if DEBUG_DOWNLOAD
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' terminating for file `%s' with result %s\n",
- __FUNCTION__, filename,
- ret == GNUNET_OK ? "SUCCESS" : "INCOMPLETE");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "`%s' terminating for file `%s' with result %s\n",
+ __FUNCTION__, filename,
+ ret == GNUNET_OK ? "SUCCESS" : "INCOMPLETE");
#endif
GNUNET_free (realFN);
return ret;
Modified: GNUnet/src/applications/fs/ecrs/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/downloadtest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/ecrs/downloadtest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -96,11 +96,11 @@
GNUNET_free (buf);
CLOSE (fd);
ret = GNUNET_ECRS_file_upload (NULL, cfg, name, GNUNET_YES, /* index */
- 0, /* anon */
- 0, /* prio */
- GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES, /*
expire */
- NULL, /* progress */
- NULL, &testTerminate, NULL, &uri);
+ 0, /* anon */
+ 0, /* prio */
+ GNUNET_get_time () + 10 *
GNUNET_CRON_MINUTES, /* expire */
+ NULL, /* progress */
+ NULL, &testTerminate, NULL, &uri);
GNUNET_free (name);
return uri;
}
@@ -119,23 +119,25 @@
tmp = GNUNET_ECRS_uri_to_string (uri);
GNUNET_GE_LOG (NULL,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Starting download of `%s'\n", tmp);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Starting download of `%s'\n", tmp);
GNUNET_free (tmp);
tmpName = makeName (0);
ret = GNUNET_SYSERR;
for (j = SIZE - 16 * 1024; j >= 0; j -= 16 * 1024)
{
if (GNUNET_OK == GNUNET_ECRS_file_download_partial (NULL,
- cfg,
- uri,
- tmpName,
- j,
- 16 * 1024,
- 0,
- GNUNET_NO,
- &progress_check,
- NULL, &testTerminate, NULL))
+ cfg,
+ uri,
+ tmpName,
+ j,
+ 16 * 1024,
+ 0,
+ GNUNET_NO,
+ &progress_check,
+ NULL,
+ &testTerminate,
+ NULL))
{
fd = GNUNET_disk_file_open (NULL, tmpName, O_RDONLY);
buf = GNUNET_malloc (size);
@@ -168,7 +170,9 @@
char *name;
name = makeName (size);
- ret = GNUNET_ECRS_file_uninde (NULL, cfg, name, NULL, NULL, &testTerminate,
NULL);
+ ret =
+ GNUNET_ECRS_file_uninde (NULL, cfg, name, NULL, NULL, &testTerminate,
+ NULL);
if (0 != UNLINK (name))
ret = GNUNET_SYSERR;
GNUNET_free (name);
Modified: GNUnet/src/applications/fs/ecrs/ecrs.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrs.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/ecrs.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -30,7 +30,8 @@
#include "ecrs.h"
void
-GNUNET_ECRS_encryptInPlace (const GNUNET_HashCode * hc, void *data, unsigned
int len)
+GNUNET_ECRS_encryptInPlace (const GNUNET_HashCode * hc, void *data,
+ unsigned int len)
{
char *tmp;
GNUNET_AES_SessionKey skey;
@@ -38,13 +39,15 @@
GNUNET_hash_to_AES_key (hc, &skey, &iv);
tmp = GNUNET_malloc (len);
- GNUNET_GE_ASSERT (NULL, len == GNUNET_AES_encrypt (data, len, &skey, &iv,
tmp));
+ GNUNET_GE_ASSERT (NULL,
+ len == GNUNET_AES_encrypt (data, len, &skey, &iv, tmp));
memcpy (data, tmp, len);
GNUNET_free (tmp);
}
void
-GNUNET_ECRS_decryptInPlace (const GNUNET_HashCode * hc, void *data, unsigned
int len)
+GNUNET_ECRS_decryptInPlace (const GNUNET_HashCode * hc, void *data,
+ unsigned int len)
{
char *tmp;
GNUNET_AES_SessionKey skey;
@@ -52,7 +55,8 @@
GNUNET_hash_to_AES_key (hc, &skey, &iv);
tmp = GNUNET_malloc (len);
- GNUNET_GE_ASSERT (NULL, len == GNUNET_AES_decrypt (&skey, data, len, &iv,
tmp));
+ GNUNET_GE_ASSERT (NULL,
+ len == GNUNET_AES_decrypt (&skey, data, len, &iv, tmp));
memcpy (data, tmp, len);
GNUNET_free (tmp);
}
Modified: GNUnet/src/applications/fs/ecrs/ecrs.h
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrs.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/ecrs.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -112,10 +112,10 @@
void GNUNET_ECRS_encryptInPlace (const GNUNET_HashCode * hc,
- void *data, unsigned int len);
+ void *data, unsigned int len);
void GNUNET_ECRS_decryptInPlace (const GNUNET_HashCode * hc,
- void *data, unsigned int len);
+ void *data, unsigned int len);
Modified: GNUnet/src/applications/fs/ecrs/ecrstest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/ecrstest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/ecrstest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -77,11 +77,11 @@
GNUNET_free (buf);
CLOSE (fd);
ret = GNUNET_ECRS_file_upload (NULL, cfg, name, GNUNET_YES, /* index */
- 0, /* anon */
- 0, /* prio */
- GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES, /*
expire */
- NULL, /* progress */
- NULL, &testTerminate, NULL, &uri);
+ 0, /* anon */
+ 0, /* prio */
+ GNUNET_get_time () + 10 *
GNUNET_CRON_MINUTES, /* expire */
+ NULL, /* progress */
+ NULL, &testTerminate, NULL, &uri);
if (ret != GNUNET_SYSERR)
{
struct GNUNET_ECRS_MetaData *meta;
@@ -93,8 +93,8 @@
meta = GNUNET_ECRS_meta_data_create ();
key = GNUNET_ECRS_keyword_strings_to_uri (keywords);
- ret = GNUNET_ECRS_publish_under_keyword (NULL, cfg, key, 0, 0,
GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES, /* expire */
- uri, meta);
+ ret = GNUNET_ECRS_publish_under_keyword (NULL, cfg, key, 0, 0,
GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES, /* expire */
+ uri, meta);
GNUNET_ECRS_meta_data_destroy (meta);
GNUNET_ECRS_uri_destroy (uri);
GNUNET_free (name);
@@ -124,7 +124,8 @@
tmp = GNUNET_ECRS_uri_to_string (fi->uri);
GNUNET_GE_LOG (NULL,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "Search found
URI `%s'\n", tmp);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Search found URI `%s'\n", tmp);
GNUNET_free (tmp);
GNUNET_GE_ASSERT (NULL, NULL == *my);
*my = GNUNET_ECRS_uri_duplicate (fi->uri);
@@ -143,11 +144,11 @@
myURI = NULL;
ret = GNUNET_ECRS_search (NULL,
- cfg,
- *uri,
- 0,
- 15 * GNUNET_CRON_SECONDS,
- &searchCB, &myURI, &testTerminate, NULL);
+ cfg,
+ *uri,
+ 0,
+ 15 * GNUNET_CRON_SECONDS,
+ &searchCB, &myURI, &testTerminate, NULL);
GNUNET_ECRS_uri_destroy (*uri);
*uri = myURI;
if ((ret != GNUNET_SYSERR) && (myURI != NULL))
@@ -169,16 +170,16 @@
tmp = GNUNET_ECRS_uri_to_string (uri);
GNUNET_GE_LOG (NULL,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Starting download of `%s'\n", tmp);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Starting download of `%s'\n", tmp);
GNUNET_free (tmp);
tmpName = makeName (0);
ret = GNUNET_SYSERR;
if (GNUNET_OK == GNUNET_ECRS_file_download (NULL,
- cfg,
- uri,
- tmpName, 0, NULL, NULL, &testTerminate,
- NULL))
+ cfg,
+ uri,
+ tmpName, 0, NULL, NULL,
+ &testTerminate, NULL))
{
fd = GNUNET_disk_file_open (NULL, tmpName, O_RDONLY);
@@ -210,7 +211,9 @@
char *name;
name = makeName (size);
- ret = GNUNET_ECRS_file_uninde (NULL, cfg, name, NULL, NULL, &testTerminate,
NULL);
+ ret =
+ GNUNET_ECRS_file_uninde (NULL, cfg, name, NULL, NULL, &testTerminate,
+ NULL);
if (0 != UNLINK (name))
ret = GNUNET_SYSERR;
GNUNET_free (name);
Modified: GNUnet/src/applications/fs/ecrs/helper.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/helper.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/helper.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -37,7 +37,8 @@
* if keywords is not legal (i.e. empty).
*/
struct GNUNET_ECRS_URI *
-GNUNET_ECRS_keyword_string_to_uri (struct GNUNET_GE_Context *ectx, const char
*input)
+GNUNET_ECRS_keyword_string_to_uri (struct GNUNET_GE_Context *ectx,
+ const char *input)
{
char **keywords;
unsigned int num_Words;
@@ -70,8 +71,8 @@
{
GNUNET_free_non_null (searchString);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
- _("No keywords specified!\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
+ _("No keywords specified!\n"));
return NULL;
}
keywords = GNUNET_malloc (num_Words * sizeof (char *));
@@ -90,7 +91,9 @@
++num_Words;
}
}
- uri = GNUNET_ECRS_keyword_command_line_to_uri (ectx, num_Words, (const char
**) keywords);
+ uri =
+ GNUNET_ECRS_keyword_command_line_to_uri (ectx, num_Words,
+ (const char **) keywords);
GNUNET_free (keywords);
GNUNET_free (searchString);
return uri;
@@ -106,7 +109,8 @@
*/
struct GNUNET_ECRS_URI *
GNUNET_ECRS_keyword_command_line_to_uri (struct GNUNET_GE_Context *ectx,
- unsigned int num_keywords, const char **keywords)
+ unsigned int num_keywords,
+ const char **keywords)
{
unsigned int i;
unsigned int uriLen;
@@ -119,7 +123,8 @@
GNUNET_array_grow (uriString, uriSize, 4096);
strcpy (uriString, GNUNET_ECRS_URI_PREFIX);
strcat (uriString, GNUNET_ECRS_SEARCH_INFIX);
- uriLen = 1 + strlen (GNUNET_ECRS_URI_PREFIX) + strlen
(GNUNET_ECRS_SEARCH_INFIX);
+ uriLen =
+ 1 + strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_SEARCH_INFIX);
for (i = 0; i < num_keywords; i++)
@@ -160,7 +165,8 @@
*/
struct GNUNET_ECRS_URI *
GNUNET_ECRS_keyword_list_to_uri (struct GNUNET_GE_Context *ectx,
- unsigned int num_keywords, const char **keywords)
+ unsigned int num_keywords,
+ const char **keywords)
{
unsigned int i;
unsigned int uriLen;
@@ -173,7 +179,8 @@
GNUNET_array_grow (uriString, uriSize, 4096);
strcpy (uriString, GNUNET_ECRS_URI_PREFIX);
strcat (uriString, GNUNET_ECRS_SEARCH_INFIX);
- uriLen = 1 + strlen (GNUNET_ECRS_URI_PREFIX) + strlen
(GNUNET_ECRS_SEARCH_INFIX);
+ uriLen =
+ 1 + strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_SEARCH_INFIX);
for (i = 0; i < num_keywords; i++)
Modified: GNUnet/src/applications/fs/ecrs/indexinfo.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/indexinfo.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/indexinfo.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -40,7 +40,8 @@
*/
int
GNUNET_ECRS_file_test_indexed (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, const char *filename)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *filename)
{
GNUNET_HashCode hc;
struct GNUNET_ClientServerConnection *sock;
@@ -98,8 +99,9 @@
if (errno != EINVAL)
{
GNUNET_GE_LOG_STRERROR_FILE (cls->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_ADMIN | GNUNET_GE_USER,
- "readlink", fullName);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK
+ | GNUNET_GE_ADMIN | GNUNET_GE_USER,
+ "readlink", fullName);
}
GNUNET_free (lnkName);
GNUNET_free (fullName);
@@ -138,8 +140,9 @@
*/
int
GNUNET_ECRS_get_indexed_files (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- GNUNET_ECRS_FileProcessor iterator, void *closure)
+ struct GNUNET_GC_Configuration *cfg,
+ GNUNET_ECRS_FileProcessor iterator,
+ void *closure)
{
char *tmp;
char *indexDirectory;
Modified: GNUnet/src/applications/fs/ecrs/keyspace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/keyspace.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/keyspace.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -79,22 +79,23 @@
j++;
if (j == size)
{
- GNUNET_GE_BREAK (NULL, 0); /* kblock malformed */
+ GNUNET_GE_BREAK (NULL, 0); /* kblock malformed */
return GNUNET_SYSERR;
}
dstURI = (const char *) &kb[1];
j++;
fi.meta = GNUNET_ECRS_meta_data_deserialize (ectx,
- &((const char *) kb)[j], size - j);
+ &((const char *) kb)[j],
+ size - j);
if (fi.meta == NULL)
{
- GNUNET_GE_BREAK (ectx, 0); /* kblock malformed */
+ GNUNET_GE_BREAK (ectx, 0); /* kblock malformed */
return GNUNET_SYSERR;
}
fi.uri = GNUNET_ECRS_string_to_uri (ectx, dstURI);
if (fi.uri == NULL)
{
- GNUNET_GE_BREAK (ectx, 0); /* kblock malformed */
+ GNUNET_GE_BREAK (ectx, 0); /* kblock malformed */
GNUNET_ECRS_meta_data_destroy (fi.meta);
return GNUNET_SYSERR;
}
@@ -117,13 +118,13 @@
*/
int
GNUNET_ECRS_publish_under_keyword (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const struct GNUNET_ECRS_URI *uri,
- unsigned int anonymityLevel,
- unsigned int priority,
- GNUNET_CronTime expirationTime,
- const struct GNUNET_ECRS_URI *dst,
- const struct GNUNET_ECRS_MetaData *md)
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri,
+ unsigned int anonymityLevel,
+ unsigned int priority,
+ GNUNET_CronTime expirationTime,
+ const struct GNUNET_ECRS_URI *dst,
+ const struct GNUNET_ECRS_MetaData *md)
{
struct GNUNET_ClientServerConnection *sock;
GNUNET_DatastoreValue *value;
@@ -151,7 +152,9 @@
GNUNET_GE_BREAK (ectx, 0);
return GNUNET_SYSERR;
}
- mdsize = GNUNET_ECRS_meta_data_get_serialized_size (md,
GNUNET_ECRS_SERIALIZE_PART);
+ mdsize =
+ GNUNET_ECRS_meta_data_get_serialized_size (md,
+ GNUNET_ECRS_SERIALIZE_PART);
dstURI = GNUNET_ECRS_uri_to_string (dst);
size = mdsize + sizeof (KBlock) + strlen (dstURI) + 1;
if (size > MAX_KBLOCK_SIZE)
@@ -163,10 +166,11 @@
memcpy (&kb[1], dstURI, strlen (dstURI) + 1);
mdsize = size - sizeof (KBlock) - strlen (dstURI) - 1;
mdsize = GNUNET_ECRS_meta_data_serialize (ectx,
- md,
- &((char *) &kb[1])[strlen (dstURI) +
+ md,
+ &((char *)
+ &kb[1])[strlen (dstURI) +
1], mdsize,
- GNUNET_ECRS_SERIALIZE_PART);
+ GNUNET_ECRS_SERIALIZE_PART);
if (mdsize == -1)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -182,12 +186,14 @@
kb->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_KEYWORD);
memcpy (&kb[1], dstURI, strlen (dstURI) + 1);
GNUNET_GE_ASSERT (ectx,
- mdsize ==
- GNUNET_ECRS_meta_data_serialize (ectx,
- md,
- &((char *) &kb[1])[strlen (dstURI) +
- 1], mdsize,
- GNUNET_ECRS_SERIALIZE_FULL));
+ mdsize ==
+ GNUNET_ECRS_meta_data_serialize (ectx,
+ md,
+ &((char *)
+ &kb[1])[strlen
+ (dstURI) +
+ 1], mdsize,
+
GNUNET_ECRS_SERIALIZE_FULL));
}
value->size = htonl (sizeof (GNUNET_DatastoreValue) + size);
value->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_KEYWORD);
@@ -198,9 +204,9 @@
ret = GNUNET_OK;
if (GNUNET_GC_get_configuration_value_yesno (cfg,
- "FS",
- "DISABLE-CREATION-TIME",
- GNUNET_NO) == GNUNET_YES)
+ "FS",
+ "DISABLE-CREATION-TIME",
+ GNUNET_NO) == GNUNET_YES)
xuri = GNUNET_ECRS_uri_duplicate (uri);
else
xuri = GNUNET_ECRS_uri_expand_keywords_with_date (uri);
@@ -215,21 +221,24 @@
#if DEBUG_KEYSPACE
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&key, &enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Encrypting KBlock with key %s.\n", &enc);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Encrypting KBlock with key %s.\n", &enc);
#endif
GNUNET_ECRS_encryptInPlace (&key, &kb[1], mdsize + strlen (dstURI) + 1);
pk = GNUNET_RSA_create_key_from_hash (&key);
GNUNET_RSA_get_public_key (pk, &kb->keyspace);
GNUNET_GE_ASSERT (ectx,
- GNUNET_OK == GNUNET_RSA_sign (pk,
- mdsize + strlen (dstURI) + 1,
- &kb[1], &kb->signature));
+ GNUNET_OK == GNUNET_RSA_sign (pk,
+ mdsize +
+ strlen (dstURI) + 1,
+ &kb[1],
+ &kb->signature));
#if EXTRA_CHECKS
/* extra check: verify sig */
GNUNET_GE_ASSERT (ectx,
- GNUNET_OK == getQueryFor (size, (DBlock *) kb, GNUNET_YES,
- &hc));
+ GNUNET_OK == getQueryFor (size, (DBlock *) kb,
+ GNUNET_YES, &hc));
#endif
GNUNET_RSA_free_key (pk);
if (GNUNET_OK != GNUNET_FS_insert (sock, value))
Modified: GNUnet/src/applications/fs/ecrs/meta.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/meta.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/meta.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -80,7 +80,7 @@
*/
int
GNUNET_ECRS_meta_data_inser (MetaData * md,
- EXTRACTOR_KeywordType type, const char *data)
+ EXTRACTOR_KeywordType type, const char *data)
{
int idx;
@@ -104,7 +104,7 @@
*/
int
GNUNET_ECRS_meta_data_delete (MetaData * md,
- EXTRACTOR_KeywordType type, const char *data)
+ EXTRACTOR_KeywordType type, const char *data)
{
int idx;
int ret = GNUNET_SYSERR;
@@ -134,7 +134,8 @@
*/
int
GNUNET_ECRS_meta_data_get_contents (const MetaData * md,
- GNUNET_ECRS_MetaDataProcessor iterator, void *closure)
+ GNUNET_ECRS_MetaDataProcessor iterator,
+ void *closure)
{
int i;
int sub;
@@ -161,7 +162,8 @@
* @return number of entries
*/
char *
-GNUNET_ECRS_meta_data_get_by_type (const MetaData * md, EXTRACTOR_KeywordType
type)
+GNUNET_ECRS_meta_data_get_by_type (const MetaData * md,
+ EXTRACTOR_KeywordType type)
{
int i;
@@ -253,7 +255,7 @@
*/
size_t
GNUNET_ECRS_meta_data_get_thumbnail (const struct GNUNET_ECRS_MetaData * md,
- unsigned char **thumb)
+ unsigned char **thumb)
{
char *encoded;
int ret;
@@ -301,9 +303,9 @@
*/
int
GNUNET_ECRS_meta_data_extract_from_file (struct GNUNET_GE_Context *ectx,
- MetaData * md,
- const char *filename,
- EXTRACTOR_ExtractorList * extractors)
+ MetaData * md,
+ const char *filename,
+ EXTRACTOR_ExtractorList * extractors)
{
EXTRACTOR_KeywordList *head;
EXTRACTOR_KeywordList *pos;
@@ -436,8 +438,8 @@
*/
int
GNUNET_ECRS_meta_data_serialize (struct GNUNET_GE_Context *ectx,
- const MetaData * md,
- char *target, unsigned int max, int part)
+ const MetaData * md,
+ char *target, unsigned int max, int part)
{
MetaDataHeader *hdr;
size_t size;
@@ -577,7 +579,7 @@
*/
struct GNUNET_ECRS_MetaData *
GNUNET_ECRS_meta_data_deserialize (struct GNUNET_GE_Context *ectx,
- const char *input, unsigned int size)
+ const char *input, unsigned int size)
{
MetaData *md;
const MetaDataHeader *hdr;
@@ -758,7 +760,8 @@
* @return the new filename
*/
char *
-GNUNET_ECRS_suggest_better_filename (struct GNUNET_GE_Context *ectx, const
char *filename)
+GNUNET_ECRS_suggest_better_filename (struct GNUNET_GE_Context *ectx,
+ const char *filename)
{
EXTRACTOR_ExtractorList *l;
EXTRACTOR_KeywordList *list;
@@ -797,8 +800,10 @@
while ((mimeMap[i][0] != NULL) && (0 != strcmp (mime, mimeMap[i][0])))
i++;
if (mimeMap[i][1] == NULL)
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Did not find mime type `%s' in extension list.\n", mime);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Did not find mime type `%s' in extension list.\n",
+ mime);
mime = mimeMap[i][1];
}
if (key == NULL)
@@ -873,17 +878,20 @@
if (0 != STAT (renameTo, &filestat))
{
if (0 != RENAME (filename, renameTo))
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Renaming of file `%s' to `%s' failed: %s\n"),
- filename, renameTo, STRERROR (errno));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Renaming of file `%s' to `%s' failed: %s\n"),
+ filename, renameTo, STRERROR (errno));
else
ret = GNUNET_strdup (renameTo);
}
else
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Could not rename file `%s' to `%s': file exists\n"),
- filename, renameTo);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Could not rename file `%s' to `%s': file exists\n"),
+ filename, renameTo);
}
}
GNUNET_free (path);
@@ -898,7 +906,7 @@
*/
int
GNUNET_ECRS_meta_data_test_equal (const struct GNUNET_ECRS_MetaData *md1,
- const struct GNUNET_ECRS_MetaData *md2)
+ const struct GNUNET_ECRS_MetaData *md2)
{
int i;
int j;
Modified: GNUnet/src/applications/fs/ecrs/metatest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/metatest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/metatest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -41,23 +41,27 @@
unsigned int size;
m = GNUNET_ECRS_meta_data_create ();
- if (GNUNET_OK != GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_TITLE,
"TestTitle"))
+ if (GNUNET_OK !=
+ GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_TITLE, "TestTitle"))
ABORT (m);
- if (GNUNET_OK != GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_AUTHOR,
"TestTitle"))
+ if (GNUNET_OK !=
+ GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_AUTHOR, "TestTitle"))
ABORT (m);
- if (GNUNET_OK == GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_TITLE,
"TestTitle")) /* dup! */
+ if (GNUNET_OK == GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_TITLE,
"TestTitle")) /* dup! */
ABORT (m);
- if (GNUNET_OK == GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_AUTHOR,
"TestTitle")) /* dup! */
+ if (GNUNET_OK == GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_AUTHOR,
"TestTitle")) /* dup! */
ABORT (m);
if (2 != GNUNET_ECRS_meta_data_get_contents (m, NULL, NULL))
ABORT (m);
- if (GNUNET_OK != GNUNET_ECRS_meta_data_delete (m, EXTRACTOR_AUTHOR,
"TestTitle"))
+ if (GNUNET_OK !=
+ GNUNET_ECRS_meta_data_delete (m, EXTRACTOR_AUTHOR, "TestTitle"))
ABORT (m);
if (GNUNET_OK == GNUNET_ECRS_meta_data_delete (m, EXTRACTOR_AUTHOR,
"TestTitle")) /* already gone */
ABORT (m);
if (1 != GNUNET_ECRS_meta_data_get_contents (m, NULL, NULL))
ABORT (m);
- if (GNUNET_OK != GNUNET_ECRS_meta_data_delete (m, EXTRACTOR_TITLE,
"TestTitle"))
+ if (GNUNET_OK !=
+ GNUNET_ECRS_meta_data_delete (m, EXTRACTOR_TITLE, "TestTitle"))
ABORT (m);
if (GNUNET_OK == GNUNET_ECRS_meta_data_delete (m, EXTRACTOR_TITLE,
"TestTitle")) /* already gone */
ABORT (m);
@@ -68,7 +72,8 @@
{
GNUNET_snprintf (val, 256, "%s.%d",
"A teststring that should compress well.", j);
- if (GNUNET_OK != GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_UNKNOWN, val))
+ if (GNUNET_OK !=
+ GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_UNKNOWN, val))
{
GNUNET_free (val);
ABORT (m);
@@ -78,10 +83,12 @@
if (i != GNUNET_ECRS_meta_data_get_contents (m, NULL, NULL))
ABORT (m);
- size = GNUNET_ECRS_meta_data_get_serialized_size (m,
GNUNET_ECRS_SERIALIZE_FULL);
+ size =
+ GNUNET_ECRS_meta_data_get_serialized_size (m, GNUNET_ECRS_SERIALIZE_FULL);
val = GNUNET_malloc (size);
if (size != GNUNET_ECRS_meta_data_serialize (NULL,
- m, val, size,
GNUNET_ECRS_SERIALIZE_FULL))
+ m, val, size,
+ GNUNET_ECRS_SERIALIZE_FULL))
{
GNUNET_free (val);
ABORT (m);
@@ -96,7 +103,8 @@
{
GNUNET_snprintf (val, 256, "%s.%d",
"A teststring that should compress well.", j);
- if (GNUNET_OK != GNUNET_ECRS_meta_data_delete (m, EXTRACTOR_UNKNOWN,
val))
+ if (GNUNET_OK !=
+ GNUNET_ECRS_meta_data_delete (m, EXTRACTOR_UNKNOWN, val))
{
GNUNET_free (val);
ABORT (m);
@@ -125,13 +133,18 @@
{
GNUNET_snprintf (txt, 128, "%u -- %u\n", i, q);
GNUNET_ECRS_meta_data_inser (meta,
- q % EXTRACTOR_getHighestKeywordTypeNumber (), txt);
+ q %
+ EXTRACTOR_getHighestKeywordTypeNumber (),
+ txt);
}
- size = GNUNET_ECRS_meta_data_get_serialized_size (meta,
GNUNET_ECRS_SERIALIZE_FULL);
+ size =
+ GNUNET_ECRS_meta_data_get_serialized_size (meta,
+ GNUNET_ECRS_SERIALIZE_FULL);
data = GNUNET_malloc (size * 4);
if (size != GNUNET_ECRS_meta_data_serialize (NULL,
- meta,
- data, size * 4,
GNUNET_ECRS_SERIALIZE_FULL))
+ meta,
+ data, size * 4,
+ GNUNET_ECRS_SERIALIZE_FULL))
{
GNUNET_free (data);
ABORT (meta);
Modified: GNUnet/src/applications/fs/ecrs/metatest2.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/metatest2.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/metatest2.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -45,15 +45,18 @@
GNUNET_ECRS_meta_data_destroy (m);
ABORT ();
}
- if (GNUNET_OK != GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_FILENAME,
"lib-link.m4"))
+ if (GNUNET_OK !=
+ GNUNET_ECRS_meta_data_inser (m, EXTRACTOR_FILENAME, "lib-link.m4"))
{
GNUNET_ECRS_meta_data_destroy (m);
ABORT ();
}
- size = GNUNET_ECRS_meta_data_get_serialized_size (m,
GNUNET_ECRS_SERIALIZE_FULL);
+ size =
+ GNUNET_ECRS_meta_data_get_serialized_size (m, GNUNET_ECRS_SERIALIZE_FULL);
val = GNUNET_malloc (size);
if (size != GNUNET_ECRS_meta_data_serialize (NULL,
- m, val, size,
GNUNET_ECRS_SERIALIZE_FULL))
+ m, val, size,
+ GNUNET_ECRS_SERIALIZE_FULL))
{
GNUNET_ECRS_meta_data_destroy (m);
GNUNET_free (val);
Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -45,9 +45,10 @@
char *fileName;
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY,
&fileName);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &fileName);
gnHome = GNUNET_expand_file_name (ectx, fileName);
GNUNET_free (fileName);
fileName =
@@ -68,7 +69,8 @@
*/
int
GNUNET_ECRS_namespace_delete (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, const char *name)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *name)
{
char *fileName;
@@ -81,8 +83,8 @@
if (0 != UNLINK (fileName))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "unlink", fileName);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "unlink", fileName);
GNUNET_free (fileName);
return GNUNET_SYSERR;
}
@@ -112,14 +114,14 @@
*/
struct GNUNET_ECRS_URI *
GNUNET_ECRS_namespace_create (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *name,
- const struct GNUNET_ECRS_MetaData *meta,
- unsigned int anonymityLevel,
- unsigned int priority,
- GNUNET_CronTime expiration,
- const struct GNUNET_ECRS_URI *advertisementURI,
- const GNUNET_HashCode * rootEntry)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *name,
+ const struct GNUNET_ECRS_MetaData *meta,
+ unsigned int anonymityLevel,
+ unsigned int priority,
+ GNUNET_CronTime expiration,
+ const struct GNUNET_ECRS_URI *advertisementURI,
+ const GNUNET_HashCode * rootEntry)
{
struct GNUNET_ECRS_URI *rootURI;
char *fileName;
@@ -141,7 +143,8 @@
int i;
char *cpy;
- if ((advertisementURI != NULL) && (!GNUNET_ECRS_uri_test_ksk
(advertisementURI)))
+ if ((advertisementURI != NULL)
+ && (!GNUNET_ECRS_uri_test_ksk (advertisementURI)))
{
GNUNET_GE_BREAK (ectx, 0);
return NULL;
@@ -150,9 +153,9 @@
if (GNUNET_YES == GNUNET_disk_file_test (ectx, fileName))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Cannot create pseudonym `%s', file `%s' exists.\n"),
- name, fileName);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Cannot create pseudonym `%s', file `%s' exists.\n"),
+ name, fileName);
GNUNET_free (fileName);
return NULL;
}
@@ -166,7 +169,9 @@
/* create advertisements */
- mdsize = GNUNET_ECRS_meta_data_get_serialized_size (meta,
GNUNET_ECRS_SERIALIZE_PART);
+ mdsize =
+ GNUNET_ECRS_meta_data_get_serialized_size (meta,
+ GNUNET_ECRS_SERIALIZE_PART);
size = mdsize + sizeof (NBlock);
if (size > MAX_NBLOCK_SIZE)
{
@@ -176,9 +181,10 @@
nb->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_NAMESPACE);
mdsize = size - sizeof (NBlock);
mdsize = GNUNET_ECRS_meta_data_serialize (ectx,
- meta,
- (char *) &nb[1],
- mdsize, GNUNET_ECRS_SERIALIZE_PART);
+ meta,
+ (char *) &nb[1],
+ mdsize,
+ GNUNET_ECRS_SERIALIZE_PART);
if (mdsize == -1)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -194,8 +200,9 @@
nb = (NBlock *) & value[1];
nb->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_NAMESPACE);
GNUNET_ECRS_meta_data_serialize (ectx,
- meta,
- (char *) &nb[1], mdsize,
GNUNET_ECRS_SERIALIZE_FULL);
+ meta,
+ (char *) &nb[1], mdsize,
+ GNUNET_ECRS_SERIALIZE_FULL);
}
value->size = htonl (sizeof (GNUNET_DatastoreValue) + size);
value->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_NAMESPACE);
@@ -216,10 +223,12 @@
nb->rootEntry = *rootEntry;
GNUNET_GE_ASSERT (ectx,
- GNUNET_OK == GNUNET_RSA_sign (hk,
- mdsize +
- 3 * sizeof (GNUNET_HashCode),
- &nb->identifier, &nb->signature));
+ GNUNET_OK == GNUNET_RSA_sign (hk,
+ mdsize +
+ 3 *
+ sizeof (GNUNET_HashCode),
+ &nb->identifier,
+ &nb->signature));
if (GNUNET_OK != GNUNET_FS_insert (sock, value))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -254,18 +263,20 @@
GNUNET_hash (keywords[i], strlen (keywords[i]), &hc);
pk = GNUNET_RSA_create_key_from_hash (&hc);
GNUNET_RSA_get_public_key (pk, &knb->kblock.keyspace);
- GNUNET_GE_ASSERT (ectx, size - sizeof (KBlock) - sizeof (unsigned
int)
- == sizeof (NBlock) + mdsize);
- GNUNET_ECRS_encryptInPlace (&hc,
- &knb->nblock,
- size - sizeof (KBlock) -
- sizeof (unsigned int));
+ GNUNET_GE_ASSERT (ectx,
+ size - sizeof (KBlock) - sizeof (unsigned int) ==
+ sizeof (NBlock) + mdsize);
+ GNUNET_ECRS_encryptInPlace (&hc, &knb->nblock,
+ size - sizeof (KBlock) -
+ sizeof (unsigned int));
GNUNET_GE_ASSERT (ectx,
- GNUNET_OK == GNUNET_RSA_sign (pk,
- sizeof (NBlock) + mdsize,
- &knb->nblock,
- &knb->kblock.signature));
+ GNUNET_OK == GNUNET_RSA_sign (pk,
+ sizeof (NBlock) +
+ mdsize,
+ &knb->nblock,
+ &knb->kblock.
+ signature));
/* extra check: verify sig */
GNUNET_RSA_free_key (pk);
if (GNUNET_OK != GNUNET_FS_insert (sock, knvalue))
@@ -303,8 +314,9 @@
*/
int
GNUNET_ECRS_namespace_test_exists (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *name, const GNUNET_HashCode * hc)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *name,
+ const GNUNET_HashCode * hc)
{
struct GNUNET_RSA_PrivateKey *hk;
char *fileName;
@@ -324,7 +336,8 @@
if (len < 2)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("File `%s' does not contain a pseudonym.\n"), fileName);
+ _("File `%s' does not contain a pseudonym.\n"),
+ fileName);
GNUNET_free (fileName);
return GNUNET_SYSERR;
}
@@ -335,8 +348,8 @@
if (ntohs (hke->len) != len)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Format of pseudonym `%s' is invalid.\n"), name);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Format of pseudonym `%s' is invalid.\n"), name);
GNUNET_free (hke);
return GNUNET_SYSERR;
}
@@ -365,17 +378,17 @@
*/
struct GNUNET_ECRS_URI *
GNUNET_ECRS_namespace_add_content (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *name,
- unsigned int anonymityLevel,
- unsigned int priority,
- GNUNET_CronTime expiration,
- GNUNET_Int32Time creationTime,
- GNUNET_Int32Time updateInterval,
- const GNUNET_HashCode * thisId,
- const GNUNET_HashCode * nextId,
- const struct GNUNET_ECRS_URI *dstU,
- const struct GNUNET_ECRS_MetaData *md)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *name,
+ unsigned int anonymityLevel,
+ unsigned int priority,
+ GNUNET_CronTime expiration,
+ GNUNET_Int32Time creationTime,
+ GNUNET_Int32Time updateInterval,
+ const GNUNET_HashCode * thisId,
+ const GNUNET_HashCode * nextId,
+ const struct GNUNET_ECRS_URI *dstU,
+ const struct GNUNET_ECRS_MetaData *md)
{
struct GNUNET_ECRS_URI *uri;
struct GNUNET_ClientServerConnection *sock;
@@ -404,7 +417,8 @@
if (len < 2)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("File `%s' does not contain a pseudonym.\n"), fileName);
+ _("File `%s' does not contain a pseudonym.\n"),
+ fileName);
GNUNET_free (fileName);
return NULL;
}
@@ -415,7 +429,7 @@
if (ntohs (hke->len) != len)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Format of pseudonym `%s' is invalid.\n"), name);
+ _("Format of pseudonym `%s' is invalid.\n"), name);
GNUNET_free (hke);
return NULL;
}
@@ -426,7 +440,9 @@
/* THEN: construct SBlock */
dstURI = GNUNET_ECRS_uri_to_string (dstU);
- mdsize = GNUNET_ECRS_meta_data_get_serialized_size (md,
GNUNET_ECRS_SERIALIZE_PART);
+ mdsize =
+ GNUNET_ECRS_meta_data_get_serialized_size (md,
+ GNUNET_ECRS_SERIALIZE_PART);
size = mdsize + sizeof (SBlock) + strlen (dstURI) + 1;
if (size > MAX_SBLOCK_SIZE)
{
@@ -438,9 +454,10 @@
memcpy (destPos, dstURI, strlen (dstURI) + 1);
mdsize = size - sizeof (SBlock) - strlen (dstURI) - 1;
mdsize = GNUNET_ECRS_meta_data_serialize (ectx,
- md,
- &destPos[strlen (dstURI) + 1],
- mdsize, GNUNET_ECRS_SERIALIZE_PART);
+ md,
+ &destPos[strlen (dstURI) + 1],
+ mdsize,
+ GNUNET_ECRS_SERIALIZE_PART);
if (mdsize == -1)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -458,9 +475,9 @@
destPos = (char *) &sb[1];
memcpy (destPos, dstURI, strlen (dstURI) + 1);
GNUNET_ECRS_meta_data_serialize (ectx,
- md,
- &destPos[strlen (dstURI) + 1],
- mdsize, GNUNET_ECRS_SERIALIZE_FULL);
+ md,
+ &destPos[strlen (dstURI) + 1],
+ mdsize, GNUNET_ECRS_SERIALIZE_FULL);
}
value->size = htonl (sizeof (GNUNET_DatastoreValue) + size);
value->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_SIGNED);
@@ -485,20 +502,24 @@
uri->data.sks.identifier = *thisId;
GNUNET_ECRS_encryptInPlace (thisId,
- &sb->creationTime,
- size
- - sizeof (unsigned int)
- - sizeof (GNUNET_RSA_Signature)
- - sizeof (GNUNET_RSA_PublicKey) -
- sizeof (GNUNET_HashCode));
+ &sb->creationTime,
+ size
+ - sizeof (unsigned int)
+ - sizeof (GNUNET_RSA_Signature)
+ - sizeof (GNUNET_RSA_PublicKey) -
+ sizeof (GNUNET_HashCode));
/* FINALLY: GNUNET_RSA_sign & publish SBlock */
GNUNET_GE_ASSERT (ectx,
- GNUNET_OK == GNUNET_RSA_sign (hk,
- size
- - sizeof (GNUNET_RSA_Signature)
- - sizeof (GNUNET_RSA_PublicKey)
- - sizeof (unsigned int),
- &sb->identifier, &sb->signature));
+ GNUNET_OK == GNUNET_RSA_sign (hk,
+ size
+ -
+ sizeof
+ (GNUNET_RSA_Signature) -
+ sizeof
+ (GNUNET_RSA_PublicKey) -
+ sizeof (unsigned int),
+ &sb->identifier,
+ &sb->signature));
GNUNET_RSA_free_key (hk);
sock = GNUNET_client_connection_create (ectx, cfg);
@@ -546,8 +567,9 @@
if (len < 2)
{
GNUNET_GE_LOG (c->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("File `%s' does not contain a pseudonym.\n"), fileName);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("File `%s' does not contain a pseudonym.\n"),
+ fileName);
GNUNET_free (fileName);
return GNUNET_OK;
}
@@ -557,8 +579,8 @@
if (ntohs (hke->len) != len)
{
GNUNET_GE_LOG (c->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Format of file `%s' is invalid.\n"), fileName);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Format of file `%s' is invalid.\n"), fileName);
GNUNET_free (hke);
GNUNET_free (fileName);
return GNUNET_OK;
@@ -568,8 +590,8 @@
if (hk == NULL)
{
GNUNET_GE_LOG (c->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Format of file `%s' is invalid.\n"), fileName);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Format of file `%s' is invalid.\n"), fileName);
GNUNET_free (fileName);
GNUNET_GE_BREAK (c->ectx, 0);
return GNUNET_SYSERR;
@@ -598,8 +620,8 @@
*/
int
GNUNET_ECRS_get_namespaces (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- GNUNET_ECRS_NamespaceInfoProcessor cb, void *cls)
+ struct GNUNET_GC_Configuration *cfg,
+ GNUNET_ECRS_NamespaceInfoProcessor cb, void *cls)
{
char *dirName;
struct lNCLS myCLS;
Modified: GNUnet/src/applications/fs/ecrs/namespacetest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespacetest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/ecrs/namespacetest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -51,7 +51,8 @@
else
fprintf (stderr,
"Namespace search returned unexpected result: \nHAVE: %s\nWANT:
%s...\n",
- GNUNET_ECRS_uri_to_string (fi->uri), GNUNET_ECRS_uri_to_string
(want));
+ GNUNET_ECRS_uri_to_string (fi->uri),
+ GNUNET_ECRS_uri_to_string (want));
return GNUNET_OK;
}
@@ -78,30 +79,34 @@
GNUNET_hash ("root", 4, &root);
rootURI =
GNUNET_ECRS_namespace_create (NULL,
- cfg,
- CHECKNAME,
- meta,
- 0, 0, GNUNET_get_time () + 15 * GNUNET_CRON_MINUTES,
- adv, &root);
+ cfg,
+ CHECKNAME,
+ meta,
+ 0, 0,
+ GNUNET_get_time () +
+ 15 * GNUNET_CRON_MINUTES, adv, &root);
CHECK (NULL != rootURI);
GNUNET_hash ("this", 4, &thisId);
GNUNET_hash ("next", 4, &nextId);
uri = rootURI; /* just for fun: NS::this advertises NS::root
*/
- advURI = GNUNET_ECRS_namespace_add_content (NULL, cfg, CHECKNAME, 1,
/* anonymity */
- 1000, /* priority */
- 5 * GNUNET_CRON_MINUTES + GNUNET_get_time (),
- GNUNET_get_time_int32 (NULL) + 300,
- 0, &thisId, &nextId, uri, meta);
+ advURI = GNUNET_ECRS_namespace_add_content (NULL, cfg, CHECKNAME, 1, /*
anonymity */
+ 1000, /* priority */
+ 5 * GNUNET_CRON_MINUTES +
+ GNUNET_get_time (),
+ GNUNET_get_time_int32 (NULL) +
+ 300, 0, &thisId, &nextId, uri,
+ meta);
CHECK (NULL != advURI);
fprintf (stderr, "Starting namespace search...\n");
CHECK (GNUNET_OK == GNUNET_ECRS_search (NULL,
- cfg,
- advURI,
- 1, 60 * GNUNET_CRON_SECONDS, &spcb, uri,
- NULL, NULL));
+ cfg,
+ advURI,
+ 1, 60 * GNUNET_CRON_SECONDS, &spcb,
+ uri, NULL, NULL));
fprintf (stderr, "Completed namespace search...\n");
CHECK (GNUNET_OK == GNUNET_ECRS_namespace_delete (NULL, cfg, CHECKNAME));
- CHECK (GNUNET_SYSERR == GNUNET_ECRS_namespace_delete (NULL, cfg, CHECKNAME));
+ CHECK (GNUNET_SYSERR ==
+ GNUNET_ECRS_namespace_delete (NULL, cfg, CHECKNAME));
GNUNET_ECRS_meta_data_destroy (meta);
GNUNET_ECRS_uri_destroy (rootURI);
GNUNET_ECRS_uri_destroy (advURI);
Modified: GNUnet/src/applications/fs/ecrs/parser.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/parser.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/parser.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -32,9 +32,10 @@
* @param scls must be of type "struct GNUNET_ECRS_URI **"
*/
int
-GNUNET_ECRS_getopt_configure_set_keywords (GNUNET_CommandLineProcessorContext *
- ctx, void *scls, const char *option,
- const char *value)
+GNUNET_ECRS_getopt_configure_set_keywords (GNUNET_CommandLineProcessorContext
+ * ctx, void *scls,
+ const char *option,
+ const char *value)
{
struct GNUNET_ECRS_URI **uri = scls;
struct GNUNET_ECRS_URI *u = *uri;
@@ -62,9 +63,10 @@
* @param scls must be of type "struct GNUNET_ECRS_MetaData **"
*/
int
-GNUNET_ECRS_getopt_configure_set_metadata (GNUNET_CommandLineProcessorContext *
- ctx, void *scls, const char *option,
- const char *value)
+GNUNET_ECRS_getopt_configure_set_metadata (GNUNET_CommandLineProcessorContext
+ * ctx, void *scls,
+ const char *option,
+ const char *value)
{
struct GNUNET_ECRS_MetaData **mm = scls;
EXTRACTOR_KeywordType type;
@@ -97,7 +99,8 @@
(tmp[strlen (typename)] == ':') &&
(0 == strncmp (typename, tmp, strlen (typename))))
{
- GNUNET_ECRS_meta_data_inser (meta, type, &tmp[strlen (typename) +
1]);
+ GNUNET_ECRS_meta_data_inser (meta, type,
+ &tmp[strlen (typename) + 1]);
GNUNET_free (tmp);
tmp = NULL;
break;
@@ -106,7 +109,8 @@
(tmp[strlen (typename_i18n)] == ':') &&
(0 == strncmp (typename_i18n, tmp, strlen (typename_i18n))))
{
- GNUNET_ECRS_meta_data_inser (meta, type, &tmp[strlen (typename_i18n)
+ 1]);
+ GNUNET_ECRS_meta_data_inser (meta, type,
+ &tmp[strlen (typename_i18n) + 1]);
GNUNET_free (tmp);
tmp = NULL;
break;
Modified: GNUnet/src/applications/fs/ecrs/search.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/search.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/search.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -164,8 +164,8 @@
{
case chk:
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("CHK URI not allowed for search.\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("CHK URI not allowed for search.\n"));
break;
case sks:
{
@@ -176,7 +176,7 @@
&hk);
GNUNET_hash_xor (&hk, &uri->data.sks.namespace, &keys[0]); /*
compute routing key r = H(identifier) ^ namespace */
keys[1] = uri->data.sks.namespace;
- addPS (GNUNET_GNUNET_ECRS_BLOCKTYPE_SIGNED, 2, &keys[0],
&uri->data.sks.identifier, /* identifier = decryption key */
+ addPS (GNUNET_GNUNET_ECRS_BLOCKTYPE_SIGNED, 2, &keys[0],
&uri->data.sks.identifier, /* identifier = decryption key */
sqc);
break;
}
@@ -190,8 +190,8 @@
#if DEBUG_SEARCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Computing queries (this may take a while).\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Computing queries (this may take a while).\n");
#endif
for (i = 0; i < uri->data.ksk.keywordCount; i++)
{
@@ -200,19 +200,21 @@
pk = GNUNET_RSA_create_key_from_hash (&hc);
GNUNET_RSA_get_public_key (pk, &pub);
GNUNET_hash (&pub, sizeof (GNUNET_RSA_PublicKey), &query);
- addPS (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY, /*
GNUNET_GNUNET_ECRS_BLOCKTYPE_KEYWORD, GNUNET_GNUNET_ECRS_BLOCKTYPE_NAMESPACE or
GNUNET_GNUNET_ECRS_BLOCKTYPE_KEYWORD_FOR_NAMESPACE ok */
+ addPS (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY, /*
GNUNET_GNUNET_ECRS_BLOCKTYPE_KEYWORD, GNUNET_GNUNET_ECRS_BLOCKTYPE_NAMESPACE or
GNUNET_GNUNET_ECRS_BLOCKTYPE_KEYWORD_FOR_NAMESPACE ok */
1, &query, &hc, sqc);
GNUNET_RSA_free_key (pk);
}
#if DEBUG_SEARCH
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER, "Queries ready.\n");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Queries ready.\n");
#endif
break;
}
case loc:
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("LOC URI not allowed for search.\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("LOC URI not allowed for search.\n"));
break;
default:
GNUNET_GE_BREAK (ectx, 0);
@@ -284,11 +286,11 @@
int ret;
fi.meta = GNUNET_ECRS_meta_data_deserialize (ectx,
- (const char *) &nb[1],
- size - sizeof (NBlock));
+ (const char *) &nb[1],
+ size - sizeof (NBlock));
if (fi.meta == NULL)
{
- GNUNET_GE_BREAK (ectx, 0); /* nblock malformed */
+ GNUNET_GE_BREAK (ectx, 0); /* nblock malformed */
return GNUNET_SYSERR;
}
fi.uri = &uri;
@@ -331,8 +333,9 @@
size = ntohl (value->size) - sizeof (GNUNET_DatastoreValue);
#if DEBUG_SEARCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Search received reply of type %u and size %u.\n", type, size);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Search received reply of type %u and size %u.\n", type,
+ size);
#endif
if (GNUNET_OK !=
getQueryFor (size, (const DBlock *) &value[1], GNUNET_YES, &query))
@@ -365,38 +368,42 @@
kb = GNUNET_malloc (size);
memcpy (kb, &value[1], size);
#if DEBUG_SEARCH
- IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- GNUNET_hash_to_enc (&ps->decryptKey, &enc));
+ IF_GELOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER, GNUNET_hash_to_enc (&ps->decryptKey,
+ &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Decrypting KBlock with key %s.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "Decrypting KBlock with key %s.\n", &enc);
#endif
GNUNET_ECRS_decryptInPlace (&ps->decryptKey,
- &kb[1], size - sizeof (KBlock));
+ &kb[1], size - sizeof (KBlock));
j = sizeof (KBlock);
while ((j < size) && (((const char *) kb)[j] != '\0'))
j++;
if (j == size)
{
- GNUNET_GE_BREAK (ectx, 0); /* kblock malformed */
+ GNUNET_GE_BREAK (ectx, 0); /* kblock malformed */
GNUNET_free (kb);
return GNUNET_SYSERR;
}
dstURI = (const char *) &kb[1];
j++;
fi.meta = GNUNET_ECRS_meta_data_deserialize (ectx,
- &((const char *) kb)[j],
- size - j);
+ &((const char *)
+ kb)[j],
+ size - j);
if (fi.meta == NULL)
{
- GNUNET_GE_BREAK (ectx, 0); /* kblock malformed */
+ GNUNET_GE_BREAK (ectx, 0); /* kblock malformed */
GNUNET_free (kb);
return GNUNET_SYSERR;
}
fi.uri = GNUNET_ECRS_string_to_uri (ectx, dstURI);
if (fi.uri == NULL)
{
- GNUNET_GE_BREAK (ectx, 0); /* kblock malformed */
+ GNUNET_GE_BREAK (ectx, 0); /* kblock malformed */
GNUNET_ECRS_meta_data_destroy (fi.meta);
GNUNET_free (kb);
return GNUNET_SYSERR;
@@ -435,9 +442,9 @@
kb = GNUNET_malloc (size);
memcpy (kb, &value[1], size);
GNUNET_ECRS_decryptInPlace (&ps->decryptKey,
- &kb->nblock,
- size - sizeof (KBlock) -
- sizeof (unsigned int));
+ &kb->nblock,
+ size - sizeof (KBlock) -
+ sizeof (unsigned int));
ret =
processNBlock (&kb->nblock, &ps->decryptKey,
size - sizeof (KNBlock) + sizeof (NBlock),
@@ -459,38 +466,38 @@
sb = GNUNET_malloc (size);
memcpy (sb, &value[1], size);
GNUNET_ECRS_decryptInPlace (&ps->decryptKey,
- &sb->creationTime,
- size
- - sizeof (unsigned int)
- - sizeof (GNUNET_RSA_Signature)
- - sizeof (GNUNET_RSA_PublicKey)
- - sizeof (GNUNET_HashCode));
+ &sb->creationTime,
+ size
+ - sizeof (unsigned int)
+ - sizeof (GNUNET_RSA_Signature)
+ - sizeof (GNUNET_RSA_PublicKey)
+ - sizeof (GNUNET_HashCode));
j = 0;
dstURI = (const char *) &sb[1];
while ((j < size - sizeof (SBlock)) && (dstURI[j] != '\0'))
j++;
if (j == size - sizeof (SBlock))
{
- GNUNET_GE_BREAK (ectx, 0); /* sblock malformed */
+ GNUNET_GE_BREAK (ectx, 0); /* sblock malformed */
GNUNET_free (sb);
return GNUNET_SYSERR;
}
j++;
/* j == strlen(dstURI) + 1 */
fi.meta = GNUNET_ECRS_meta_data_deserialize (ectx,
- &dstURI[j],
- size - j -
- sizeof (SBlock));
+ &dstURI[j],
+ size - j -
+ sizeof (SBlock));
if (fi.meta == NULL)
{
- GNUNET_GE_BREAK (ectx, 0); /* sblock malformed */
+ GNUNET_GE_BREAK (ectx, 0); /* sblock malformed */
GNUNET_free (sb);
return GNUNET_SYSERR;
}
fi.uri = GNUNET_ECRS_string_to_uri (ectx, dstURI);
if (fi.uri == NULL)
{
- GNUNET_GE_BREAK (ectx, 0); /* sblock malformed */
+ GNUNET_GE_BREAK (ectx, 0); /* sblock malformed */
GNUNET_ECRS_meta_data_destroy (fi.meta);
GNUNET_free (sb);
return GNUNET_SYSERR;
@@ -554,12 +561,13 @@
*/
int
GNUNET_ECRS_search (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const struct GNUNET_ECRS_URI *uri,
- unsigned int anonymityLevel,
- GNUNET_CronTime timeout,
- GNUNET_ECRS_SearchResultProcessor spcb,
- void *spcbClosure, GNUNET_ECRS_TestTerminate tt, void *ttClosure)
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri,
+ unsigned int anonymityLevel,
+ GNUNET_CronTime timeout,
+ GNUNET_ECRS_SearchResultProcessor spcb,
+ void *spcbClosure, GNUNET_ECRS_TestTerminate tt,
+ void *ttClosure)
{
SendQueriesContext ctx;
PendingSearch *ps;
@@ -624,20 +632,22 @@
ps->lastTransmission = now;
#if DEBUG_SEARCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "ECRS initiating FS search with timeout %llus and priority
%u.\n",
- (ps->timeout - now) / GNUNET_CRON_SECONDS, ps->priority);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "ECRS initiating FS search with timeout %llus and
priority %u.\n",
+ (ps->timeout - now) / GNUNET_CRON_SECONDS,
+ ps->priority);
#endif
ps->handle
= GNUNET_FS_start_search (ctx.sctx,
- NULL,
- ps->type,
- ps->keyCount,
- ps->keys,
- anonymityLevel,
- ps->priority,
- ps->timeout,
- (GNUNET_DatastoreValueIterator) &
receiveReplies, &ctx);
+ NULL,
+ ps->type,
+ ps->keyCount,
+ ps->keys,
+ anonymityLevel,
+ ps->priority,
+ ps->timeout,
+ (GNUNET_DatastoreValueIterator) &
+ receiveReplies, &ctx);
}
GNUNET_mutex_unlock (ctx.lock);
if (((NULL != tt) &&
Modified: GNUnet/src/applications/fs/ecrs/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/searchtest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/ecrs/searchtest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -67,11 +67,11 @@
searchFile (const struct GNUNET_ECRS_URI *uri, int resultCount)
{
GNUNET_ECRS_search (NULL,
- cfg,
- uri,
- 0,
- 60 * 15 * GNUNET_CRON_SECONDS,
- &searchCB, &resultCount, &testTerminate, NULL);
+ cfg,
+ uri,
+ 0,
+ 60 * 15 * GNUNET_CRON_SECONDS,
+ &searchCB, &resultCount, &testTerminate, NULL);
if (resultCount > 0)
return GNUNET_SYSERR;
return GNUNET_OK;
@@ -111,14 +111,14 @@
printf ("Testing search for 'XXtest' with one result.\n");
#endif
uri = GNUNET_ECRS_string_to_uri (NULL,
-
"gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test");
+
"gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test");
meta = GNUNET_ECRS_meta_data_create ();
keywords[0] = "XXtest";
keywords[1] = NULL;
key = GNUNET_ECRS_keyword_strings_to_uri (keywords);
- CHECK (GNUNET_OK == GNUNET_ECRS_publish_under_keyword (NULL, cfg, key, 0, 0,
GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES, /* expire */
- uri, meta));
+ CHECK (GNUNET_OK == GNUNET_ECRS_publish_under_keyword (NULL, cfg, key, 0, 0,
GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES, /* expire */
+ uri, meta));
CHECK (GNUNET_OK == searchFile (key, 1));
GNUNET_ECRS_uri_destroy (key);
GNUNET_ECRS_uri_destroy (uri);
@@ -129,12 +129,12 @@
printf ("Testing search for 'XXtest AND binary' with two results.\n");
#endif
uri = GNUNET_ECRS_string_to_uri (NULL,
-
"gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test-different");
+
"gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test-different");
keywords[1] = "binary";
keywords[2] = NULL;
key = GNUNET_ECRS_keyword_string_to_uri (keywords);
- CHECK (GNUNET_OK == GNUNET_ECRS_publish_under_keyword (NULL, cfg, key, 0, 0,
GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES, /* expire */
- uri, meta));
+ CHECK (GNUNET_OK == GNUNET_ECRS_publish_under_keyword (NULL, cfg, key, 0, 0,
GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES, /* expire */
+ uri, meta));
CHECK (GNUNET_OK == searchFile (key, 2));
GNUNET_ECRS_uri_destroy (key);
GNUNET_ECRS_uri_destroy (uri);
Modified: GNUnet/src/applications/fs/ecrs/unindex.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/unindex.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/unindex.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -54,7 +54,8 @@
*/
static int
pushBlock (struct GNUNET_ClientServerConnection *sock,
- const CHK * chk, unsigned int level, GNUNET_DatastoreValue **
iblocks)
+ const CHK * chk, unsigned int level,
+ GNUNET_DatastoreValue ** iblocks)
{
unsigned int size;
unsigned int present;
@@ -91,7 +92,8 @@
/* append CHK */
memcpy (&((char *) db)[size], chk, sizeof (CHK));
iblocks[level]->size = htonl (size +
- sizeof (CHK) + sizeof (GNUNET_DatastoreValue));
+ sizeof (CHK) +
+ sizeof (GNUNET_DatastoreValue));
return GNUNET_OK;
}
@@ -120,15 +122,17 @@
if (0 != LSTAT (fn, &buf))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER
| GNUNET_GE_ADMIN,
- "stat", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_USER | GNUNET_GE_ADMIN, "stat",
+ fn);
return GNUNET_SYSERR;
}
#ifdef S_ISLNK
if (!S_ISLNK (buf.st_mode))
return GNUNET_OK;
#endif
- serverDir = GNUNET_get_daemon_configuration_value (sock, "FS",
"INDEX-DIRECTORY");
+ serverDir =
+ GNUNET_get_daemon_configuration_value (sock, "FS", "INDEX-DIRECTORY");
if (serverDir == NULL)
return GNUNET_OK;
serverFN = GNUNET_malloc (strlen (serverDir) + 2 + sizeof (GNUNET_EncName));
@@ -142,8 +146,9 @@
if (0 != UNLINK (serverFN))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER
| GNUNET_GE_ADMIN,
- "unlink", serverFN);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_USER | GNUNET_GE_ADMIN, "unlink",
+ serverFN);
GNUNET_free (serverFN);
return GNUNET_SYSERR;
}
@@ -160,10 +165,11 @@
*/
int
GNUNET_ECRS_file_uninde (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;
@@ -222,7 +228,8 @@
if (fd == -1)
return GNUNET_SYSERR;
dblock =
- GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + DBLOCK_SIZE + sizeof
(DBlock));
+ GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + DBLOCK_SIZE +
+ sizeof (DBlock));
dblock->size =
htonl (sizeof (GNUNET_DatastoreValue) + DBLOCK_SIZE + sizeof (DBlock));
dblock->anonymityLevel = htonl (0);
@@ -231,18 +238,21 @@
dblock->expirationTime = GNUNET_htonll (0);
db = (DBlock *) & dblock[1];
db->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA);
- iblocks = GNUNET_malloc (sizeof (GNUNET_DatastoreValue *) * (treedepth + 1));
+ iblocks =
+ GNUNET_malloc (sizeof (GNUNET_DatastoreValue *) * (treedepth + 1));
for (i = 0; i <= treedepth; i++)
{
iblocks[i] =
GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + IBLOCK_SIZE +
sizeof (DBlock));
- iblocks[i]->size = htonl (sizeof (GNUNET_DatastoreValue) + sizeof
(DBlock));
+ iblocks[i]->size =
+ htonl (sizeof (GNUNET_DatastoreValue) + sizeof (DBlock));
iblocks[i]->anonymityLevel = htonl (0);
iblocks[i]->prio = htonl (0);
iblocks[i]->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA);
iblocks[i]->expirationTime = GNUNET_htonll (0);
- ((DBlock *) & iblocks[i][1])->type = htonl
(GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA);
+ ((DBlock *) & iblocks[i][1])->type =
+ htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA);
}
pos = 0;
@@ -264,8 +274,9 @@
if (size != READ (fd, &db[1], size))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "READ", filename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "READ", filename);
goto FAILURE;
}
if (tt != NULL)
Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/upload.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -114,16 +114,16 @@
*/
int
GNUNET_ECRS_file_upload (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *filename,
- int doIndex,
- unsigned int anonymityLevel,
- unsigned int priority,
- GNUNET_CronTime expirationTime,
- GNUNET_ECRS_UploadProgressCallback upcb,
- void *upcbClosure,
- GNUNET_ECRS_TestTerminate tt,
- void *ttClosure, struct GNUNET_ECRS_URI **uri)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *filename,
+ int doIndex,
+ unsigned int anonymityLevel,
+ unsigned int priority,
+ GNUNET_CronTime expirationTime,
+ GNUNET_ECRS_UploadProgressCallback upcb,
+ void *upcbClosure,
+ GNUNET_ECRS_TestTerminate tt,
+ void *ttClosure, struct GNUNET_ECRS_URI **uri)
{
unsigned long long filesize;
unsigned long long pos;
@@ -152,16 +152,16 @@
if (GNUNET_YES != GNUNET_disk_file_test (ectx, filename))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' is not a file.\n"), filename);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' is not a file.\n"), filename);
return GNUNET_SYSERR;
}
if (GNUNET_OK !=
GNUNET_disk_file_size (ectx, filename, &filesize, GNUNET_YES))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Cannot get size of file `%s'"), filename);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Cannot get size of file `%s'"), filename);
return GNUNET_SYSERR;
}
@@ -169,8 +169,8 @@
if (sock == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Failed to connect to gnunetd."));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Failed to connect to gnunetd."));
return GNUNET_SYSERR;
}
eta = 0;
@@ -181,8 +181,8 @@
if (GNUNET_SYSERR == GNUNET_hash_file (ectx, filename, &fileId))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Cannot hash `%s'.\n"), filename);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Cannot hash `%s'.\n"), filename);
GNUNET_client_connection_destroy (sock);
return GNUNET_SYSERR;
}
@@ -200,16 +200,17 @@
{
case GNUNET_SYSERR:
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Initialization for indexing file `%s' failed.\n"),
- filename);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Initialization for indexing file `%s' failed.\n"),
+ filename);
GNUNET_client_connection_destroy (sock);
return GNUNET_SYSERR;
case GNUNET_NO:
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Indexing file `%s' failed. Trying to insert file...\n"),
- filename);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Indexing file `%s' failed. Trying to insert
file...\n"),
+ filename);
doIndex = GNUNET_YES;
break;
default:
@@ -221,15 +222,17 @@
if (fd == -1)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Cannot open file `%s': `%s'"), filename, STRERROR (errno));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Cannot open file `%s': `%s'"), filename,
+ STRERROR (errno));
GNUNET_client_connection_destroy (sock);
return GNUNET_SYSERR;
}
dblock =
- GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + DBLOCK_SIZE + sizeof
(DBlock));
+ GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + DBLOCK_SIZE +
+ sizeof (DBlock));
dblock->size =
htonl (sizeof (GNUNET_DatastoreValue) + DBLOCK_SIZE + sizeof (DBlock));
dblock->anonymityLevel = htonl (anonymityLevel);
@@ -238,18 +241,21 @@
dblock->expirationTime = GNUNET_htonll (expirationTime);
db = (DBlock *) & dblock[1];
db->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA);
- iblocks = GNUNET_malloc (sizeof (GNUNET_DatastoreValue *) * (treedepth + 1));
+ iblocks =
+ GNUNET_malloc (sizeof (GNUNET_DatastoreValue *) * (treedepth + 1));
for (i = 0; i <= treedepth; i++)
{
iblocks[i] =
GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + IBLOCK_SIZE +
sizeof (DBlock));
- iblocks[i]->size = htonl (sizeof (GNUNET_DatastoreValue) + sizeof
(DBlock));
+ iblocks[i]->size =
+ htonl (sizeof (GNUNET_DatastoreValue) + sizeof (DBlock));
iblocks[i]->anonymityLevel = htonl (anonymityLevel);
iblocks[i]->prio = htonl (priority);
iblocks[i]->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA);
iblocks[i]->expirationTime = GNUNET_htonll (expirationTime);
- ((DBlock *) & iblocks[i][1])->type = htonl
(GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA);
+ ((DBlock *) & iblocks[i][1])->type =
+ htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA);
}
pos = 0;
@@ -267,15 +273,16 @@
memset (&db[1], 0, DBLOCK_SIZE);
}
GNUNET_GE_ASSERT (ectx,
- sizeof (GNUNET_DatastoreValue) + size + sizeof (DBlock) <
- GNUNET_MAX_BUFFER_SIZE);
+ sizeof (GNUNET_DatastoreValue) + size +
+ sizeof (DBlock) < GNUNET_MAX_BUFFER_SIZE);
dblock->size =
htonl (sizeof (GNUNET_DatastoreValue) + size + sizeof (DBlock));
if (size != READ (fd, &db[1], size))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_ADMIN | GNUNET_GE_USER,
- "READ", filename);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_ADMIN | GNUNET_GE_USER,
+ "READ", filename);
goto FAILURE;
}
if (tt != NULL)
@@ -288,16 +295,19 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&mchk.query, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Query for current block of size %u is %s\n", size, &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Query for current block of size %u is %s\n", size,
+ &enc);
#endif
if (doIndex)
{
if (GNUNET_SYSERR == GNUNET_FS_index (sock, &fileId, dblock, pos))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Indexing data failed at position %i.\n"), pos);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _("Indexing data failed at position %i.\n"),
+ pos);
goto FAILURE;
}
}
@@ -339,8 +349,8 @@
goto FAILURE;
#if DEBUG_UPLOAD
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Tree depth is %u, walking up tree.\n", treedepth);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Tree depth is %u, walking up tree.\n", treedepth);
#endif
for (i = 0; i < treedepth; i++)
{
@@ -350,7 +360,8 @@
{
#if DEBUG_UPLOAD
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "Level
%u is empty\n", i);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Level %u is empty\n", i);
#endif
continue;
}
@@ -358,8 +369,8 @@
fileBlockGetKey (db, size, &mchk.key);
#if DEBUG_UPLOAD
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Computing query for %u bytes content.\n", size);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Computing query for %u bytes content.\n", size);
#endif
fileBlockGetQuery (db, size, &mchk.query);
#if DEBUG_UPLOAD
@@ -367,8 +378,9 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&mchk.query, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Query for current block at level %u is `%s'.\n", i, &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Query for current block at level %u is `%s'.\n", i,
+ &enc);
#endif
if (GNUNET_OK != pushBlock (sock,
&mchk, i + 1, iblocks, priority,
@@ -397,10 +409,10 @@
}
#if DEBUG_UPLOAD
IF_GELOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&mchk.query,
- &enc));
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ GNUNET_hash_to_enc (&mchk.query, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Query for top block is %s\n", &enc);
+ "Query for top block is %s\n", &enc);
#endif
/* build URI */
fid.file_length = GNUNET_htonll (filesize);
Modified: GNUnet/src/applications/fs/ecrs/uri.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uri.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/uri.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -97,7 +97,8 @@
unsigned int i;
n =
- keywordCount + strlen (GNUNET_ECRS_URI_PREFIX) + strlen
(GNUNET_ECRS_SEARCH_INFIX) + 1;
+ keywordCount + strlen (GNUNET_ECRS_URI_PREFIX) +
+ strlen (GNUNET_ECRS_SEARCH_INFIX) + 1;
for (i = 0; i < keywordCount; i++)
n += strlen (keywords[i]);
ret = GNUNET_malloc (n);
@@ -132,8 +133,8 @@
GNUNET_hash_to_enc (identifier, &id);
GNUNET_snprintf (ret, n,
"%s%s%s/%s",
- GNUNET_ECRS_URI_PREFIX, GNUNET_ECRS_SUBSPACE_INFIX, (char
*) &ns,
- (char *) &id);
+ GNUNET_ECRS_URI_PREFIX, GNUNET_ECRS_SUBSPACE_INFIX,
+ (char *) &ns, (char *) &id);
return ret;
}
@@ -152,8 +153,8 @@
GNUNET_hash_to_enc (&fi->chk.query, &queryhash);
n =
- strlen (GNUNET_ECRS_URI_PREFIX) + 2 * sizeof (GNUNET_EncName) + 8 + 16 +
32 +
- strlen (GNUNET_ECRS_FILE_INFIX);
+ strlen (GNUNET_ECRS_URI_PREFIX) + 2 * sizeof (GNUNET_EncName) + 8 + 16 +
+ 32 + strlen (GNUNET_ECRS_FILE_INFIX);
ret = GNUNET_malloc (n);
GNUNET_snprintf (ret,
n,
@@ -238,7 +239,8 @@
* the number of keywords placed in the array
*/
static int
-parseKeywordURI (struct GNUNET_GE_Context *ectx, const char *uri, char
***keywords)
+parseKeywordURI (struct GNUNET_GE_Context *ectx, const char *uri,
+ char ***keywords)
{
unsigned int pos;
int ret;
@@ -254,7 +256,9 @@
if (0 != strncmp (uri, GNUNET_ECRS_URI_PREFIX, pos))
return GNUNET_SYSERR;
- if (0 != strncmp (&uri[pos], GNUNET_ECRS_SEARCH_INFIX, strlen
(GNUNET_ECRS_SEARCH_INFIX)))
+ if (0 !=
+ strncmp (&uri[pos], GNUNET_ECRS_SEARCH_INFIX,
+ strlen (GNUNET_ECRS_SEARCH_INFIX)))
return GNUNET_SYSERR;
pos += strlen (GNUNET_ECRS_SEARCH_INFIX);
if (slen == pos)
@@ -318,7 +322,8 @@
if (0 != strncmp (uri, GNUNET_ECRS_URI_PREFIX, pos))
return GNUNET_SYSERR;
if (0 != strncmp (&uri[pos],
- GNUNET_ECRS_SUBSPACE_INFIX, strlen
(GNUNET_ECRS_SUBSPACE_INFIX)))
+ GNUNET_ECRS_SUBSPACE_INFIX,
+ strlen (GNUNET_ECRS_SUBSPACE_INFIX)))
return GNUNET_SYSERR;
pos += strlen (GNUNET_ECRS_SUBSPACE_INFIX);
if ((slen < pos + sizeof (GNUNET_EncName) + 1) ||
@@ -354,7 +359,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if this is not a file URI
*/
static int
-parseFileURI (struct GNUNET_GE_Context *ectx, const char *uri, FileIdentifier
* fi)
+parseFileURI (struct GNUNET_GE_Context *ectx, const char *uri,
+ FileIdentifier * fi)
{
unsigned int pos;
size_t slen;
@@ -367,7 +373,9 @@
if (0 != strncmp (uri, GNUNET_ECRS_URI_PREFIX, pos))
return GNUNET_SYSERR;
- if (0 != strncmp (&uri[pos], GNUNET_ECRS_FILE_INFIX, strlen
(GNUNET_ECRS_FILE_INFIX)))
+ if (0 !=
+ strncmp (&uri[pos], GNUNET_ECRS_FILE_INFIX,
+ strlen (GNUNET_ECRS_FILE_INFIX)))
return GNUNET_SYSERR;
pos += strlen (GNUNET_ECRS_FILE_INFIX);
if ((slen < pos + 2 * sizeof (GNUNET_EncName) + 1) ||
@@ -402,7 +410,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if this is not a file URI
*/
static int
-parseLocationURI (struct GNUNET_GE_Context *ectx, const char *uri, Location *
loc)
+parseLocationURI (struct GNUNET_GE_Context *ectx, const char *uri,
+ Location * loc)
{
unsigned int pos;
unsigned int npos;
@@ -420,7 +429,8 @@
if (0 != strncmp (uri, GNUNET_ECRS_URI_PREFIX, pos))
return GNUNET_SYSERR;
if (0 != strncmp (&uri[pos],
- GNUNET_ECRS_LOCATION_INFIX, strlen
(GNUNET_ECRS_LOCATION_INFIX)))
+ GNUNET_ECRS_LOCATION_INFIX,
+ strlen (GNUNET_ECRS_LOCATION_INFIX)))
return GNUNET_SYSERR;
pos += strlen (GNUNET_ECRS_LOCATION_INFIX);
if ((slen < pos + 2 * sizeof (GNUNET_EncName) + 1) ||
@@ -573,7 +583,8 @@
* @return GNUNET_OK on success
*/
int
-GNUNET_ECRS_uri_get_namespace_from_sks (const struct GNUNET_ECRS_URI *uri,
GNUNET_HashCode * id)
+GNUNET_ECRS_uri_get_namespace_from_sks (const struct GNUNET_ECRS_URI *uri,
+ GNUNET_HashCode * id)
{
if (!GNUNET_ECRS_uri_test_sks (uri))
{
@@ -590,7 +601,8 @@
* @return GNUNET_OK on success
*/
int
-GNUNET_ECRS_uri_get_content_hash_from_sks (const struct GNUNET_ECRS_URI *uri,
GNUNET_HashCode * id)
+GNUNET_ECRS_uri_get_content_hash_from_sks (const struct GNUNET_ECRS_URI *uri,
+ GNUNET_HashCode * id)
{
if (!GNUNET_ECRS_uri_test_sks (uri))
{
@@ -639,7 +651,8 @@
*/
int
GNUNET_ECRS_uri_get_keywords_from_ksk (const struct GNUNET_ECRS_URI *uri,
- GNUNET_ECRS_KeywordIterator iterator, void *cls)
+ GNUNET_ECRS_KeywordIterator iterator,
+ void *cls)
{
int i;
if (uri->type != ksk)
@@ -880,7 +893,8 @@
* Are these two URIs equal?
*/
int
-GNUNET_ECRS_uri_test_equal (const struct GNUNET_ECRS_URI *uri1, const struct
GNUNET_ECRS_URI *uri2)
+GNUNET_ECRS_uri_test_equal (const struct GNUNET_ECRS_URI *uri1,
+ const struct GNUNET_ECRS_URI *uri2)
{
int ret;
int i;
@@ -945,7 +959,8 @@
* @return -1 if this is not a location URI, otherwise GNUNET_OK
*/
int
-GNUNET_ECRS_uri_get_peer_identity_from_loc (const struct GNUNET_ECRS_URI *uri,
GNUNET_PeerIdentity * peer)
+GNUNET_ECRS_uri_get_peer_identity_from_loc (const struct GNUNET_ECRS_URI *uri,
+ GNUNET_PeerIdentity * peer)
{
if (uri->type != loc)
return -1;
@@ -987,9 +1002,10 @@
*/
struct GNUNET_ECRS_URI *
GNUNET_ECRS_location_to_uri (const struct GNUNET_ECRS_URI *baseUri,
- const GNUNET_RSA_PublicKey * sender,
- GNUNET_Int32Time expirationTime,
- GNUNET_ECRS_SignFunction signer, void *signer_cls)
+ const GNUNET_RSA_PublicKey * sender,
+ GNUNET_Int32Time expirationTime,
+ GNUNET_ECRS_SignFunction signer,
+ void *signer_cls)
{
struct GNUNET_ECRS_URI *uri;
Modified: GNUnet/src/applications/fs/ecrs/uritest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uritest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs/uritest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -80,12 +80,13 @@
baseURI =
GNUNET_ECRS_string_to_uri (NULL,
-
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42");
+
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42");
hk = GNUNET_RSA_create_key ();
GNUNET_RSA_get_public_key (hk, &pk);
uri = GNUNET_ECRS_location_to_uri (baseURI,
- &pk, 43, (GNUNET_ECRS_SignFunction) &
GNUNET_RSA_sign,
- hk);
+ &pk, 43,
+ (GNUNET_ECRS_SignFunction) &
+ GNUNET_RSA_sign, hk);
GNUNET_RSA_free_key (hk);
if (uri == NULL)
{
@@ -144,17 +145,17 @@
if (NULL !=
GNUNET_ECRS_string_to_uri (NULL,
- "gnunet://ecrs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK"))
+
"gnunet://ecrs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3VUK"))
ABORT ();
if (NULL !=
GNUNET_ECRS_string_to_uri (NULL,
-
"gnunet://ecrs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3V/test"))
+
"gnunet://ecrs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3V/test"))
ABORT ();
if (NULL != GNUNET_ECRS_string_to_uri (NULL, "gnunet://ecrs/sks/test"))
ABORT ();
ret =
GNUNET_ECRS_string_to_uri (NULL,
-
"gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test");
+
"gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test");
if (ret == NULL)
ABORT ();
if (GNUNET_ECRS_uri_test_ksk (ret))
@@ -189,19 +190,19 @@
if (NULL !=
GNUNET_ECRS_string_to_uri (NULL,
-
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H00000440000.42"))
+
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H00000440000.42"))
ABORT ();
if (NULL !=
GNUNET_ECRS_string_to_uri (NULL,
-
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000"))
+
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000"))
ABORT ();
if (NULL !=
GNUNET_ECRS_string_to_uri (NULL,
-
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.FGH"))
+
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.FGH"))
ABORT ();
ret =
GNUNET_ECRS_string_to_uri (NULL,
-
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42");
+
"gnunet://ecrs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.42");
if (ret == NULL)
ABORT ();
if (GNUNET_ECRS_uri_test_ksk (ret))
Modified: GNUnet/src/applications/fs/ecrs_core.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs_core.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -46,7 +46,8 @@
int
fileBlockEncode (const DBlock * data,
unsigned int len,
- const GNUNET_HashCode * query, GNUNET_DatastoreValue ** value)
+ const GNUNET_HashCode * query,
+ GNUNET_DatastoreValue ** value)
{
GNUNET_HashCode hc;
GNUNET_AES_SessionKey skey;
@@ -68,10 +69,10 @@
db->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA);
GNUNET_GE_ASSERT (NULL, len - sizeof (DBlock) < GNUNET_MAX_BUFFER_SIZE);
GNUNET_GE_ASSERT (NULL,
- len - sizeof (DBlock)
- == GNUNET_AES_encrypt (&data[1],
- len - sizeof (DBlock), &skey, &iv,
- &db[1]));
+ len - sizeof (DBlock)
+ == GNUNET_AES_encrypt (&data[1],
+ len - sizeof (DBlock), &skey, &iv,
+ &db[1]));
GNUNET_hash (&db[1], len - sizeof (DBlock), &hc);
if (0 != memcmp (query, &hc, sizeof (GNUNET_HashCode)))
{
@@ -117,7 +118,8 @@
GNUNET_hash (data, len, &hc);
GNUNET_hash_to_AES_key (&hc, &skey, &iv);
tmp = GNUNET_malloc (len);
- GNUNET_GE_ASSERT (NULL, len == GNUNET_AES_encrypt (data, len, &skey, &iv,
tmp));
+ GNUNET_GE_ASSERT (NULL,
+ len == GNUNET_AES_encrypt (data, len, &skey, &iv, tmp));
GNUNET_hash (tmp, len, query);
GNUNET_free (tmp);
}
@@ -128,7 +130,7 @@
if (size <= 4)
{
GNUNET_GE_BREAK (NULL, 0);
- return GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY; /* signal error */
+ return GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY; /* signal error */
}
return ntohl (*((const unsigned int *) data));
}
@@ -253,12 +255,12 @@
}
case GNUNET_GNUNET_ECRS_BLOCKTYPE_ONDEMAND:
{
- GNUNET_GE_BREAK (NULL, 0); /* should never be used here! */
+ GNUNET_GE_BREAK (NULL, 0); /* should never be used here! */
return GNUNET_SYSERR;
}
default:
{
- GNUNET_GE_BREAK (NULL, 0); /* unknown block type */
+ GNUNET_GE_BREAK (NULL, 0); /* unknown block type */
return GNUNET_SYSERR;
}
} /* end switch */
@@ -296,8 +298,8 @@
}
if (0 != memcmp (hc, &keys[0], sizeof (GNUNET_HashCode)))
{
- GNUNET_GE_BREAK (NULL, 0); /* mismatch between primary queries,
- we should not even see those here. */
+ GNUNET_GE_BREAK (NULL, 0); /* mismatch between primary queries,
+ we should not even see those here.
*/
return GNUNET_SYSERR;
}
if (keyCount == 0)
@@ -324,13 +326,13 @@
case GNUNET_GNUNET_ECRS_BLOCKTYPE_KEYWORD:
case GNUNET_GNUNET_ECRS_BLOCKTYPE_KEYWORD_FOR_NAMESPACE:
if (keyCount != 1)
- GNUNET_GE_BREAK (NULL, 0); /* keyCount should be 1 */
+ GNUNET_GE_BREAK (NULL, 0); /* keyCount should be 1 */
return GNUNET_OK; /* if query matches, everything matches! */
case GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY:
- GNUNET_GE_BREAK (NULL, 0); /* block type should be known */
+ GNUNET_GE_BREAK (NULL, 0); /* block type should be known */
return GNUNET_SYSERR;
default:
- GNUNET_GE_BREAK (NULL, 0); /* unknown block type */
+ GNUNET_GE_BREAK (NULL, 0); /* unknown block type */
return GNUNET_SYSERR;
}
}
Modified: GNUnet/src/applications/fs/ecrs_core_test.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core_test.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/ecrs_core_test.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -43,7 +43,8 @@
data = GNUNET_malloc (len);
memset (&data[1], rand (), len - sizeof (DBlock));
data->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA);
- CHECK (GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA == getTypeOfBlock (len, data),
data);
+ CHECK (GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA == getTypeOfBlock (len, data),
+ data);
fileBlockGetKey (data, len, &key);
fileBlockGetQuery (data, len, &query);
CHECK (GNUNET_OK == fileBlockEncode (data, len, &query, &value), data);
Modified: GNUnet/src/applications/fs/fsui/deserialize.c
===================================================================
--- GNUnet/src/applications/fs/fsui/deserialize.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/fsui/deserialize.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -179,7 +179,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
static int
-readFileInfo (struct GNUNET_GE_Context *ectx, int fd, GNUNET_ECRS_FileInfo *
fi)
+readFileInfo (struct GNUNET_GE_Context *ectx, int fd,
+ GNUNET_ECRS_FileInfo * fi)
{
fi->meta = read_meta (ectx, fd);
if (fi->meta == NULL)
@@ -211,7 +212,8 @@
*/
static GNUNET_FSUI_DownloadList *
readDownloadList (struct GNUNET_GE_Context *ectx,
- int fd, GNUNET_FSUI_Context * ctx, GNUNET_FSUI_DownloadList
* parent)
+ int fd, GNUNET_FSUI_Context * ctx,
+ GNUNET_FSUI_DownloadList * parent)
{
GNUNET_FSUI_DownloadList *ret;
GNUNET_FSUI_SearchList *pos;
@@ -318,9 +320,9 @@
ret->child = readDownloadList (ectx, fd, ctx, ret);
#if DEBUG_PERSISTENCE
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FSUI persistence: restoring download `%s': (%llu, %llu)\n",
- ret->filename, ret->completed, ret->total);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FSUI persistence: restoring download `%s': (%llu, %llu)\n",
+ ret->filename, ret->completed, ret->total);
#endif
return ret;
}
@@ -422,12 +424,15 @@
GNUNET_GE_BREAK (NULL, 0);
break;
}
- if (!(GNUNET_ECRS_uri_test_ksk (list->uri) || GNUNET_ECRS_uri_test_sks
(list->uri)))
+ if (!
+ (GNUNET_ECRS_uri_test_ksk (list->uri)
+ || GNUNET_ECRS_uri_test_sks (list->uri)))
{
GNUNET_GE_BREAK (NULL, 0);
break;
}
- list->numberOfURIKeys = GNUNET_ECRS_uri_get_keyword_count_from_ksk
(list->uri);
+ list->numberOfURIKeys =
+ GNUNET_ECRS_uri_get_keyword_count_from_ksk (list->uri);
if (list->sizeResultsReceived > 0)
{
list->resultsReceived
@@ -762,9 +767,10 @@
{
GNUNET_GE_BREAK (ctx->ectx, 0);
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("FSUI state file `%s' had syntax error at offset %u.\n"),
- ctx->name, LSEEK (fd, 0, SEEK_CUR));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("FSUI state file `%s' had syntax error at offset %u.\n"),
+ ctx->name, LSEEK (fd, 0, SEEK_CUR));
}
CLOSE (fd);
UNLINK (ctx->name);
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/fsui/download.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -47,7 +47,8 @@
if (isRoot == GNUNET_YES)
return GNUNET_OK; /* namespace ad, ignore */
GNUNET_URITRACK_add_state (dl->ctx->ectx,
- dl->ctx->cfg, fi->uri, GNUNET_URITRACK_DIRECTORY_FOUND);
+ dl->ctx->cfg, fi->uri,
+ GNUNET_URITRACK_DIRECTORY_FOUND);
return GNUNET_OK;
}
@@ -57,14 +58,19 @@
/**
* Start to download a file.
*/
-static GNUNET_FSUI_DownloadList *startDownload (struct GNUNET_FSUI_Context
*ctx,
- unsigned int anonymityLevel,
- int is_recursive,
- const struct GNUNET_ECRS_URI *uri,
- const struct GNUNET_ECRS_MetaData
*meta,
- const char *filename,
- struct GNUNET_FSUI_SearchList
*psearch,
- GNUNET_FSUI_DownloadList * parent);
+static GNUNET_FSUI_DownloadList *startDownload (struct GNUNET_FSUI_Context
+ *ctx,
+ unsigned int anonymityLevel,
+ int is_recursive,
+ const struct GNUNET_ECRS_URI
+ *uri,
+ const struct
+ GNUNET_ECRS_MetaData *meta,
+ const char *filename,
+ struct GNUNET_FSUI_SearchList
+ *psearch,
+ GNUNET_FSUI_DownloadList *
+ parent);
/**
* Initiate a (recursive) download of the given
@@ -102,11 +108,13 @@
{
char *tmp = GNUNET_ECRS_uri_to_string (fi->uri);
GNUNET_GE_ASSERT (ectx,
- strlen (tmp) >=
- strlen (GNUNET_ECRS_URI_PREFIX) + strlen
(GNUNET_ECRS_FILE_INFIX));
+ strlen (tmp) >=
+ strlen (GNUNET_ECRS_URI_PREFIX) +
+ strlen (GNUNET_ECRS_FILE_INFIX));
filename =
GNUNET_strdup (&tmp
- [strlen (GNUNET_ECRS_URI_PREFIX) + strlen
(GNUNET_ECRS_FILE_INFIX)]);
+ [strlen (GNUNET_ECRS_URI_PREFIX) +
+ strlen (GNUNET_ECRS_FILE_INFIX)]);
GNUNET_free (tmp);
}
fullName =
@@ -118,8 +126,8 @@
GNUNET_free (filename);
#if DEBUG_DTM
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Starting recursive download of `%s'\n", fullName);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Starting recursive download of `%s'\n", fullName);
#endif
startDownload (parent->ctx,
parent->anonymityLevel,
@@ -195,8 +203,9 @@
{
md = NULL;
GNUNET_ECRS_directory_list_contents (dl->ctx->ectx,
- lastBlock,
- lastBlockSize, &md, &listURIfoundDirectory, dl);
+ lastBlock,
+ lastBlockSize, &md,
+ &listURIfoundDirectory, dl);
if (md != NULL)
GNUNET_ECRS_meta_data_destroy (md);
}
@@ -205,8 +214,9 @@
md = NULL;
GNUNET_mutex_lock (dl->ctx->lock);
GNUNET_ECRS_directory_list_contents (dl->ctx->ectx,
- lastBlock,
- lastBlockSize, &md, &triggerRecursiveDownload, dl);
+ lastBlock,
+ lastBlockSize, &md,
+ &triggerRecursiveDownload, dl);
GNUNET_mutex_unlock (dl->ctx->lock);
if (md != NULL)
GNUNET_ECRS_meta_data_destroy (md);
@@ -245,19 +255,21 @@
ectx = dl->ctx->ectx;
#if DEBUG_DTM
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Download thread for `%s' started...\n", dl->filename);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Download thread for `%s' started...\n", dl->filename);
#endif
GNUNET_GE_ASSERT (ectx, dl->ctx != NULL);
GNUNET_GE_ASSERT (ectx, dl->filename != NULL);
mem = GNUNET_GE_memory_create (2);
ee =
- GNUNET_GE_create_context_memory (GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_ERROR | GNUNET_GE_WARNING |
- GNUNET_GE_FATAL | GNUNET_GE_BULK |
GNUNET_GE_IMMEDIATE, mem);
+ GNUNET_GE_create_context_memory (GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_ERROR | GNUNET_GE_WARNING |
+ GNUNET_GE_FATAL | GNUNET_GE_BULK |
+ GNUNET_GE_IMMEDIATE, mem);
ret =
GNUNET_ECRS_file_download (ee, dl->ctx->cfg, dl->fi.uri, dl->filename,
- dl->anonymityLevel, &downloadProgressCallback, dl,
- &testTerminate, dl);
+ dl->anonymityLevel, &downloadProgressCallback,
+ dl, &testTerminate, dl);
if (ret == GNUNET_OK)
{
dl->state = GNUNET_FSUI_COMPLETED;
@@ -274,8 +286,9 @@
event.data.DownloadCompleted.filename = dl->filename;
event.data.DownloadCompleted.uri = dl->fi.uri;
GNUNET_URITRACK_add_state (dl->ctx->ectx,
- dl->ctx->cfg,
- dl->fi.uri, GNUNET_URITRACK_DOWNLOAD_COMPLETED);
+ dl->ctx->cfg,
+ dl->fi.uri,
+ GNUNET_URITRACK_DOWNLOAD_COMPLETED);
dl->ctx->ecb (dl->ctx->ecbClosure, &event);
}
else if (dl->state == GNUNET_FSUI_ACTIVE)
@@ -298,7 +311,8 @@
error = _("Download failed (no reason given)");
event.data.DownloadError.message = error;
GNUNET_URITRACK_add_state (dl->ctx->ectx,
- dl->ctx->cfg, dl->fi.uri,
GNUNET_URITRACK_DOWNLOAD_ABORTED);
+ dl->ctx->cfg, dl->fi.uri,
+ GNUNET_URITRACK_DOWNLOAD_ABORTED);
dl->ctx->ecb (dl->ctx->ecbClosure, &event);
}
else if (dl->state == GNUNET_FSUI_ABORTED)
@@ -313,7 +327,7 @@
event.data.DownloadAborted.dc.sctx =
dl->search == NULL ? NULL : dl->search->cctx;
GNUNET_URITRACK_add_state (dl->ctx->ectx, dl->ctx->cfg, dl->fi.uri,
- GNUNET_URITRACK_DOWNLOAD_ABORTED);
+ GNUNET_URITRACK_DOWNLOAD_ABORTED);
dl->ctx->ecb (dl->ctx->ecbClosure, &event);
}
else
@@ -324,7 +338,8 @@
if ((ret == GNUNET_OK) &&
- (dl->is_directory == GNUNET_YES) && (GNUNET_ECRS_uri_get_file_siz
(dl->fi.uri) > 0))
+ (dl->is_directory == GNUNET_YES)
+ && (GNUNET_ECRS_uri_get_file_siz (dl->fi.uri) > 0))
{
char *dirBlock;
int fd;
@@ -350,16 +365,19 @@
if (MAP_FAILED == dirBlock)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_ADMIN | GNUNET_GE_USER,
- "mmap", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_ADMIN | GNUNET_GE_USER,
+ "mmap", fn);
}
else
{
md = NULL;
GNUNET_ECRS_directory_list_contents (dl->ctx->ectx,
- dirBlock,
- totalBytes,
- &md, &listURIfoundDirectory, dl);
+ dirBlock,
+ totalBytes,
+ &md,
+ &listURIfoundDirectory,
+ dl);
if (md != NULL)
GNUNET_ECRS_meta_data_destroy (md);
@@ -369,9 +387,11 @@
md = NULL;
GNUNET_mutex_lock (dl->ctx->lock);
GNUNET_ECRS_directory_list_contents (dl->ctx->ectx,
- dirBlock,
- totalBytes,
- &md, &triggerRecursiveDownload, dl);
+ dirBlock,
+ totalBytes,
+ &md,
+
&triggerRecursiveDownload,
+ dl);
GNUNET_mutex_unlock (dl->ctx->lock);
GNUNET_ECRS_meta_data_destroy (md);
MUNMAP (dirBlock, totalBytes);
@@ -383,9 +403,9 @@
}
#if DEBUG_DTM
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Download thread for `%s' terminated (%s)...\n",
- dl->filename, ret == GNUNET_OK ? "COMPLETED" : "ABORTED");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Download thread for `%s' terminated (%s)...\n",
+ dl->filename, ret == GNUNET_OK ? "COMPLETED" : "ABORTED");
#endif
dl->runTime = GNUNET_get_time () - dl->startTime;
GNUNET_GE_free_context (ee);
@@ -403,7 +423,8 @@
const struct GNUNET_ECRS_URI *uri,
const struct GNUNET_ECRS_MetaData *meta,
const char *filename,
- struct GNUNET_FSUI_SearchList *psearch,
GNUNET_FSUI_DownloadList * parent)
+ struct GNUNET_FSUI_SearchList *psearch,
+ GNUNET_FSUI_DownloadList * parent)
{
GNUNET_FSUI_DownloadList *dl;
GNUNET_FSUI_Event event;
@@ -412,7 +433,7 @@
GNUNET_GE_ASSERT (NULL, parent != NULL);
if (!(GNUNET_ECRS_uri_test_chk (uri) || GNUNET_ECRS_uri_test_loc (uri)))
{
- GNUNET_GE_BREAK (NULL, 0); /* wrong type of URI! */
+ GNUNET_GE_BREAK (NULL, 0); /* wrong type of URI! */
return NULL;
}
dl = GNUNET_malloc (sizeof (GNUNET_FSUI_DownloadList));
@@ -442,12 +463,14 @@
event.data.DownloadStarted.dc.spos = dl->search;
event.data.DownloadStarted.dc.sctx =
dl->search == NULL ? NULL : dl->search->cctx;
- event.data.DownloadStarted.total = GNUNET_ECRS_uri_get_file_siz (dl->fi.uri);
+ event.data.DownloadStarted.total =
+ GNUNET_ECRS_uri_get_file_siz (dl->fi.uri);
event.data.DownloadStarted.filename = dl->filename;
event.data.DownloadStarted.fi.uri = dl->fi.uri;
event.data.DownloadStarted.fi.meta = dl->fi.meta;
event.data.DownloadStarted.anonymityLevel = dl->anonymityLevel;
- GNUNET_URITRACK_add_state (ctx->ectx, ctx->cfg, uri,
GNUNET_URITRACK_DOWNLOAD_STARTED);
+ GNUNET_URITRACK_add_state (ctx->ectx, ctx->cfg, uri,
+ GNUNET_URITRACK_DOWNLOAD_STARTED);
dl->cctx = dl->ctx->ecb (dl->ctx->ecbClosure, &event);
dl->next = parent->child;
parent->child = dl;
@@ -470,13 +493,13 @@
*/
struct GNUNET_FSUI_DownloadList *
GNUNET_FSUI_download_start (struct GNUNET_FSUI_Context *ctx,
- unsigned int anonymityLevel,
- int doRecursive,
- const struct GNUNET_ECRS_URI *uri,
- const struct GNUNET_ECRS_MetaData *meta,
- const char *filename,
- struct GNUNET_FSUI_SearchList *psearch,
- struct GNUNET_FSUI_DownloadList *pdownload)
+ unsigned int anonymityLevel,
+ int doRecursive,
+ const struct GNUNET_ECRS_URI *uri,
+ const struct GNUNET_ECRS_MetaData *meta,
+ const char *filename,
+ struct GNUNET_FSUI_SearchList *psearch,
+ struct GNUNET_FSUI_DownloadList *pdownload)
{
struct GNUNET_FSUI_DownloadList *ret;
@@ -511,10 +534,10 @@
#if DEBUG_DTM
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Download thread manager investigates pending download of file `%s'
(%u/%u downloads)\n",
- list->filename,
- list->ctx->activeDownloadThreads, list->ctx->threadPoolSize);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Download thread manager investigates pending download of
file `%s' (%u/%u downloads)\n",
+ list->filename,
+ list->ctx->activeDownloadThreads, list->ctx->threadPoolSize);
#endif
ret = GNUNET_NO;
/* should this one be started? */
@@ -525,9 +548,9 @@
{
#if DEBUG_DTM
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Download thread manager starts download of file `%s'\n",
- list->filename);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Download thread manager starts download of file `%s'\n",
+ list->filename);
#endif
list->state = GNUNET_FSUI_ACTIVE;
list->handle = GNUNET_thread_create (&downloadThread, list, 128 * 1024);
@@ -538,22 +561,25 @@
else
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ADMIN | GNUNET_GE_USER | GNUNET_GE_BULK |
GNUNET_GE_ERROR,
- "pthread_create");
+ GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK | GNUNET_GE_ERROR,
+ "pthread_create");
list->state = GNUNET_FSUI_ERROR_JOINED;
}
}
/* should this one be stopped? */
if ((list->ctx->threadPoolSize
- < list->ctx->activeDownloadThreads) && (list->state ==
GNUNET_FSUI_ACTIVE))
+ < list->ctx->activeDownloadThreads)
+ && (list->state == GNUNET_FSUI_ACTIVE))
{
#if DEBUG_DTM
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Download thread manager aborts active download of file `%s'
(%u/%u downloads)\n",
- list->filename,
- list->ctx->activeDownloadThreads, list->ctx->threadPoolSize);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Download thread manager aborts active download of file
`%s' (%u/%u downloads)\n",
+ list->filename,
+ list->ctx->activeDownloadThreads,
+ list->ctx->threadPoolSize);
#endif
list->state = GNUNET_FSUI_SUSPENDING;
GNUNET_GE_ASSERT (ectx, list->handle != NULL);
@@ -567,13 +593,14 @@
/* has this one "died naturally"? */
if ((list->state == GNUNET_FSUI_COMPLETED) ||
- (list->state == GNUNET_FSUI_ABORTED) || (list->state ==
GNUNET_FSUI_ERROR))
+ (list->state == GNUNET_FSUI_ABORTED)
+ || (list->state == GNUNET_FSUI_ERROR))
{
#if DEBUG_DTM
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Download thread manager collects inactive download of file
`%s'\n",
- list->filename);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Download thread manager collects inactive download of
file `%s'\n",
+ list->filename);
#endif
GNUNET_thread_stop_sleep (list->handle);
GNUNET_thread_join (list->handle, &unused);
@@ -601,7 +628,8 @@
* GNUNET_NO if the download has already finished
*/
int
-GNUNET_FSUI_download_abort (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_DownloadList *dl)
+GNUNET_FSUI_download_abort (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_DownloadList *dl)
{
struct GNUNET_FSUI_DownloadList *c;
@@ -633,7 +661,8 @@
* @return GNUNET_SYSERR if no such download is pending
*/
int
-GNUNET_FSUI_download_stop (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_DownloadList *dl)
+GNUNET_FSUI_download_stop (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_DownloadList *dl)
{
void *unused;
struct GNUNET_FSUI_DownloadList *prev;
@@ -652,8 +681,8 @@
{
GNUNET_mutex_unlock (ctx->lock);
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "GNUNET_FSUI_stopDownload failed to locate download.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "GNUNET_FSUI_stopDownload failed to locate download.\n");
return GNUNET_SYSERR;
}
if (prev == dl)
Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -102,7 +102,8 @@
{
char *u;
- if (!GNUNET_ECRS_uri_test_equal (upURI,
event->data.SearchResult.fi.uri))
+ if (!GNUNET_ECRS_uri_test_equal
+ (upURI, event->data.SearchResult.fi.uri))
{
#if DEBUG_VERBOSE
printf
@@ -117,11 +118,12 @@
#endif
GNUNET_free (u);
download = GNUNET_FSUI_download_start (ctx,
- 0,
- GNUNET_NO,
- event->data.SearchResult.fi.uri,
- event->data.SearchResult.fi.meta,
- fn, NULL, NULL);
+ 0,
+ GNUNET_NO,
+ event->data.SearchResult.fi.
+ uri,
+ event->data.SearchResult.fi.
+ meta, fn, NULL, NULL);
if (download == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -254,8 +256,8 @@
/* ACTUAL TEST CODE */
#endif
ctx = GNUNET_FSUI_start (NULL,
- cfg, "fsuidownloadtest", 32, GNUNET_YES, &eventCallback,
- NULL);
+ cfg, "fsuidownloadtest", 32, GNUNET_YES,
+ &eventCallback, NULL);
CHECK (ctx != NULL);
fn = makeName (42);
buf = GNUNET_malloc (FILESIZE);
@@ -267,12 +269,12 @@
kuri = GNUNET_ECRS_keyword_list_to_uri (ectx, 2, (const char **) keywords);
waitForEvent = GNUNET_FSUI_upload_completed;
upload = GNUNET_FSUI_upload_star (ctx,
- fn,
- (GNUNET_FSUI_DirectoryScanCallback) &
- GNUNET_disk_directory_scan, NULL, 0, 0,
- GNUNET_YES, GNUNET_NO, GNUNET_NO,
- GNUNET_get_time () + 5 * GNUNET_CRON_HOURS, meta,
- kuri, kuri);
+ fn,
+ (GNUNET_FSUI_DirectoryScanCallback) &
+ GNUNET_disk_directory_scan, NULL, 0, 0,
+ GNUNET_YES, GNUNET_NO, GNUNET_NO,
+ GNUNET_get_time () +
+ 5 * GNUNET_CRON_HOURS, meta, kuri, kuri);
CHECK (upload != NULL);
GNUNET_ECRS_uri_destroy (kuri);
kuri = NULL;
@@ -291,7 +293,8 @@
keywords[1]);
uri = GNUNET_ECRS_keyword_string_to_uri (ectx, keyword);
waitForEvent = GNUNET_FSUI_download_completed;
- search = GNUNET_FSUI_search_start (ctx, 0, 10000, 240 * GNUNET_CRON_SECONDS,
uri);
+ search =
+ GNUNET_FSUI_search_start (ctx, 0, 10000, 240 * GNUNET_CRON_SECONDS, uri);
CHECK (search != NULL);
prog = 0;
while (search != NULL)
@@ -306,14 +309,14 @@
#if DEBUG_VERBOSE
printf ("Testing FSUI suspend-resume\n");
#endif
- GNUNET_FSUI_stop (ctx); /* download possibly incomplete
- at this point, thus testing resume */
+ GNUNET_FSUI_stop (ctx); /* download possibly incomplete
+ at this point, thus testing resume
*/
CHECK (search == NULL);
CHECK (download == NULL);
ctx = GNUNET_FSUI_start (NULL,
- cfg,
- "fsuidownloadtest",
- 32, GNUNET_YES, &eventCallback, NULL);
+ cfg,
+ "fsuidownloadtest",
+ 32, GNUNET_YES, &eventCallback, NULL);
#if DEBUG_VERBOSE
printf ("Resumed...\n");
#endif
Modified: GNUnet/src/applications/fs/fsui/fsui-loader.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui-loader.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/fsui/fsui-loader.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -67,7 +67,9 @@
fprintf (stderr, "Call with name of FSUI resource file!\n");
return -1;
}
- ctx = GNUNET_FSUI_start (NULL, cfg, argv[1], 16, GNUNET_YES, &eventCallback,
NULL);
+ ctx =
+ GNUNET_FSUI_start (NULL, cfg, argv[1], 16, GNUNET_YES, &eventCallback,
+ NULL);
if (ctx != NULL)
GNUNET_FSUI_stop (ctx);
else
Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/fsui/fsui.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -49,8 +49,8 @@
#if DEBUG_PERSISTENCE
if (dpos != NULL)
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Download thread manager schedules pending downloads...\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Download thread manager schedules pending downloads...\n");
#endif
while (dpos != NULL)
{
@@ -63,7 +63,8 @@
/* ******************* START code *********************** */
static void
-signalDownloadResume (struct GNUNET_FSUI_DownloadList *ret,
GNUNET_FSUI_Context * ctx)
+signalDownloadResume (struct GNUNET_FSUI_DownloadList *ret,
+ GNUNET_FSUI_Context * ctx)
{
GNUNET_FSUI_Event event;
GNUNET_CronTime now;
@@ -110,7 +111,8 @@
}
static void
-signalUploadResume (struct GNUNET_FSUI_UploadList *ret, GNUNET_FSUI_Context *
ctx)
+signalUploadResume (struct GNUNET_FSUI_UploadList *ret,
+ GNUNET_FSUI_Context * ctx)
{
GNUNET_FSUI_Event event;
GNUNET_CronTime now;
@@ -157,18 +159,19 @@
* threads below are controlled by the parent.
*/
static void
-doResumeUploads (struct GNUNET_FSUI_UploadList *ret, GNUNET_FSUI_Context * ctx)
+doResumeUploads (struct GNUNET_FSUI_UploadList *ret,
+ GNUNET_FSUI_Context * ctx)
{
while (ret != NULL)
{
if (ret->state == GNUNET_FSUI_ACTIVE)
{
- ret->shared->handle = GNUNET_thread_create
(&GNUNET_FSUI_uploadThread,
- ret, 128 * 1024);
+ ret->shared->handle =
+ GNUNET_thread_create (&GNUNET_FSUI_uploadThread, ret, 128 * 1024);
if (ret->shared->handle == NULL)
GNUNET_GE_DIE_STRERROR (ctx->ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- "pthread_create");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "pthread_create");
}
ret = ret->next;
}
@@ -184,10 +187,10 @@
*/
struct GNUNET_FSUI_Context *
GNUNET_FSUI_start (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *name,
- unsigned int threadPoolSize,
- int doResume, GNUNET_FSUI_EventProcessor cb, void *closure)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *name,
+ unsigned int threadPoolSize,
+ int doResume, GNUNET_FSUI_EventProcessor cb, void *closure)
{
GNUNET_FSUI_Event event;
GNUNET_FSUI_Context *ret;
@@ -200,7 +203,7 @@
GNUNET_GE_ASSERT (ectx, cfg != NULL);
ret = GNUNET_malloc (sizeof (GNUNET_FSUI_Context));
memset (ret, 0, sizeof (GNUNET_FSUI_Context));
- ret->activeDownloads.state = GNUNET_FSUI_PENDING; /* !? */
+ ret->activeDownloads.state = GNUNET_FSUI_PENDING; /* !? */
ret->activeDownloads.ctx = ret;
ret->cfg = cfg;
ret->ecb = cb;
@@ -211,9 +214,10 @@
ret->activeDownloadThreads = 0;
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY, &gh);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &gh);
GNUNET_disk_directory_create (ectx, gh);
fn = GNUNET_malloc (strlen (gh) + strlen (name) + 2 + 5);
strcpy (fn, gh);
@@ -228,12 +232,14 @@
ret->ipc = GNUNET_IPC_semaphore_create (ectx, fn, 1);
#if DEBUG_PERSISTENCE
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Getting IPC lock for FSUI (%s).\n", fn);
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Getting IPC lock for FSUI (%s).\n", fn);
#endif
GNUNET_IPC_semaphore_down (ret->ipc, GNUNET_YES);
#if DEBUG_PERSISTENCE
- GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_REQUEST |
GNUNET_GE_USER, "Aquired IPC lock.\n");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Aquired IPC lock.\n");
#endif
strcat (fn, ".res");
GNUNET_FSUI_deserialize (ret);
@@ -288,7 +294,8 @@
ret->cron = cron_create (ectx);
/* 3a) resume downloads */
GNUNET_cron_add_job (ret->cron,
- &updateDownloadThreads, 0, GNUNET_FSUI_UDT_FREQUENCY,
ret);
+ &updateDownloadThreads, 0, GNUNET_FSUI_UDT_FREQUENCY,
+ ret);
GNUNET_cron_start (ret->cron);
/* 3b) resume uploads */
doResumeUploads (ret->activeUploads.child, ret);
@@ -303,8 +310,8 @@
xlist, 32 * 1024);
if (xlist->handle == NULL)
GNUNET_GE_DIE_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- "pthread_create");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "pthread_create");
}
xlist = xlist->next;
}
@@ -319,8 +326,8 @@
GNUNET_thread_create (&GNUNET_FSUI_searchThread, list, 32 * 1024);
if (list->handle == NULL)
GNUNET_GE_DIE_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- "pthread_create");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "pthread_create");
}
list = list->next;
}
@@ -335,7 +342,8 @@
*/
static void
signalDownloadSuspend (struct GNUNET_GE_Context *ectx,
- GNUNET_FSUI_Context * ctx, GNUNET_FSUI_DownloadList *
list)
+ GNUNET_FSUI_Context * ctx,
+ GNUNET_FSUI_DownloadList * list)
{
GNUNET_FSUI_Event event;
while (list != NULL)
@@ -405,7 +413,8 @@
* (recursively) free upload list
*/
static void
-freeUploadList (struct GNUNET_FSUI_Context *ctx, GNUNET_FSUI_UploadList * list)
+freeUploadList (struct GNUNET_FSUI_Context *ctx,
+ GNUNET_FSUI_UploadList * list)
{
GNUNET_FSUI_UploadList *next;
GNUNET_FSUI_UploadShared *shared;
@@ -454,13 +463,13 @@
ectx = ctx->ectx;
if (ctx->ipc != NULL)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FSUI shutdown. This may take a while.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FSUI shutdown. This may take a while.\n");
/* 1) stop everything */
GNUNET_cron_stop (ctx->cron);
- GNUNET_cron_del_job (ctx->cron, &updateDownloadThreads,
GNUNET_FSUI_UDT_FREQUENCY,
- ctx);
+ GNUNET_cron_del_job (ctx->cron, &updateDownloadThreads,
+ GNUNET_FSUI_UDT_FREQUENCY, ctx);
GNUNET_cron_destroy (ctx->cron);
/* 1a) stop downloading */
@@ -477,7 +486,8 @@
{
if ((spos->state == GNUNET_FSUI_ACTIVE) ||
(spos->state == GNUNET_FSUI_ABORTED) ||
- (spos->state == GNUNET_FSUI_ERROR) || (spos->state ==
GNUNET_FSUI_COMPLETED))
+ (spos->state == GNUNET_FSUI_ERROR)
+ || (spos->state == GNUNET_FSUI_COMPLETED))
{
if (spos->state == GNUNET_FSUI_ACTIVE)
spos->state = GNUNET_FSUI_PENDING;
@@ -494,7 +504,8 @@
{
if ((xpos->state == GNUNET_FSUI_ACTIVE) ||
(xpos->state == GNUNET_FSUI_ABORTED) ||
- (xpos->state == GNUNET_FSUI_ERROR) || (xpos->state ==
GNUNET_FSUI_COMPLETED))
+ (xpos->state == GNUNET_FSUI_ERROR)
+ || (xpos->state == GNUNET_FSUI_COMPLETED))
{
if (xpos->state == GNUNET_FSUI_ACTIVE)
xpos->state = GNUNET_FSUI_PENDING;
@@ -511,7 +522,8 @@
{
if ((upos->state == GNUNET_FSUI_ACTIVE) ||
(upos->state == GNUNET_FSUI_ABORTED) ||
- (upos->state == GNUNET_FSUI_ERROR) || (upos->state ==
GNUNET_FSUI_COMPLETED))
+ (upos->state == GNUNET_FSUI_ERROR)
+ || (upos->state == GNUNET_FSUI_COMPLETED))
{
/* NOTE: will force transitive termination
of rest of tree! */
@@ -606,7 +618,8 @@
GNUNET_free (ctx->name);
if (ctx->ipc != NULL)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "FSUI
shutdown complete.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FSUI shutdown complete.\n");
GNUNET_free (ctx);
}
Modified: GNUnet/src/applications/fs/fsui/fsuitest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/fsui/fsuitest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -72,11 +72,11 @@
#endif
fn = makeName (43);
download = GNUNET_FSUI_download_start (ctx,
- 0,
- GNUNET_NO,
- event->data.SearchResult.fi.uri,
- event->data.SearchResult.fi.meta,
- fn, NULL, NULL);
+ 0,
+ GNUNET_NO,
+ event->data.SearchResult.fi.uri,
+ event->data.SearchResult.fi.meta,
+ fn, NULL, NULL);
GNUNET_free (fn);
break;
case GNUNET_FSUI_upload_completed:
@@ -143,9 +143,9 @@
ok = GNUNET_YES;
/* ACTUAL TEST CODE */
- ctx = GNUNET_FSUI_start (NULL, cfg, "fsuitest", 32, /* thread pool size */
- GNUNET_NO, /* no resume */
- &eventCallback, NULL);
+ ctx = GNUNET_FSUI_start (NULL, cfg, "fsuitest", 32, /* thread pool size */
+ GNUNET_NO, /* no resume */
+ &eventCallback, NULL);
CHECK (ctx != NULL);
filename = makeName (42);
GNUNET_disk_file_write (NULL,
@@ -153,13 +153,13 @@
"foo bar test!", strlen ("foo bar test!"), "600");
meta = GNUNET_ECRS_meta_data_create ();
kuri = GNUNET_ECRS_keyword_list_to_uri (NULL, 2, (const char **) keywords);
- upload = GNUNET_FSUI_upload_star (ctx, filename,
(GNUNET_FSUI_DirectoryScanCallback) & GNUNET_disk_directory_scan, NULL, 0,
/* anonymity */
- 0, /* priority */
- GNUNET_YES,
- GNUNET_NO,
- GNUNET_NO,
- GNUNET_get_time () + 5 * GNUNET_CRON_HOURS, meta,
- kuri, kuri);
+ upload = GNUNET_FSUI_upload_star (ctx, filename,
(GNUNET_FSUI_DirectoryScanCallback) & GNUNET_disk_directory_scan, NULL, 0, /*
anonymity */
+ 0, /* priority */
+ GNUNET_YES,
+ GNUNET_NO,
+ GNUNET_NO,
+ GNUNET_get_time () +
+ 5 * GNUNET_CRON_HOURS, meta, kuri, kuri);
CHECK (upload != NULL);
GNUNET_ECRS_uri_destroy (kuri);
GNUNET_ECRS_meta_data_destroy (meta);
@@ -175,7 +175,8 @@
GNUNET_snprintf (keyword, 40, "%s %s %s", keywords[0], _("AND"),
keywords[1]);
uri = GNUNET_ECRS_keyword_string_to_uri (NULL, keyword);
- search = GNUNET_FSUI_search_start (ctx, 0, 100, 240 * GNUNET_CRON_SECONDS,
uri);
+ search =
+ GNUNET_FSUI_search_start (ctx, 0, 100, 240 * GNUNET_CRON_SECONDS, uri);
GNUNET_ECRS_uri_destroy (uri);
CHECK (search != NULL);
prog = 0;
Modified: GNUnet/src/applications/fs/fsui/fsuitest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest2.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/fsui/fsuitest2.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -69,12 +69,13 @@
GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS); /* give apps time to
start */
/* ACTUAL TEST CODE */
- ctx = GNUNET_FSUI_start (NULL, cfg, "fsuitest2", 32, GNUNET_YES, /* do
resume! */
- &eventCallback, NULL);
+ ctx = GNUNET_FSUI_start (NULL, cfg, "fsuitest2", 32, GNUNET_YES, /* do
resume! */
+ &eventCallback, NULL);
CHECK (ctx != NULL);
GNUNET_FSUI_stop (ctx);
ctx =
- GNUNET_FSUI_start (NULL, cfg, "fsuitest2", 32, GNUNET_YES, &eventCallback,
NULL);
+ GNUNET_FSUI_start (NULL, cfg, "fsuitest2", 32, GNUNET_YES, &eventCallback,
+ NULL);
CHECK (ctx != NULL);
FAILURE:
if (ctx != NULL)
Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/fsui/search.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -59,7 +59,8 @@
event.data.SearchResult.searchURI = pos->uri;
pos->ctx->ecb (pos->ctx->ecbClosure, &event);
GNUNET_URITRACK_add_state (pos->ctx->ectx,
- pos->ctx->cfg, pos->uri, GNUNET_URITRACK_SEARCH_RESULT);
+ pos->ctx->cfg, pos->uri,
+ GNUNET_URITRACK_SEARCH_RESULT);
}
@@ -82,7 +83,8 @@
if (isRoot)
{
GNUNET_NS_namespace_set_root (ectx, pos->ctx->cfg, fi->uri);
- GNUNET_NS_namespace_add_information (ectx, pos->ctx->cfg, fi->uri,
fi->meta);
+ GNUNET_NS_namespace_add_information (ectx, pos->ctx->cfg, fi->uri,
+ fi->meta);
return GNUNET_OK;
}
for (i = 0; i < pos->sizeResultsReceived; i++)
@@ -90,8 +92,8 @@
{
#if DEBUG_SEARCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received search result that I have seen before.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received search result that I have seen before.\n");
#endif
return GNUNET_OK; /* seen before */
}
@@ -102,8 +104,8 @@
GNUNET_GE_BREAK (ectx, 0);
#if DEBUG_SEARCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received search result without key to decrypt.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received search result without key to decrypt.\n");
#endif
return GNUNET_SYSERR;
}
@@ -119,8 +121,9 @@
{
#if DEBUG_SEARCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Received search result that I have seen before
(missing keyword to show client).\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "Received search result that I have seen
before (missing keyword to show client).\n");
#endif
return GNUNET_OK;
}
@@ -128,8 +131,9 @@
{
#if DEBUG_SEARCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received search result (showing client)!\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "Received search result (showing client)!\n");
#endif
GNUNET_array_grow (rp->matchingKeys, rp->matchingKeyCount,
0);
@@ -154,9 +158,10 @@
rp->matchingKeys[rp->matchingKeyCount - 1] = *key;
#if DEBUG_SEARCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received search result (waiting for more %u keys
before showing client).\n",
- pos->numberOfURIKeys - rp->matchingKeyCount);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "Received search result (waiting for more %u
keys before showing client).\n",
+ pos->numberOfURIKeys - rp->matchingKeyCount);
#endif
return GNUNET_OK;
}
@@ -175,9 +180,9 @@
rp->matchingKeys[0] = *key;
#if DEBUG_SEARCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received search result (waiting for %u more keys before showing
client).\n",
- pos->numberOfURIKeys - rp->matchingKeyCount);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received search result (waiting for %u more keys before
showing client).\n",
+ pos->numberOfURIKeys - rp->matchingKeyCount);
#endif
return GNUNET_OK;
}
@@ -185,8 +190,8 @@
{
#if DEBUG_SEARCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received search result (showing client)!\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received search result (showing client)!\n");
#endif
processResult (fi, pos);
}
@@ -217,13 +222,12 @@
mem = GNUNET_GE_memory_create (2);
ee = GNUNET_GE_create_context_memory (GNUNET_GE_USER | GNUNET_GE_ADMIN |
- GNUNET_GE_ERROR | GNUNET_GE_WARNING |
GNUNET_GE_FATAL |
- GNUNET_GE_BULK | GNUNET_GE_IMMEDIATE, mem);
- ret = GNUNET_ECRS_search (ee,
- pos->ctx->cfg,
- pos->uri,
- pos->anonymityLevel,
- pos->timeout, &spcb, pos, &testTerminate, pos);
+ GNUNET_GE_ERROR | GNUNET_GE_WARNING |
+ GNUNET_GE_FATAL | GNUNET_GE_BULK |
+ GNUNET_GE_IMMEDIATE, mem);
+ ret =
+ GNUNET_ECRS_search (ee, pos->ctx->cfg, pos->uri, pos->anonymityLevel,
+ pos->timeout, &spcb, pos, &testTerminate, pos);
if (ret != GNUNET_OK)
{
const char *error;
@@ -287,9 +291,10 @@
*/
struct GNUNET_FSUI_SearchList *
GNUNET_FSUI_search_start (struct GNUNET_FSUI_Context *ctx,
- unsigned int anonymityLevel,
- unsigned int maxResults,
- GNUNET_CronTime timeout, const struct GNUNET_ECRS_URI *uri)
+ unsigned int anonymityLevel,
+ unsigned int maxResults,
+ GNUNET_CronTime timeout,
+ const struct GNUNET_ECRS_URI *uri)
{
GNUNET_FSUI_SearchList *pos;
struct GNUNET_GE_Context *ectx;
@@ -314,8 +319,9 @@
if (pos->handle == NULL)
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER
| GNUNET_GE_ADMIN,
- "PTHREAD_CREATE");
+ GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_USER | GNUNET_GE_ADMIN,
+ "PTHREAD_CREATE");
GNUNET_ECRS_uri_destroy (pos->uri);
GNUNET_free (pos);
GNUNET_mutex_unlock (ctx->lock);
@@ -331,7 +337,8 @@
* Abort a search.
*/
int
-GNUNET_FSUI_search_abort (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_SearchList *sl)
+GNUNET_FSUI_search_abort (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_SearchList *sl)
{
if (sl->state == GNUNET_FSUI_PENDING)
{
@@ -349,7 +356,8 @@
* Stop a search.
*/
int
-GNUNET_FSUI_search_stop (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_SearchList *sl)
+GNUNET_FSUI_search_stop (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_SearchList *sl)
{
GNUNET_FSUI_Event event;
GNUNET_FSUI_SearchList *pos;
@@ -381,7 +389,8 @@
pos->next = NULL;
if ((pos->state == GNUNET_FSUI_ACTIVE) ||
(pos->state == GNUNET_FSUI_COMPLETED) ||
- (pos->state == GNUNET_FSUI_ABORTED) || (pos->state == GNUNET_FSUI_ERROR))
+ (pos->state == GNUNET_FSUI_ABORTED)
+ || (pos->state == GNUNET_FSUI_ERROR))
{
GNUNET_GE_ASSERT (ctx->ectx, pos->handle != NULL);
GNUNET_thread_join (pos->handle, &unused);
@@ -411,7 +420,8 @@
for (i = 0; i < pos->sizeUnmatchedResultsReceived; i++)
{
GNUNET_ECRS_uri_destroy (pos->unmatchedResultsReceived[i].fi.uri);
- GNUNET_ECRS_meta_data_destroy (pos->unmatchedResultsReceived[i].fi.meta);
+ GNUNET_ECRS_meta_data_destroy (pos->unmatchedResultsReceived[i].fi.
+ meta);
GNUNET_array_grow (pos->unmatchedResultsReceived[i].matchingKeys,
pos->unmatchedResultsReceived[i].matchingKeyCount,
0);
Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/fsui/searchtest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -150,21 +150,22 @@
#endif
lock = GNUNET_mutex_create (GNUNET_NO);
ctx = GNUNET_FSUI_start (NULL,
- cfg, "fsuisearchtest", 32, GNUNET_YES, &eventCallback,
- NULL);
+ cfg, "fsuisearchtest", 32, GNUNET_YES,
+ &eventCallback, NULL);
CHECK (ctx != NULL);
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, 100, 240 * GNUNET_CRON_SECONDS,
luri);
+ search =
+ GNUNET_FSUI_search_start (ctx, 0, 100, 240 * GNUNET_CRON_SECONDS, luri);
GNUNET_ECRS_uri_destroy (luri);
uri = NULL;
CHECK (NULL != search);
GNUNET_FSUI_stop (ctx);
/* resume search! */
ctx = GNUNET_FSUI_start (NULL,
- cfg, "fsuisearchtest", 32, GNUNET_YES, &eventCallback,
- NULL);
+ cfg, "fsuisearchtest", 32, GNUNET_YES,
+ &eventCallback, NULL);
fn = makeName (42);
GNUNET_disk_file_write (NULL,
fn, "foo bar test!", strlen ("foo bar test!"),
@@ -174,15 +175,12 @@
waitForEvent = GNUNET_FSUI_upload_completed;
upload =
GNUNET_FSUI_upload_star (ctx,
- fn,
- (GNUNET_FSUI_DirectoryScanCallback) &
GNUNET_disk_directory_scan,
- NULL,
- 0,
- 0,
- GNUNET_YES,
- GNUNET_NO, GNUNET_NO,
- GNUNET_get_time () + 5 * GNUNET_CRON_HOURS, meta, kuri,
- kuri);
+ fn,
+ (GNUNET_FSUI_DirectoryScanCallback) &
+ GNUNET_disk_directory_scan, NULL, 0, 0,
+ GNUNET_YES, GNUNET_NO, GNUNET_NO,
+ GNUNET_get_time () + 5 * GNUNET_CRON_HOURS, meta,
+ kuri, kuri);
CHECK (NULL != upload);
GNUNET_free (fn);
fn = NULL;
Modified: GNUnet/src/applications/fs/fsui/serialize.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serialize.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/fsui/serialize.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -76,16 +76,18 @@
char *buf;
size = GNUNET_ECRS_meta_data_get_serialized_size (meta,
- GNUNET_ECRS_SERIALIZE_FULL |
- GNUNET_ECRS_SERIALIZE_NO_COMPRESS);
+ GNUNET_ECRS_SERIALIZE_FULL
+ |
+
GNUNET_ECRS_SERIALIZE_NO_COMPRESS);
if (size > 1024 * 1024)
size = 1024 * 1024;
buf = GNUNET_malloc (size);
GNUNET_ECRS_meta_data_serialize (ectx,
- meta,
- buf,
- size,
- GNUNET_ECRS_SERIALIZE_PART |
GNUNET_ECRS_SERIALIZE_NO_COMPRESS);
+ meta,
+ buf,
+ size,
+ GNUNET_ECRS_SERIALIZE_PART |
+ GNUNET_ECRS_SERIALIZE_NO_COMPRESS);
WRITEINT (fd, size);
WRITE (fd, buf, size);
GNUNET_free (buf);
@@ -93,7 +95,8 @@
static void
-writeFileInfo (struct GNUNET_GE_Context *ectx, int fd, const
GNUNET_ECRS_FileInfo * fi)
+writeFileInfo (struct GNUNET_GE_Context *ectx, int fd,
+ const GNUNET_ECRS_FileInfo * fi)
{
writeMetaData (ectx, fd, fi->meta);
writeURI (fd, fi->uri);
@@ -105,7 +108,8 @@
*/
static void
writeDownloadList (struct GNUNET_GE_Context *ectx,
- int fd, GNUNET_FSUI_Context * ctx, GNUNET_FSUI_DownloadList
* list)
+ int fd, GNUNET_FSUI_Context * ctx,
+ GNUNET_FSUI_DownloadList * list)
{
int i;
GNUNET_FSUI_SearchList *pos;
@@ -117,9 +121,9 @@
}
#if DEBUG_PERSISTENCE
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Serializing download state of download `%s': (%llu, %llu)\n",
- list->filename, list->completed, list->total);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Serializing download state of download `%s': (%llu, %llu)\n",
+ list->filename, list->completed, list->total);
#endif
WRITEINT (fd, 1);
if (list->search == NULL)
@@ -196,8 +200,8 @@
continue;
}
GNUNET_GE_ASSERT (ctx->ectx,
- GNUNET_ECRS_uri_test_ksk (spos->uri) ||
- GNUNET_ECRS_uri_test_sks (spos->uri));
+ GNUNET_ECRS_uri_test_ksk (spos->uri) ||
+ GNUNET_ECRS_uri_test_sks (spos->uri));
WRITEINT (fd, 1);
WRITEINT (fd, spos->state);
WRITEINT (fd, spos->maxResults);
@@ -216,7 +220,8 @@
rp = &spos->unmatchedResultsReceived[i];
writeFileInfo (ctx->ectx, fd, &rp->fi);
- GNUNET_GE_ASSERT (ctx->ectx, rp->matchingKeyCount <
spos->numberOfURIKeys);
+ GNUNET_GE_ASSERT (ctx->ectx,
+ rp->matchingKeyCount < spos->numberOfURIKeys);
if (rp->matchingKeyCount > 1024)
{
WRITEINT (fd, 0); /* too large to serialize */
@@ -289,7 +294,8 @@
}
static void
-writeUploads (int fd, struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_UploadList *upos)
+writeUploads (int fd, struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_UploadList *upos)
{
struct GNUNET_FSUI_UploadShared *shared;
int bits;
Modified: GNUnet/src/applications/fs/fsui/serializetest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/fsui/serializetest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -184,8 +184,8 @@
/* ACTUAL TEST CODE */
#endif
ctx = GNUNET_FSUI_start (NULL,
- cfg, "fsuiserializetest", 32, GNUNET_YES, &eventCallback,
- NULL);
+ cfg, "fsuiserializetest", 32, GNUNET_YES,
+ &eventCallback, NULL);
CHECK (ctx != NULL);
fn = makeName (42);
buf = GNUNET_malloc (FILESIZE);
@@ -197,12 +197,12 @@
kuri = GNUNET_ECRS_keyword_list_to_uri (ectx, 2, (const char **) keywords);
waitForEvent = GNUNET_FSUI_upload_completed;
upload = GNUNET_FSUI_upload_star (ctx,
- fn,
- (GNUNET_FSUI_DirectoryScanCallback) &
- GNUNET_disk_directory_scan, NULL, 0, 0,
- GNUNET_YES, GNUNET_NO, GNUNET_NO,
- GNUNET_get_time () + 5 * GNUNET_CRON_HOURS, meta,
- kuri, kuri);
+ fn,
+ (GNUNET_FSUI_DirectoryScanCallback) &
+ GNUNET_disk_directory_scan, NULL, 0, 0,
+ GNUNET_YES, GNUNET_NO, GNUNET_NO,
+ GNUNET_get_time () +
+ 5 * GNUNET_CRON_HOURS, meta, kuri, kuri);
CHECK (upload != NULL);
GNUNET_ECRS_uri_destroy (kuri);
kuri = NULL;
@@ -218,12 +218,12 @@
#if DEBUG_VERBOSE
printf ("Testing FSUI suspend-resume\n");
#endif
- GNUNET_FSUI_stop (ctx); /* download possibly incomplete
- at this point, thus testing resume */
+ GNUNET_FSUI_stop (ctx); /* download possibly incomplete
+ at this point, thus testing resume
*/
ctx = GNUNET_FSUI_start (NULL,
- cfg,
- "fsuiserializetest",
- 32, GNUNET_YES, &eventCallback, NULL);
+ cfg,
+ "fsuiserializetest",
+ 32, GNUNET_YES, &eventCallback, NULL);
#if DEBUG_VERBOSE
printf ("Resumed...\n");
#endif
@@ -251,12 +251,12 @@
#if DEBUG_VERBOSE
printf ("Testing FSUI suspend-resume\n");
#endif
- GNUNET_FSUI_stop (ctx); /* download possibly incomplete
- at this point, thus testing resume */
+ GNUNET_FSUI_stop (ctx); /* download possibly incomplete
+ at this point, thus testing resume
*/
ctx = GNUNET_FSUI_start (NULL,
- cfg,
- "fsuiserializetest",
- 32, GNUNET_YES, &eventCallback, NULL);
+ cfg,
+ "fsuiserializetest",
+ 32, GNUNET_YES, &eventCallback, NULL);
#if DEBUG_VERBOSE
printf ("Resumed...\n");
#endif
Modified: GNUnet/src/applications/fs/fsui/serializetest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest2.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/fsui/serializetest2.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -362,8 +362,8 @@
/* ACTUAL TEST CODE */
#endif
ctx = GNUNET_FSUI_start (NULL,
- cfg, "serializetest2", 32, GNUNET_YES, &eventCallback,
- NULL);
+ cfg, "serializetest2", 32, GNUNET_YES,
+ &eventCallback, NULL);
CHECK (ctx != NULL);
for (j = 4; j < 256; j += 4)
{
@@ -377,9 +377,10 @@
}
meta = GNUNET_ECRS_meta_data_create ();
kuri = GNUNET_ECRS_keyword_list_to_uri (ectx, 2, (const char **) keywords);
- GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_MIMETYPE,
GNUNET_DIRECTORY_MIME);
- upload = GNUNET_FSUI_upload_star (ctx,
- UPLOAD_PREFIX,
+ GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_MIMETYPE,
+ GNUNET_DIRECTORY_MIME);
+ upload =
+ GNUNET_FSUI_upload_star (ctx, UPLOAD_PREFIX,
(GNUNET_FSUI_DirectoryScanCallback) &
GNUNET_disk_directory_scan, NULL, 0, 0,
GNUNET_YES, GNUNET_NO, GNUNET_NO,
@@ -393,14 +394,16 @@
GNUNET_snprintf (keyword, 40, "%s %s %s", keywords[0], _("AND"),
keywords[1]);
uri = GNUNET_ECRS_keyword_string_to_uri (ectx, keyword);
- search = GNUNET_FSUI_search_start (ctx, 0, 100, 240 * GNUNET_CRON_SECONDS,
uri);
+ search =
+ GNUNET_FSUI_search_start (ctx, 0, 100, 240 * GNUNET_CRON_SECONDS, uri);
CHECK (search != NULL);
download = GNUNET_FSUI_download_start (ctx,
- 0,
- GNUNET_YES,
- upURI,
- meta,
- UPLOAD_PREFIX "-download", search, NULL);
+ 0,
+ GNUNET_YES,
+ upURI,
+ meta,
+ UPLOAD_PREFIX "-download", search,
+ NULL);
GNUNET_ECRS_meta_data_destroy (meta);
prog = 0;
suspendRestart = 10;
@@ -415,14 +418,14 @@
#if DEBUG_VERBOSE
printf ("Testing FSUI suspend-resume\n");
#endif
- GNUNET_FSUI_stop (ctx); /* download possibly incomplete
- at this point, thus testing resume */
+ GNUNET_FSUI_stop (ctx); /* download possibly incomplete
+ at this point, thus testing resume
*/
CHECK (search == NULL);
CHECK (download == NULL);
ctx = GNUNET_FSUI_start (NULL,
- cfg,
- "serializetest2", 32, GNUNET_YES, &eventCallback,
- NULL);
+ cfg,
+ "serializetest2", 32, GNUNET_YES,
+ &eventCallback, NULL);
#if DEBUG_VERBOSE
printf ("Resumed...\n");
#endif
Modified: GNUnet/src/applications/fs/fsui/serializetest3.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest3.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/fsui/serializetest3.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -160,13 +160,14 @@
/* ACTUAL TEST CODE */
#endif
ctx = GNUNET_FSUI_start (NULL,
- cfg, "serializetest3", 32, GNUNET_YES, &eventCallback,
- NULL);
+ cfg, "serializetest3", 32, GNUNET_YES,
+ &eventCallback, NULL);
CHECK (ctx != NULL);
GNUNET_snprintf (keyword, 40, "%s %s %s", keywords[0], _("AND"),
keywords[1]);
uri = GNUNET_ECRS_keyword_string_to_uri (ectx, keyword);
- search = GNUNET_FSUI_search_start (ctx, 0, 100, 240 * GNUNET_CRON_SECONDS,
uri);
+ search =
+ GNUNET_FSUI_search_start (ctx, 0, 100, 240 * GNUNET_CRON_SECONDS, uri);
CHECK (search != NULL);
prog = 0;
suspendRestart = 10;
@@ -181,13 +182,13 @@
#if DEBUG_VERBOSE
printf ("Testing FSUI suspend-resume\n");
#endif
- GNUNET_FSUI_stop (ctx); /* download possibly incomplete
- at this point, thus testing resume */
+ GNUNET_FSUI_stop (ctx); /* download possibly incomplete
+ at this point, thus testing resume
*/
CHECK (search == NULL);
ctx = GNUNET_FSUI_start (NULL,
- cfg,
- "serializetest3", 32, GNUNET_YES, &eventCallback,
- NULL);
+ cfg,
+ "serializetest3", 32, GNUNET_YES,
+ &eventCallback, NULL);
#if DEBUG_VERBOSE
printf ("Resumed...\n");
#endif
Modified: GNUnet/src/applications/fs/fsui/serializetest4.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest4.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/fsui/serializetest4.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -330,8 +330,8 @@
/* ACTUAL TEST CODE */
#endif
ctx = GNUNET_FSUI_start (NULL,
- cfg, "serializetest4", 32, GNUNET_YES, &eventCallback,
- NULL);
+ cfg, "serializetest4", 32, GNUNET_YES,
+ &eventCallback, NULL);
CHECK (ctx != NULL);
for (j = 4; j < 16; j += 4)
{
@@ -345,9 +345,10 @@
}
meta = GNUNET_ECRS_meta_data_create ();
kuri = GNUNET_ECRS_keyword_list_to_uri (ectx, 2, (const char **) keywords);
- GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_MIMETYPE,
GNUNET_DIRECTORY_MIME);
- upload = GNUNET_FSUI_upload_star (ctx,
- UPLOAD_PREFIX,
+ GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_MIMETYPE,
+ GNUNET_DIRECTORY_MIME);
+ upload =
+ GNUNET_FSUI_upload_star (ctx, UPLOAD_PREFIX,
(GNUNET_FSUI_DirectoryScanCallback) &
GNUNET_disk_directory_scan, NULL, 0, 0,
GNUNET_YES, GNUNET_NO, GNUNET_NO,
@@ -361,10 +362,11 @@
keywords[1]);
uri = GNUNET_ECRS_keyword_string_to_uri (ectx, keyword);
download = GNUNET_FSUI_download_start (ctx,
- 0,
- GNUNET_YES,
- upURI,
- meta, UPLOAD_PREFIX "-download", NULL, NULL);
+ 0,
+ GNUNET_YES,
+ upURI,
+ meta, UPLOAD_PREFIX "-download",
+ NULL, NULL);
GNUNET_ECRS_meta_data_destroy (meta);
prog = 0;
suspendRestart = 10;
@@ -379,13 +381,13 @@
#if DEBUG_VERBOSE
printf ("Testing FSUI suspend-resume\n");
#endif
- GNUNET_FSUI_stop (ctx); /* download possibly incomplete
- at this point, thus testing resume */
+ GNUNET_FSUI_stop (ctx); /* download possibly incomplete
+ at this point, thus testing resume
*/
CHECK (download == NULL);
ctx = GNUNET_FSUI_start (NULL,
- cfg,
- "serializetest4", 32, GNUNET_YES, &eventCallback,
- NULL);
+ cfg,
+ "serializetest4", 32, GNUNET_YES,
+ &eventCallback, NULL);
#if DEBUG_VERBOSE
printf ("Resumed...\n");
#endif
Modified: GNUnet/src/applications/fs/fsui/unindex.c
===================================================================
--- GNUnet/src/applications/fs/fsui/unindex.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/fsui/unindex.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -84,11 +84,13 @@
}
mem = GNUNET_GE_memory_create (2);
ee =
- GNUNET_GE_create_context_memory (GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_ERROR | GNUNET_GE_WARNING |
- GNUNET_GE_FATAL | GNUNET_GE_BULK |
GNUNET_GE_IMMEDIATE, mem);
+ GNUNET_GE_create_context_memory (GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_ERROR | GNUNET_GE_WARNING |
+ GNUNET_GE_FATAL | GNUNET_GE_BULK |
+ GNUNET_GE_IMMEDIATE, mem);
ret =
- GNUNET_ECRS_file_uninde (ee, utc->ctx->cfg, utc->filename,
&progressCallback,
- utc, &tt, utc);
+ GNUNET_ECRS_file_uninde (ee, utc->ctx->cfg, utc->filename,
+ &progressCallback, utc, &tt, utc);
if (ret == GNUNET_OK)
{
utc->state = GNUNET_FSUI_COMPLETED;
@@ -127,8 +129,8 @@
}
#if 0
GNUNET_GE_LOG (utc->ctx->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FSUI unindexThread exits in state %u.\n", utc->state);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FSUI unindexThread exits in state %u.\n", utc->state);
#endif
GNUNET_GE_free_context (ee);
GNUNET_GE_memory_free (mem);
@@ -172,7 +174,8 @@
* running
*/
struct GNUNET_FSUI_UnindexList *
-GNUNET_FSUI_unindex_start (struct GNUNET_FSUI_Context *ctx, const char
*filename)
+GNUNET_FSUI_unindex_start (struct GNUNET_FSUI_Context *ctx,
+ const char *filename)
{
GNUNET_FSUI_UnindexList *utc;
@@ -196,8 +199,9 @@
if (utc->handle == NULL)
{
GNUNET_GE_LOG_STRERROR (ctx->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- "PTHREAD_CREATE");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ "PTHREAD_CREATE");
GNUNET_free (utc->filename);
GNUNET_free (utc);
return NULL;
@@ -216,7 +220,8 @@
* @return GNUNET_SYSERR if no such unindex is pending
*/
int
-GNUNET_FSUI_unindex_abort (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_UnindexList *ul)
+GNUNET_FSUI_unindex_abort (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_UnindexList *ul)
{
if ((ul->state != GNUNET_FSUI_ACTIVE) && (ul->state != GNUNET_FSUI_PENDING))
return GNUNET_NO;
@@ -239,7 +244,8 @@
* @return GNUNET_SYSERR if no such unindex is pending
*/
int
-GNUNET_FSUI_unindex_stop (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_UnindexList *dl)
+GNUNET_FSUI_unindex_stop (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_UnindexList *dl)
{
GNUNET_FSUI_UnindexList *prev;
struct GNUNET_GE_Context *ectx;
@@ -254,7 +260,8 @@
}
#if 0
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"GNUNET_FSUI_stopUnindex called.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "GNUNET_FSUI_stopUnindex called.\n");
#endif
GNUNET_mutex_lock (ctx->lock);
prev = ctx->unindexOperations;
@@ -264,8 +271,8 @@
{
GNUNET_mutex_unlock (ctx->lock);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "GNUNET_FSUI_stopUnindex failed to locate deletion
operation.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "GNUNET_FSUI_stopUnindex failed to locate deletion
operation.\n");
return GNUNET_SYSERR;
}
if (prev == dl)
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/fsui/upload.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -187,8 +187,10 @@
GNUNET_GE_BREAK (ectx, count == size);
mem = GNUNET_GE_memory_create (2);
ee =
- GNUNET_GE_create_context_memory (GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_ERROR | GNUNET_GE_WARNING |
- GNUNET_GE_FATAL | GNUNET_GE_BULK |
GNUNET_GE_IMMEDIATE, mem);
+ GNUNET_GE_create_context_memory (GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_ERROR | GNUNET_GE_WARNING |
+ GNUNET_GE_FATAL | GNUNET_GE_BULK |
+ GNUNET_GE_IMMEDIATE, mem);
ret = GNUNET_ECRS_directory_create (ee, &data, &len, size, fis, meta);
GNUNET_array_grow (fis, size, 0);
if (ret != GNUNET_OK)
@@ -202,7 +204,8 @@
while (pos != NULL)
{
if (pos->uri != NULL)
- GNUNET_URITRACK_add_state (ectx, cfg, pos->uri,
GNUNET_URITRACK_DIRECTORY_ADDED);
+ GNUNET_URITRACK_add_state (ectx, cfg, pos->uri,
+ GNUNET_URITRACK_DIRECTORY_ADDED);
pos = pos->next;
}
GNUNET_GE_memory_reset (mem);
@@ -211,8 +214,8 @@
if (handle == -1)
{
GNUNET_GE_LOG_STRERROR_FILE (ee,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- "mkstemp", tempName);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "mkstemp", tempName);
GNUNET_free (tempName);
GNUNET_free (data);
*error = GNUNET_strdup (GNUNET_GE_memory_get (mem, 0));
@@ -223,7 +226,8 @@
if (len != WRITE (handle, data, len))
{
GNUNET_GE_LOG_STRERROR_FILE (ee,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
"write", tempName);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "write", tempName);
*error = GNUNET_strdup (GNUNET_GE_memory_get (mem, 0));
GNUNET_GE_free_context (ee);
GNUNET_GE_memory_free (mem);
@@ -335,16 +339,19 @@
utc->start_time = GNUNET_get_time ();
mem = GNUNET_GE_memory_create (2);
ee =
- GNUNET_GE_create_context_memory (GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_ERROR | GNUNET_GE_WARNING |
- GNUNET_GE_FATAL | GNUNET_GE_BULK |
GNUNET_GE_IMMEDIATE, mem);
+ GNUNET_GE_create_context_memory (GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_ERROR | GNUNET_GE_WARNING |
+ GNUNET_GE_FATAL | GNUNET_GE_BULK |
+ GNUNET_GE_IMMEDIATE, mem);
ret =
GNUNET_ECRS_file_upload (ee, utc->shared->ctx->cfg, filename,
- utc->shared->doIndex == GNUNET_YES ? (utc->child ==
- NULL ? GNUNET_YES :
- GNUNET_NO) :
- GNUNET_NO, utc->shared->anonymityLevel,
- utc->shared->priority, utc->shared->expiration,
- &progressCallback, utc, &testTerminate, utc, &utc->uri);
+ utc->shared->doIndex ==
+ GNUNET_YES ? (utc->child ==
+ NULL ? GNUNET_YES : GNUNET_NO) :
+ GNUNET_NO, utc->shared->anonymityLevel,
+ utc->shared->priority, utc->shared->expiration,
+ &progressCallback, utc, &testTerminate, utc,
+ &utc->uri);
if (ret != GNUNET_OK)
{
if (utc->state == GNUNET_FSUI_ACTIVE)
@@ -378,7 +385,8 @@
utc->state = GNUNET_FSUI_COMPLETED;
if (utc->child == NULL)
GNUNET_ECRS_meta_data_extract_from_file (utc->shared->ctx->ectx,
- utc->meta, utc->filename, utc->shared->extractors);
+ utc->meta, utc->filename,
+ utc->shared->extractors);
while (GNUNET_OK ==
GNUNET_ECRS_meta_data_delete (utc->meta, EXTRACTOR_FILENAME, NULL));
/* only publish the last part of the path
@@ -409,10 +417,11 @@
if (GNUNET_OK == GNUNET_IDENTITY_get_self (sock, &hello))
{
loc = GNUNET_ECRS_location_to_uri (utc->uri,
- &hello->publicKey,
- ntohl (hello->expirationTime),
- (GNUNET_ECRS_SignFunction) &
- GNUNET_IDENTITY_sign_function, sock);
+ &hello->publicKey,
+ ntohl (hello->expirationTime),
+ (GNUNET_ECRS_SignFunction) &
+ GNUNET_IDENTITY_sign_function,
+ sock);
GNUNET_free (hello);
}
@@ -431,27 +440,30 @@
}
if (utc->shared->global_keywords != NULL)
GNUNET_ECRS_publish_under_keyword (ectx,
- utc->shared->ctx->cfg,
- utc->shared->global_keywords,
- utc->shared->anonymityLevel,
- utc->shared->priority,
- utc->shared->expiration, loc, utc->meta);
+ utc->shared->ctx->cfg,
+ utc->shared->global_keywords,
+ utc->shared->anonymityLevel,
+ utc->shared->priority,
+ utc->shared->expiration, loc,
+ utc->meta);
if (utc->keywords != NULL)
GNUNET_ECRS_publish_under_keyword (ectx,
- utc->shared->ctx->cfg,
- utc->keywords,
- utc->shared->anonymityLevel,
- utc->shared->priority,
- utc->shared->expiration, loc, utc->meta);
+ utc->shared->ctx->cfg,
+ utc->keywords,
+ utc->shared->anonymityLevel,
+ utc->shared->priority,
+ utc->shared->expiration, loc,
+ utc->meta);
if (utc->shared->individualKeywords == GNUNET_YES)
{
uri = GNUNET_ECRS_meta_data_to_uri (utc->meta);
GNUNET_ECRS_publish_under_keyword (ectx,
- utc->shared->ctx->cfg,
- uri,
- utc->shared->anonymityLevel,
- utc->shared->priority,
- utc->shared->expiration, loc, utc->meta);
+ utc->shared->ctx->cfg,
+ uri,
+ utc->shared->anonymityLevel,
+ utc->shared->priority,
+ utc->shared->expiration, loc,
+ utc->meta);
GNUNET_ECRS_uri_destroy (uri);
}
GNUNET_ECRS_uri_destroy (loc);
@@ -462,10 +474,11 @@
fi.uri = utc->uri;
GNUNET_URITRACK_track (ectx, utc->shared->ctx->cfg, &fi);
GNUNET_URITRACK_add_state (ectx,
- utc->shared->ctx->cfg,
- utc->uri,
- utc->shared->doIndex ==
- GNUNET_YES ? GNUNET_URITRACK_INDEXED :
GNUNET_URITRACK_INSERTED);
+ utc->shared->ctx->cfg,
+ utc->uri,
+ utc->shared->doIndex ==
+ GNUNET_YES ? GNUNET_URITRACK_INDEXED :
+ GNUNET_URITRACK_INSERTED);
event.type = GNUNET_FSUI_upload_completed;
event.data.UploadCompleted.uc.pos = utc;
event.data.UploadCompleted.uc.cctx = utc->cctx;
@@ -547,11 +560,17 @@
GNUNET_mutex_unlock (ctx->lock);
}
-static struct GNUNET_FSUI_UploadList *addUploads (struct
GNUNET_FSUI_UploadShared *shared,
- const char *filename,
- const struct GNUNET_ECRS_URI
*keywords,
- const struct GNUNET_ECRS_MetaData
*md,
- struct GNUNET_FSUI_UploadList
*parent);
+static struct GNUNET_FSUI_UploadList *addUploads (struct
+ GNUNET_FSUI_UploadShared
+ *shared,
+ const char *filename,
+ const struct GNUNET_ECRS_URI
+ *keywords,
+ const struct
+ GNUNET_ECRS_MetaData *md,
+ struct
+ GNUNET_FSUI_UploadList
+ *parent);
static int
addChildUpload (const char *name, const char *dirName, void *data)
@@ -579,7 +598,8 @@
addUploads (struct GNUNET_FSUI_UploadShared *shared,
const char *filename,
const struct GNUNET_ECRS_URI *keywords,
- const struct GNUNET_ECRS_MetaData *md, struct
GNUNET_FSUI_UploadList *parent)
+ const struct GNUNET_ECRS_MetaData *md,
+ struct GNUNET_FSUI_UploadList *parent)
{
GNUNET_FSUI_UploadList *utc;
@@ -619,7 +639,7 @@
}
utc->meta = GNUNET_ECRS_meta_data_duplicate (md);
GNUNET_ECRS_meta_data_inser (utc->meta,
- EXTRACTOR_MIMETYPE, GNUNET_DIRECTORY_MIME);
+ EXTRACTOR_MIMETYPE, GNUNET_DIRECTORY_MIME);
}
if (keywords != NULL)
utc->keywords = GNUNET_ECRS_uri_duplicate (keywords);
@@ -677,18 +697,18 @@
*/
struct GNUNET_FSUI_UploadList *
GNUNET_FSUI_upload_star (struct GNUNET_FSUI_Context *ctx,
- const char *filename,
- GNUNET_FSUI_DirectoryScanCallback dsc,
- void *dscClosure,
- unsigned int anonymityLevel,
- unsigned int priority,
- int doIndex,
- int doExtract,
- int individualKeywords,
- GNUNET_CronTime expiration,
- const struct GNUNET_ECRS_MetaData *md,
- const struct GNUNET_ECRS_URI *globalURI,
- const struct GNUNET_ECRS_URI *keyUri)
+ const char *filename,
+ GNUNET_FSUI_DirectoryScanCallback dsc,
+ void *dscClosure,
+ unsigned int anonymityLevel,
+ unsigned int priority,
+ int doIndex,
+ int doExtract,
+ int individualKeywords,
+ GNUNET_CronTime expiration,
+ const struct GNUNET_ECRS_MetaData *md,
+ const struct GNUNET_ECRS_URI *globalURI,
+ const struct GNUNET_ECRS_URI *keyUri)
{
char *config;
EXTRACTOR_ExtractorList *extractors;
@@ -703,8 +723,9 @@
if (GNUNET_GC_have_configuration_value (ctx->cfg, "FS", "EXTRACTORS"))
{
GNUNET_GC_get_configuration_value_string (ctx->cfg,
- "FS",
- "EXTRACTORS", NULL, &config);
+ "FS",
+ "EXTRACTORS", NULL,
+ &config);
if (config != NULL)
{
extractors = EXTRACTOR_loadConfigLibraries (extractors, config);
@@ -737,7 +758,8 @@
if (shared->handle == NULL)
{
GNUNET_GE_LOG_STRERROR (ctx->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
"PTHREAD_CREATE");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "PTHREAD_CREATE");
freeUploadList (ul);
freeShared (shared);
return NULL;
@@ -756,7 +778,8 @@
* @return GNUNET_SYSERR on error
*/
int
-GNUNET_FSUI_upload_abort (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_UploadList *ul)
+GNUNET_FSUI_upload_abort (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_UploadList *ul)
{
GNUNET_FSUI_UploadList *c;
@@ -794,7 +817,8 @@
* @return GNUNET_SYSERR on error
*/
int
-GNUNET_FSUI_upload_stop (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_UploadList *ul)
+GNUNET_FSUI_upload_stop (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_UploadList *ul)
{
void *unused;
struct GNUNET_FSUI_UploadShared *shared;
Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/lib/fslib.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -82,8 +82,8 @@
{
#if DEBUG_FSLIB
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FSLIB: received message from gnunetd\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FSLIB: received message from gnunetd\n");
#endif
delay = 100 * GNUNET_CRON_MILLISECONDS;
/* verify hdr, if reply, process, otherwise
@@ -118,11 +118,12 @@
matched++;
if (ctx->handles[i]->callback != NULL)
{
- value = GNUNET_malloc (sizeof (GNUNET_DatastoreValue) +
size);
- value->size = htonl (size + sizeof
(GNUNET_DatastoreValue));
- value->type = htonl (getTypeOfBlock (size,
- (DBlock *) &
- rep[1]));
+ value =
+ GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + size);
+ value->size =
+ htonl (size + sizeof (GNUNET_DatastoreValue));
+ value->type =
+ htonl (getTypeOfBlock (size, (DBlock *) & rep[1]));
value->prio = htonl (0);
value->anonymityLevel = rep->anonymityLevel;
value->expirationTime = rep->expirationTime;
@@ -145,17 +146,18 @@
#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_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "FSLIB: received content but have no pending
request\n");
#endif
}
else
{
#if DEBUG_FSLIB
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FSLIB: error communicating with gnunetd; sleeping for
%ums\n",
- delay);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FSLIB: error communicating with gnunetd; sleeping
for %ums\n",
+ delay);
#endif
if (ctx->abort == GNUNET_NO)
GNUNET_thread_sleep (delay);
@@ -170,8 +172,8 @@
SEARCH_CONTEXT *
GNUNET_FS_create_search_context (struct GNUNET_GE_Context * ectx,
- struct GNUNET_GC_Configuration * cfg,
- struct GNUNET_Mutex * lock)
+ struct GNUNET_GC_Configuration * cfg,
+ struct GNUNET_Mutex * lock)
{
SEARCH_CONTEXT *ret;
@@ -192,7 +194,9 @@
ret->abort = GNUNET_NO;
ret->thread = GNUNET_thread_create (&processReplies, ret, 128 * 1024);
if (ret->thread == NULL)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "PTHREAD_CREATE");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "PTHREAD_CREATE");
return ret;
}
@@ -226,14 +230,14 @@
*/
SEARCH_HANDLE *
GNUNET_FS_start_search (SEARCH_CONTEXT * ctx,
- const GNUNET_PeerIdentity * target,
- unsigned int type,
- unsigned int keyCount,
- const GNUNET_HashCode * keys,
- unsigned int anonymityLevel,
- unsigned int prio,
- GNUNET_CronTime timeout, GNUNET_DatastoreValueIterator
callback,
- void *closure)
+ const GNUNET_PeerIdentity * target,
+ unsigned int type,
+ unsigned int keyCount,
+ const GNUNET_HashCode * keys,
+ unsigned int anonymityLevel,
+ unsigned int prio,
+ GNUNET_CronTime timeout,
+ GNUNET_DatastoreValueIterator callback, void *closure)
{
SEARCH_HANDLE *ret;
CS_fs_request_search_MESSAGE *req;
@@ -244,7 +248,8 @@
ret = GNUNET_malloc (sizeof (SEARCH_HANDLE));
#if DEBUG_FSLIB
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "FSLIB: start
search (%p)\n", ret);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FSLIB: start search (%p)\n", ret);
#endif
req =
GNUNET_malloc (sizeof (CS_fs_request_search_MESSAGE) +
@@ -277,8 +282,10 @@
IF_GELOG (ctx->ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&req->query[0], &enc));
- GNUNET_GE_LOG (ctx->ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "FSLIB: initiating search for `%s' of type %u\n", &enc, type);
+ GNUNET_GE_LOG (ctx->ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FSLIB: initiating search for `%s' of type %u\n", &enc,
+ type);
#endif
GNUNET_GE_ASSERT (NULL, ctx->sock != NULL);
if (GNUNET_OK != GNUNET_client_connection_write (ctx->sock, &req->header))
@@ -288,8 +295,8 @@
}
#if DEBUG_FSLIB
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FSLIB: search started (%p)\n", ret);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FSLIB: search started (%p)\n", ret);
#endif
return ret;
}
@@ -304,8 +311,8 @@
#if DEBUG_FSLIB
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FSLIB: stop search (%p)\n", handle);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FSLIB: stop search (%p)\n", handle);
#endif
handle->req->header.type = htons (GNUNET_CS_PROTO_GAP_QUERY_STOP);
GNUNET_GE_ASSERT (NULL, ctx->sock != NULL);
@@ -313,8 +320,9 @@
GNUNET_client_connection_write (ctx->sock, &handle->req->header))
{
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "FSLIB: failed to request stop search with gnunetd\n");
+ GNUNET_GE_WARNING | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "FSLIB: failed to request stop search with gnunetd\n");
}
GNUNET_mutex_lock (ctx->lock);
for (i = ctx->handleCount - 1; i >= 0; i--)
@@ -327,8 +335,8 @@
GNUNET_free (handle->req);
#if DEBUG_FSLIB
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FSLIB: search stopped (%p)\n", handle);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FSLIB: search stopped (%p)\n", handle);
#endif
GNUNET_free (handle);
}
@@ -338,7 +346,8 @@
* in the routing table like? Returns -1 on error.
*/
int
-GNUNET_FS_get_current_average_priority (struct GNUNET_ClientServerConnection
*sock)
+GNUNET_FS_get_current_average_priority (struct GNUNET_ClientServerConnection
+ *sock)
{
GNUNET_MessageHeader req;
int ret;
@@ -360,7 +369,7 @@
*/
int
GNUNET_FS_insert (struct GNUNET_ClientServerConnection *sock,
- const GNUNET_DatastoreValue * block)
+ const GNUNET_DatastoreValue * block)
{
int ret;
CS_fs_request_insert_MESSAGE *ri;
@@ -405,7 +414,7 @@
*/
int
GNUNET_FS_prepare_to_inde (struct GNUNET_ClientServerConnection *sock,
- const GNUNET_HashCode * fileHc, const char *fn)
+ const GNUNET_HashCode * fileHc, const char *fn)
{
int ret;
CS_fs_request_init_index_MESSAGE *ri;
@@ -426,8 +435,8 @@
#if DEBUG_FSLIB
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Sending index initialization request to gnunetd\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Sending index initialization request to gnunetd\n");
#endif
if (GNUNET_OK != GNUNET_client_connection_write (sock, &ri->header))
{
@@ -437,8 +446,8 @@
GNUNET_free (ri);
#if DEBUG_FSLIB
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Waiting for confirmation of index initialization request by
gnunetd\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Waiting for confirmation of index initialization request by
gnunetd\n");
#endif
if (GNUNET_OK != GNUNET_client_connection_read_result (sock, &ret))
return GNUNET_SYSERR;
@@ -455,8 +464,9 @@
*/
int
GNUNET_FS_index (struct GNUNET_ClientServerConnection *sock,
- const GNUNET_HashCode * fileHc,
- const GNUNET_DatastoreValue * block, unsigned long long offset)
+ const GNUNET_HashCode * fileHc,
+ const GNUNET_DatastoreValue * block,
+ unsigned long long offset)
{
int ret;
CS_fs_request_index_MESSAGE *ri;
@@ -475,8 +485,8 @@
memcpy (&ri[1], &block[1], size);
#if DEBUG_FSLIB
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Sending index request to gnunetd\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Sending index request to gnunetd\n");
#endif
retry = AUTO_RETRY;
do
@@ -488,8 +498,8 @@
}
#if DEBUG_FSLIB
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Waiting for confirmation of index request by gnunetd\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Waiting for confirmation of index request by gnunetd\n");
#endif
if (GNUNET_OK != GNUNET_client_connection_read_result (sock, &ret))
{
@@ -512,7 +522,7 @@
*/
int
GNUNET_FS_delete (struct GNUNET_ClientServerConnection *sock,
- const GNUNET_DatastoreValue * block)
+ const GNUNET_DatastoreValue * block)
{
int ret;
CS_fs_request_delete_MESSAGE *rd;
@@ -553,7 +563,7 @@
*/
int
GNUNET_FS_unindex (struct GNUNET_ClientServerConnection *sock,
- unsigned int blocksize, const GNUNET_HashCode * hc)
+ unsigned int blocksize, const GNUNET_HashCode * hc)
{
int ret;
CS_fs_request_unindex_MESSAGE ru;
@@ -577,7 +587,7 @@
*/
int
GNUNET_FS_test_indexed (struct GNUNET_ClientServerConnection *sock,
- const GNUNET_HashCode * hc)
+ const GNUNET_HashCode * hc)
{
RequestTestindex ri;
int ret;
Modified: GNUnet/src/applications/fs/lib/fslibtest.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslibtest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/lib/fslibtest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -46,7 +46,8 @@
GNUNET_DatastoreValue *block;
DBlock *db;
- block = GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + sizeof (DBlock) + i);
+ block =
+ GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + sizeof (DBlock) + i);
block->size = htonl (sizeof (GNUNET_DatastoreValue) + sizeof (DBlock) + i);
block->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA);
block->prio = htonl (0);
@@ -66,7 +67,8 @@
KBlock *db;
struct GNUNET_RSA_PrivateKey *kkey;
- block = GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + sizeof (KBlock) + i);
+ block =
+ GNUNET_malloc (sizeof (GNUNET_DatastoreValue) + sizeof (KBlock) + i);
block->size = htonl (sizeof (GNUNET_DatastoreValue) + sizeof (KBlock) + i);
block->type = htonl (GNUNET_GNUNET_ECRS_BLOCKTYPE_KEYWORD);
block->prio = htonl (0);
@@ -126,17 +128,19 @@
blk = makeBlock (cls->i);
fileBlockGetQuery ((DBlock *) & blk[1],
- ntohl (blk->size) - sizeof (GNUNET_DatastoreValue),
&ekey);
- GNUNET_GE_ASSERT (NULL, GNUNET_OK ==
- fileBlockEncode ((DBlock *) & blk[1],
- ntohl (blk->size) - sizeof
(GNUNET_DatastoreValue),
- &ekey, &eblk));
- if ((0 == memcmp (&ekey,
- key, sizeof (GNUNET_HashCode))) &&
- (value->size == blk->size) &&
- (0 == memcmp (&value[1],
- &eblk[1],
- ntohl (value->size) - sizeof (GNUNET_DatastoreValue))))
+ ntohl (blk->size) - sizeof (GNUNET_DatastoreValue),
+ &ekey);
+ GNUNET_GE_ASSERT (NULL,
+ GNUNET_OK == fileBlockEncode ((DBlock *) & blk[1],
+ ntohl (blk->size) -
+ sizeof
+ (GNUNET_DatastoreValue),
+ &ekey, &eblk));
+ if ((0 == memcmp (&ekey, key, sizeof (GNUNET_HashCode)))
+ && (value->size == blk->size)
+ && (0 ==
+ memcmp (&value[1], &eblk[1],
+ ntohl (value->size) - sizeof (GNUNET_DatastoreValue))))
{
cls->found = GNUNET_YES;
GNUNET_semaphore_up (cls->sem);
@@ -165,21 +169,23 @@
dv = makeBlock (i);
db = (DBlock *) & dv[1];
- fileBlockGetQuery (db, ntohl (dv->size) - sizeof (GNUNET_DatastoreValue),
&query);
+ fileBlockGetQuery (db, ntohl (dv->size) - sizeof (GNUNET_DatastoreValue),
+ &query);
GNUNET_free (dv);
closure.found = GNUNET_NO;
closure.i = i;
closure.sem = GNUNET_semaphore_create (0);
now = GNUNET_get_time ();
handle = GNUNET_FS_start_search (ctx,
- NULL,
- GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA,
- 1,
- &query,
- 0,
- 0,
- now + 30 * GNUNET_CRON_SECONDS,
- (GNUNET_DatastoreValueIterator) & searchResultCB,
&closure);
+ NULL,
+ GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA,
+ 1,
+ &query,
+ 0,
+ 0,
+ now + 30 * GNUNET_CRON_SECONDS,
+ (GNUNET_DatastoreValueIterator) &
+ searchResultCB, &closure);
GNUNET_cron_add_job (cron, &abortSem, 30 * GNUNET_CRON_SECONDS, 0,
closure.sem);
GNUNET_semaphore_down (closure.sem, GNUNET_YES);
@@ -229,9 +235,9 @@
GNUNET_cron_start (cron);
lock = GNUNET_mutex_create (GNUNET_NO);
GNUNET_GE_ASSERT (NULL,
- GNUNET_OK == GNUNET_wait_for_daemon_running (NULL, cfg,
- 60 *
-
GNUNET_CRON_SECONDS));
+ GNUNET_OK == GNUNET_wait_for_daemon_running (NULL, cfg,
+ 60 *
+
GNUNET_CRON_SECONDS));
GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS); /* give apps time to
start */
sock = GNUNET_client_connection_create (NULL, cfg);
CHECK (sock != NULL);
@@ -248,8 +254,8 @@
&query);
CHECK (GNUNET_OK == fileBlockEncode ((DBlock *) & block[1],
ntohl (block->size) -
- sizeof (GNUNET_DatastoreValue),
&query,
- &eblock));
+ sizeof (GNUNET_DatastoreValue),
+ &query, &eblock));
eblock->expirationTime = block->expirationTime;
eblock->prio = block->prio;
CHECK (GNUNET_OK == GNUNET_FS_insert (sock, eblock));
@@ -262,19 +268,21 @@
/* indexing without symlink */
CHECK (GNUNET_OK == GNUNET_FS_index (sock, &hc, block, 0));
CHECK (GNUNET_OK == trySearch (ctx, i));
- CHECK (GNUNET_OK == GNUNET_FS_unindex (sock, GNUNET_MAX_BUFFER_SIZE,
&hc));
+ CHECK (GNUNET_OK ==
+ GNUNET_FS_unindex (sock, GNUNET_MAX_BUFFER_SIZE, &hc));
/* indexing with symlink */
tmpName = GNUNET_strdup ("/tmp/symlinkTestXXXXXX");
CHECK (-1 != (fd = mkstemp (tmpName)));
CHECK (-1 != WRITE (fd,
&((DBlock *) & block[1])[1],
- ntohl (block->size) - sizeof (GNUNET_DatastoreValue)
-
- sizeof (DBlock)));
+ ntohl (block->size) -
+ sizeof (GNUNET_DatastoreValue) - sizeof (DBlock)));
CLOSE (fd);
CHECK (GNUNET_FS_prepare_to_inde (sock, &hc, tmpName) == GNUNET_YES);
CHECK (GNUNET_OK == GNUNET_FS_index (sock, &hc, block, 0));
CHECK (GNUNET_OK == trySearch (ctx, i));
- CHECK (GNUNET_OK == GNUNET_FS_unindex (sock, GNUNET_MAX_BUFFER_SIZE,
&hc));
+ CHECK (GNUNET_OK ==
+ GNUNET_FS_unindex (sock, GNUNET_MAX_BUFFER_SIZE, &hc));
UNLINK (tmpName);
GNUNET_free (tmpName);
GNUNET_free (block);
@@ -289,8 +297,8 @@
&query);
CHECK (GNUNET_OK == fileBlockEncode ((DBlock *) & block[1],
ntohl (block->size) -
- sizeof (GNUNET_DatastoreValue),
&query,
- &eblock));
+ sizeof (GNUNET_DatastoreValue),
+ &query, &eblock));
eblock->expirationTime = block->expirationTime;
eblock->prio = block->prio;
CHECK (GNUNET_OK == GNUNET_FS_insert (sock, eblock));
@@ -302,7 +310,8 @@
sizeof (DBlock), &hc);
CHECK (GNUNET_OK == GNUNET_FS_index (sock, &hc, block, 0));
CHECK (GNUNET_OK == trySearch (ctx, i));
- CHECK (GNUNET_OK == GNUNET_FS_unindex (sock, GNUNET_MAX_BUFFER_SIZE,
&hc));
+ CHECK (GNUNET_OK ==
+ GNUNET_FS_unindex (sock, GNUNET_MAX_BUFFER_SIZE, &hc));
GNUNET_free (block);
}
fprintf (stderr, "\n");
@@ -318,11 +327,11 @@
i = 2;
mainThread = GNUNET_thread_get_self ();
hnd = GNUNET_FS_start_search (ctx,
- NULL,
- GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- 1,
- &query, 0, 0, 10 * GNUNET_CRON_SECONDS,
- &countCallback, &i);
+ NULL,
+ GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
+ 1,
+ &query, 0, 0, 10 * GNUNET_CRON_SECONDS,
+ &countCallback, &i);
CHECK (hnd != NULL);
GNUNET_thread_sleep (10 * GNUNET_CRON_SECONDS);
GNUNET_FS_stop_search (ctx, hnd);
Modified: GNUnet/src/applications/fs/module/anonymity.c
===================================================================
--- GNUnet/src/applications/fs/module/anonymity.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/module/anonymity.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -56,14 +56,14 @@
level--;
if (traffic == NULL)
return GNUNET_SYSERR;
- if (GNUNET_OK != traffic->get (5 * GNUNET_CRON_SECONDS /
GNUNET_TRAFFIC_TIME_UNIT, /* TTL_DECREMENT/TTU */
+ if (GNUNET_OK != traffic->get (5 * GNUNET_CRON_SECONDS /
GNUNET_TRAFFIC_TIME_UNIT, /* TTL_DECREMENT/TTU */
GNUNET_P2P_PROTO_GAP_RESULT,
- GNUNET_TRAFFIC_TYPE_RECEIVED, &count, &peers,
&sizes,
- &timevect))
+ GNUNET_TRAFFIC_TYPE_RECEIVED, &count, &peers,
+ &sizes, &timevect))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Failed to get traffic stats.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Failed to get traffic stats.\n"));
return GNUNET_SYSERR;
}
if (level > 1000)
@@ -71,17 +71,17 @@
if (peers < level / 1000)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Not enough cover traffic to satisfy anonymity requirements
(%u, %u peers). "
- "Result dropped.\n", level, peers);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Not enough cover traffic to satisfy anonymity
requirements (%u, %u peers). "
+ "Result dropped.\n", level, peers);
return GNUNET_SYSERR;
}
if (count < level % 1000)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Not enough cover traffic to satisfy anonymity requirements
(%u, %u messages). "
- "Result dropped.\n", level, count);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Not enough cover traffic to satisfy anonymity
requirements (%u, %u messages). "
+ "Result dropped.\n", level, count);
return GNUNET_SYSERR;
}
}
@@ -90,9 +90,9 @@
if (count < level)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Not enough cover traffic to satisfy anonymity requirements
(%u, %u messages). "
- "Result dropped.\n", level, count);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Not enough cover traffic to satisfy anonymity
requirements (%u, %u messages). "
+ "Result dropped.\n", level, count);
return GNUNET_SYSERR;
}
}
Modified: GNUnet/src/applications/fs/module/anonymity.h
===================================================================
--- GNUnet/src/applications/fs/module/anonymity.h 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/module/anonymity.h 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -44,6 +44,7 @@
* @return GNUNET_OK if cover traffic is sufficient
*/
int checkCoverTraffic (struct GNUNET_GE_Context *ectx,
- GNUNET_Traffic_ServiceAPI * traffic, unsigned int
level);
+ GNUNET_Traffic_ServiceAPI * traffic,
+ unsigned int level);
#endif
Modified: GNUnet/src/applications/fs/module/dht_push.h
===================================================================
--- GNUnet/src/applications/fs/module/dht_push.h 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/module/dht_push.h 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -34,7 +34,8 @@
/**
* Initialize the migration module.
*/
-void init_dht_push (GNUNET_CoreAPIForPlugins * capi, GNUNET_DHT_ServiceAPI *
s);
+void init_dht_push (GNUNET_CoreAPIForPlugins * capi,
+ GNUNET_DHT_ServiceAPI * s);
void done_dht_push (void);
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/fs/module/fs.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -120,7 +120,9 @@
return NULL;
}
gw = (const GapWrapper *) value;
- size = ntohl (gw->dc.size) - sizeof (GapWrapper) + sizeof
(GNUNET_DatastoreValue);
+ size =
+ ntohl (gw->dc.size) - sizeof (GapWrapper) +
+ sizeof (GNUNET_DatastoreValue);
dv = GNUNET_malloc (size);
dv->size = htonl (size);
dv->type = htonl (getTypeOfBlock (size - sizeof (GNUNET_DatastoreValue),
@@ -173,7 +175,7 @@
GNUNET_YES, &hc))
|| (0 != memcmp (&hc, query, sizeof (GNUNET_HashCode))))
{
- GNUNET_GE_BREAK_OP (ectx, 0); /* value failed verification! */
+ GNUNET_GE_BREAK_OP (ectx, 0); /* value failed verification! */
return GNUNET_SYSERR;
}
dv = gapWrapperToDatastoreValue (value, prio);
@@ -215,7 +217,7 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (query, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FS received GAP-PUT request (query: `%s')\n", &enc);
+ "FS received GAP-PUT request (query: `%s')\n", &enc);
#endif
if (migration)
ret = datastore->putUpdate (query, dv);
@@ -241,7 +243,7 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (query, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Found reply to query `%s'.\n", &enc);
+ "Found reply to query `%s'.\n", &enc);
#endif
gw = (const GapWrapper *) value;
size = ntohl (gw->dc.size) - sizeof (GapWrapper);
@@ -291,7 +293,7 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&rs->query[0], &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FS received QUERY STOP (query: `%s')\n", &enc);
+ "FS received QUERY STOP (query: `%s')\n", &enc);
#endif
gap->get_stop (ntohl (rs->type),
1 + (ntohs (req->size) -
@@ -321,8 +323,9 @@
#endif
cectx =
- coreAPI->createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
GNUNET_GE_ROUTEKIND,
- sock);
+ coreAPI->
+ createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
+ GNUNET_GE_ROUTEKIND, sock);
if (ntohs (req->size) < sizeof (CS_fs_request_insert_MESSAGE))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -359,14 +362,15 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&query, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FS received REQUEST INSERT (query: `%s', type: %u, priority %u)\n",
- &enc, type, ntohl (ri->prio));
+ "FS received REQUEST INSERT (query: `%s', type: %u, priority
%u)\n",
+ &enc, type, ntohl (ri->prio));
#endif
datum->type = htonl (type);
memcpy (&datum[1],
&ri[1], ntohs (req->size) - sizeof (CS_fs_request_insert_MESSAGE));
GNUNET_mutex_lock (lock);
- if ((type != GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA) || (0 == datastore->get
(&query, type, NULL, NULL)))
+ if ((type != GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA)
+ || (0 == datastore->get (&query, type, NULL, NULL)))
ret = datastore->put (&query, datum);
else
ret = GNUNET_OK;
@@ -431,8 +435,9 @@
struct GNUNET_GE_Context *cectx;
cectx =
- coreAPI->createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
GNUNET_GE_ROUTEKIND,
- sock);
+ coreAPI->
+ createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
+ GNUNET_GE_ROUTEKIND, sock);
if (ntohs (req->size) < sizeof (CS_fs_request_init_index_MESSAGE))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -460,9 +465,9 @@
GNUNET_free (fn);
#if DEBUG_FS
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Sending confirmation (%s) of index initialization request to
client\n",
- ret == GNUNET_OK ? "success" : "failure");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Sending confirmation (%s) of index initialization request to
client\n",
+ ret == GNUNET_OK ? "success" : "failure");
#endif
GNUNET_GE_free_context (cectx);
return coreAPI->sendValueToClient (sock, ret);
@@ -482,8 +487,9 @@
struct GNUNET_GE_Context *cectx;
cectx =
- coreAPI->createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
GNUNET_GE_ROUTEKIND,
- sock);
+ coreAPI->
+ createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
+ GNUNET_GE_ROUTEKIND, sock);
if (ntohs (req->size) < sizeof (CS_fs_request_index_MESSAGE))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -504,9 +510,9 @@
(const DBlock *) &ri[1]);
#if DEBUG_FS
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Sending confirmation (%s) of index request to client\n",
- ret == GNUNET_OK ? "success" : "failure");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Sending confirmation (%s) of index request to client\n",
+ ret == GNUNET_OK ? "success" : "failure");
#endif
GNUNET_GE_free_context (cectx);
return coreAPI->sendValueToClient (sock, ret);
@@ -532,17 +538,17 @@
{
#if DEBUG_FS
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' found value that does not match (%u, %u).\n",
- __FUNCTION__, ntohl (comp->size), ntohl (value->size));
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "`%s' found value that does not match (%u, %u).\n",
+ __FUNCTION__, ntohl (comp->size), ntohl (value->size));
#endif
return GNUNET_OK;
}
*comp = *value; /* make copy! */
#if DEBUG_FS
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' found value that matches.\n", __FUNCTION__);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "`%s' found value that matches.\n", __FUNCTION__);
#endif
return GNUNET_SYSERR;
}
@@ -567,8 +573,9 @@
struct GNUNET_GE_Context *cectx;
cectx =
- coreAPI->createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
GNUNET_GE_ROUTEKIND,
- sock);
+ coreAPI->
+ createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
+ GNUNET_GE_ROUTEKIND, sock);
if (ntohs (req->size) < sizeof (CS_fs_request_delete_MESSAGE))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -605,7 +612,8 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&query, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FS received REQUEST DELETE (query: `%s', type: %u)\n", &enc, type);
+ "FS received REQUEST DELETE (query: `%s', type: %u)\n", &enc,
+ type);
#endif
GNUNET_mutex_lock (lock);
if (GNUNET_SYSERR == datastore->get (&query, type, &completeValue, value))
/* aborted == found! */
@@ -616,9 +624,9 @@
GNUNET_free (value);
#if DEBUG_FS
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Sending confirmation (%s) of delete request to client\n",
- ret != GNUNET_SYSERR ? "success" : "failure");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Sending confirmation (%s) of delete request to client\n",
+ ret != GNUNET_SYSERR ? "success" : "failure");
#endif
GNUNET_GE_free_context (cectx);
return coreAPI->sendValueToClient (sock, ret);
@@ -636,8 +644,9 @@
struct GNUNET_GE_Context *cectx;
cectx =
- coreAPI->createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
GNUNET_GE_ROUTEKIND,
- sock);
+ coreAPI->
+ createClientLogContext (GNUNET_GE_USER | GNUNET_GE_EVENTKIND |
+ GNUNET_GE_ROUTEKIND, sock);
if (ntohs (req->size) != sizeof (CS_fs_request_unindex_MESSAGE))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -648,7 +657,8 @@
ru = (const CS_fs_request_unindex_MESSAGE *) req;
#if DEBUG_FS
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "FS received
REQUEST UNINDEX\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FS received REQUEST UNINDEX\n");
#endif
ret = ONDEMAND_unindex (cectx,
datastore, ntohl (ru->blocksize), &ru->fileId);
@@ -675,8 +685,8 @@
ru = (const RequestTestindex *) req;
#if DEBUG_FS
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FS received REQUEST TESTINDEXED\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FS received REQUEST TESTINDEXED\n");
#endif
ret = ONDEMAND_testindexed (datastore, &ru->fileId);
return coreAPI->sendValueToClient (sock, ret);
@@ -692,8 +702,8 @@
{
#if DEBUG_FS
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FS received REQUEST GETAVGPRIORITY\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FS received REQUEST GETAVGPRIORITY\n");
#endif
return coreAPI->sendValueToClient (sock, gap->getAvgPriority ());
}
@@ -738,11 +748,12 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (key, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Converting reply for query `%s' for gap.\n", &enc);
+ "Converting reply for query `%s' for gap.\n", &enc);
#endif
et = GNUNET_ntohll (invalue->expirationTime);
now = GNUNET_get_time ();
- if ((et <= now) && (ntohl (invalue->type) !=
GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA))
+ if ((et <= now)
+ && (ntohl (invalue->type) != GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA))
{
/* content expired and not just data -- drop! */
return GNUNET_OK;
@@ -765,21 +776,23 @@
(const DBlock *) &value[1], GNUNET_YES, &hc))
|| (!equalsGNUNET_HashCode (&hc, key)))
{
- GNUNET_GE_BREAK (ectx, 0); /* value failed verification! */
+ GNUNET_GE_BREAK (ectx, 0); /* value failed verification! */
return GNUNET_SYSERR;
}
#endif
ret = isDatumApplicable (ntohl (value->type),
- ntohl (value->size) - sizeof
(GNUNET_DatastoreValue),
- (const DBlock *) &value[1],
- key, ggc->keyCount, ggc->keys);
+ ntohl (value->size) -
+ sizeof (GNUNET_DatastoreValue),
+ (const DBlock *) &value[1], key, ggc->keyCount,
+ ggc->keys);
if (ret == GNUNET_SYSERR)
{
IF_GELOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
GNUNET_hash_to_enc (key, &enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Converting reply for query `%s' for gap failed (datum not
applicable).\n",
- &enc);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Converting reply for query `%s' for gap failed (datum
not applicable).\n",
+ &enc);
GNUNET_free_non_null (xvalue);
return GNUNET_SYSERR; /* no query will ever match */
}
@@ -787,15 +800,18 @@
{
IF_GELOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
GNUNET_hash_to_enc (key, &enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Converting reply for query `%s' for gap failed (type not
applicable).\n",
- &enc);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Converting reply for query `%s' for gap failed (type not
applicable).\n",
+ &enc);
GNUNET_free_non_null (xvalue);
return GNUNET_OK; /* Additional filtering based on type;
i.e., namespace request and namespace
in reply does not match namespace in query
*/
}
- size = sizeof (GapWrapper) + ntohl (value->size) - sizeof
(GNUNET_DatastoreValue);
+ size =
+ sizeof (GapWrapper) + ntohl (value->size) -
+ sizeof (GNUNET_DatastoreValue);
level = ntohl (value->anonymityLevel);
if (GNUNET_OK != checkCoverTraffic (ectx, traffic, level))
@@ -806,9 +822,10 @@
GNUNET_free_non_null (xvalue);
IF_GELOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
GNUNET_hash_to_enc (key, &enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Converting reply for query `%s' for gap failed (insufficient
cover traffic).\n",
- &enc);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Converting reply for query `%s' for gap failed
(insufficient cover traffic).\n",
+ &enc);
return GNUNET_OK;
}
gw = GNUNET_malloc (size);
@@ -859,7 +876,7 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&keys[0], &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "GAP requests content for `%s' of type %u\n", &enc, type);
+ "GAP requests content for `%s' of type %u\n", &enc, type);
#endif
myClosure.count = 0;
myClosure.keyCount = keyCount;
@@ -870,7 +887,8 @@
if (type == GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA)
{
ret = datastore->get (&keys[0],
- GNUNET_GNUNET_ECRS_BLOCKTYPE_ONDEMAND,
&gapGetConverter, &myClosure);
+ GNUNET_GNUNET_ECRS_BLOCKTYPE_ONDEMAND,
+ &gapGetConverter, &myClosure);
}
if (ret != GNUNET_SYSERR)
ret = datastore->get (&keys[0], type, &gapGetConverter, &myClosure);
@@ -892,7 +910,7 @@
gapDel (void *closure, const GNUNET_HashCode * key,
const GNUNET_DataContainer * value)
{
- GNUNET_GE_BREAK (ectx, 0); /* gap does not use 'del'! */
+ GNUNET_GE_BREAK (ectx, 0); /* gap does not use 'del'! */
return GNUNET_SYSERR;
}
@@ -906,7 +924,7 @@
static int
gapIterate (void *closure, GNUNET_DataProcessor processor, void *cls)
{
- GNUNET_GE_BREAK (ectx, 0); /* gap does not use 'iterate' */
+ GNUNET_GE_BREAK (ectx, 0); /* gap does not use 'iterate' */
return GNUNET_SYSERR;
}
@@ -1085,9 +1103,9 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&rs->query[0], &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FS received QUERY START (query: `%s', ttl %llu, priority %u,
anonymity %u)\n",
- &enc, GNUNET_ntohll (rs->expiration) - GNUNET_get_time (),
- ntohl (rs->prio), ntohl (rs->anonymityLevel));
+ "FS received QUERY START (query: `%s', ttl %llu, priority %u,
anonymity %u)\n",
+ &enc, GNUNET_ntohll (rs->expiration) - GNUNET_get_time (),
+ ntohl (rs->prio), ntohl (rs->anonymityLevel));
#endif
type = ntohl (rs->type);
trackQuery (&rs->query[0], type, sock);
@@ -1105,8 +1123,8 @@
{
#if DEBUG_FS
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "FS successfully took GAP shortcut for `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "FS successfully took GAP shortcut for `%s'.\n", &enc);
#endif
return GNUNET_OK;
}
@@ -1164,22 +1182,23 @@
GNUNET_GE_ASSERT (ectx, sizeof (NBlock) == 716);
GNUNET_GE_ASSERT (ectx, sizeof (KNBlock) == 1244);
migration = GNUNET_GC_get_configuration_value_yesno (capi->cfg,
- "FS", "ACTIVEMIGRATION",
- GNUNET_YES);
+ "FS",
+ "ACTIVEMIGRATION",
+ GNUNET_YES);
if (migration == GNUNET_SYSERR)
return GNUNET_SYSERR;
if (GNUNET_GC_get_configuration_value_number (capi->cfg,
- "FS",
- "QUOTA",
- 1,
- ((unsigned long long) -1) / 1024,
- 1024, "a) == -1)
+ "FS",
+ "QUOTA",
+ 1,
+ ((unsigned long long) -1) /
+ 1024, 1024, "a) == -1)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("You must specify a postive number for `%s' in the
configuration in section `%s'.\n"),
- "QUOTA", "FS");
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("You must specify a postive number for `%s' in the
configuration in section `%s'.\n"),
+ "QUOTA", "FS");
return GNUNET_SYSERR;
}
datastore = capi->requestService ("datastore");
@@ -1213,7 +1232,9 @@
ltgSignal = GNUNET_semaphore_create (0);
localGetProcessor = GNUNET_thread_create (&localGetter, NULL, 128 * 1024);
if (localGetProcessor == NULL)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_ADMIN | GNUNET_GE_FATAL |
GNUNET_GE_BULK, "pthread_create");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_ADMIN | GNUNET_GE_FATAL |
+ GNUNET_GE_BULK, "pthread_create");
coreAPI = capi;
ONDEMAND_init (capi);
lock = GNUNET_mutex_create (GNUNET_NO);
@@ -1225,63 +1246,68 @@
dsGap.fast_get = &fastGet;
initQueryManager (capi);
gap->init (&dsGap,
- &uniqueReplyIdentifier, (GNUNET_ReplyHashingCallback) &
replyHashFunction);
- GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"),
- "fs",
- GNUNET_CS_PROTO_GAP_QUERY_START,
- GNUNET_CS_PROTO_GAP_QUERY_STOP,
- GNUNET_CS_PROTO_GAP_INSERT,
- GNUNET_CS_PROTO_GAP_INDEX,
- GNUNET_CS_PROTO_GAP_DELETE,
- GNUNET_CS_PROTO_GAP_UNINDEX,
- GNUNET_CS_PROTO_GAP_TESTINDEX,
- GNUNET_CS_PROTO_GAP_GET_AVG_PRIORITY,
GNUNET_CS_PROTO_GAP_INIT_INDEX);
+ &uniqueReplyIdentifier,
+ (GNUNET_ReplyHashingCallback) & replyHashFunction);
+ GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _
+ ("`%s' registering client handlers %d %d %d %d %d %d %d %d
%d\n"),
+ "fs", GNUNET_CS_PROTO_GAP_QUERY_START,
+ GNUNET_CS_PROTO_GAP_QUERY_STOP, GNUNET_CS_PROTO_GAP_INSERT,
+ GNUNET_CS_PROTO_GAP_INDEX, GNUNET_CS_PROTO_GAP_DELETE,
+ GNUNET_CS_PROTO_GAP_UNINDEX, GNUNET_CS_PROTO_GAP_TESTINDEX,
+ GNUNET_CS_PROTO_GAP_GET_AVG_PRIORITY,
+ GNUNET_CS_PROTO_GAP_INIT_INDEX);
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- capi->registerClientHandler (GNUNET_CS_PROTO_GAP_QUERY_START,
- &csHandleRequestQueryStart));
+ GNUNET_SYSERR !=
+ capi->
+ registerClientHandler (GNUNET_CS_PROTO_GAP_QUERY_START,
+ &csHandleRequestQueryStart));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- capi->registerClientHandler (GNUNET_CS_PROTO_GAP_QUERY_STOP,
- &csHandleRequestQueryStop));
+ GNUNET_SYSERR !=
+ capi->
+ registerClientHandler (GNUNET_CS_PROTO_GAP_QUERY_STOP,
+ &csHandleRequestQueryStop));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- capi->registerClientHandler (GNUNET_CS_PROTO_GAP_INSERT,
-
&csHandleCS_fs_request_insert_MESSAGE));
+ GNUNET_SYSERR !=
+ capi->registerClientHandler (GNUNET_CS_PROTO_GAP_INSERT,
+
&csHandleCS_fs_request_insert_MESSAGE));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR != capi->registerClientHandler
(GNUNET_CS_PROTO_GAP_INDEX,
-
&csHandleCS_fs_request_index_MESSAGE));
+ GNUNET_SYSERR !=
+ capi->registerClientHandler (GNUNET_CS_PROTO_GAP_INDEX,
+
&csHandleCS_fs_request_index_MESSAGE));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- capi->registerClientHandler (GNUNET_CS_PROTO_GAP_INIT_INDEX,
-
&csHandleCS_fs_request_init_index_MESSAGE));
+ GNUNET_SYSERR !=
+ capi->
+ registerClientHandler (GNUNET_CS_PROTO_GAP_INIT_INDEX,
+
&csHandleCS_fs_request_init_index_MESSAGE));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- capi->registerClientHandler (GNUNET_CS_PROTO_GAP_DELETE,
-
&csHandleCS_fs_request_delete_MESSAGE));
+ GNUNET_SYSERR !=
+ capi->registerClientHandler (GNUNET_CS_PROTO_GAP_DELETE,
+
&csHandleCS_fs_request_delete_MESSAGE));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- capi->registerClientHandler (GNUNET_CS_PROTO_GAP_UNINDEX,
-
&csHandleCS_fs_request_unindex_MESSAGE));
+ GNUNET_SYSERR !=
+ capi->registerClientHandler (GNUNET_CS_PROTO_GAP_UNINDEX,
+
&csHandleCS_fs_request_unindex_MESSAGE));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- capi->registerClientHandler (GNUNET_CS_PROTO_GAP_TESTINDEX,
-
&csHandleCS_fs_request_test_index_MESSAGEed));
+ GNUNET_SYSERR !=
+ capi->
+ registerClientHandler (GNUNET_CS_PROTO_GAP_TESTINDEX,
+
&csHandleCS_fs_request_test_index_MESSAGEed));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- capi->registerClientHandler (GNUNET_CS_PROTO_GAP_GET_AVG_PRIORITY,
- &csHandleRequestGetAvgPriority));
+ GNUNET_SYSERR !=
+ capi->
+ registerClientHandler
+ (GNUNET_CS_PROTO_GAP_GET_AVG_PRIORITY,
+ &csHandleRequestGetAvgPriority));
initMigration (capi, datastore, gap, dht, traffic);
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "fs",
- gettext_noop
- ("enables (anonymous)
file-sharing")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "fs",
+ gettext_noop
+ ("enables
(anonymous) file-sharing")));
return GNUNET_OK;
}
@@ -1291,44 +1317,55 @@
LG_Job *job;
void *unused;
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"fs shutdown\n");
+ GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "fs shutdown\n");
doneMigration ();
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_GAP_QUERY_START,
- &csHandleRequestQueryStart));
+ GNUNET_SYSERR !=
+ coreAPI->
+ unregisterClientHandler (GNUNET_CS_PROTO_GAP_QUERY_START,
+ &csHandleRequestQueryStart));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_GAP_QUERY_STOP,
- &csHandleRequestQueryStop));
+ GNUNET_SYSERR !=
+ coreAPI->
+ unregisterClientHandler (GNUNET_CS_PROTO_GAP_QUERY_STOP,
+ &csHandleRequestQueryStop));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_GAP_INSERT,
-
&csHandleCS_fs_request_insert_MESSAGE));
+ GNUNET_SYSERR !=
+ coreAPI->
+ unregisterClientHandler (GNUNET_CS_PROTO_GAP_INSERT,
+
&csHandleCS_fs_request_insert_MESSAGE));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_GAP_INDEX,
-
&csHandleCS_fs_request_index_MESSAGE));
+ GNUNET_SYSERR !=
+ coreAPI->
+ unregisterClientHandler (GNUNET_CS_PROTO_GAP_INDEX,
+
&csHandleCS_fs_request_index_MESSAGE));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_GAP_INIT_INDEX,
-
&csHandleCS_fs_request_init_index_MESSAGE));
+ GNUNET_SYSERR !=
+ coreAPI->
+ unregisterClientHandler (GNUNET_CS_PROTO_GAP_INIT_INDEX,
+
&csHandleCS_fs_request_init_index_MESSAGE));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_GAP_DELETE,
-
&csHandleCS_fs_request_delete_MESSAGE));
+ GNUNET_SYSERR !=
+ coreAPI->
+ unregisterClientHandler (GNUNET_CS_PROTO_GAP_DELETE,
+
&csHandleCS_fs_request_delete_MESSAGE));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_GAP_UNINDEX,
-
&csHandleCS_fs_request_unindex_MESSAGE));
+ GNUNET_SYSERR !=
+ coreAPI->
+ unregisterClientHandler (GNUNET_CS_PROTO_GAP_UNINDEX,
+
&csHandleCS_fs_request_unindex_MESSAGE));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_GAP_TESTINDEX,
-
&csHandleCS_fs_request_test_index_MESSAGEed));
+ GNUNET_SYSERR !=
+ coreAPI->
+ unregisterClientHandler (GNUNET_CS_PROTO_GAP_TESTINDEX,
+
&csHandleCS_fs_request_test_index_MESSAGEed));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- coreAPI->unregisterClientHandler
(GNUNET_CS_PROTO_GAP_GET_AVG_PRIORITY,
-
&csHandleRequestGetAvgPriority));
+ GNUNET_SYSERR !=
+ coreAPI->
+ unregisterClientHandler
+ (GNUNET_CS_PROTO_GAP_GET_AVG_PRIORITY,
+ &csHandleRequestGetAvgPriority));
doneQueryManager ();
while (lg_jobs != NULL)
{
Modified: GNUnet/src/applications/fs/module/migration.c
===================================================================
--- GNUnet/src/applications/fs/module/migration.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/module/migration.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -233,8 +233,8 @@
{
#if DEBUG_MIGRATION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Migration: no content available for migration.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Migration: no content available for migration.\n");
#endif
GNUNET_mutex_unlock (lock);
return 0;
@@ -246,23 +246,25 @@
GNUNET_mutex_unlock (lock);
return 0;
}
- size = sizeof (GapWrapper) + ntohl (value->size) - sizeof
(GNUNET_DatastoreValue);
+ size =
+ sizeof (GapWrapper) + ntohl (value->size) -
+ sizeof (GNUNET_DatastoreValue);
if (size > padding)
{
#if DEBUG_MIGRATION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Migration: available content too big (%u > %u) for
migration.\n",
- size, padding);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Migration: available content too big (%u > %u) for
migration.\n",
+ size, padding);
#endif
GNUNET_mutex_unlock (lock);
return 0;
}
#if DEBUG_MIGRATION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Migration: random lookup in datastore returned type %d.\n",
- ntohl (value->type));
+ GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Migration: random lookup in datastore returned type %d.\n",
+ ntohl (value->type));
#endif
if (ntohl (value->type) == GNUNET_GNUNET_ECRS_BLOCKTYPE_ONDEMAND)
{
@@ -274,8 +276,8 @@
GNUNET_mutex_unlock (lock);
#if DEBUG_MIGRATION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Migration: failed to locate indexed content for
migration.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Migration: failed to locate indexed content for
migration.\n");
#endif
return 0;
}
@@ -286,15 +288,17 @@
value = enc;
}
- size = sizeof (GapWrapper) + ntohl (value->size) - sizeof
(GNUNET_DatastoreValue);
+ size =
+ sizeof (GapWrapper) + ntohl (value->size) -
+ sizeof (GNUNET_DatastoreValue);
if (size > padding)
{
GNUNET_mutex_unlock (lock);
#if DEBUG_MIGRATION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Migration: available content too big (%u > %u) for
migration.\n",
- size, padding);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Migration: available content too big (%u > %u) for
migration.\n",
+ size, padding);
#endif
return 0;
}
@@ -322,8 +326,8 @@
GNUNET_free (gw);
#if DEBUG_MIGRATION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "gap's tryMigrate returned %u\n", ret);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "gap's tryMigrate returned %u\n", ret);
#endif
if (ret != 0)
{
@@ -343,8 +347,8 @@
{
#if DEBUG_MIGRATION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Migration: not enough cover traffic\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Migration: not enough cover traffic\n");
#endif
}
}
@@ -358,7 +362,8 @@
void
initMigration (GNUNET_CoreAPIForPlugins * capi,
GNUNET_Datastore_ServiceAPI * ds,
- GNUNET_GAP_ServiceAPI * g, GNUNET_DHT_ServiceAPI * d,
GNUNET_Traffic_ServiceAPI * t)
+ GNUNET_GAP_ServiceAPI * g, GNUNET_DHT_ServiceAPI * d,
+ GNUNET_Traffic_ServiceAPI * t)
{
ectx = capi->ectx;
lock = GNUNET_mutex_create (GNUNET_NO);
Modified: GNUnet/src/applications/fs/module/ondemand.c
===================================================================
--- GNUnet/src/applications/fs/module/ondemand.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/module/ondemand.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -146,11 +146,13 @@
if (0 != SYMLINK (fn, serverFN))
{
GNUNET_GE_LOG_STRERROR_FILE (cectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER
| GNUNET_GE_BULK,
- "symlink", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "symlink",
+ fn);
GNUNET_GE_LOG_STRERROR_FILE (cectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER
| GNUNET_GE_BULK,
- "symlink", serverFN);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "symlink",
+ serverFN);
GNUNET_free (serverFN);
return GNUNET_NO;
}
@@ -206,8 +208,8 @@
/* not sym-linked, write content to offset! */
#if DEBUG_ONDEMAND
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Storing on-demand encoded data in `%s'.\n", fn);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Storing on-demand encoded data in `%s'.\n", fn);
#endif
fd = GNUNET_disk_file_open (cectx, fn, O_LARGEFILE | O_CREAT | O_WRONLY,
S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); /* 644 */
if (fd == -1)
@@ -224,8 +226,9 @@
else
{
GNUNET_GE_LOG_STRERROR_FILE (cectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- "write", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK,
+ "write", fn);
ret = GNUNET_SYSERR;
}
CLOSE (fd);
@@ -267,10 +270,12 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&key, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Storing on-demand content for query `%s'\n", &enc);
+ "Storing on-demand content for query `%s'\n", &enc);
#endif
- ret = datastore->get (&key, GNUNET_GNUNET_ECRS_BLOCKTYPE_ONDEMAND,
&checkPresent, &odb.header);
+ ret =
+ datastore->get (&key, GNUNET_GNUNET_ECRS_BLOCKTYPE_ONDEMAND,
+ &checkPresent, &odb.header);
if (ret >= 0)
{
ret = datastore->put (&key, &odb.header);
@@ -320,9 +325,10 @@
#if DEBUG_ONDEMAND
GNUNET_hash_to_enc (query, &enc);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("Indexed file disappeared, deleting block for query `%s'\n"),
- &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _
+ ("Indexed file disappeared, deleting block for query `%s'\n"),
+ &enc);
#endif
/* schedule for "immediate" execution */
GNUNET_cron_add_job (coreAPI->cron, &asyncDelJob, 0, 0, job);
@@ -340,7 +346,8 @@
int
ONDEMAND_getIndexed (GNUNET_Datastore_ServiceAPI * datastore,
const GNUNET_DatastoreValue * dbv,
- const GNUNET_HashCode * query, GNUNET_DatastoreValue **
enc)
+ const GNUNET_HashCode * query,
+ GNUNET_DatastoreValue ** enc)
{
char *fn;
char *iobuf;
@@ -369,8 +376,9 @@
struct stat linkStat;
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- "open", fn);
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "open",
+ fn);
/* Is the symlink there? */
if (LSTAT (fn, &linkStat) == -1)
@@ -417,12 +425,13 @@
if (ret != -1)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_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"),
- ofn);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_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"),
+ ofn);
}
GNUNET_free (ofn);
asyncDelete (datastore, dbv, query);
@@ -467,8 +476,9 @@
SEEK_SET))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- "lseek", fn);
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "lseek",
+ fn);
GNUNET_free (fn);
CLOSE (fileHandle);
asyncDelete (datastore, dbv, query);
@@ -481,8 +491,9 @@
if (blen != ntohl (odb->blockSize))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- "read", fn);
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "read",
+ fn);
GNUNET_free (fn);
GNUNET_free (db);
CLOSE (fileHandle);
@@ -498,8 +509,9 @@
if (ret == GNUNET_SYSERR)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Indexed content changed (does not match its hash).\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Indexed content changed (does not match its hash).\n"));
asyncDelete (datastore, dbv, query);
return GNUNET_SYSERR;
}
@@ -552,17 +564,17 @@
{
#if DEBUG_ONDEMAND
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' found value that does not match (%u, %u).\n",
- __FUNCTION__, ntohl (comp->size), ntohl (value->size));
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "`%s' found value that does not match (%u, %u).\n",
+ __FUNCTION__, ntohl (comp->size), ntohl (value->size));
#endif
return GNUNET_OK;
}
*comp = *value; /* make copy! */
#if DEBUG_ONDEMAND
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "`%s' found value that matches.\n", __FUNCTION__);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "`%s' found value that matches.\n", __FUNCTION__);
#endif
return GNUNET_SYSERR;
}
@@ -597,8 +609,8 @@
fn = getOnDemandFile (fileId);
#if DEBUG_ONDEMAND
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Removing on-demand encoded data stored in `%s'.\n", fn);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Removing on-demand encoded data stored in `%s'.\n", fn);
#endif
fd = GNUNET_disk_file_open (cectx, fn, O_RDONLY | O_LARGEFILE, S_IRUSR |
S_IWUSR | S_IRGRP | S_IROTH); /* 644 */
if (fd == -1)
@@ -622,8 +634,9 @@
if (delta != READ (fd, &block[1], delta))
{
GNUNET_GE_LOG_STRERROR_FILE (cectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- "read", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK,
+ "read", fn);
CLOSE (fd);
GNUNET_free (fn);
GNUNET_free (block);
@@ -640,19 +653,20 @@
odb.fileId = *fileId;
/* compute the primary key */
fileBlockGetQuery (block, delta + sizeof (DBlock), &key);
- if (GNUNET_SYSERR == datastore->get (&key,
GNUNET_GNUNET_ECRS_BLOCKTYPE_ONDEMAND, &completeValue, &odb.header)) /*
aborted == found! */
+ if (GNUNET_SYSERR == datastore->get (&key,
GNUNET_GNUNET_ECRS_BLOCKTYPE_ONDEMAND, &completeValue, &odb.header)) /*
aborted == found! */
ret = datastore->del (&key, &odb.header);
else /* not found */
ret = GNUNET_SYSERR;
if (ret == GNUNET_SYSERR)
{
IF_GELOG (cectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
GNUNET_hash_to_enc (&key,
- &enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _
- ("Unindexed ODB block `%s' from offset %llu already missing
from datastore.\n"),
- &enc, pos);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ GNUNET_hash_to_enc (&key, &enc));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Unindexed ODB block `%s' from offset %llu already
missing from datastore.\n"),
+ &enc, pos);
}
pos += delta;
}
@@ -681,16 +695,17 @@
}
ectx = capi->ectx;
GNUNET_GC_get_configuration_value_filename (capi->cfg,
- "GNUNETD",
- "GNUNETD_HOME",
- GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY,
&tmp);
+ "GNUNETD",
+ "GNUNETD_HOME",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY,
+ &tmp);
GNUNET_GE_ASSERT (ectx, NULL != tmp);
tmp = GNUNET_realloc (tmp, strlen (tmp) + strlen ("/data/shared/") + 1);
strcat (tmp, "/data/shared/");
GNUNET_GC_get_configuration_value_filename (capi->cfg,
- "FS",
- "INDEX-DIRECTORY",
- tmp, &index_directory);
+ "FS",
+ "INDEX-DIRECTORY",
+ tmp, &index_directory);
GNUNET_free (tmp);
GNUNET_disk_directory_create (ectx, index_directory); /* just in case */
return GNUNET_OK;
Modified: GNUnet/src/applications/fs/module/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/module/querymanager.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/module/querymanager.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -125,7 +125,8 @@
* @param client where did the query come from?
*/
void
-untrackQuery (const GNUNET_HashCode * query, struct GNUNET_ClientHandle
*client)
+untrackQuery (const GNUNET_HashCode * query,
+ struct GNUNET_ClientHandle *client)
{
int i;
@@ -148,7 +149,8 @@
* @param value the response
*/
void
-processResponse (const GNUNET_HashCode * key, const GNUNET_DatastoreValue *
value)
+processResponse (const GNUNET_HashCode * key,
+ const GNUNET_DatastoreValue * value)
{
int i;
CS_fs_reply_content_MESSAGE *rc;
@@ -157,9 +159,10 @@
GNUNET_EncName enc;
#endif
- GNUNET_GE_ASSERT (ectx, ntohl (value->size) > sizeof
(GNUNET_DatastoreValue));
- if ((GNUNET_ntohll (value->expirationTime) < GNUNET_get_time ()) &&
- (ntohl (value->type) != GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA))
+ GNUNET_GE_ASSERT (ectx,
+ ntohl (value->size) > sizeof (GNUNET_DatastoreValue));
+ if ((GNUNET_ntohll (value->expirationTime) < GNUNET_get_time ())
+ && (ntohl (value->type) != GNUNET_GNUNET_ECRS_BLOCKTYPE_DATA))
return; /* ignore expired, non-data responses! */
matchCount = 0;
@@ -177,20 +180,22 @@
{
matchCount++;
rc = GNUNET_malloc (sizeof (CS_fs_reply_content_MESSAGE) +
- ntohl (value->size) - sizeof
(GNUNET_DatastoreValue));
- rc->header.size = htons (sizeof (CS_fs_reply_content_MESSAGE) +
- ntohl (value->size) -
- sizeof (GNUNET_DatastoreValue));
+ ntohl (value->size) -
+ sizeof (GNUNET_DatastoreValue));
+ rc->header.size =
+ htons (sizeof (CS_fs_reply_content_MESSAGE) +
+ ntohl (value->size) - sizeof (GNUNET_DatastoreValue));
rc->header.type = htons (GNUNET_CS_PROTO_GAP_RESULT);
rc->anonymityLevel = value->anonymityLevel;
rc->expirationTime = value->expirationTime;
memcpy (&rc[1],
- &value[1], ntohl (value->size) - sizeof
(GNUNET_DatastoreValue));
+ &value[1],
+ ntohl (value->size) - sizeof (GNUNET_DatastoreValue));
#if DEBUG_QUERYMANAGER
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Sending reply for `%s' to client waiting in slot %u.\n",
- &enc, i);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Sending reply for `%s' to client waiting in slot
%u.\n",
+ &enc, i);
#endif
if (stats != NULL)
stats->change (stat_replies_transmitted, 1);
@@ -202,8 +207,8 @@
if (matchCount == 0)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Reply `%s' did not match any request.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Reply `%s' did not match any request.\n", &enc);
}
#endif
GNUNET_mutex_unlock (queryManagerLock);
Modified: GNUnet/src/applications/fs/namespace/namespace_info.c
===================================================================
--- GNUnet/src/applications/fs/namespace/namespace_info.c 2007-11-25
12:06:33 UTC (rev 5760)
+++ GNUnet/src/applications/fs/namespace/namespace_info.c 2007-11-25
12:07:29 UTC (rev 5761)
@@ -81,11 +81,13 @@
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY, &fnBase);
- fn = GNUNET_malloc (strlen (fnBase) +
- strlen (NS_DIR) + strlen (namespaceName) + 6);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &fnBase);
+ fn =
+ GNUNET_malloc (strlen (fnBase) + strlen (NS_DIR) +
+ strlen (namespaceName) + 6);
strcpy (fn, fnBase);
strcat (fn, DIR_SEPARATOR_STR);
strcat (fn, NS_DIR);
@@ -94,15 +96,19 @@
strcat (fn, namespaceName);
GNUNET_free (fnBase);
- size = GNUNET_ECRS_meta_data_get_serialized_size (meta,
GNUNET_ECRS_SERIALIZE_FULL);
+ size =
+ GNUNET_ECRS_meta_data_get_serialized_size (meta,
+ GNUNET_ECRS_SERIALIZE_FULL);
tag = size + sizeof (int);
buf = GNUNET_malloc (tag);
((int *) buf)[0] = htonl (ranking); /* ranking */
GNUNET_GE_ASSERT (ectx,
- size == GNUNET_ECRS_meta_data_serialize (ectx,
- meta,
- &buf[sizeof (int)],
- size,
GNUNET_ECRS_SERIALIZE_FULL));
+ size == GNUNET_ECRS_meta_data_serialize (ectx,
+ meta,
+ &buf[sizeof
+ (int)],
+ size,
+
GNUNET_ECRS_SERIALIZE_FULL));
GNUNET_disk_file_write (ectx, fn, buf, tag, "660");
GNUNET_free (fn);
GNUNET_free (buf);
@@ -122,11 +128,13 @@
*meta = NULL;
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY, &fnBase);
- fn = GNUNET_malloc (strlen (fnBase) +
- strlen (NS_DIR) + strlen (namespaceName) + 6);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &fnBase);
+ fn =
+ GNUNET_malloc (strlen (fnBase) + strlen (NS_DIR) +
+ strlen (namespaceName) + 6);
strcpy (fn, fnBase);
strcat (fn, DIR_SEPARATOR_STR);
strcat (fn, NS_DIR);
@@ -191,24 +199,25 @@
*/
struct GNUNET_ECRS_URI *
GNUNET_NS_namespace_create (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- unsigned int anonymityLevel,
- unsigned int insertPriority,
- GNUNET_CronTime insertExpiration,
- const char *namespaceName,
- const struct GNUNET_ECRS_MetaData *meta,
- const struct GNUNET_ECRS_URI *advertisementURI,
- const GNUNET_HashCode * rootEntry)
+ struct GNUNET_GC_Configuration *cfg,
+ unsigned int anonymityLevel,
+ unsigned int insertPriority,
+ GNUNET_CronTime insertExpiration,
+ const char *namespaceName,
+ const struct GNUNET_ECRS_MetaData *meta,
+ const struct GNUNET_ECRS_URI *advertisementURI,
+ const GNUNET_HashCode * rootEntry)
{
struct GNUNET_ECRS_URI *ret;
ret = GNUNET_ECRS_namespace_create (ectx,
- cfg,
- namespaceName,
- meta,
- anonymityLevel,
- insertPriority,
- insertExpiration, advertisementURI, rootEntry);
+ cfg,
+ namespaceName,
+ meta,
+ anonymityLevel,
+ insertPriority,
+ insertExpiration, advertisementURI,
+ rootEntry);
/* store binding of namespaceName to 'meta' in state DB! */
if (ret != NULL)
{
@@ -233,7 +242,8 @@
*/
int
GNUNET_NS_namespace_delete (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, const char
*namespaceName)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *namespaceName)
{
int ret;
char *tmp;
@@ -241,11 +251,13 @@
ret = GNUNET_ECRS_namespace_delete (ectx, cfg, namespaceName);
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY, &tmp);
- fn = GNUNET_malloc (strlen (tmp) + strlen (NS_UPDATE_DIR) +
- strlen (namespaceName) + 20);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &tmp);
+ fn =
+ GNUNET_malloc (strlen (tmp) + strlen (NS_UPDATE_DIR) +
+ strlen (namespaceName) + 20);
strcpy (fn, tmp);
GNUNET_free (tmp);
strcat (fn, DIR_SEPARATOR_STR);
@@ -270,7 +282,8 @@
*/
int
GNUNET_NS_namespace_rank (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, const char *ns, int
delta)
+ struct GNUNET_GC_Configuration *cfg, const char *ns,
+ int delta)
{
struct GNUNET_ECRS_MetaData *meta;
int ret;
@@ -349,8 +362,9 @@
*/
int
GNUNET_NS_namespace_list_all (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- GNUNET_NS_NamespaceIterator iterator, void *closure)
+ struct GNUNET_GC_Configuration *cfg,
+ GNUNET_NS_NamespaceIterator iterator,
+ void *closure)
{
LNClosure cls;
char *fn;
@@ -362,13 +376,15 @@
cls.closure = closure;
cls.ectx = ectx;
cls.cfg = cfg;
- ret1 = GNUNET_ECRS_get_namespaces (ectx, cfg, &localListNamespaceHelper,
&cls);
+ ret1 =
+ GNUNET_ECRS_get_namespaces (ectx, cfg, &localListNamespaceHelper, &cls);
if (ret1 == -1)
return ret1;
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY, &fnBase);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &fnBase);
fn = GNUNET_malloc (strlen (fnBase) + strlen (NS_DIR) + 4);
strcpy (fn, fnBase);
GNUNET_free (fnBase);
@@ -396,11 +412,13 @@
char *ret;
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY, &tmp);
- ret = GNUNET_malloc (strlen (tmp) + strlen (NS_UPDATE_DIR) +
- strlen (nsname) + sizeof (GNUNET_EncName) + 20);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &tmp);
+ ret =
+ GNUNET_malloc (strlen (tmp) + strlen (NS_UPDATE_DIR) + strlen (nsname) +
+ sizeof (GNUNET_EncName) + 20);
strcpy (ret, tmp);
GNUNET_free (tmp);
strcat (ret, DIR_SEPARATOR_STR);
@@ -537,7 +555,9 @@
struct UpdateData *buf;
uri = GNUNET_ECRS_uri_to_string (fi->uri);
- metaSize = GNUNET_ECRS_meta_data_get_serialized_size (fi->meta,
GNUNET_ECRS_SERIALIZE_FULL);
+ metaSize =
+ GNUNET_ECRS_meta_data_get_serialized_size (fi->meta,
+ GNUNET_ECRS_SERIALIZE_FULL);
size = sizeof (struct UpdateData) + metaSize + strlen (uri) + 1;
buf = GNUNET_malloc (size);
buf->nextId = *nextId;
@@ -546,11 +566,13 @@
buf->lastPubTime = htonl (lastPubTime);
memcpy (&buf[1], uri, strlen (uri) + 1);
GNUNET_GE_ASSERT (ectx,
- metaSize ==
- GNUNET_ECRS_meta_data_serialize (ectx,
- fi->meta,
- &((char *) &buf[1])[strlen (uri) + 1],
- metaSize, GNUNET_ECRS_SERIALIZE_FULL));
+ metaSize ==
+ GNUNET_ECRS_meta_data_serialize (ectx,
+ fi->meta,
+ &((char *)
+ &buf[1])[strlen (uri) +
+ 1], metaSize,
+
GNUNET_ECRS_SERIALIZE_FULL));
GNUNET_free (uri);
fn = getUpdateDataFilename (ectx, cfg, nsname, thisId);
GNUNET_disk_file_write (ectx, fn, buf, size, "400"); /* no editing, just
deletion */
@@ -568,11 +590,12 @@
*/
int
GNUNET_NS_compute_next_identifier (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *name,
- const GNUNET_HashCode * lastId,
- const GNUNET_HashCode * thisId,
- GNUNET_Int32Time updateInterval, GNUNET_HashCode * nextId)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *name,
+ const GNUNET_HashCode * lastId,
+ const GNUNET_HashCode * thisId,
+ GNUNET_Int32Time updateInterval,
+ GNUNET_HashCode * nextId)
{
GNUNET_HashCode delta;
GNUNET_CronTime now;
@@ -617,16 +640,17 @@
*/
struct GNUNET_ECRS_URI *
GNUNET_NS_add_to_namespace (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- unsigned int anonymityLevel,
- unsigned int insertPriority,
- GNUNET_CronTime insertExpiration,
- const char *name,
- GNUNET_Int32Time updateInterval,
- const GNUNET_HashCode * lastId,
- const GNUNET_HashCode * thisId,
- const GNUNET_HashCode * nextId,
- const struct GNUNET_ECRS_URI *dst, const struct
GNUNET_ECRS_MetaData *md)
+ struct GNUNET_GC_Configuration *cfg,
+ unsigned int anonymityLevel,
+ unsigned int insertPriority,
+ GNUNET_CronTime insertExpiration,
+ const char *name,
+ GNUNET_Int32Time updateInterval,
+ const GNUNET_HashCode * lastId,
+ const GNUNET_HashCode * thisId,
+ const GNUNET_HashCode * nextId,
+ const struct GNUNET_ECRS_URI *dst,
+ const struct GNUNET_ECRS_MetaData *md)
{
GNUNET_Int32Time creationTime;
GNUNET_HashCode nid;
@@ -654,9 +678,11 @@
{
if (lastInterval != updateInterval)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _
- ("Publication interval for periodic publication
changed."));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _
+ ("Publication interval for periodic publication
changed."));
}
/* try to compute tid and/or
nid based on information read from lastId */
@@ -675,9 +701,12 @@
}
if (creationTime > GNUNET_get_time () + 7 * GNUNET_CRON_DAYS)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Publishing update for periodically updated "
- "content more than a week ahead of schedule.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _
+ ("Publishing update for periodically updated "
+ "content more than a week ahead of
schedule.\n"));
}
if (thisId != NULL)
tid = *thisId; /* allow override! */
@@ -737,13 +766,14 @@
}
}
uri = GNUNET_ECRS_namespace_add_content (ectx,
- cfg,
- name,
- anonymityLevel,
- insertPriority,
- insertExpiration,
- creationTime,
- updateInterval, &tid, &nid, dst, md);
+ cfg,
+ name,
+ anonymityLevel,
+ insertPriority,
+ insertExpiration,
+ creationTime,
+ updateInterval, &tid, &nid, dst,
+ md);
if ((uri != NULL) && (dst != NULL))
{
fi.uri = GNUNET_ECRS_uri_duplicate (dst);
@@ -832,9 +862,10 @@
*/
int
GNUNET_NS_namespace_list_contents (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *name,
- GNUNET_NS_UpdateIterator iterator, void *closure)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *name,
+ GNUNET_NS_UpdateIterator iterator,
+ void *closure)
{
struct lNCC cls;
char *dirName;
@@ -874,9 +905,9 @@
*/
void
GNUNET_NS_namespace_add_information (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const struct GNUNET_ECRS_URI *uri,
- const struct GNUNET_ECRS_MetaData *meta)
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri,
+ const struct GNUNET_ECRS_MetaData *meta)
{
char *name;
int ranking;
@@ -917,17 +948,18 @@
*/
int
GNUNET_NS_namespace_get_root (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *ns, GNUNET_HashCode * root)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *ns, GNUNET_HashCode * root)
{
char *fn;
char *fnBase;
int ret;
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY, &fnBase);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &fnBase);
fn = GNUNET_malloc (strlen (fnBase) + strlen (NS_ROOTS) + strlen (ns) + 6);
strcpy (fn, fnBase);
strcat (fn, DIR_SEPARATOR_STR);
@@ -947,7 +979,8 @@
void
GNUNET_NS_namespace_set_root (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, const struct
GNUNET_ECRS_URI *uri)
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri)
{
char *fn;
char *fnBase;
@@ -961,9 +994,10 @@
}
name = GNUNET_ECRS_get_namespace_name (&ns);
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY, &fnBase);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &fnBase);
fn =
GNUNET_malloc (strlen (fnBase) + strlen (NS_ROOTS) + strlen (name) + 6);
strcpy (fn, fnBase);
@@ -987,8 +1021,9 @@
*/
int
GNUNET_NS_register_discovery_callback (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- GNUNET_NS_NamespaceIterator iterator, void
*closure)
+ struct GNUNET_GC_Configuration *cfg,
+ GNUNET_NS_NamespaceIterator iterator,
+ void *closure)
{
struct DiscoveryCallback *list;
@@ -1007,7 +1042,8 @@
* Unregister namespace discovery callback.
*/
int
-GNUNET_NS_unregister_discovery_callback (GNUNET_NS_NamespaceIterator iterator,
void *closure)
+GNUNET_NS_unregister_discovery_callback (GNUNET_NS_NamespaceIterator iterator,
+ void *closure)
{
struct DiscoveryCallback *prev;
struct DiscoveryCallback *pos;
Modified: GNUnet/src/applications/fs/namespace/namespace_infotest.c
===================================================================
--- GNUnet/src/applications/fs/namespace/namespace_infotest.c 2007-11-25
12:06:33 UTC (rev 5760)
+++ GNUnet/src/applications/fs/namespace/namespace_infotest.c 2007-11-25
12:07:29 UTC (rev 5761)
@@ -72,21 +72,23 @@
GNUNET_ECRS_meta_data_inser (meta, 0, "test");
GNUNET_create_random_hash (&root);
uri = GNUNET_NS_namespace_create (ectx,
- cfg,
- 1,
- 1,
- GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES,
- "test", meta, NULL, &root);
+ cfg,
+ 1,
+ 1,
+ GNUNET_get_time () +
+ 10 * GNUNET_CRON_MINUTES, "test", meta,
+ NULL, &root);
CHECK (uri != NULL);
newVal = GNUNET_NS_namespace_list_all (ectx, cfg, NULL, NULL);
CHECK (old < newVal);
old = GNUNET_NS_namespace_list_contents (ectx, cfg, "test", NULL, NULL);
euri = GNUNET_NS_add_to_namespace (ectx,
- cfg,
- 1,
- 1,
- GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES,
- "test", 42, NULL, &root, NULL, uri, meta);
+ cfg,
+ 1,
+ 1,
+ GNUNET_get_time () +
+ 10 * GNUNET_CRON_MINUTES, "test", 42,
+ NULL, &root, NULL, uri, meta);
CHECK (euri != NULL);
newVal = GNUNET_NS_namespace_list_contents (ectx, cfg, "test", NULL, NULL);
CHECK (old < newVal);
Modified: GNUnet/src/applications/fs/tools/gnunet-directory.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-directory.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/tools/gnunet-directory.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -101,12 +101,15 @@
if (data == MAP_FAILED)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "mmap", name);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "mmap", name);
ret = -1;
}
else
{
- ret = GNUNET_ECRS_directory_list_contents (ectx, data, len, &md,
&printNode, NULL);
+ ret =
+ GNUNET_ECRS_directory_list_contents (ectx, data, len, &md,
+ &printNode, NULL);
MUNMAP (data, len);
}
CLOSE (fd);
@@ -128,8 +131,8 @@
* All gnunet-directory command line options
*/
static struct GNUNET_CommandLineOption gnunetdirectoryOptions[] = {
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Perform directory
related operations.")), /* -h */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Perform directory related
operations.")), /* -h */
{'k', "kill", NULL,
gettext_noop
("remove all entries from the directory database and stop tracking URIs"),
@@ -141,7 +144,7 @@
{'t', "track", NULL,
gettext_noop ("start tracking entries for the directory database"),
0, &GNUNET_getopt_configure_set_one, &do_track},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
GNUNET_COMMAND_LINE_OPTION_END,
};
Modified: GNUnet/src/applications/fs/tools/gnunet-download.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-download.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/tools/gnunet-download.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -68,12 +68,12 @@
{'a', "anonymity", "LEVEL",
gettext_noop ("set the desired LEVEL of sender-anonymity"),
1, &GNUNET_getopt_configure_set_uint, &anonymity},
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
{'d', "directory", NULL,
gettext_noop
("download a GNUnet directory that has already been downloaded. Requires
that a filename of an existing file is specified instead of the URI. The
download will only download the top-level files in the directory unless the
`-R' option is also specified."),
0, &GNUNET_getopt_configure_set_one, &do_directory},
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Download files from
GNUnet.")), /* -h */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Download files from
GNUnet.")), /* -h */
GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
GNUNET_COMMAND_LINE_OPTION_LOGGING, /* -L */
{'o', "output", "FILENAME",
@@ -86,7 +86,7 @@
{'R', "recursive", NULL,
gettext_noop ("download a GNUnet directory recursively"),
0, &GNUNET_getopt_configure_set_one, &do_recursive},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -168,13 +168,14 @@
char *f;
f = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
- EXTRACTOR_FILENAME,
- EXTRACTOR_TITLE,
- EXTRACTOR_ARTIST,
- EXTRACTOR_AUTHOR,
- EXTRACTOR_PUBLISHER,
- EXTRACTOR_CREATOR,
- EXTRACTOR_PRODUCER, EXTRACTOR_UNKNOWN, -1);
+ EXTRACTOR_FILENAME,
+ EXTRACTOR_TITLE,
+ EXTRACTOR_ARTIST,
+ EXTRACTOR_AUTHOR,
+ EXTRACTOR_PUBLISHER,
+ EXTRACTOR_CREATOR,
+ EXTRACTOR_PRODUCER,
+ EXTRACTOR_UNKNOWN, -1);
if (f == NULL)
f = GNUNET_strdup (_("no name given"));
fn = GNUNET_malloc (strlen (filename) + strlen (f) + 4);
@@ -186,7 +187,8 @@
GNUNET_free (f);
meta = GNUNET_ECRS_meta_data_create ();
GNUNET_FSUI_download_start (ctx,
- anonymity, do_recursive, fi->uri, meta, fn, NULL, NULL);
+ anonymity, do_recursive, fi->uri, meta, fn,
+ NULL, NULL);
GNUNET_ECRS_meta_data_destroy (meta);
GNUNET_free (fn);
return GNUNET_OK;
@@ -222,25 +224,27 @@
if (i == argc)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Not enough arguments. "
- "You must specify a GNUnet file URI\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Not enough arguments. "
+ "You must specify a GNUnet file URI\n"));
errorCode = -1;
goto quit;
}
GNUNET_GC_get_configuration_value_number (cfg,
- "GNUNET",
- "VERBOSE", 0, 9999, 0, &verbose);
+ "GNUNET",
+ "VERBOSE", 0, 9999, 0, &verbose);
uri = NULL;
if (!do_directory)
{
uri = GNUNET_ECRS_string_to_uri (ectx, argv[i]);
if ((NULL == uri) ||
- (!(GNUNET_ECRS_uri_test_loc (uri) || GNUNET_ECRS_uri_test_chk
(uri))))
+ (!(GNUNET_ECRS_uri_test_loc (uri)
+ || GNUNET_ECRS_uri_test_chk (uri))))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("URI `%s' invalid for gnunet-download.\n"), argv[i]);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("URI `%s' invalid for gnunet-download.\n"),
+ argv[i]);
errorCode = -1;
goto quit;
}
@@ -270,26 +274,30 @@
else
{
GNUNET_GE_ASSERT (ectx,
- strlen (argv[i]) >
- strlen (GNUNET_ECRS_URI_PREFIX) + strlen
(GNUNET_ECRS_FILE_INFIX));
- filename = GNUNET_expand_file_name (ectx,
- &argv[i][strlen
-
(GNUNET_ECRS_URI_PREFIX) +
- strlen
-
(GNUNET_ECRS_FILE_INFIX)]);
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- _("No filename specified, using `%s' instead (for now).\n"),
- filename);
+ strlen (argv[i]) >
+ strlen (GNUNET_ECRS_URI_PREFIX) +
+ strlen (GNUNET_ECRS_FILE_INFIX));
+ filename =
+ GNUNET_expand_file_name (ectx,
+ &argv[i][strlen (GNUNET_ECRS_URI_PREFIX)
+ +
+ strlen
+ (GNUNET_ECRS_FILE_INFIX)]);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _
+ ("No filename specified, using `%s' instead (for
now).\n"),
+ filename);
try_rename = GNUNET_YES;
}
}
ok = GNUNET_NO;
lock = GNUNET_mutex_create (GNUNET_NO);
ctx = GNUNET_FSUI_start (ectx,
- cfg,
- "gnunet-download",
- parallelism == 0 ? 1 : parallelism,
- GNUNET_NO, &progressModel, NULL);
+ cfg,
+ "gnunet-download",
+ parallelism == 0 ? 1 : parallelism,
+ GNUNET_NO, &progressModel, NULL);
start_time = GNUNET_get_time ();
errorCode = 1;
if (do_directory)
@@ -318,8 +326,10 @@
if (fd != -1)
CLOSE (fd);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
- _("Could not access gnunet-directory file `%s'\n"), efn);
+ GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_USER,
+ _("Could not access gnunet-directory file `%s'\n"),
+ efn);
GNUNET_FSUI_stop (ctx);
GNUNET_mutex_destroy (lock);
GNUNET_free (efn);
@@ -327,9 +337,10 @@
}
meta = GNUNET_ECRS_meta_data_create ();
count = GNUNET_ECRS_directory_list_contents (ectx,
- data,
- sbuf.st_size,
- &meta, &directoryIterator, ctx);
+ data,
+ sbuf.st_size,
+ &meta, &directoryIterator,
+ ctx);
GNUNET_ECRS_meta_data_destroy (meta);
MUNMAP (data, sbuf.st_size);
CLOSE (fd);
@@ -347,8 +358,9 @@
{
meta = GNUNET_ECRS_meta_data_create ();
dl = GNUNET_FSUI_download_start (ctx,
- anonymity,
- do_recursive, uri, meta, filename, NULL, NULL);
+ anonymity,
+ do_recursive, uri, meta, filename,
+ NULL, NULL);
GNUNET_ECRS_meta_data_destroy (meta);
if (dl == NULL)
{
@@ -372,7 +384,7 @@
if ((errorCode == 0) && (dl != NULL) && (try_rename == GNUNET_YES))
{
char *newname = GNUNET_ECRS_suggest_better_filename (ectx,
- filename);
+ filename);
if (newname != NULL)
{
Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -115,15 +115,16 @@
convertId (this_id, &thisId);
convertId (prev_id, &prevId);
nsuri = GNUNET_NS_add_to_namespace (ectx,
- cfg,
- anonymity,
- priority,
- GNUNET_get_time () + 2 * GNUNET_CRON_YEARS,
- pseudonym,
- (GNUNET_Int32Time) interval,
- prev_id == NULL ? NULL : &prevId,
- this_id == NULL ? NULL : &thisId,
- next_id == NULL ? NULL : &nextId, uri, meta);
+ cfg,
+ anonymity,
+ priority,
+ GNUNET_get_time () +
+ 2 * GNUNET_CRON_YEARS, pseudonym,
+ (GNUNET_Int32Time) interval,
+ prev_id == NULL ? NULL : &prevId,
+ this_id == NULL ? NULL : &thisId,
+ next_id == NULL ? NULL : &nextId, uri,
+ meta);
if (nsuri != NULL)
{
us = GNUNET_ECRS_uri_to_string (nsuri);
@@ -266,7 +267,7 @@
{'a', "anonymity", "LEVEL",
gettext_noop ("set the desired LEVEL of sender-anonymity"),
1, &GNUNET_getopt_configure_set_uint, &anonymity},
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
{'C', "copy", NULL,
gettext_noop ("even if gnunetd is running on the local machine, force the"
" creation of a copy instead of making a link to the GNUnet
share directory"),
@@ -283,7 +284,7 @@
gettext_noop
("print list of extracted keywords that would be used, but do not perform
upload"),
0, &GNUNET_getopt_configure_set_one, &extract_only},
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Make files available to
GNUnet for sharing.")), /* -h */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Make files available to
GNUnet for sharing.")), /* -h */
GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
{'i', "interval", "SECONDS",
gettext_noop ("set interval for availability of updates to SECONDS"
@@ -334,7 +335,7 @@
gettext_noop ("ID of the previous version of the content"
" (for namespace update only)"),
1, &GNUNET_getopt_configure_set_string, &prev_id},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -382,7 +383,8 @@
l = EXTRACTOR_loadDefaultLibraries ();
ex = NULL;
- GNUNET_GC_get_configuration_value_string (cfg, "FS", "EXTRACTORS", "",
&ex);
+ GNUNET_GC_get_configuration_value_string (cfg, "FS", "EXTRACTORS", "",
+ &ex);
if (strlen (ex) > 0)
l = EXTRACTOR_loadConfigLibraries (l, ex);
GNUNET_free (ex);
@@ -407,12 +409,13 @@
GNUNET_GC_get_configuration_value_number (cfg,
- "GNUNET",
- "VERBOSE", 0, 9999, 0, &verbose);
+ "GNUNET",
+ "VERBOSE", 0, 9999, 0, &verbose);
/* check arguments */
if (pseudonym != NULL)
{
- if (GNUNET_OK != GNUNET_ECRS_namespace_test_exists (ectx, cfg,
pseudonym, NULL))
+ if (GNUNET_OK !=
+ GNUNET_ECRS_namespace_test_exists (ectx, cfg, pseudonym, NULL))
{
printf (_("Could not access namespace `%s' (does not exist?).\n"),
pseudonym);
@@ -432,7 +435,8 @@
if ((NULL == strptime (creation_time, fmt, &t)))
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "strptime");
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "strptime");
printf (_("Parsing time failed. Use `%s' format.\n"), fmt);
errorCode = -1;
goto quit;
@@ -484,8 +488,8 @@
}
/* fundamental init */
- ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-insert", GNUNET_NO, 32, /* make
configurable */
- &printstatus, &verbose);
+ ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-insert", GNUNET_NO, 32, /*
make configurable */
+ &printstatus, &verbose);
/* first insert all of the top-level files or directories */
tmp = GNUNET_expand_file_name (ectx, filename);
@@ -494,16 +498,13 @@
start_time = GNUNET_get_time ();
errorCode = 1;
ul = GNUNET_FSUI_upload_star (ctx,
- tmp,
- (GNUNET_FSUI_DirectoryScanCallback) &
GNUNET_disk_directory_scan,
- ectx,
- anonymity,
- priority,
- !do_insert,
- GNUNET_YES,
- !do_no_direct_references,
- start_time + 2 * GNUNET_CRON_YEARS,
- meta, gloKeywords, topKeywords);
+ tmp,
+ (GNUNET_FSUI_DirectoryScanCallback) &
+ GNUNET_disk_directory_scan, ectx, anonymity,
+ priority, !do_insert, GNUNET_YES,
+ !do_no_direct_references,
+ start_time + 2 * GNUNET_CRON_YEARS, meta,
+ gloKeywords, topKeywords);
if (gloKeywords != NULL)
GNUNET_ECRS_uri_destroy (gloKeywords);
if (topKeywords != NULL)
Modified: GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -72,7 +72,7 @@
{'A', "automate", NULL,
gettext_noop ("automate creation of a namespace by starting a collection"),
0, &GNUNET_getopt_configure_set_one, &start_collection},
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
{'C', "create", "NICKNAME",
gettext_noop ("create a new pseudonym under the given NICKNAME"),
1, &GNUNET_getopt_configure_set_string, &create_name},
@@ -82,7 +82,7 @@
{'E', "end", NULL,
gettext_noop ("end automated building of a namespace (ends collection)"),
0, &GNUNET_getopt_configure_set_one, &stop_collection},
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Create new pseudonyms,
delete pseudonyms or list existing pseudonyms.")), /* -h */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Create new pseudonyms,
delete pseudonyms or list existing pseudonyms.")), /* -h */
GNUNET_COMMAND_LINE_OPTION_LOGGING, /* -L */
{'k', "keyword", "KEYWORD",
gettext_noop
@@ -105,7 +105,7 @@
{'s', "set-rating", "ID:VALUE",
gettext_noop ("set the rating of a namespace"),
0, &GNUNET_getopt_configure_set_string, &set_rating},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -227,8 +227,8 @@
if (start_collection)
{
GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_OWNER, create_name);
- if (GNUNET_OK == GNUNET_CO_collection_start (anonymity, priority,
GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC, /* FIXME: allow other update
policies */
- create_name, meta))
+ if (GNUNET_OK == GNUNET_CO_collection_start (anonymity, priority,
GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC, /* FIXME: allow other update policies */
+ create_name, meta))
{
printf (_("Started collection `%s'.\n"), create_name);
}
@@ -264,15 +264,17 @@
else
{
if (advertisement == NULL)
- advertisement = GNUNET_ECRS_keyword_string_to_uri (ectx,
"namespace");
+ advertisement =
+ GNUNET_ECRS_keyword_string_to_uri (ectx, "namespace");
}
rootURI = GNUNET_NS_namespace_create (ectx,
- cfg,
- anonymity,
- priority,
- expiration + GNUNET_get_time (),
- create_name,
- meta, advertisement, &rootEntry);
+ cfg,
+ anonymity,
+ priority,
+ expiration +
+ GNUNET_get_time (),
+ create_name, meta,
+ advertisement, &rootEntry);
if (rootURI == NULL)
{
printf (_("Could not create namespace `%s' (exists?).\n"),
Modified: GNUnet/src/applications/fs/tools/gnunet-search.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-search.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/tools/gnunet-search.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -92,14 +92,16 @@
case GNUNET_FSUI_search_result:
/* retain URIs for possible directory dump later */
GNUNET_array_grow (fis, fiCount, fiCount + 1);
- fis[fiCount - 1].uri = GNUNET_ECRS_uri_duplicate
(event->data.SearchResult.fi.uri);
- fis[fiCount - 1].meta
- = GNUNET_ECRS_meta_data_duplicate (event->data.SearchResult.fi.meta);
+ fis[fiCount - 1].uri =
+ GNUNET_ECRS_uri_duplicate (event->data.SearchResult.fi.uri);
+ fis[fiCount - 1].meta =
+ GNUNET_ECRS_meta_data_duplicate (event->data.SearchResult.fi.meta);
uri = GNUNET_ECRS_uri_to_string (event->data.SearchResult.fi.uri);
printf ("%s:\n", uri);
- filename = GNUNET_ECRS_meta_data_get_by_type
(event->data.SearchResult.fi.meta,
- EXTRACTOR_FILENAME);
+ filename =
+ GNUNET_ECRS_meta_data_get_by_type (event->data.SearchResult.fi.meta,
+ EXTRACTOR_FILENAME);
if (filename != NULL)
{
char *dotdot;
@@ -133,8 +135,8 @@
{'a', "anonymity", "LEVEL",
gettext_noop ("set the desired LEVEL of sender-anonymity"),
1, &GNUNET_getopt_configure_set_uint, &anonymity},
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Search GNUnet for
files.")), /* -h */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Search GNUnet for files.")),
/* -h */
GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
GNUNET_COMMAND_LINE_OPTION_LOGGING, /* -L */
{'m', "max", "LIMIT",
@@ -146,7 +148,7 @@
{'t', "timeout", "DELAY",
gettext_noop ("wait DELAY seconds for search results before aborting"),
1, &GNUNET_getopt_configure_set_uint, &delay},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -176,7 +178,9 @@
return -1;
}
/* convert args to URI */
- uri = GNUNET_ECRS_keyword_command_line_to_uri (ectx, argc - i, (const char
**) &argv[i]);
+ uri =
+ GNUNET_ECRS_keyword_command_line_to_uri (ectx, argc - i,
+ (const char **) &argv[i]);
if (uri == NULL)
{
printf (_("Error converting arguments to URI!\n"));
@@ -186,8 +190,8 @@
if (max_results == 0)
max_results = (unsigned int) -1; /* infty */
ctx =
- GNUNET_FSUI_start (ectx, cfg, "gnunet-search", 4, GNUNET_NO,
&eventCallback,
- NULL);
+ GNUNET_FSUI_start (ectx, cfg, "gnunet-search", 4, GNUNET_NO,
+ &eventCallback, NULL);
if (ctx == NULL)
{
GNUNET_ECRS_uri_destroy (uri);
@@ -196,8 +200,8 @@
}
errorCode = 1;
s = GNUNET_FSUI_search_start (ctx,
- anonymity, max_results, delay * GNUNET_CRON_SECONDS,
- uri);
+ anonymity, max_results,
+ delay * GNUNET_CRON_SECONDS, uri);
GNUNET_ECRS_uri_destroy (uri);
if (s == NULL)
{
Modified: GNUnet/src/applications/fs/tools/gnunet-unindex.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-unindex.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/tools/gnunet-unindex.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -104,11 +104,11 @@
* All gnunet-unindex command line options
*/
static struct GNUNET_CommandLineOption gnunetunindexOptions[] = {
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Unindex files.")), /* -h */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Unindex files.")), /* -h
*/
GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
GNUNET_COMMAND_LINE_OPTION_LOGGING, /* -L */
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -141,25 +141,27 @@
if (i == argc)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Not enough arguments. " "You must specify a filename.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Not enough arguments. "
+ "You must specify a filename.\n"));
GNUNET_fini (ectx, cfg);
return -1;
}
GNUNET_GC_get_configuration_value_number (cfg,
- "GNUNET",
- "VERBOSE", 0, 9999, 0, &verbose);
+ "GNUNET",
+ "VERBOSE", 0, 9999, 0, &verbose);
/* fundamental init */
ctx = GNUNET_FSUI_start (ectx,
- cfg, "gnunet-unindex", 2, GNUNET_NO, &printstatus,
- &verbose);
+ cfg, "gnunet-unindex", 2, GNUNET_NO, &printstatus,
+ &verbose);
errorCode = 1;
start_time = GNUNET_get_time ();
filename = GNUNET_expand_file_name (ectx, argv[i]);
ul = GNUNET_FSUI_unindex_start (ctx, filename);
if (ul == NULL)
{
- printf (_("`%s' failed. Is `%s' a file?\n"), "GNUNET_FSUI_unindex",
filename);
+ printf (_("`%s' failed. Is `%s' a file?\n"), "GNUNET_FSUI_unindex",
+ filename);
errorCode = 2;
}
else
Modified: GNUnet/src/applications/fs/uritrack/callbacks.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/callbacks.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/uritrack/callbacks.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -81,9 +81,9 @@
*/
int
GNUNET_URITRACK_register_track_callback (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- GNUNET_ECRS_SearchResultProcessor iterator,
- void *closure)
+ struct GNUNET_GC_Configuration *cfg,
+ GNUNET_ECRS_SearchResultProcessor
+ iterator, void *closure)
{
Callback *c;
@@ -105,8 +105,8 @@
* Unregister a URI callback.
*/
int
-GNUNET_URITRACK_unregister_track_callback (GNUNET_ECRS_SearchResultProcessor
iterator,
- void *closure)
+GNUNET_URITRACK_unregister_track_callback (GNUNET_ECRS_SearchResultProcessor
+ iterator, void *closure)
{
int i;
void *unused;
Modified: GNUnet/src/applications/fs/uritrack/file_info.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/file_info.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/uritrack/file_info.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -39,7 +39,8 @@
#define TRACK_OPTION "fs_uridb_status"
static struct GNUNET_IPC_Semaphore *
-createIPC (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration *cfg)
+createIPC (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *basename;
char *ipcName;
@@ -47,9 +48,10 @@
size_t n;
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY,
&basename);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &basename);
n = strlen (basename) + 512;
ipcName = GNUNET_malloc (n);
GNUNET_snprintf (ipcName, n, "%s/directory_ipc_lock", basename);
@@ -60,15 +62,17 @@
}
static char *
-getUriDbName (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+getUriDbName (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *nw;
char *pfx;
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY, &pfx);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &pfx);
nw = GNUNET_malloc (strlen (pfx) + strlen (STATE_NAME) + 2);
strcpy (nw, pfx);
strcat (nw, DIR_SEPARATOR_STR);
@@ -79,15 +83,17 @@
}
static char *
-getToggleName (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+getToggleName (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *nw;
char *pfx;
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY, &pfx);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &pfx);
nw = GNUNET_malloc (strlen (pfx) + strlen (TRACK_OPTION) + 2);
strcpy (nw, pfx);
strcat (nw, DIR_SEPARATOR_STR);
@@ -103,7 +109,8 @@
* @return GNUNET_YES of tracking is enabled, GNUNET_NO if not
*/
int
-GNUNET_URITRACK_get_tracking_status (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg)
+GNUNET_URITRACK_get_tracking_status (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
int status;
char *tn;
@@ -123,8 +130,8 @@
GNUNET_free (tn);
#if DEBUG_FILE_INFO
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("Collecting file identifiers disabled.\n"));
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("Collecting file identifiers disabled.\n"));
#endif
return GNUNET_NO;
}
@@ -159,7 +166,8 @@
*/
void
GNUNET_URITRACK_track (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, const
GNUNET_ECRS_FileInfo * fi)
+ struct GNUNET_GC_Configuration *cfg,
+ const GNUNET_ECRS_FileInfo * fi)
{
struct GNUNET_IPC_Semaphore *sem;
char *data;
@@ -177,16 +185,18 @@
if (cpc.present == 1)
return;
size = GNUNET_ECRS_meta_data_get_serialized_size (fi->meta,
- GNUNET_ECRS_SERIALIZE_FULL |
- GNUNET_ECRS_SERIALIZE_NO_COMPRESS);
+ GNUNET_ECRS_SERIALIZE_FULL
+ |
+
GNUNET_ECRS_SERIALIZE_NO_COMPRESS);
data = GNUNET_malloc (size);
GNUNET_GE_ASSERT (ectx,
- size == GNUNET_ECRS_meta_data_serialize (ectx,
- fi->meta,
- data,
- size,
- GNUNET_ECRS_SERIALIZE_FULL |
-
GNUNET_ECRS_SERIALIZE_NO_COMPRESS));
+ size == GNUNET_ECRS_meta_data_serialize (ectx,
+ fi->meta,
+ data,
+ size,
+
GNUNET_ECRS_SERIALIZE_FULL
+ |
+
GNUNET_ECRS_SERIALIZE_NO_COMPRESS));
size = htonl (size);
suri = GNUNET_ECRS_uri_to_string (fi->uri);
sem = createIPC (ectx, cfg);
@@ -217,7 +227,7 @@
*/
void
GNUNET_URITRACK_clear (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg)
+ struct GNUNET_GC_Configuration *cfg)
{
struct GNUNET_IPC_Semaphore *sem;
char *fn;
@@ -229,8 +239,9 @@
{
if (0 != UNLINK (fn))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "unlink", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "unlink", fn);
}
GNUNET_free (fn);
GNUNET_IPC_semaphore_up (sem);
@@ -245,7 +256,8 @@
*/
void
GNUNET_URITRACK_toggle_tracking (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, int onOff)
+ struct GNUNET_GC_Configuration *cfg,
+ int onOff)
{
int o = htonl (onOff);
char *tn;
@@ -267,9 +279,10 @@
*/
int
GNUNET_URITRACK_list (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- int need_metadata,
- GNUNET_ECRS_SearchResultProcessor iterator, void *closure)
+ struct GNUNET_GC_Configuration *cfg,
+ int need_metadata,
+ GNUNET_ECRS_SearchResultProcessor iterator,
+ void *closure)
{
struct GNUNET_IPC_Semaphore *sem;
int rval;
@@ -299,8 +312,9 @@
GNUNET_IPC_semaphore_up (sem);
GNUNET_IPC_semaphore_destroy (sem);
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
| GNUNET_GE_BULK,
- "open", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "open",
+ fn);
GNUNET_free (fn);
return GNUNET_SYSERR; /* error opening URI db */
}
@@ -309,8 +323,9 @@
{
CLOSE (fd);
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
| GNUNET_GE_BULK,
- "mmap", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "mmap",
+ fn);
GNUNET_free (fn);
GNUNET_IPC_semaphore_up (sem);
GNUNET_IPC_semaphore_destroy (sem);
@@ -347,7 +362,8 @@
}
if (need_metadata == GNUNET_YES)
{
- fi.meta = GNUNET_ECRS_meta_data_deserialize (ectx, &result[spos],
msize);
+ fi.meta =
+ GNUNET_ECRS_meta_data_deserialize (ectx, &result[spos], msize);
if (fi.meta == NULL)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -369,8 +385,8 @@
GNUNET_ECRS_uri_destroy (fi.uri);
if (0 != MUNMAP (result, buf.st_size))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "munmap", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN
+ | GNUNET_GE_BULK, "munmap", fn);
CLOSE (fd);
GNUNET_free (fn);
GNUNET_IPC_semaphore_up (sem);
@@ -384,7 +400,9 @@
GNUNET_ECRS_uri_destroy (fi.uri);
}
if (0 != MUNMAP (result, buf.st_size))
- GNUNET_GE_LOG_STRERROR_FILE (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "munmap", fn);
+ GNUNET_GE_LOG_STRERROR_FILE (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "munmap", fn);
CLOSE (fd);
GNUNET_free (fn);
GNUNET_IPC_semaphore_up (sem);
@@ -392,10 +410,12 @@
return rval;
FORMATERROR:
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Deleted corrupt URI database in `%s'."), STATE_NAME);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Deleted corrupt URI database in `%s'."), STATE_NAME);
if (0 != MUNMAP (result, buf.st_size))
- GNUNET_GE_LOG_STRERROR_FILE (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "munmap", fn);
+ GNUNET_GE_LOG_STRERROR_FILE (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "munmap", fn);
CLOSE (fd);
GNUNET_free (fn);
GNUNET_IPC_semaphore_up (sem);
Modified: GNUnet/src/applications/fs/uritrack/tracktest.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/tracktest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/uritrack/tracktest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -47,7 +47,8 @@
if ((fi1.meta != NULL) &&
(fi1.uri != NULL) &&
(GNUNET_ECRS_meta_data_test_equal (fi->meta,
- fi1.meta)) && (GNUNET_ECRS_uri_test_equal
(fi->uri, fi1.uri)))
+ fi1.meta))
+ && (GNUNET_ECRS_uri_test_equal (fi->uri, fi1.uri)))
{
notifications++;
return GNUNET_OK;
@@ -55,7 +56,8 @@
if ((fi2.meta != NULL) &&
(fi2.uri != NULL) &&
(GNUNET_ECRS_meta_data_test_equal (fi->meta,
- fi2.meta)) && (GNUNET_ECRS_uri_test_equal
(fi->uri, fi2.uri)))
+ fi2.meta))
+ && (GNUNET_ECRS_uri_test_equal (fi->uri, fi2.uri)))
{
notifications++;
return GNUNET_OK;
@@ -70,7 +72,8 @@
if ((fi1.meta != NULL) &&
(fi1.uri != NULL) &&
(GNUNET_ECRS_meta_data_test_equal (fi->meta,
- fi1.meta)) && (GNUNET_ECRS_uri_test_equal
(fi->uri, fi1.uri)))
+ fi1.meta))
+ && (GNUNET_ECRS_uri_test_equal (fi->uri, fi1.uri)))
{
GNUNET_ECRS_uri_destroy (fi1.uri);
fi1.uri = NULL;
@@ -81,7 +84,8 @@
if ((fi2.meta != NULL) &&
(fi2.uri != NULL) &&
(GNUNET_ECRS_meta_data_test_equal (fi->meta,
- fi2.meta)) && (GNUNET_ECRS_uri_test_equal
(fi->uri, fi2.uri)))
+ fi2.meta))
+ && (GNUNET_ECRS_uri_test_equal (fi->uri, fi2.uri)))
{
GNUNET_ECRS_uri_destroy (fi2.uri);
fi2.uri = NULL;
Modified: GNUnet/src/applications/fs/uritrack/uri_info.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/uri_info.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/fs/uritrack/uri_info.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -41,9 +41,10 @@
size_t n;
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_DEFAULT_HOME_DIRECTORY,
&basename);
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_DEFAULT_HOME_DIRECTORY,
+ &basename);
n = strlen (basename) + 512;
ipcName = GNUNET_malloc (n);
GNUNET_snprintf (ipcName, n, "%s/uri_info.db", basename);
@@ -58,10 +59,11 @@
value = 1024 * 1024;
GNUNET_GC_get_configuration_value_number (cfg,
- "FS",
- "URI_DB_SIZE",
- 1,
- 1024 * 1024 * 1024, 1024 * 1024, &value);
+ "FS",
+ "URI_DB_SIZE",
+ 1,
+ 1024 * 1024 * 1024, 1024 * 1024,
+ &value);
return value;
}
@@ -76,7 +78,8 @@
*/
enum GNUNET_URITRACK_STATE
GNUNET_URITRACK_get_state (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, const struct
GNUNET_ECRS_URI *uri)
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri)
{
char *s;
int crc;
@@ -100,8 +103,9 @@
if (o != LSEEK (fd, o, SEEK_SET))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "lseek", s);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "lseek",
+ s);
CLOSE (fd);
return GNUNET_URITRACK_FRESH;
}
@@ -121,8 +125,9 @@
*/
void
GNUNET_URITRACK_add_state (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const struct GNUNET_ECRS_URI *uri, enum
GNUNET_URITRACK_STATE state)
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri,
+ enum GNUNET_URITRACK_STATE state)
{
char *s;
int crc;
@@ -146,8 +151,9 @@
if (o != LSEEK (fd, o, SEEK_SET))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "lseek", s);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "lseek",
+ s);
CLOSE (fd);
GNUNET_free (s);
return;
@@ -166,16 +172,18 @@
if (o != LSEEK (fd, o, SEEK_SET))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "lseek", s);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "lseek",
+ s);
CLOSE (fd);
GNUNET_free (s);
return;
}
if (2 != write (fd, io, 2))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN
| GNUNET_GE_BULK,
- "write", s);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "write",
+ s);
GNUNET_disk_file_close (ectx, s, fd);
GNUNET_free (s);
}
Modified: GNUnet/src/applications/gap/gap.c
===================================================================
--- GNUnet/src/applications/gap/gap.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/applications/gap/gap.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -529,13 +529,13 @@
GNUNET_hash_to_enc (&peer->hashPubKey, &enc2);
((char *) &enc2)[6] = '\0';
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Q %s peer %2u (%s) ranks (responses: %2u, distance %4d): %u%s\n",
- &enc,
- idx,
- &enc2,
- rp == NULL ? 0 : rp->responseCount,
- distance, ranking, id == qr->noTarget ? " (no target)" : "");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Q %s peer %2u (%s) ranks (responses: %2u, distance %4d):
%u%s\n",
+ &enc,
+ idx,
+ &enc2,
+ rp == NULL ? 0 : rp->responseCount,
+ distance, ranking, id == qr->noTarget ? " (no target)" : "");
#endif
qr->rankings[idx] = ranking;
change_pid_rc (id, -1);
@@ -594,8 +594,8 @@
GNUNET_hash_to_enc (&peer->hashPubKey, &encp);
GNUNET_hash_to_enc (&qr->msg->queries[0], &encq));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Sending query `%s' to `%s'\n", &encq, &encp);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Sending query `%s' to `%s'\n", &encq, &encp);
#endif
if (stats != NULL)
stats->change (stat_routing_forwards, 1);
@@ -854,7 +854,8 @@
*/
static int
queueReply (const GNUNET_PeerIdentity * sender,
- const GNUNET_HashCode * primaryKey, const GNUNET_DataContainer *
data)
+ const GNUNET_HashCode * primaryKey,
+ const GNUNET_DataContainer * data)
{
P2P_gap_reply_MESSAGE *pmsg;
IndirectionTableEntry *ite;
@@ -863,10 +864,10 @@
GNUNET_EncName enc;
IF_GELOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (primaryKey,
- &enc));
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ GNUNET_hash_to_enc (primaryKey, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Gap queues reply to query `%s' for later use.\n", &enc);
+ "Gap queues reply to query `%s' for later use.\n", &enc);
#endif
#if EXTRA_CHECKS
@@ -879,8 +880,8 @@
{
#if DEBUG_GAP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "GAP: Dropping reply, routing table has no query associated with
it (anymore)\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "GAP: Dropping reply, routing table has no query
associated with it (anymore)\n");
#endif
return GNUNET_NO; /* we don't care for the reply (anymore) */
}
@@ -888,8 +889,8 @@
{
#if DEBUG_GAP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "GAP: Dropping reply, found reply locally during delay\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "GAP: Dropping reply, found reply locally during
delay\n");
#endif
return GNUNET_NO; /* wow, really bad concurrent DB lookup and
processing for
the same query. Well, at least we should
not also
@@ -1000,9 +1001,9 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (query, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "GAP: Queueing query '%s' in slot %p\n", &enc, ite);
+ "GAP: Queueing query '%s' in slot %p\n", &enc, ite);
#endif
- GNUNET_GE_ASSERT (ectx, sender != 0); /* do NOT add to RT for local
clients! */
+ GNUNET_GE_ASSERT (ectx, sender != 0); /* do NOT add to RT for local clients!
*/
now = GNUNET_get_time ();
if ((stats != NULL) && (ite->ttl == 0))
stats->change (stat_routing_slots_used, 1);
@@ -1035,8 +1036,8 @@
else
{ /* GNUNET_array_grow mode */
GNUNET_GE_ASSERT (ectx,
- 0 == memcmp (query, &ite->primaryKey,
- sizeof (GNUNET_HashCode)));
+ 0 == memcmp (query, &ite->primaryKey,
+ sizeof (GNUNET_HashCode)));
/* extend lifetime */
if (ite->ttl < now + ttl)
ite->ttl = now + ttl;
@@ -1428,8 +1429,8 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&recv.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "GAP sending reply to `%s'\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "GAP sending reply to `%s'\n", &enc);
#endif
coreAPI->unicast (&recv, msg, BASE_REPLY_PRIORITY * (ite->priority + 5),
/* weigh priority */
@@ -1563,10 +1564,11 @@
GNUNET_hash_to_enc (&query->queries[0], &enc));
((char *) &enc)[6] = '\0';
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
- "GAP is executing request for `%s':%s%s (%d)\n",
- &enc,
- doForward ? " forwarding" : "", isRouted ? " routing" : "", i);
+ GNUNET_GE_INFO | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
+ "GAP is executing request for `%s':%s%s (%d)\n",
+ &enc,
+ doForward ? " forwarding" : "", isRouted ? " routing" : "",
+ i);
#endif
if ((stats != NULL) && (isRouted || doForward))
stats->change (stat_routing_processed, 1);
@@ -1686,9 +1688,9 @@
GNUNET_hash_to_enc (&msg->primaryKey, &enc2);
((char *) &enc2)[6] = '\0';
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "GAP received content `%s' from `%s'\n",
- &enc2, (host != NULL) ? (const char *) &enc : "myself");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "GAP received content `%s' from `%s'\n",
+ &enc2, (host != NULL) ? (const char *) &enc : "myself");
#endif
ite = &ROUTING_indTable_[computeRoutingIndex (&msg->primaryKey)];
@@ -1718,8 +1720,8 @@
if (host != NULL) GNUNET_hash_to_enc (&host->hashPubKey,
&enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("GAP received invalid content from `%s'\n"),
- (host != NULL) ? (const char *) &enc : _("myself"));
+ _("GAP received invalid content from `%s'\n"),
+ (host != NULL) ? (const char *) &enc : _("myself"));
GNUNET_GE_BREAK_OP (ectx, 0);
GNUNET_free (value);
return GNUNET_SYSERR; /* invalid */
@@ -1844,7 +1846,8 @@
* @return GNUNET_SYSERR on error, GNUNET_OK on success
*/
static int
-init (GNUNET_Blockstore * datastore, GNUNET_UniqueReplyIdentifierCallback uid,
GNUNET_ReplyHashingCallback rh)
+init (GNUNET_Blockstore * datastore, GNUNET_UniqueReplyIdentifierCallback uid,
+ GNUNET_ReplyHashingCallback rh)
{
if (bs != NULL)
{
@@ -1908,19 +1911,20 @@
if (traffic == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Cover traffic requested but traffic service not loaded.
Rejecting request.\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Cover traffic requested but traffic service not
loaded. Rejecting request.\n"));
return GNUNET_SYSERR;
}
if (GNUNET_OK !=
traffic->get ((TTL_DECREMENT + timeout) / GNUNET_TRAFFIC_TIME_UNIT,
- GNUNET_P2P_PROTO_GAP_QUERY,
GNUNET_TRAFFIC_TYPE_RECEIVED, &count, &peers,
- &sizes, &timevect))
+ GNUNET_P2P_PROTO_GAP_QUERY,
+ GNUNET_TRAFFIC_TYPE_RECEIVED, &count, &peers, &sizes,
+ &timevect))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Failed to get traffic stats.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Failed to get traffic stats.\n"));
return GNUNET_SYSERR;
}
if (anonymityLevel > 1000)
@@ -1928,17 +1932,19 @@
if (peers < anonymityLevel / 1000)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Cannot satisfy desired level of anonymity, ignoring
request.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _
+ ("Cannot satisfy desired level of anonymity,
ignoring request.\n"));
return GNUNET_SYSERR;
}
if (count < anonymityLevel % 1000)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Cannot satisfy desired level of anonymity, ignoring
request.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _
+ ("Cannot satisfy desired level of anonymity,
ignoring request.\n"));
return GNUNET_SYSERR;
}
}
@@ -1947,9 +1953,10 @@
if (count < anonymityLevel)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Cannot satisfy desired level of anonymity, ignoring
request.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _
+ ("Cannot satisfy desired level of anonymity,
ignoring request.\n"));
return GNUNET_SYSERR;
}
}
@@ -2051,9 +2058,9 @@
GNUNET_hash_to_enc (&sender->hashPubKey, &enc));
}
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Dropping query from %s, this peer is too busy.\n",
- sender == NULL ? "localhost" : (char *) &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Dropping query from %s, this peer is too busy.\n",
+ sender == NULL ? "localhost" : (char *) &enc);
#endif
return GNUNET_OK;
}
@@ -2114,8 +2121,8 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&qmsg->queries[0], &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received GAP query `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received GAP query `%s'.\n", &enc);
#endif
if ((policy & QUERY_DROPMASK) == 0)
{
@@ -2125,13 +2132,14 @@
#if DEBUG_GAP
if (sender != NULL)
{
- IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ IF_GELOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&sender->hashPubKey, &enc));
}
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Dropping query from %s, policy decided that this peer is too
busy.\n",
- sender == NULL ? "localhost" : (const char *) &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Dropping query from %s, policy decided that this peer is
too busy.\n",
+ sender == NULL ? "localhost" : (const char *) &enc);
#endif
if (stats != NULL)
stats->change (stat_routing_direct_drops, 1);
@@ -2199,17 +2207,19 @@
ectx = capi->ectx;
cfg = capi->cfg;
coreAPI = capi;
- if ((-1 == GNUNET_GC_get_configuration_value_number (cfg, "LOAD",
"HARDCPULIMIT", 0, 100000, /* 1000 CPUs!? */
- 0, /* 0 == no limit */
- &hardCPULimit)) || (-1 ==
GNUNET_GC_get_configuration_value_number (cfg, "LOAD", "HARDUPLIMIT", 0,
999999999, 0, /* 0 == no limit */
-
&hardUpLimit))
+ if ((-1 == GNUNET_GC_get_configuration_value_number (cfg, "LOAD",
"HARDCPULIMIT", 0, 100000, /* 1000 CPUs!? */
+ 0, /* 0 == no
limit */
+ &hardCPULimit)) || (-1
== GNUNET_GC_get_configuration_value_number (cfg, "LOAD", "HARDUPLIMIT", 0,
999999999, 0, /* 0 == no limit */
+
&hardUpLimit))
|| (-1 ==
GNUNET_GC_get_configuration_value_number (cfg, "GAP", "TABLESIZE",
- MIN_INDIRECTION_TABLE_SIZE,
- GNUNET_MAX_GNUNET_malloc_CHECKED
- / sizeof (IndirectionTableEntry),
- MIN_INDIRECTION_TABLE_SIZE,
- &indirectionTableSize)))
+ MIN_INDIRECTION_TABLE_SIZE,
+
GNUNET_MAX_GNUNET_malloc_CHECKED
+ /
+ sizeof
+ (IndirectionTableEntry),
+ MIN_INDIRECTION_TABLE_SIZE,
+ &indirectionTableSize)))
return NULL;
GNUNET_GE_ASSERT (ectx, sizeof (P2P_gap_reply_MESSAGE) == 68);
GNUNET_GE_ASSERT (ectx, sizeof (P2P_gap_query_MESSAGE) == 144);
@@ -2279,9 +2289,10 @@
traffic = coreAPI->requestService ("traffic");
if (traffic == NULL)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Traffic service failed to load; gap cannot ensure
cover-traffic availability.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Traffic service failed to load; gap cannot ensure
cover-traffic availability.\n"));
}
random_qsel = GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 0xFFFF);
lookup_exclusion = GNUNET_mutex_create (GNUNET_NO);
@@ -2304,9 +2315,10 @@
2 * GNUNET_CRON_MINUTES, NULL);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("`%s' registering handlers %d %d\n"),
- "gap", GNUNET_P2P_PROTO_GAP_QUERY, GNUNET_P2P_PROTO_GAP_RESULT);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("`%s' registering handlers %d %d\n"),
+ "gap", GNUNET_P2P_PROTO_GAP_QUERY,
+ GNUNET_P2P_PROTO_GAP_RESULT);
capi->registerHandler (GNUNET_P2P_PROTO_GAP_QUERY, &handleQuery);
capi->registerHandler (GNUNET_P2P_PROTO_GAP_RESULT, &useContent);
coreAPI->registerSendCallback (sizeof (P2P_gap_query_MESSAGE),
Modified: GNUnet/src/applications/gap/gaptest.c
===================================================================
--- GNUnet/src/applications/gap/gaptest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/gap/gaptest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -100,10 +100,11 @@
GNUNET_free (buf);
GNUNET_disk_file_close (ectx, name, fd);
ret = GNUNET_ECRS_file_upload (ectx, cfg, name, GNUNET_YES, /* index */
- 0, /* anon */
- 0, /* prio */
- GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES, /*
expire */
- &uprogress, NULL, &testTerminate, NULL, &uri);
+ 0, /* anon */
+ 0, /* prio */
+ GNUNET_get_time () + 10 *
GNUNET_CRON_MINUTES, /* expire */
+ &uprogress, NULL, &testTerminate, NULL,
+ &uri);
if (ret != GNUNET_SYSERR)
{
struct GNUNET_ECRS_MetaData *meta;
@@ -115,8 +116,8 @@
meta = GNUNET_ECRS_meta_data_create ();
key = GNUNET_ECRS_keyword_strings_to_uri (keywords);
- ret = GNUNET_ECRS_publish_under_keyword (ectx, cfg, key, 0, 0,
GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES, /* expire */
- uri, meta);
+ ret = GNUNET_ECRS_publish_under_keyword (ectx, cfg, key, 0, 0,
GNUNET_get_time () + 10 * GNUNET_CRON_MINUTES, /* expire */
+ uri, meta);
GNUNET_ECRS_meta_data_destroy (meta);
GNUNET_ECRS_uri_destroy (uri);
GNUNET_free (name);
@@ -146,7 +147,8 @@
tmp = GNUNET_ECRS_uri_to_string (fi->uri);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "Search found
URI `%s'\n", tmp);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Search found URI `%s'\n", tmp);
GNUNET_free (tmp);
GNUNET_GE_ASSERT (ectx, NULL == *my);
*my = GNUNET_ECRS_uri_duplicate (fi->uri);
@@ -165,11 +167,11 @@
myURI = NULL;
ret = GNUNET_ECRS_search (ectx,
- cfg,
- *uri,
- 0,
- 15 * GNUNET_CRON_SECONDS,
- &searchCB, &myURI, &testTerminate, NULL);
+ cfg,
+ *uri,
+ 0,
+ 15 * GNUNET_CRON_SECONDS,
+ &searchCB, &myURI, &testTerminate, NULL);
GNUNET_ECRS_uri_destroy (*uri);
*uri = myURI;
if ((ret != GNUNET_SYSERR) && (myURI != NULL))
@@ -191,17 +193,17 @@
tmp = GNUNET_ECRS_uri_to_string (uri);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Starting download of `%s'\n", tmp);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Starting download of `%s'\n", tmp);
GNUNET_free (tmp);
tmpName = makeName (0);
ret = GNUNET_SYSERR;
if (GNUNET_OK == GNUNET_ECRS_file_download (ectx,
- cfg,
- uri,
- tmpName,
- 0, &dprogress, NULL, &testTerminate,
- NULL))
+ cfg,
+ uri,
+ tmpName,
+ 0, &dprogress, NULL,
+ &testTerminate, NULL))
{
fd = GNUNET_disk_file_open (ectx, tmpName, O_RDONLY);
@@ -232,7 +234,9 @@
char *name;
name = makeName (size);
- ret = GNUNET_ECRS_file_uninde (ectx, cfg, name, NULL, NULL, &testTerminate,
NULL);
+ ret =
+ GNUNET_ECRS_file_uninde (ectx, cfg, name, NULL, NULL, &testTerminate,
+ NULL);
if (0 != UNLINK (name))
ret = GNUNET_SYSERR;
GNUNET_free (name);
@@ -284,14 +288,16 @@
uri = uploadFile (12345);
CHECK (NULL != uri);
GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST", "localhost:12087");
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:12087");
CHECK (GNUNET_OK == searchFile (&uri));
CHECK (GNUNET_OK == downloadFile (12345, uri));
GNUNET_ECRS_uri_destroy (uri);
GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST", "localhost:2087");
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:2087");
CHECK (GNUNET_OK == unindexFile (12345));
FAILURE:
Modified: GNUnet/src/applications/gap/gaptest2.c
===================================================================
--- GNUnet/src/applications/gap/gaptest2.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/gap/gaptest2.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -105,11 +105,11 @@
GNUNET_free (buf);
GNUNET_disk_file_close (ectx, name, fd);
ret = GNUNET_ECRS_file_upload (ectx, cfg, name, GNUNET_YES, /* index */
- 1, /* anon */
- 0, /* prio */
- GNUNET_get_time () + 100 * GNUNET_CRON_MINUTES,
/* expire */
- &uprogress, /* progress */
- NULL, &testTerminate, NULL, &uri);
+ 1, /* anon */
+ 0, /* prio */
+ GNUNET_get_time () + 100 *
GNUNET_CRON_MINUTES, /* expire */
+ &uprogress, /* progress */
+ NULL, &testTerminate, NULL, &uri);
if (ret != GNUNET_SYSERR)
{
struct GNUNET_ECRS_MetaData *meta;
@@ -121,8 +121,8 @@
meta = GNUNET_ECRS_meta_data_create ();
key = GNUNET_ECRS_keyword_strings_to_uri (keywords);
- ret = GNUNET_ECRS_publish_under_keyword (ectx, cfg, key, 0, 0,
GNUNET_get_time () + 100 * GNUNET_CRON_MINUTES, /* expire */
- uri, meta);
+ ret = GNUNET_ECRS_publish_under_keyword (ectx, cfg, key, 0, 0,
GNUNET_get_time () + 100 * GNUNET_CRON_MINUTES, /* expire */
+ uri, meta);
GNUNET_ECRS_meta_data_destroy (meta);
GNUNET_ECRS_uri_destroy (uri);
GNUNET_free (name);
@@ -152,7 +152,7 @@
tmp = GNUNET_ECRS_uri_to_string (fi->uri);
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Search found URI `%s'\n", tmp);
+ "Search found URI `%s'\n", tmp);
GNUNET_free (tmp);
GNUNET_GE_ASSERT (ectx, NULL == *my);
*my = GNUNET_ECRS_uri_duplicate (fi->uri);
@@ -171,11 +171,11 @@
myURI = NULL;
ret = GNUNET_ECRS_search (ectx,
- cfg,
- *uri,
- 1,
- 1450 * GNUNET_CRON_SECONDS,
- &searchCB, &myURI, &testTerminate, NULL);
+ cfg,
+ *uri,
+ 1,
+ 1450 * GNUNET_CRON_SECONDS,
+ &searchCB, &myURI, &testTerminate, NULL);
GNUNET_ECRS_uri_destroy (*uri);
*uri = myURI;
if ((ret != GNUNET_SYSERR) && (myURI != NULL))
@@ -197,17 +197,17 @@
tmp = GNUNET_ECRS_uri_to_string (uri);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Starting download of `%s'\n", tmp);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Starting download of `%s'\n", tmp);
GNUNET_free (tmp);
tmpName = makeName (0);
ret = GNUNET_SYSERR;
if (GNUNET_OK == GNUNET_ECRS_file_download (ectx,
- cfg,
- uri,
- tmpName,
- 1, &dprogress, NULL, &testTerminate,
- NULL))
+ cfg,
+ uri,
+ tmpName,
+ 1, &dprogress, NULL,
+ &testTerminate, NULL))
{
fd = GNUNET_disk_file_open (ectx, tmpName, O_RDONLY);
@@ -238,7 +238,9 @@
char *name;
name = makeName (size);
- ret = GNUNET_ECRS_file_uninde (ectx, cfg, name, NULL, NULL, &testTerminate,
NULL);
+ ret =
+ GNUNET_ECRS_file_uninde (ectx, cfg, name, NULL, NULL, &testTerminate,
+ NULL);
if (0 != UNLINK (name))
ret = GNUNET_SYSERR;
GNUNET_free (name);
@@ -296,7 +298,8 @@
uri = uploadFile (SIZE);
CHECK (NULL != uri);
GNUNET_snprintf (buf, 128, "localhost:%u", 2077 + PEER_COUNT * 10);
- GNUNET_GC_set_configuration_value_string (cfg, ectx, "NETWORK", "HOST", buf);
+ GNUNET_GC_set_configuration_value_string (cfg, ectx, "NETWORK", "HOST",
+ buf);
CHECK (GNUNET_OK == searchFile (&uri));
printf ("Search successful!\n");
start = GNUNET_get_time ();
@@ -307,8 +310,9 @@
GNUNET_CRON_SECONDS));
GNUNET_ECRS_uri_destroy (uri);
GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST", "localhost:2087");
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:2087");
CHECK (GNUNET_OK == unindexFile (SIZE));
FAILURE:
Modified: GNUnet/src/applications/gap/gaptest3.c
===================================================================
--- GNUnet/src/applications/gap/gaptest3.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/gap/gaptest3.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -105,10 +105,11 @@
GNUNET_free (buf);
GNUNET_disk_file_close (ectx, name, fd);
ret = GNUNET_ECRS_file_upload (ectx, cfg, name, GNUNET_YES, /* index */
- 1, /* anon */
- 0, /* prio */
- GNUNET_get_time () + 100 * GNUNET_CRON_MINUTES,
/* expire */
- &uprogress, NULL, &testTerminate, NULL, &uri);
+ 1, /* anon */
+ 0, /* prio */
+ GNUNET_get_time () + 100 *
GNUNET_CRON_MINUTES, /* expire */
+ &uprogress, NULL, &testTerminate, NULL,
+ &uri);
GNUNET_free (name);
if (ret != GNUNET_SYSERR)
return uri;
@@ -128,17 +129,17 @@
tmp = GNUNET_ECRS_uri_to_string (uri);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Starting download of `%s'\n", tmp);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Starting download of `%s'\n", tmp);
GNUNET_free (tmp);
tmpName = makeName (0);
ret = GNUNET_SYSERR;
if (GNUNET_OK == GNUNET_ECRS_file_download (ectx,
- cfg,
- uri,
- tmpName,
- 1, &dprogress, NULL, &testTerminate,
- NULL))
+ cfg,
+ uri,
+ tmpName,
+ 1, &dprogress, NULL,
+ &testTerminate, NULL))
{
fd = GNUNET_disk_file_open (ectx, tmpName, O_RDONLY);
@@ -246,7 +247,8 @@
for (i = 1; i < PEER_COUNT; i += 2)
{
GNUNET_snprintf (buf, 128, "localhost:%u", 2087 + i * 10);
- GNUNET_GC_set_configuration_value_string (cfg, ectx, "NETWORK", "HOST",
buf);
+ GNUNET_GC_set_configuration_value_string (cfg, ectx, "NETWORK", "HOST",
+ buf);
sock = GNUNET_client_connection_create (NULL, cfg);
if (GNUNET_OK != GNUNET_IDENTITY_get_self (sock, &hello))
{
@@ -267,8 +269,9 @@
}
GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "NETWORK", "HOST", "localhost:2087");
+ ectx,
+ "NETWORK", "HOST",
+ "localhost:2087");
printf ("Downloading...\n");
start = GNUNET_get_time ();
CHECK (GNUNET_OK == downloadFile (SIZE, uri));
Modified: GNUnet/src/applications/gap/pid_table.h
===================================================================
--- GNUnet/src/applications/gap/pid_table.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/gap/pid_table.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -27,7 +27,8 @@
#include "gnunet_util.h"
#include "gnunet_stats_service.h"
-void init_pid_table (struct GNUNET_GE_Context *ectx, GNUNET_Stats_ServiceAPI *
s);
+void init_pid_table (struct GNUNET_GE_Context *ectx,
+ GNUNET_Stats_ServiceAPI * s);
void done_pid_table (void);
Modified: GNUnet/src/applications/getoption/clientapi.c
===================================================================
--- GNUnet/src/applications/getoption/clientapi.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/getoption/clientapi.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -38,8 +38,9 @@
* @return NULL on error (for both option not set and internal errors)
*/
char *
-GNUNET_get_daemon_configuration_value (struct GNUNET_ClientServerConnection
*sock,
- const char *section, const char *option)
+GNUNET_get_daemon_configuration_value (struct GNUNET_ClientServerConnection
+ *sock, const char *section,
+ const char *option)
{
CS_getoption_request_MESSAGE req;
CS_getoption_reply_MESSAGE *reply;
Modified: GNUnet/src/applications/getoption/getoption.c
===================================================================
--- GNUnet/src/applications/getoption/getoption.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/getoption/getoption.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -49,12 +49,14 @@
req->option[CS_getoption_request_MESSAGNUNET_GE_OPT_LEN - 1] = '\0';
val = NULL;
if (GNUNET_NO == GNUNET_GC_have_configuration_value (coreAPI->cfg,
- req->section, req->option))
+ req->section,
+ req->option))
return GNUNET_SYSERR; /* signal error: option not set */
if ((0 != GNUNET_GC_get_configuration_value_string (coreAPI->cfg,
- req->section,
- req->option,
- NULL, &val)) || (val == NULL))
+ req->section,
+ req->option,
+ NULL, &val))
+ || (val == NULL))
return GNUNET_SYSERR; /* signal error: option not set */
rep = GNUNET_malloc (sizeof (GNUNET_MessageHeader) + strlen (val) + 1);
@@ -72,18 +74,19 @@
{
coreAPI = capi;
GNUNET_GE_LOG (capi->ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- _("`%s' registering client handler %d\n"),
- "getoption", GNUNET_CS_PROTO_GET_OPTION_REQUEST);
- capi->registerClientHandler (GNUNET_CS_PROTO_GET_OPTION_REQUEST,
&handleGetOption);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ _("`%s' registering client handler %d\n"),
+ "getoption", GNUNET_CS_PROTO_GET_OPTION_REQUEST);
+ capi->registerClientHandler (GNUNET_CS_PROTO_GET_OPTION_REQUEST,
+ &handleGetOption);
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "getoption",
- _
- ("allows clients to
determine gnunetd's"
- " configuration")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "getoption",
+ _
+ ("allows
clients to determine gnunetd's"
+ "
configuration")));
return GNUNET_OK;
}
Modified: GNUnet/src/applications/identity/hostkey.c
===================================================================
--- GNUnet/src/applications/identity/hostkey.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/identity/hostkey.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -74,8 +74,8 @@
if (ret == GNUNET_OK)
{
GNUNET_GE_ASSERT (NULL,
- GNUNET_OK == GNUNET_RSA_verify (data, size, result,
- &publicKey));
+ GNUNET_OK == GNUNET_RSA_verify (data, size, result,
+ &publicKey));
}
#endif
return ret;
@@ -98,7 +98,8 @@
}
void
-initPrivateKey (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+initPrivateKey (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *gnHome;
char *hostkeyfile;
@@ -107,17 +108,19 @@
int res;
GNUNET_GE_ASSERT (ectx,
- -1 != GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNETD",
- "GNUNETD_HOME",
-
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY,
- &gnHome));
+ -1 != GNUNET_GC_get_configuration_value_filename (cfg,
+
"GNUNETD",
+
"GNUNETD_HOME",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY,
+
&gnHome));
GNUNET_disk_directory_create (ectx, gnHome);
if (GNUNET_YES != GNUNET_disk_directory_test (ectx, gnHome))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- _("Failed to access GNUnet home directory `%s'\n"), gnHome);
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _("Failed to access GNUnet home directory `%s'\n"),
+ gnHome);
abort ();
}
@@ -146,18 +149,19 @@
{
GNUNET_free (encPrivateKey);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE |
GNUNET_GE_ADMIN,
- _
- ("Existing hostkey in file `%s' failed format check,
creating new hostkey.\n"),
- hostkeyfile);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE | GNUNET_GE_ADMIN,
+ _
+ ("Existing hostkey in file `%s' failed format check,
creating new hostkey.\n"),
+ hostkeyfile);
encPrivateKey = NULL;
}
}
if (encPrivateKey == NULL)
{ /* make new hostkey */
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Creating new hostkey (this may take a while).\n"));
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Creating new hostkey (this may take a while).\n"));
hostkey = GNUNET_RSA_create_key ();
GNUNET_GE_ASSERT (ectx, hostkey != NULL);
encPrivateKey = GNUNET_RSA_encode_key (hostkey);
@@ -168,7 +172,8 @@
"600");
GNUNET_free (encPrivateKey);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK, _("Done
creating hostkey.\n"));
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Done creating hostkey.\n"));
}
else
{
Modified: GNUnet/src/applications/identity/hostkey.h
===================================================================
--- GNUnet/src/applications/identity/hostkey.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/identity/hostkey.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -59,7 +59,8 @@
-void initPrivateKey (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg);
+void initPrivateKey (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
void donePrivateKey (void);
Modified: GNUnet/src/applications/identity/identity.c
===================================================================
--- GNUnet/src/applications/identity/identity.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/identity/identity.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -346,27 +346,29 @@
{
if (0 == UNLINK (fullname))
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- _
- ("File `%s' in directory `%s' does not match naming
convention. "
- "Removed.\n"), filename, networkIdDirectory);
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK,
+ _
+ ("File `%s' in directory `%s' does not match naming
convention. "
+ "Removed.\n"), filename, networkIdDirectory);
else
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "unlink", fullname);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "unlink", fullname);
}
else if (GNUNET_disk_directory_test (ectx, fullname) == GNUNET_YES)
{
if (0 == RMDIR (fullname))
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- _
- ("Directory `%s' in directory `%s' does not match naming
convention. "
- "Removed.\n"), filename, networkIdDirectory);
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK,
+ _
+ ("Directory `%s' in directory `%s' does not match
naming convention. "
+ "Removed.\n"), filename, networkIdDirectory);
else
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "rmdir", fullname);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "rmdir", fullname);
}
GNUNET_free (fullname);
return GNUNET_OK;
@@ -396,8 +398,9 @@
if ((retries & 32) > 0)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Still no peers found in `%s'!\n"), networkIdDirectory);
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Still no peers found in `%s'!\n"),
+ networkIdDirectory);
}
}
GNUNET_GE_ASSERT (ectx, numberOfHosts_ <= sizeOfHosts_);
@@ -525,8 +528,8 @@
fn = getHostFileName (identity, protocol);
if (0 != UNLINK (fn))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "unlink", fn);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "unlink", fn);
GNUNET_free (fn);
if (entry->protocolCount == 0)
@@ -723,12 +726,15 @@
{
if (0 == UNLINK (fn))
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Removed file `%s' containing invalid HELLO data.\n"), fn);
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Removed file `%s' containing invalid HELLO data.\n"),
+ fn);
else
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- "unlink", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK,
+ "unlink", fn);
GNUNET_free (fn);
GNUNET_mutex_unlock (lock_);
return NULL;
@@ -746,12 +752,15 @@
{
if (0 == UNLINK (fn))
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Removed file `%s' containing invalid HELLO data.\n"), fn);
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Removed file `%s' containing invalid HELLO data.\n"),
+ fn);
else
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- "unlink", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK,
+ "unlink", fn);
GNUNET_free (fn);
GNUNET_free (result);
GNUNET_mutex_unlock (lock_);
@@ -784,7 +793,8 @@
GNUNET_MessageHello *hello;
int res;
- hello = identity2Hello (signer, GNUNET_TRANSPORT_PROTOCOL_NUMBER_ANY,
GNUNET_YES);
+ hello =
+ identity2Hello (signer, GNUNET_TRANSPORT_PROTOCOL_NUMBER_ANY, GNUNET_YES);
if (hello == NULL)
{
#if DEBUG_IDENTITY
@@ -794,17 +804,19 @@
GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
GNUNET_hash_to_enc (&signer->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Signature failed verification: peer `%s' not known.\n"),
- &enc);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Signature failed verification: peer `%s' not known.\n"),
+ &enc);
#endif
return GNUNET_SYSERR;
}
res = GNUNET_RSA_verify (message, size, sig, &hello->publicKey);
if (res == GNUNET_SYSERR)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER |
GNUNET_GE_USER,
- _("Signature failed verification: signature invalid.\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_USER,
+ _("Signature failed verification: signature invalid.\n"));
GNUNET_free (hello);
return res;
}
@@ -877,10 +889,11 @@
GNUNET_hash_to_enc (&identity->hashPubKey, &hn);
#if DEBUG_IDENTITY
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Blacklisting host `%s' for %llu seconds"
- " until %llu (strict=%d).\n",
- &hn, entry->delta / GNUNET_CRON_SECONDS, entry->until, strict);
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "Blacklisting host `%s' for %llu seconds"
+ " until %llu (strict=%d).\n",
+ &hn, entry->delta / GNUNET_CRON_SECONDS, entry->until,
+ strict);
#endif
GNUNET_mutex_unlock (lock_);
return GNUNET_OK;
@@ -917,10 +930,10 @@
GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
GNUNET_hash_to_enc (&identity->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- _
- ("Peer `%s' is currently strictly blacklisted (for another
%llums).\n"),
- &enc, entry->until - now);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Peer `%s' is currently strictly blacklisted (for
another %llums).\n"),
+ &enc, entry->until - now);
#endif
GNUNET_mutex_unlock (lock_);
return GNUNET_YES;
@@ -1039,14 +1052,14 @@
GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
GNUNET_hash_to_enc (&entry->identity.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- entry->strict ?
- _
- ("Peer `%s' is currently strictly blacklisted (for another
%llums).\n")
- :
- _
- ("Peer `%s' is currently blacklisted (for another
%llums).\n"),
- &enc, entry->until - now);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ entry->strict ?
+ _
+ ("Peer `%s' is currently strictly blacklisted (for
another %llums).\n")
+ :
+ _
+ ("Peer `%s' is currently blacklisted (for another
%llums).\n"),
+ &enc, entry->until - now);
#endif
#endif
}
@@ -1100,7 +1113,8 @@
{
if ((0 != UNLINK (fn)) && (errno != ENOENT))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "unlink", fn);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "unlink", fn);
}
else
{
@@ -1374,11 +1388,12 @@
gnHome = NULL;
GNUNET_GE_ASSERT (ectx,
- -1 != GNUNET_GC_get_configuration_value_filename (coreAPI->cfg,
- "GNUNETD",
- "GNUNETD_HOME",
-
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY,
- &gnHome));
+ -1 !=
+ GNUNET_GC_get_configuration_value_filename (coreAPI->cfg,
+ "GNUNETD",
+ "GNUNETD_HOME",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY,
+ &gnHome));
if (gnHome == NULL)
return NULL;
GNUNET_disk_directory_create (ectx, gnHome);
@@ -1388,11 +1403,11 @@
strcat (tmp, HOST_DIR);
networkIdDirectory = NULL;
GNUNET_GE_ASSERT (ectx,
- -1 != GNUNET_GC_get_configuration_value_filename (coreAPI->cfg,
- "GNUNETD",
- "HOSTS",
- tmp,
- &networkIdDirectory));
+ -1 !=
+ GNUNET_GC_get_configuration_value_filename (coreAPI->cfg,
+ "GNUNETD",
+ "HOSTS", tmp,
+
&networkIdDirectory));
GNUNET_free (tmp);
GNUNET_disk_directory_create (ectx, networkIdDirectory);
trustDirectory = GNUNET_malloc (strlen (gnHome) + strlen (TRUSTDIR) + 2);
@@ -1444,8 +1459,9 @@
&identityHelloHandler);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_IDENTITY_REQUEST_HELLO,
&identityRequestHelloHandler);
- coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_IDENTITY_REQUEST_SIGNATURE,
- &identityRequestSignatureHandler);
+ coreAPI->
+ unregisterClientHandler (GNUNET_CS_PROTO_IDENTITY_REQUEST_SIGNATURE,
+ &identityRequestSignatureHandler);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_IDENTITY_REQUEST_INFO,
&identityRequestInfoHandler);
for (i = 0; i < MAX_TEMP_HOSTS; i++)
Modified: GNUnet/src/applications/kvstore_sqlite/kv_sqlite.c
===================================================================
--- GNUnet/src/applications/kvstore_sqlite/kv_sqlite.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/kvstore_sqlite/kv_sqlite.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -201,10 +201,10 @@
size_t mem;
GNUNET_GC_get_configuration_value_filename (coreAPI->cfg,
- "KEYVALUE_DATABASE",
- "DIR",
- GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
"/kvstore/",
- &dir);
+ "KEYVALUE_DATABASE",
+ "DIR",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
+ "/kvstore/", &dir);
GNUNET_disk_directory_create (ectx, dir);
mem = strlen (dir) + strlen (name) + 6;
fn = GNUNET_malloc (mem);
@@ -263,7 +263,8 @@
if (sqlite3_open (db->fn, &dbh->dbh) != SQLITE_OK)
{
printf ("FN: %s\n", db->fn);
- LOG_SQLITE (dbh->dbh, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
"sqlite3_open");
+ LOG_SQLITE (dbh->dbh, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "sqlite3_open");
sqlite3_close (dbh->dbh);
GNUNET_mutex_unlock (lock);
GNUNET_thread_release_self (dbh->tid);
@@ -392,7 +393,8 @@
get (GNUNET_KeyValueRecord * kv,
void *key,
int keylen,
- unsigned int sort, unsigned int limit, GNUNET_KeyValueProcessor handler,
void *closure)
+ unsigned int sort, unsigned int limit, GNUNET_KeyValueProcessor handler,
+ void *closure)
{
unsigned int len, enclen, retlen;
char *sel, *order, *where, limit_spec[30];
@@ -544,7 +546,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR otherwise
*/
static int
-del (GNUNET_KeyValueRecord * kv, void *key, int keylen, unsigned long long age)
+del (GNUNET_KeyValueRecord * kv, void *key, int keylen,
+ unsigned long long age)
{
unsigned int len;
char *del, *key_where, *age_where;
@@ -658,8 +661,8 @@
ectx = capi->ectx;
#if DEBUG_SQLITE
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "KV-SQLite: initializing database\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "KV-SQLite: initializing database\n");
#endif
lock = GNUNET_mutex_create (GNUNET_NO);
@@ -688,8 +691,8 @@
#if DEBUG_SQLITE
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "SQLite KVStore: database shutdown\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "SQLite KVStore: database shutdown\n");
#endif
GNUNET_mutex_destroy (lock);
Modified: GNUnet/src/applications/pingpong/pingpong.c
===================================================================
--- GNUnet/src/applications/pingpong/pingpong.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/pingpong/pingpong.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -129,8 +129,10 @@
if (ntohs (msg->size) != sizeof (P2P_pingpong_MESSAGE))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER,
- _("Received malformed `%s' message. Dropping.\n"), "ping");
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER,
+ _("Received malformed `%s' message. Dropping.\n"),
+ "ping");
return GNUNET_SYSERR;
}
if (stats != NULL)
@@ -140,8 +142,8 @@
&pmsg->receiver, sizeof (GNUNET_PeerIdentity)))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_ADMIN,
- _("Received ping for another peer. Dropping.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_ADMIN,
+ _("Received ping for another peer. Dropping.\n"));
return GNUNET_SYSERR; /* not for us */
}
@@ -150,14 +152,14 @@
GNUNET_hash_to_enc (&sender->hashPubKey, &enc);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received ping from peer %s.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received ping from peer %s.\n", &enc);
#endif
pong = *pmsg;
pong.header.type = htons (GNUNET_P2P_PROTO_PONG);
if (stats != NULL)
stats->change (stat_pingReceived, 1);
- coreAPI->unicast (sender, &pong.header, GNUNET_EXTREME_PRIORITY, 0); /* send
now! */
+ coreAPI->unicast (sender, &pong.header, GNUNET_EXTREME_PRIORITY, 0); /*
send now! */
if (stats != NULL)
stats->change (stat_pongSent, 1);
return GNUNET_OK;
@@ -185,7 +187,8 @@
*/
static int
plaintextPingReceived (const GNUNET_PeerIdentity * sender,
- const GNUNET_MessageHeader * hmsg, GNUNET_TSession *
tsession)
+ const GNUNET_MessageHeader * hmsg,
+ GNUNET_TSession * tsession)
{
#if DEBUG_PINGPONG
GNUNET_EncName enc;
@@ -197,8 +200,10 @@
if (ntohs (hmsg->size) != sizeof (P2P_pingpong_MESSAGE))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER,
- _("Received malformed `%s' message. Dropping.\n"), "ping");
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER,
+ _("Received malformed `%s' message. Dropping.\n"),
+ "ping");
GNUNET_GE_BREAK_OP (NULL, 0);
return GNUNET_SYSERR;
}
@@ -207,8 +212,8 @@
&pmsg->receiver, sizeof (GNUNET_PeerIdentity)))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_ADMIN,
- _("Received PING not destined for us!\n"));
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_ADMIN,
+ _("Received PING not destined for us!\n"));
GNUNET_GE_BREAK_OP (NULL, 0);
return GNUNET_SYSERR; /* not for us */
}
@@ -216,8 +221,8 @@
#if DEBUG_PINGPONG
GNUNET_hash_to_enc (&sender->hashPubKey, &enc);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received plaintext ping from peer %s.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received plaintext ping from peer %s.\n", &enc);
#endif
pong = *pmsg;
pong.header.type = htons (GNUNET_P2P_PROTO_PONG);
@@ -263,15 +268,17 @@
(0 != memcmp (sender, &pmsg->receiver, sizeof (GNUNET_PeerIdentity))))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER,
- _("Received malformed `%s' message. Dropping.\n"), "pong");
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER,
+ _("Received malformed `%s' message. Dropping.\n"),
+ "pong");
return GNUNET_SYSERR; /* bad pong */
}
#if DEBUG_PINGPONG
GNUNET_hash_to_enc (&sender->hashPubKey, &enc);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received PONG from `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received PONG from `%s'.\n", &enc);
#endif
matched = 0;
if (stats != NULL)
@@ -296,16 +303,17 @@
#if DEBUG_PINGPONG
GNUNET_hash_to_enc (&sender->hashPubKey, &enc);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received PONG from `%s' matched %u peers.\n", &enc, matched);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received PONG from `%s' matched %u peers.\n", &enc,
+ matched);
#endif
if (matched == 0)
{
#if DEBUG_PINGPONG
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_ADMIN,
- _("Could not match PONG against any PING. "
- "Try increasing MAX_PING_PONG constant.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_ADMIN,
+ _("Could not match PONG against any PING. "
+ "Try increasing MAX_PING_PONG constant.\n"));
#endif
}
return GNUNET_OK;
@@ -316,7 +324,8 @@
*/
static int
plaintextPongReceived (const GNUNET_PeerIdentity * sender,
- const GNUNET_MessageHeader * msg, GNUNET_TSession *
session)
+ const GNUNET_MessageHeader * msg,
+ GNUNET_TSession * session)
{
int i;
const P2P_pingpong_MESSAGE *pmsg;
@@ -331,8 +340,10 @@
(0 != memcmp (sender, &pmsg->receiver, sizeof (GNUNET_PeerIdentity))))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER,
- _("Received malformed `%s' message. Dropping.\n"), "pong");
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER,
+ _("Received malformed `%s' message. Dropping.\n"),
+ "pong");
return GNUNET_SYSERR; /* bad pong */
}
if (stats != NULL)
@@ -358,17 +369,17 @@
#if DEBUG_PINGPONG
GNUNET_hash_to_enc (&sender->hashPubKey, &enc);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received plaintext PONG from `%s' matched %u peers.\n",
- &enc, matched);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received plaintext PONG from `%s' matched %u peers.\n",
+ &enc, matched);
#endif
if (matched == 0)
{
#if DEBUG_PINGPONG
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_ADMIN,
- _("Could not match PONG against any PING. "
- "Try increasing MAX_PING_PONG constant.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_ADMIN,
+ _("Could not match PONG against any PING. "
+ "Try increasing MAX_PING_PONG constant.\n"));
#endif
}
return GNUNET_OK;
@@ -410,9 +421,9 @@
if (j == -1)
{ /* all send this second!? */
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_ADMIN,
- _("Cannot create PING, table full. "
- "Try increasing MAX_PING_PONG.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_ADMIN,
+ _("Cannot create PING, table full. "
+ "Try increasing MAX_PING_PONG.\n"));
GNUNET_mutex_unlock (pingPongLock);
return NULL;
}
@@ -529,13 +540,16 @@
(PingPongEntry *) GNUNET_malloc (sizeof (PingPongEntry) * MAX_PING_PONG);
memset (pingPongs, 0, sizeof (PingPongEntry) * MAX_PING_PONG);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- _("`%s' registering handlers %d %d (plaintext and ciphertext)\n"),
- "pingpong", GNUNET_P2P_PROTO_PING, GNUNET_P2P_PROTO_PONG);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ _
+ ("`%s' registering handlers %d %d (plaintext and
ciphertext)\n"),
+ "pingpong", GNUNET_P2P_PROTO_PING, GNUNET_P2P_PROTO_PONG);
capi->registerHandler (GNUNET_P2P_PROTO_PING, &pingReceived);
capi->registerHandler (GNUNET_P2P_PROTO_PONG, &pongReceived);
- capi->registerPlaintextHandler (GNUNET_P2P_PROTO_PING,
&plaintextPingReceived);
- capi->registerPlaintextHandler (GNUNET_P2P_PROTO_PONG,
&plaintextPongReceived);
+ capi->registerPlaintextHandler (GNUNET_P2P_PROTO_PING,
+ &plaintextPingReceived);
+ capi->registerPlaintextHandler (GNUNET_P2P_PROTO_PONG,
+ &plaintextPongReceived);
ret.ping = &initiatePing;
ret.pingUser = &createPing;
ret.ping_size = sizeof (P2P_pingpong_MESSAGE);
Modified: GNUnet/src/applications/rpc/parameters.c
===================================================================
--- GNUnet/src/applications/rpc/parameters.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/rpc/parameters.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -60,7 +60,7 @@
* @param param The RPC parameter structure to be freed
*/
void
-GNUNET_RPC_parameters_destroy(GNUNET_RPC_CallParameters * param)
+GNUNET_RPC_parameters_destroy (GNUNET_RPC_CallParameters * param)
{
if (param == NULL)
return;
@@ -79,7 +79,8 @@
* GNUNET_RPC_parameters_get_serialized_size(param) bytes of memory.
*/
void
-GNUNET_RPC_parameters_serialize (GNUNET_RPC_CallParameters * param, char
*target)
+GNUNET_RPC_parameters_serialize (GNUNET_RPC_CallParameters * param,
+ char *target)
{
int i;
const char *paramName;
@@ -97,7 +98,8 @@
{
paramName = GNUNET_RPC_parameters_get_name (param, i);
paramValue = NULL;
- GNUNET_RPC_parameters_get_value_by_index (param, i, &dataLength,
¶mValue);
+ GNUNET_RPC_parameters_get_value_by_index (param, i, &dataLength,
+ ¶mValue);
memcpy (&target[pos], paramName, strlen (paramName) + 1);
pos += strlen (paramName) + 1;
*(unsigned int *) &target[pos] = htonl (dataLength);
@@ -141,7 +143,8 @@
return NULL;
}
- GNUNET_RPC_parameters_add (ret, &buffer[xpos], dataLength, &buffer[pos]);
+ GNUNET_RPC_parameters_add (ret, &buffer[xpos], dataLength,
+ &buffer[pos]);
pos += dataLength;
}
return ret;
@@ -167,7 +170,8 @@
{
paramName = GNUNET_RPC_parameters_get_name (param, i);
paramValue = NULL;
- GNUNET_RPC_parameters_get_value_by_index (param, i, &dataLength,
¶mValue);
+ GNUNET_RPC_parameters_get_value_by_index (param, i, &dataLength,
+ ¶mValue);
if (pos + strlen (paramName) + 1 + sizeof (unsigned int) < pos)
return 0;
pos += strlen (paramName) + 1;
@@ -209,7 +213,8 @@
void
GNUNET_RPC_parameters_add (GNUNET_RPC_CallParameters * param,
- const char *name, unsigned int dataLength, const void *data)
+ const char *name, unsigned int dataLength,
+ const void *data)
{
Parameter *new;
@@ -244,7 +249,8 @@
*/
void
GNUNET_RPC_parameters_add_data_container (GNUNET_RPC_CallParameters * param,
- const char *name, const GNUNET_DataContainer * data)
+ const char *name,
+ const GNUNET_DataContainer * data)
{
Parameter *new;
@@ -273,7 +279,8 @@
* @return Name of the parameter
*/
const char *
-GNUNET_RPC_parameters_get_name (GNUNET_RPC_CallParameters * param, unsigned
int i)
+GNUNET_RPC_parameters_get_name (GNUNET_RPC_CallParameters * param,
+ unsigned int i)
{
Parameter *p;
@@ -296,8 +303,9 @@
*/
int
GNUNET_RPC_parameters_get_value_by_name (GNUNET_RPC_CallParameters * param,
- const char *name,
- unsigned int *dataLength, void **value)
+ const char *name,
+ unsigned int *dataLength,
+ void **value)
{
Parameter *p;
@@ -326,7 +334,8 @@
* @return GNUNET_SYSERR on error
*/
GNUNET_DataContainer *
-GNUNET_RPC_parameters_get_data_container_by_name (GNUNET_RPC_CallParameters *
param, const char *name)
+GNUNET_RPC_parameters_get_data_container_by_name (GNUNET_RPC_CallParameters *
+ param, const char *name)
{
Parameter *p;
GNUNET_DataContainer *ret;
@@ -357,8 +366,9 @@
*/
int
GNUNET_RPC_parameters_get_value_by_index (GNUNET_RPC_CallParameters * param,
- unsigned int i,
- unsigned int *dataLength, void **value)
+ unsigned int i,
+ unsigned int *dataLength,
+ void **value)
{
Parameter *p;
@@ -381,7 +391,8 @@
* @param value set to the value of the parameter
*/
GNUNET_DataContainer *
-GNUNET_RPC_parameters_get_data_container_by_index (GNUNET_RPC_CallParameters *
param, unsigned int i)
+GNUNET_RPC_parameters_get_data_container_by_index (GNUNET_RPC_CallParameters *
+ param, unsigned int i)
{
Parameter *p;
GNUNET_DataContainer *ret;
Modified: GNUnet/src/applications/rpc/parameterstest.c
===================================================================
--- GNUnet/src/applications/rpc/parameterstest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/rpc/parameterstest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -36,10 +36,12 @@
p = GNUNET_RPC_parameters_create ();
- if (GNUNET_SYSERR != GNUNET_RPC_parameters_get_value_by_index (p, 0, &len,
&buf))
+ if (GNUNET_SYSERR !=
+ GNUNET_RPC_parameters_get_value_by_index (p, 0, &len, &buf))
return 1;
- if (GNUNET_SYSERR != GNUNET_RPC_parameters_get_value_by_name (p, "not
there", &len, &buf))
+ if (GNUNET_SYSERR !=
+ GNUNET_RPC_parameters_get_value_by_name (p, "not there", &len, &buf))
return 1;
if (GNUNET_RPC_parameters_count (p) != 0)
@@ -62,23 +64,27 @@
if (p == NULL)
return 1;
buf = NULL;
- if (GNUNET_OK != GNUNET_RPC_parameters_get_value_by_name (p, "foo", &len,
&buf))
+ if (GNUNET_OK !=
+ GNUNET_RPC_parameters_get_value_by_name (p, "foo", &len, &buf))
return 1;
if (strcmp ("bar", buf) != 0)
return 1;
buf = NULL;
if (4 != len)
return 1;
- if (GNUNET_OK != GNUNET_RPC_parameters_get_value_by_index (p, 1, &len, &buf))
+ if (GNUNET_OK !=
+ GNUNET_RPC_parameters_get_value_by_index (p, 1, &len, &buf))
return 1;
if (strcmp ("foo", buf) != 0)
return 1;
if (4 != len)
return 1;
- if (GNUNET_SYSERR != GNUNET_RPC_parameters_get_value_by_index (p, 2, &len,
&buf))
+ if (GNUNET_SYSERR !=
+ GNUNET_RPC_parameters_get_value_by_index (p, 2, &len, &buf))
return 1;
- if (GNUNET_SYSERR != GNUNET_RPC_parameters_get_value_by_name (p, "not
there", &len, &buf))
+ if (GNUNET_SYSERR !=
+ GNUNET_RPC_parameters_get_value_by_name (p, "not there", &len, &buf))
return 1;
GNUNET_RPC_parameters_destroy (p);
Modified: GNUnet/src/applications/rpc/rpc.c
===================================================================
--- GNUnet/src/applications/rpc/rpc.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/applications/rpc/rpc.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -131,10 +131,12 @@
if (0 == strcmp (rrpc->name, name))
{
GNUNET_mutex_unlock (rpcLock);
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("%s::%s - RPC %s:%p could not be registered:"
- " another callback is already using this name (%p)\n"),
- __FILE__, __FUNCTION__, name, callback, rrpc->callback);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("%s::%s - RPC %s:%p could not be registered:"
+ " another callback is already using this name
(%p)\n"),
+ __FILE__, __FUNCTION__, name, callback,
+ rrpc->callback);
return GNUNET_SYSERR;
}
rrpc = GNUNET_vector_get_next (list_of_callbacks);
@@ -145,9 +147,9 @@
rrpc->async_callback = NULL;
GNUNET_vector_insert_last (list_of_callbacks, rrpc);
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "%s::%s - Registered RPC %d: %s\n",
- __FILE__, __FUNCTION__, GNUNET_vector_get_size (list_of_callbacks),
- name);
+ "%s::%s - Registered RPC %d: %s\n",
+ __FILE__, __FUNCTION__,
+ GNUNET_vector_get_size (list_of_callbacks), name);
GNUNET_mutex_unlock (rpcLock);
return GNUNET_OK;
}
@@ -160,7 +162,8 @@
* (typically if a callback of that name is already in use).
*/
static int
-RPC_register_async (const char *name, GNUNET_RPC_AsynchronousFunction callback)
+RPC_register_async (const char *name,
+ GNUNET_RPC_AsynchronousFunction callback)
{
RegisteredRPC *rrpc;
@@ -173,10 +176,12 @@
if (0 == strcmp (rrpc->name, name))
{
GNUNET_mutex_unlock (rpcLock);
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("%s::%s - RPC %s:%p could not be registered:"
- " another callback is already using this name (%p)\n"),
- __FILE__, __FUNCTION__, name, callback, rrpc->callback);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("%s::%s - RPC %s:%p could not be registered:"
+ " another callback is already using this name
(%p)\n"),
+ __FILE__, __FUNCTION__, name, callback,
+ rrpc->callback);
return GNUNET_SYSERR;
}
rrpc = GNUNET_vector_get_next (list_of_callbacks);
@@ -187,9 +192,9 @@
rrpc->async_callback = callback;
GNUNET_vector_insert_last (list_of_callbacks, rrpc);
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "%s::%s - Registered asynchronous RPC %d: %s\n",
- __FILE__, __FUNCTION__, GNUNET_vector_get_size (list_of_callbacks),
- name);
+ "%s::%s - Registered asynchronous RPC %d: %s\n",
+ __FILE__, __FUNCTION__,
+ GNUNET_vector_get_size (list_of_callbacks), name);
GNUNET_mutex_unlock (rpcLock);
return GNUNET_OK;
}
@@ -217,10 +222,13 @@
{
if ((rrpc->callback != callback) && (callback != NULL))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("%s::%s - RPC %s:%p could not be unregistered:"
- " another callback registered under that name: %p\n"),
- __FILE__, __FUNCTION__, name, callback, rrpc->callback);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _("%s::%s - RPC %s:%p could not be unregistered:"
+ " another callback registered under that name:
%p\n"),
+ __FILE__, __FUNCTION__, name, callback,
+ rrpc->callback);
GNUNET_mutex_unlock (rpcLock);
return GNUNET_SYSERR;
}
@@ -228,17 +236,19 @@
GNUNET_free (rrpc->name);
GNUNET_free (rrpc);
GNUNET_mutex_unlock (rpcLock);
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "%s::%s - Unregistered RPC %s\n",
- __FILE__, __FUNCTION__, name);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "%s::%s - Unregistered RPC %s\n", __FILE__,
+ __FUNCTION__, name);
return GNUNET_OK;
}
rrpc = GNUNET_vector_get_next (list_of_callbacks);
}
GNUNET_mutex_unlock (rpcLock);
GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("%s::%s - RPC %s:%p could not be unregistered: not found\n"),
- __FILE__, __FUNCTION__, name, callback);
+ _
+ ("%s::%s - RPC %s:%p could not be unregistered: not found\n"),
+ __FILE__, __FUNCTION__, name, callback);
return GNUNET_SYSERR;
}
@@ -251,7 +261,8 @@
* bound to a different function).
*/
static int
-RPC_unregister_async (const char *name, GNUNET_RPC_AsynchronousFunction
callback)
+RPC_unregister_async (const char *name,
+ GNUNET_RPC_AsynchronousFunction callback)
{
RegisteredRPC *rrpc;
@@ -264,10 +275,13 @@
{
if ((rrpc->async_callback != callback) && (callback != NULL))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("%s::%s - RPC %s:%p could not be unregistered:"
- " another callback registered under that name: %p\n"),
- __FILE__, __FUNCTION__, name, callback, rrpc->callback);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _("%s::%s - RPC %s:%p could not be unregistered:"
+ " another callback registered under that name:
%p\n"),
+ __FILE__, __FUNCTION__, name, callback,
+ rrpc->callback);
GNUNET_mutex_unlock (rpcLock);
return GNUNET_SYSERR;
}
@@ -275,18 +289,19 @@
GNUNET_free (rrpc->name);
GNUNET_free (rrpc);
GNUNET_mutex_unlock (rpcLock);
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "%s::%s - Unregistered asynchronous RPC %s\n",
- __FILE__, __FUNCTION__, name);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "%s::%s - Unregistered asynchronous RPC %s\n",
+ __FILE__, __FUNCTION__, name);
return GNUNET_OK;
}
rrpc = GNUNET_vector_get_next (list_of_callbacks);
}
GNUNET_mutex_unlock (rpcLock);
GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("%s::%s - async RPC %s:%p could not be unregistered: not found\n"),
- __FILE__, __FUNCTION__, name, callback);
+ _
+ ("%s::%s - async RPC %s:%p could not be unregistered: not
found\n"),
+ __FILE__, __FUNCTION__, name, callback);
return GNUNET_SYSERR;
}
@@ -662,16 +677,17 @@
now = GNUNET_get_time ();
GNUNET_GE_ASSERT (ectx,
- (GNUNET_get_time () + 1 * GNUNET_CRON_MINUTES >
- call->expirationTime)
- || (call->expirationTime - GNUNET_get_time () <
- 1 * GNUNET_CRON_HOURS));
+ (GNUNET_get_time () + 1 * GNUNET_CRON_MINUTES >
+ call->expirationTime)
+ || (call->expirationTime - GNUNET_get_time () <
+ 1 * GNUNET_CRON_HOURS));
GNUNET_mutex_lock (rpcLock);
if (now > call->expirationTime)
{
#if DEBUG_RPC
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Completed RPC %p (timeout).\n", call);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Completed RPC %p (timeout).\n", call);
#endif
if (call->finishedCallback != NULL)
{
@@ -714,21 +730,23 @@
#if DEBUG_RPC
if (ntohs (call->msg->header.type) == GNUNET_P2P_PROTO_RPC_REQ)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
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)->data[0],
- call->expirationTime - now,
- now - call->lastAttempt, call->attempts);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ 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)->
+ data[0], call->expirationTime - now,
+ now - call->lastAttempt, call->attempts);
}
else
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Sending RPC reply %p (expires in %llums, last attempt
%llums ago, attempt %u).\n",
- call,
- call->expirationTime - now,
- now - call->lastAttempt, call->attempts);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "Sending RPC reply %p (expires in %llums, last
attempt %llums ago, attempt %u).\n",
+ call, call->expirationTime - now,
+ now - call->lastAttempt, call->attempts);
}
#endif
call->lastAttempt = now;
@@ -738,10 +756,10 @@
ntohl (call->msg->importance), maxdelay);
}
GNUNET_GE_ASSERT (ectx,
- (GNUNET_get_time () + 1 * GNUNET_CRON_MINUTES >
- call->expirationTime)
- || (call->expirationTime - GNUNET_get_time () <
- 1 * GNUNET_CRON_HOURS));
+ (GNUNET_get_time () + 1 * GNUNET_CRON_MINUTES >
+ call->expirationTime)
+ || (call->expirationTime - GNUNET_get_time () <
+ 1 * GNUNET_CRON_HOURS));
GNUNET_cron_add_job (coreAPI->cron, &retryRPCJob,
call->repetitionFrequency, 0, call);
}
@@ -791,9 +809,12 @@
slen = 0;
if (ntohs (req->header.size) < sizeof (P2P_rpc_MESSAGE) + slen)
return NULL; /* invalid! */
- ret = GNUNET_RPC_parameters_deserialize (&((P2P_rpc_MESSAGNUNET_GE_GENERIC
*) req)->data[slen],
- ntohs (req->header.size) -
- sizeof (P2P_rpc_MESSAGE) - slen);
+ ret =
+ GNUNET_RPC_parameters_deserialize (&
+ ((P2P_rpc_MESSAGNUNET_GE_GENERIC *)
+ req)->data[slen],
+ ntohs (req->header.size) -
+ sizeof (P2P_rpc_MESSAGE) - slen);
if (GNUNET_RPC_parameters_count (ret) != ntohs (req->argumentCount))
{
GNUNET_RPC_parameters_destroy (ret);
@@ -847,7 +868,9 @@
{
memcpy (&((P2P_rpc_MESSAGNUNET_GE_GENERIC *) ret)->data[0], name, slen);
}
- GNUNET_RPC_parameters_serialize (values, &((P2P_rpc_MESSAGNUNET_GE_GENERIC
*) ret)->data[slen]);
+ GNUNET_RPC_parameters_serialize (values,
+ &((P2P_rpc_MESSAGNUNET_GE_GENERIC *) ret)->
+ data[slen]);
if (name == NULL)
ret->header.type = htons (GNUNET_P2P_PROTO_RPC_RES);
@@ -885,10 +908,10 @@
GNUNET_vector_insert_last (incomingCalls, calls);
GNUNET_GE_ASSERT (ectx,
- (GNUNET_get_time () + 1 * GNUNET_CRON_MINUTES >
- calls->expirationTime)
- || (calls->expirationTime - GNUNET_get_time () <
- 1 * GNUNET_CRON_HOURS));
+ (GNUNET_get_time () + 1 * GNUNET_CRON_MINUTES >
+ calls->expirationTime)
+ || (calls->expirationTime - GNUNET_get_time () <
+ 1 * GNUNET_CRON_HOURS));
/* for right now: schedule cron job to send reply! */
GNUNET_cron_add_job (coreAPI->cron, &retryRPCJob, 0, 0, calls);
GNUNET_mutex_unlock (rpcLock);
@@ -918,17 +941,17 @@
(ntohs (message->size) < sizeof (P2P_rpc_MESSAGE)))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_REQUEST | GNUNET_GE_ADMIN,
- _("Invalid message of type %u received. Dropping.\n"),
- ntohs (message->type));
+ GNUNET_GE_WARNING | GNUNET_GE_REQUEST | GNUNET_GE_ADMIN,
+ _("Invalid message of type %u received. Dropping.\n"),
+ ntohs (message->type));
return GNUNET_SYSERR;
}
req = (P2P_rpc_MESSAGE *) message;
sq = ntohl (req->sequenceNumber);
#if DEBUG_RPC
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received RPC request with id %u.\n", sq);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received RPC request with id %u.\n", sq);
#endif
GNUNET_mutex_lock (rpcLock);
@@ -962,16 +985,18 @@
}
RPC_STATUS ("", "received duplicate request", calls);
calls->expirationTime = GNUNET_get_time () + MAX_RPC_TIMEOUT;
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Dropping RPC request %u, duplicate.\n", sq);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Dropping RPC request %u, duplicate.\n", sq);
GNUNET_mutex_unlock (rpcLock);
return GNUNET_OK; /* seen before */
}
if (minSQ > sq)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Dropping RPC request %u, sequence number too old (current
minimum is %u).\n",
- sq, minSQ);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Dropping RPC request %u, sequence number too old
(current minimum is %u).\n",
+ sq, minSQ);
GNUNET_mutex_unlock (rpcLock);
return GNUNET_OK; /* seen before */
}
@@ -985,8 +1010,9 @@
if (argumentValues != NULL)
GNUNET_RPC_parameters_destroy (argumentValues);
GNUNET_mutex_unlock (rpcLock);
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Dropping RPC request %u: message malformed.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Dropping RPC request %u: message malformed.\n"));
return GNUNET_SYSERR; /* message malformed */
}
@@ -1030,7 +1056,7 @@
}
returnValues = GNUNET_RPC_parameters_create ();
rpc->callback (sender, argumentValues, returnValues);
- GNUNET_RPC_parameters_destroy(argumentValues);
+ GNUNET_RPC_parameters_destroy (argumentValues);
errorCode = GNUNET_RPC_ERROR_OK;
}
GNUNET_mutex_unlock (rpcLock);
@@ -1053,16 +1079,18 @@
if ((ntohs (message->type) != GNUNET_P2P_PROTO_RPC_RES) ||
(ntohs (message->size) < sizeof (P2P_rpc_MESSAGE)))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Invalid message of type %u received. Dropping.\n"),
- ntohs (message->type));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Invalid message of type %u received. Dropping.\n"),
+ ntohs (message->type));
return GNUNET_SYSERR;
}
res = (P2P_rpc_MESSAGE *) message;
#if DEBUG_RPC
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received RPC reply with id %u.\n", ntohl (res->sequenceNumber));
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Received RPC reply with id %u.\n",
+ ntohl (res->sequenceNumber));
#endif
GNUNET_cron_suspend_jobs (coreAPI->cron, GNUNET_NO);
@@ -1093,11 +1121,13 @@
if (error == GNUNET_RPC_ERROR_OK)
{
reply = GNUNET_RPC_parameters_deserialize (&gen->data[0],
- ntohs (message->size) -
- sizeof (P2P_rpc_MESSAGE));
- if (ntohs (res->argumentCount) != GNUNET_RPC_parameters_count
(reply))
+ ntohs (message->size) -
+ sizeof
+ (P2P_rpc_MESSAGE));
+ if (ntohs (res->argumentCount) !=
+ GNUNET_RPC_parameters_count (reply))
{
- GNUNET_RPC_parameters_destroy(reply);
+ GNUNET_RPC_parameters_destroy (reply);
reply = NULL;
error = GNUNET_RPC_ERROR_REPLY_MALFORMED;
}
@@ -1110,7 +1140,8 @@
}
GNUNET_vector_delete (outgoingCalls, call);
notifyPeerReply (sender,
- MINGLE (call->sequenceNumber,
GNUNET_P2P_PROTO_RPC_REQ));
+ MINGLE (call->sequenceNumber,
+ GNUNET_P2P_PROTO_RPC_REQ));
GNUNET_cron_del_job (coreAPI->cron, &retryRPCJob, 0, call);
GNUNET_free (call->msg);
GNUNET_free (call);
@@ -1139,16 +1170,17 @@
(ntohs (message->size) != sizeof (RPC_ACK_Message)))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_REQUEST | GNUNET_GE_ADMIN,
- _("Invalid message of type %u received. Dropping.\n"),
- ntohs (message->type));
+ GNUNET_GE_WARNING | GNUNET_GE_REQUEST | GNUNET_GE_ADMIN,
+ _("Invalid message of type %u received. Dropping.\n"),
+ ntohs (message->type));
return GNUNET_SYSERR;
}
ack = (RPC_ACK_Message *) message;
#if DEBUG_RPC
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received RPC ACK with id %u.\n", ntohl (ack->sequenceNumber));
+ "Received RPC ACK with id %u.\n",
+ ntohl (ack->sequenceNumber));
#endif
GNUNET_cron_suspend_jobs (coreAPI->cron, GNUNET_NO);
GNUNET_mutex_lock (rpcLock);
@@ -1186,8 +1218,9 @@
pi->averageResponseTime *= 2;
}
#if DEBUG_RPC
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "ACK is a duplicate (or invalid).\n");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "ACK is a duplicate (or invalid).\n");
#endif
}
@@ -1211,7 +1244,8 @@
*/
static void
RPC_execute_callback (RPC_EXEC_CLS * context,
- unsigned int sq, unsigned short ec,
GNUNET_RPC_CallParameters * res)
+ unsigned int sq, unsigned short ec,
+ GNUNET_RPC_CallParameters * res)
{
int i;
unsigned int dl;
@@ -1221,7 +1255,9 @@
{
data = NULL;
GNUNET_RPC_parameters_get_value_by_index (res, i, &dl, &data);
- GNUNET_RPC_parameters_add (context->result,
GNUNET_RPC_parameters_get_name (res, i), dl, data);
+ GNUNET_RPC_parameters_add (context->result,
+ GNUNET_RPC_parameters_get_name (res, i), dl,
+ data);
}
context->ec = ec;
GNUNET_semaphore_up (context->sem);
@@ -1265,10 +1301,10 @@
call->rpcCallbackArgs = &cls;
GNUNET_vector_insert_last (outgoingCalls, call);
GNUNET_GE_ASSERT (ectx,
- (GNUNET_get_time () + 1 * GNUNET_CRON_MINUTES >
- call->expirationTime)
- || (call->expirationTime - GNUNET_get_time () <
- 1 * GNUNET_CRON_HOURS));
+ (GNUNET_get_time () + 1 * GNUNET_CRON_MINUTES >
+ call->expirationTime)
+ || (call->expirationTime - GNUNET_get_time () <
+ 1 * GNUNET_CRON_HOURS));
GNUNET_cron_add_job (coreAPI->cron, &retryRPCJob, 0, 0, call);
GNUNET_mutex_unlock (rpcLock);
GNUNET_semaphore_down (cls.sem, GNUNET_YES);
@@ -1289,7 +1325,8 @@
static void
RPC_async_callback (RPC_Record * rec,
unsigned int sequenceNumber,
- unsigned short errorCode, GNUNET_RPC_CallParameters *
result)
+ unsigned short errorCode,
+ GNUNET_RPC_CallParameters * result)
{
if ((errorCode == GNUNET_RPC_ERROR_OK) && (rec->callback != NULL))
{
@@ -1314,15 +1351,17 @@
const char *name,
GNUNET_RPC_CallParameters * request_param,
unsigned int importance,
- GNUNET_CronTime timeout, GNUNET_RPC_AsynchronousCompletionCallback
callback, void *closure)
+ GNUNET_CronTime timeout,
+ GNUNET_RPC_AsynchronousCompletionCallback callback, void *closure)
{
RPC_Record *ret;
if (timeout > 1 * GNUNET_CRON_HOURS)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' called with timeout above 1 hour (bug?)\n"),
- __FUNCTION__);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' called with timeout above 1 hour (bug?)\n"),
+ __FUNCTION__);
timeout = 1 * GNUNET_CRON_HOURS;
}
ret = GNUNET_malloc (sizeof (RPC_Record));
@@ -1347,10 +1386,10 @@
ret->call->rpcCallbackArgs = ret;
GNUNET_vector_insert_last (outgoingCalls, ret->call);
GNUNET_GE_ASSERT (ectx,
- (GNUNET_get_time () + 1 * GNUNET_CRON_MINUTES >
- ret->call->expirationTime)
- || (ret->call->expirationTime - GNUNET_get_time () <
- 1 * GNUNET_CRON_HOURS));
+ (GNUNET_get_time () + 1 * GNUNET_CRON_MINUTES >
+ ret->call->expirationTime)
+ || (ret->call->expirationTime - GNUNET_get_time () <
+ 1 * GNUNET_CRON_HOURS));
GNUNET_cron_add_job (coreAPI->cron, &retryRPCJob, 0, 0, ret->call);
GNUNET_mutex_unlock (rpcLock);
return ret;
@@ -1438,9 +1477,10 @@
RegisteredRPC *rpc;
rpc =
(RegisteredRPC *) GNUNET_vector_delete_last (list_of_callbacks);
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("RPC not unregistered: %s:%p\n"), rpc->name,
- rpc->callback);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("RPC not unregistered: %s:%p\n"), rpc->name,
+ rpc->callback);
GNUNET_free (rpc->name);
GNUNET_free (rpc);
}
@@ -1468,8 +1508,9 @@
outgoingCalls = GNUNET_vector_create (16);
list_of_callbacks = GNUNET_vector_create (16);
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("`%s' registering handlers %d %d %d\n"),
- "rpc", GNUNET_P2P_PROTO_RPC_REQ, GNUNET_P2P_PROTO_RPC_RES,
GNUNET_P2P_PROTO_RPC_ACK);
+ _("`%s' registering handlers %d %d %d\n"),
+ "rpc", GNUNET_P2P_PROTO_RPC_REQ, GNUNET_P2P_PROTO_RPC_RES,
+ GNUNET_P2P_PROTO_RPC_ACK);
rvalue = GNUNET_OK;
if (capi->registerHandler (GNUNET_P2P_PROTO_RPC_REQ,
&handleRPCMessageReq) == GNUNET_SYSERR)
@@ -1483,8 +1524,9 @@
if (rvalue == GNUNET_SYSERR)
{
release_module_rpc ();
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Failed to initialize `%s' service.\n"), "rpc");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Failed to initialize `%s' service.\n"), "rpc");
return NULL;
}
else
@@ -1508,23 +1550,25 @@
static void
testCallback (const GNUNET_PeerIdentity * sender,
- GNUNET_RPC_CallParameters * arguments, GNUNET_RPC_CallParameters
* results)
+ GNUNET_RPC_CallParameters * arguments,
+ GNUNET_RPC_CallParameters * results)
{
unsigned int dl;
char *data;
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"RPC callback invoked!\n");
- if ((GNUNET_OK == GNUNET_RPC_parameters_get_value_by_name (arguments,
- "command",
- &dl,
- (void **) &data)) &&
- (strncmp ("Hello", data, dl) == 0))
+ GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "RPC callback invoked!\n");
+ if ((GNUNET_OK ==
+ GNUNET_RPC_parameters_get_value_by_name (arguments, "command", &dl,
+ (void **) &data))
+ && (strncmp ("Hello", data, dl) == 0))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "RPC callback received Hello command!\n");
- GNUNET_RPC_parameters_add (results,
- "response",
- strlen ("Hello RPC World") + 1, "Hello RPC World");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "RPC callback received Hello command!\n");
+ GNUNET_RPC_parameters_add (results, "response",
+ strlen ("Hello RPC World") + 1,
+ "Hello RPC World");
}
}
@@ -1537,17 +1581,19 @@
GNUNET_semaphore_down (GNUNET_RSA_sign, GNUNET_YES);
if ((GNUNET_OK != GNUNET_RPC_parameters_get_value_by_name (results,
- "response",
- &dl,
- (void **) &reply)) ||
- (strncmp ("Hello RPC World", reply, dl) != 0))
+ "response",
+ &dl,
+ (void **)
+ &reply))
+ || (strncmp ("Hello RPC World", reply, dl) != 0))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("RPC async reply invalid.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("RPC async reply invalid.\n"));
}
else
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "RPC async reply received.\n");
+ "RPC async reply received.\n");
}
int
@@ -1563,7 +1609,8 @@
struct GNUNET_RPC_RequestHandle *record;
struct GNUNET_Semaphore *GNUNET_RSA_sign;
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"RPC testcase starting\n");
+ GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "RPC testcase starting\n");
rpcAPI = capi->requestService ("rpc");
if (rpcAPI == NULL)
{
@@ -1586,8 +1633,8 @@
args,
0,
5 * GNUNET_CRON_SECONDS,
- (GNUNET_RPC_AsynchronousCompletionCallback) &
async_RPC_Complete_callback,
- GNUNET_RSA_sign);
+ (GNUNET_RPC_AsynchronousCompletionCallback) &
+ async_RPC_Complete_callback, GNUNET_RSA_sign);
GNUNET_semaphore_up (GNUNET_RSA_sign); /* allow callback now - forces
async! */
rets = GNUNET_RPC_parameters_create ();
code = rpcAPI->RPC_execute (coreAPI->myIdentity,
@@ -1600,10 +1647,11 @@
}
GNUNET_RPC_parameters_destroy (args);
if ((GNUNET_OK != GNUNET_RPC_parameters_get_value_by_name (rets,
- "response",
- &dl,
- (void **) &reply)) ||
- (strncmp ("Hello RPC World", reply, dl) != 0))
+ "response",
+ &dl,
+ (void **)
+ &reply))
+ || (strncmp ("Hello RPC World", reply, dl) != 0))
{
GNUNET_GE_BREAK (ectx, 0);
ret = GNUNET_SYSERR;
@@ -1612,7 +1660,7 @@
GNUNET_thread_sleep (1 * GNUNET_CRON_SECONDS);
if (GNUNET_RPC_ERROR_OK != rpcAPI->RPC_stop (record))
GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("async RPC reply not received.\n"));
+ _("async RPC reply not received.\n"));
if (GNUNET_OK != rpcAPI->RPC_unregister ("testFunction", &testCallback))
{
@@ -1625,8 +1673,8 @@
ret = GNUNET_SYSERR;
}
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "RPC testcase completed with status %s\n",
- ret == GNUNET_OK ? "SUCCESS" : "FAILURE");
+ "RPC testcase completed with status %s\n",
+ ret == GNUNET_OK ? "SUCCESS" : "FAILURE");
return ret;
}
Modified: GNUnet/src/applications/session/connect.c
===================================================================
--- GNUnet/src/applications/session/connect.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/session/connect.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -165,8 +165,9 @@
GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
GNUNET_hash_to_enc (&hostId->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Received `%s' from `%s', marking session as up.\n", "PONG", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Received `%s' from `%s', marking session as up.\n", "PONG",
+ &enc);
#endif
GNUNET_GE_ASSERT (ectx, hostId != NULL);
if (stats != NULL)
@@ -204,7 +205,8 @@
from that peer */
limited = NULL;
GNUNET_GC_get_configuration_value_string (coreAPI->cfg,
- "GNUNETD", "LIMIT-ALLOW", "", &limited);
+ "GNUNETD", "LIMIT-ALLOW", "",
+ &limited);
if (strlen (limited) > 0)
{
GNUNET_hash_to_enc (&hostId->hashPubKey, &enc);
@@ -212,9 +214,9 @@
{
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Connection from peer `%s' was rejected (not allowed).\n",
- &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Connection from peer `%s' was rejected (not
allowed).\n",
+ &enc);
#endif
GNUNET_free (limited);
return GNUNET_NO;
@@ -223,7 +225,8 @@
GNUNET_free (limited);
limited = NULL;
GNUNET_GC_get_configuration_value_string (coreAPI->cfg,
- "GNUNETD", "LIMIT-DENY", "", &limited);
+ "GNUNETD", "LIMIT-DENY", "",
+ &limited);
if (strlen (limited) > 0)
{
GNUNET_hash_to_enc (&hostId->hashPubKey, &enc);
@@ -231,9 +234,9 @@
{
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Connection from peer `%s' was rejected (explicitly
denied).\n",
- &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Connection from peer `%s' was rejected (explicitly
denied).\n",
+ &enc);
#endif
GNUNET_free (limited);
return GNUNET_NO;
@@ -253,8 +256,9 @@
GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
GNUNET_hash_to_enc (&hostId->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- _("Session key from peer `%s' could not be verified.\n"), &enc);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ _("Session key from peer `%s' could not be verified.\n"),
+ &enc);
return GNUNET_SYSERR;
}
if (GNUNET_OK != identity->verifyPeerSignature (hostId,
@@ -271,8 +275,9 @@
GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
GNUNET_hash_to_enc (&hostId->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- _("Session key from peer `%s' could not be verified.\n"), &enc);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ _("Session key from peer `%s' could not be verified.\n"),
+ &enc);
#endif
return GNUNET_SYSERR; /*reject! */
}
@@ -307,14 +312,16 @@
GNUNET_GE_ASSERT (ectx, sk != NULL);
foreignHello =
- identity->identity2Hello (hostId, GNUNET_TRANSPORT_PROTOCOL_NUMBER_ANY,
GNUNET_YES);
+ identity->identity2Hello (hostId, GNUNET_TRANSPORT_PROTOCOL_NUMBER_ANY,
+ GNUNET_YES);
/* create and encrypt sessionkey */
if (NULL == foreignHello)
{
GNUNET_hash_to_enc (&hostId->hashPubKey, &enc);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- _("Cannot encrypt sessionkey, peer `%s' not known!\n"), &enc);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ _("Cannot encrypt sessionkey, peer `%s' not known!\n"),
+ &enc);
return NULL; /* other host not known */
}
identity->getPeerIdentity (&foreignHello->publicKey, &hc);
@@ -326,11 +333,12 @@
sizeof (GNUNET_PeerIdentity))))
{
GNUNET_GE_BREAK_OP (NULL,
- 0 == memcmp (&hc,
- &foreignHello->senderIdentity,
- sizeof (GNUNET_PeerIdentity)));
+ 0 == memcmp (&hc,
+ &foreignHello->senderIdentity,
+ sizeof (GNUNET_PeerIdentity)));
GNUNET_GE_BREAK_OP (NULL,
- 0 == memcmp (&hc, hostId, sizeof (GNUNET_PeerIdentity)));
+ 0 == memcmp (&hc, hostId,
+ sizeof (GNUNET_PeerIdentity)));
GNUNET_GE_BREAK_OP (NULL, 0);
GNUNET_free (foreignHello);
return NULL;
@@ -361,17 +369,17 @@
msg->header.type = htons (GNUNET_P2P_PROTO_SET_KEY);
msg->creationTime = htonl (created);
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- identity->signData (msg,
- sizeof (P2P_new_setkey_MESSAGE)
- - sizeof (GNUNET_RSA_Signature),
- &msg->signature));
+ GNUNET_SYSERR !=
+ identity->signData (msg,
+ sizeof (P2P_new_setkey_MESSAGE)
+ - sizeof (GNUNET_RSA_Signature),
+ &msg->signature));
#if EXTRA_CHECKS
/* verify signature/SKS */
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR != verifySKS (coreAPI->myIdentity,
- (const P2P_setkey_MESSAGE *) msg,
- &msg->signature));
+ GNUNET_SYSERR != verifySKS (coreAPI->myIdentity,
+ (const P2P_setkey_MESSAGE *)
+ msg, &msg->signature));
#endif
size = 0;
@@ -395,18 +403,18 @@
}
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Encrypting %d bytes of PINGPONG with key %s and IV %u\n",
- size, printSKEY (sk), *(int *) &msg->signature);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Encrypting %d bytes of PINGPONG with key %s and IV %u\n",
+ size, printSKEY (sk), *(int *) &msg->signature);
#endif
GNUNET_GE_ASSERT (ectx,
- -1 != GNUNET_AES_encrypt (pt,
- size,
- sk,
- (const
- GNUNET_AES_InitializationVector *)
- &msg->signature,
- (char *) &msg[1]));
+ -1 != GNUNET_AES_encrypt (pt,
+ size,
+ sk,
+ (const
+
GNUNET_AES_InitializationVector
+ *) &msg->signature,
+ (char *) &msg[1]));
GNUNET_free (pt);
}
return msg;
@@ -452,8 +460,9 @@
{
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Key exchange with `%s' failed: could not connect.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Key exchange with `%s' failed: could not connect.\n",
+ &enc);
#endif
return GNUNET_SYSERR; /* failed to connect */
}
@@ -477,9 +486,9 @@
GNUNET_AES_create_session_key (&sk);
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Created fresh sessionkey `%s' for peer `%s'.\n",
- printSKEY (&sk), &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Created fresh sessionkey `%s' for peer `%s'.\n",
+ printSKEY (&sk), &enc);
#endif
}
@@ -499,13 +508,13 @@
if (NULL == hello)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Could not create any HELLO for myself!\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ _("Could not create any HELLO for myself!\n"));
}
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Sending session key to peer `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Sending session key to peer `%s'.\n", &enc);
#endif
if (stats != NULL)
{
@@ -552,7 +561,8 @@
*/
static int
acceptSessionKey (const GNUNET_PeerIdentity * sender,
- const GNUNET_MessageHeader * msg, GNUNET_TSession * tsession)
+ const GNUNET_MessageHeader * msg,
+ GNUNET_TSession * tsession)
{
GNUNET_AES_SessionKey key;
GNUNET_MessageHeader *ping;
@@ -578,8 +588,8 @@
{
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Topology rejected session key from peer `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Topology rejected session key from peer `%s'.\n", &enc);
#endif
return GNUNET_SYSERR;
}
@@ -592,17 +602,18 @@
}
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Received session key from peer `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Received session key from peer `%s'.\n", &enc);
#endif
if (ntohs (msg->size) < sizeof (P2P_setkey_MESSAGE))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _
- ("Session key received from peer `%s' has invalid format
(discarded).\n"),
- &enc);
+ GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_USER
+ | GNUNET_GE_BULK,
+ _
+ ("Session key received from peer `%s' has invalid format
(discarded).\n"),
+ &enc);
return GNUNET_SYSERR;
}
if ((GNUNET_OK != coreAPI->getCurrentSessionKey (sender,
@@ -632,10 +643,11 @@
GNUNET_EncName ta;
GNUNET_hash_to_enc (&newMsg->target.hashPubKey, &ta);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _
- ("Session key received from peer `%s' is for `%s' and not
for me!\n"),
- &enc, &ta);
+ GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Session key received from peer `%s' is for `%s' and
not for me!\n"),
+ &enc, &ta);
return GNUNET_SYSERR; /* not for us! */
}
sig = &newMsg->signature;
@@ -651,9 +663,10 @@
#if DEBUG_SESSION
if (ret == GNUNET_SYSERR)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- "Signature of session key from `%s' failed"
- " verification (discarded).\n", &enc);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Signature of session key from `%s' failed"
+ " verification (discarded).\n", &enc);
#endif
if (stats != NULL)
stats->change (stat_skeyRejected, 1);
@@ -665,20 +678,22 @@
if (size != sizeof (GNUNET_AES_SessionKey))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("Invalid `%s' message received from peer `%s'.\n"),
- "setkey", &enc);
+ GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_USER
+ | GNUNET_GE_BULK,
+ _("Invalid `%s' message received from peer `%s'.\n"),
+ "setkey", &enc);
return GNUNET_SYSERR;
}
if (key.crc32 != htonl (GNUNET_crc32_n (&key, GNUNET_SESSIONKEY_LEN)))
{
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _
- ("setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"),
- printSKEY (&key), &enc, ntohl (key.crc32), GNUNET_crc32_n (&key,
-
GNUNET_SESSIONKEY_LEN));
+ GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_USER
+ | GNUNET_GE_BULK,
+ _
+ ("setkey `%s' from `%s' fails CRC check (have: %u, want
%u).\n"),
+ printSKEY (&key), &enc, ntohl (key.crc32),
+ GNUNET_crc32_n (&key, GNUNET_SESSIONKEY_LEN));
#endif
GNUNET_GE_BREAK_OP (ectx, 0);
stats->change (stat_skeyRejected, 1);
@@ -687,9 +702,10 @@
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Received setkey message from `%s' with %u bytes of data and key
`%s'.\n",
- &enc, ntohs (sessionkeySigned->header.size), printSKEY (&key));
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Received setkey message from `%s' with %u bytes of data and
key `%s'.\n",
+ &enc, ntohs (sessionkeySigned->header.size),
+ printSKEY (&key));
#endif
if (stats != NULL)
stats->change (stat_skeyAccepted, 1);
@@ -720,17 +736,17 @@
plaintext = GNUNET_malloc (size);
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Decrypting %d bytes of PINGPONG from `%s' with key `%s' and IV
%u\n",
- size, &enc, printSKEY (&key), *(int *) sig);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Decrypting %d bytes of PINGPONG from `%s' with key `%s'
and IV %u\n",
+ size, &enc, printSKEY (&key), *(int *) sig);
#endif
GNUNET_GE_ASSERT (ectx,
- -1 != GNUNET_AES_decrypt (&key,
- end,
- size,
- (const
- GNUNET_AES_InitializationVector *)
- sig, plaintext));
+ -1 != GNUNET_AES_decrypt (&key,
+ end,
+ size,
+ (const
+
GNUNET_AES_InitializationVector
+ *) sig, plaintext));
pos = 0;
/* find pings & pongs! */
while (pos + sizeof (GNUNET_MessageHeader) < size)
@@ -741,9 +757,11 @@
if (htons (hdr->size) + pos > size)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_USER
| GNUNET_GE_BULK,
- _("Error parsing encrypted session key from `%s', "
- "given message part size is invalid.\n"), &enc);
+ GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Error parsing encrypted session key from `%s', "
+ "given message part size is invalid.\n"), &enc);
break;
}
if (htons (hdr->type) == GNUNET_P2P_PROTO_PING)
@@ -752,10 +770,11 @@
pong = hdr;
else
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _
- ("Unknown type in embedded message from `%s': %u (size:
%u)\n"),
- &enc, htons (hdr->type), htons (hdr->size));
+ GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Unknown type in embedded message from `%s': %u
(size: %u)\n"),
+ &enc, htons (hdr->type), htons (hdr->size));
pos += ntohs (hdr->size);
}
}
@@ -765,8 +784,9 @@
/* notify ourselves about encapsulated pong */
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Received PONG in session key from `%s', injecting!\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Received PONG in session key from `%s', injecting!\n",
+ &enc);
#endif
coreAPI->injectMessage (sender,
(char *) pong,
@@ -776,9 +796,10 @@
/* pong can go out over ordinary channels */
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Received PING in session key from `%s', "
- "sending PONG over normal encrypted session!\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Received PING in session key from `%s', "
+ "sending PONG over normal encrypted session!\n",
+ &enc);
#endif
ping->type = htons (GNUNET_P2P_PROTO_PONG);
if (stats != NULL)
@@ -792,9 +813,10 @@
{
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Received ping in session key from `%s', "
- "sending pong together with my session key!\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Received ping in session key from `%s', "
+ "sending pong together with my session key!\n",
+ &enc);
#endif
ping->type = htons (GNUNET_P2P_PROTO_PONG);
if (stats != NULL)
@@ -833,8 +855,8 @@
{
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Topology rejected connecting to `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Topology rejected connecting to `%s'.\n", &enc);
#endif
return GNUNET_SYSERR;
}
@@ -842,15 +864,15 @@
{
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Connection to `%s' already up\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Connection to `%s' already up\n", &enc);
#endif
return GNUNET_YES; /* trivial case */
}
#if DEBUG_SESSION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Trying to exchange key with `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Trying to exchange key with `%s'.\n", &enc);
#endif
if (GNUNET_YES == identity->isBlacklisted (peer, GNUNET_NO))
return GNUNET_NO; /* not allowed right now! */
@@ -926,11 +948,14 @@
}
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- _("`%s' registering handler %d (plaintext and ciphertext)\n"),
- "session", GNUNET_P2P_PROTO_SET_KEY);
- coreAPI->registerPlaintextHandler (GNUNET_P2P_PROTO_SET_KEY,
&acceptSessionKey);
- coreAPI->registerHandler (GNUNET_P2P_PROTO_SET_KEY, &acceptSessionKeyUpdate);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ _
+ ("`%s' registering handler %d (plaintext and ciphertext)\n"),
+ "session", GNUNET_P2P_PROTO_SET_KEY);
+ coreAPI->registerPlaintextHandler (GNUNET_P2P_PROTO_SET_KEY,
+ &acceptSessionKey);
+ coreAPI->registerHandler (GNUNET_P2P_PROTO_SET_KEY,
+ &acceptSessionKeyUpdate);
ret.tryConnect = &tryConnect;
return &ret;
}
@@ -941,8 +966,10 @@
int
release_module_session ()
{
- coreAPI->unregisterPlaintextHandler (GNUNET_P2P_PROTO_SET_KEY,
&acceptSessionKey);
- coreAPI->unregisterHandler (GNUNET_P2P_PROTO_SET_KEY,
&acceptSessionKeyUpdate);
+ coreAPI->unregisterPlaintextHandler (GNUNET_P2P_PROTO_SET_KEY,
+ &acceptSessionKey);
+ coreAPI->unregisterHandler (GNUNET_P2P_PROTO_SET_KEY,
+ &acceptSessionKeyUpdate);
if (topology != NULL)
{
coreAPI->releaseService (topology);
Modified: GNUnet/src/applications/session/sessiontest.c
===================================================================
--- GNUnet/src/applications/session/sessiontest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/session/sessiontest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -89,9 +89,9 @@
{
sock1 = GNUNET_client_connection_create (NULL, cfg);
GNUNET_GC_set_configuration_value_string (cfg,
- NULL,
- "NETWORK",
- "HOST", "localhost:12087");
+ NULL,
+ "NETWORK",
+ "HOST", "localhost:12087");
sock2 = GNUNET_client_connection_create (NULL, cfg);
left = 30; /* how many iterations should we wait? */
while (GNUNET_OK ==
@@ -116,7 +116,8 @@
while (GNUNET_shutdown_test () == GNUNET_NO)
{
printf ("Checking that peers are staying connected 1...\n");
- GNUNET_STATS_get_statistics (NULL, sock1, &waitForConnect,
NULL);
+ GNUNET_STATS_get_statistics (NULL, sock1, &waitForConnect,
+ NULL);
sleep (1);
if (ok == 0)
{
@@ -124,7 +125,8 @@
break;
}
printf ("Checking that peers are staying connected 2...\n");
- GNUNET_STATS_get_statistics (NULL, sock2, &waitForConnect,
NULL);
+ GNUNET_STATS_get_statistics (NULL, sock2, &waitForConnect,
+ NULL);
sleep (1);
if (ok == 0)
{
Modified: GNUnet/src/applications/session/sessiontest2.c
===================================================================
--- GNUnet/src/applications/session/sessiontest2.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/session/sessiontest2.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -68,13 +68,13 @@
ret = GNUNET_SYSERR;
GNUNET_snprintf (host, 128, "localhost:%u", port1);
- GNUNET_GC_set_configuration_value_string (cfg1, NULL, "NETWORK", "HOST",
host);
+ GNUNET_GC_set_configuration_value_string (cfg1, NULL, "NETWORK", "HOST",
+ host);
GNUNET_snprintf (host, 128, "localhost:%u", port2);
- GNUNET_GC_set_configuration_value_string (cfg2, NULL, "NETWORK", "HOST",
host);
- if ((GNUNET_OK == GNUNET_wait_for_daemon_running (NULL,
- cfg1,
- 300 *
- GNUNET_CRON_SECONDS))
+ GNUNET_GC_set_configuration_value_string (cfg2, NULL, "NETWORK", "HOST",
+ host);
+ if ((GNUNET_OK ==
+ GNUNET_wait_for_daemon_running (NULL, cfg1, 300 * GNUNET_CRON_SECONDS))
&& (GNUNET_OK ==
GNUNET_wait_for_daemon_running (NULL, cfg2,
300 * GNUNET_CRON_SECONDS)))
Modified: GNUnet/src/applications/session/sessiontest_http.c
===================================================================
--- GNUnet/src/applications/session/sessiontest_http.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/session/sessiontest_http.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -68,13 +68,13 @@
ret = GNUNET_SYSERR;
GNUNET_snprintf (host, 128, "localhost:%u", port1);
- GNUNET_GC_set_configuration_value_string (cfg1, NULL, "NETWORK", "HOST",
host);
+ GNUNET_GC_set_configuration_value_string (cfg1, NULL, "NETWORK", "HOST",
+ host);
GNUNET_snprintf (host, 128, "localhost:%u", port2);
- GNUNET_GC_set_configuration_value_string (cfg2, NULL, "NETWORK", "HOST",
host);
- if ((GNUNET_OK == GNUNET_wait_for_daemon_running (NULL,
- cfg1,
- 300 *
- GNUNET_CRON_SECONDS))
+ GNUNET_GC_set_configuration_value_string (cfg2, NULL, "NETWORK", "HOST",
+ host);
+ if ((GNUNET_OK ==
+ GNUNET_wait_for_daemon_running (NULL, cfg1, 300 * GNUNET_CRON_SECONDS))
&& (GNUNET_OK ==
GNUNET_wait_for_daemon_running (NULL, cfg2,
300 * GNUNET_CRON_SECONDS)))
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -333,13 +333,15 @@
dbname = NULL;
GNUNET_GC_get_configuration_value_string (coreAPI->cfg,
- "MYSQL", "DATABASE", "gnunet", &dbname);
+ "MYSQL", "DATABASE", "gnunet",
+ &dbname);
GNUNET_GE_ASSERT (ectx, dbname != NULL);
mysql_real_connect (dbh->dbf, NULL, NULL, NULL, dbname, 0, NULL, 0);
GNUNET_free (dbname);
if (mysql_error (dbh->dbf)[0])
{
- LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
"mysql_real_connect", dbh);
+ LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "mysql_real_connect", dbh);
iclose ();
return GNUNET_SYSERR;
}
@@ -347,7 +349,8 @@
"SET SESSION net_read_timeout=60, SESSION
net_write_timeout=60");
if (mysql_error (dbh->dbf)[0])
{
- LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
"mysql_query", dbh);
+ LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "mysql_query", dbh);
iclose ();
return GNUNET_SYSERR;
}
@@ -394,7 +397,8 @@
}
if (mysql_error (dbh->dbf)[0])
{
- LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
"mysql_query", dbh);
+ LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "mysql_query", dbh);
iclose ();
return GNUNET_SYSERR;
}
@@ -404,14 +408,16 @@
" value BLOB NOT NULL DEFAULT '') ENGINE=MyISAM");
if (mysql_error (dbh->dbf)[0])
{
- LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
"mysql_query", dbh);
+ LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "mysql_query", dbh);
iclose ();
return GNUNET_SYSERR;
}
mysql_query (dbh->dbf, "SET AUTOCOMMIT = 1");
if (mysql_error (dbh->dbf)[0])
{
- LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
"mysql_query", dbh);
+ LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "mysql_query", dbh);
iclose ();
return GNUNET_SYSERR;
}
@@ -466,20 +472,22 @@
if (mysql_stmt_bind_param (dbh->delete_value, qbind))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_param",
- __FILE__, __LINE__, mysql_stmt_error (dbh->delete_value));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_param",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->delete_value));
iclose ();
return GNUNET_SYSERR;
}
if (mysql_stmt_execute (dbh->delete_value))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_execute",
- __FILE__, __LINE__, mysql_stmt_error (dbh->delete_value));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_execute",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->delete_value));
iclose ();
return GNUNET_SYSERR;
}
@@ -514,20 +522,22 @@
if (mysql_stmt_bind_param (dbh->insert_value, qbind))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_param",
- __FILE__, __LINE__, mysql_stmt_error (dbh->insert_value));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_param",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->insert_value));
iclose ();
return GNUNET_SYSERR;
}
if (mysql_stmt_execute (dbh->insert_value))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_execute",
- __FILE__, __LINE__, mysql_stmt_error (dbh->insert_value));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_execute",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->insert_value));
iclose ();
return GNUNET_SYSERR;
}
@@ -552,26 +562,27 @@
qbind[0].is_unsigned = GNUNET_YES;
qbind[0].buffer_type = MYSQL_TYPE_LONGLONG;
qbind[0].buffer = &vkey;
- GNUNET_GE_ASSERT (ectx, mysql_stmt_param_count (dbh->delete_entry_by_vkey)
== 1);
+ GNUNET_GE_ASSERT (ectx,
+ mysql_stmt_param_count (dbh->delete_entry_by_vkey) == 1);
if (mysql_stmt_bind_param (dbh->delete_entry_by_vkey, qbind))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_param",
- __FILE__, __LINE__,
- mysql_stmt_error (dbh->delete_entry_by_vkey));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_param",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->delete_entry_by_vkey));
iclose ();
return GNUNET_SYSERR;
}
if (mysql_stmt_execute (dbh->delete_entry_by_vkey))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_execute",
- __FILE__, __LINE__,
- mysql_stmt_error (dbh->delete_entry_by_vkey));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_execute",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->delete_entry_by_vkey));
iclose ();
return GNUNET_SYSERR;
}
@@ -665,10 +676,11 @@
if (mysql_stmt_bind_param (dbh->select_value, qbind))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_param",
- __FILE__, __LINE__, mysql_stmt_error (dbh->select_value));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_param",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->select_value));
iclose ();
GNUNET_mutex_unlock (lock);
GNUNET_free (datum);
@@ -677,10 +689,11 @@
if (mysql_stmt_execute (dbh->select_value))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_execute",
- __FILE__, __LINE__, mysql_stmt_error (dbh->select_value));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_execute",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->select_value));
iclose ();
GNUNET_free (datum);
return NULL;
@@ -689,10 +702,11 @@
if (mysql_stmt_bind_result (dbh->select_value, rbind))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_result",
- __FILE__, __LINE__, mysql_stmt_error (dbh->select_value));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_result",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->select_value));
iclose ();
GNUNET_mutex_unlock (lock);
GNUNET_free (datum);
@@ -703,10 +717,11 @@
{
mysql_stmt_reset (dbh->select_value);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_result",
- __FILE__, __LINE__, mysql_stmt_error (dbh->select_value));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_result",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->select_value));
delete_entry_by_vkey (vkey);
content_size -= ntohl (datum->size);
GNUNET_mutex_unlock (lock);
@@ -740,7 +755,8 @@
#endif
if (((ntohl (value->size) < sizeof (GNUNET_DatastoreValue))) ||
- ((ntohl (value->size) - sizeof (GNUNET_DatastoreValue)) >
MAX_DATUM_SIZE))
+ ((ntohl (value->size) - sizeof (GNUNET_DatastoreValue)) >
+ MAX_DATUM_SIZE))
{
GNUNET_GE_BREAK (ectx, 0);
return GNUNET_SYSERR;
@@ -770,7 +786,8 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (key, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Storing in database block with type %u and key %s.\n", type, &enc);
+ "Storing in database block with type %u and key %s.\n", type,
+ &enc);
#endif
GNUNET_GE_ASSERT (ectx, mysql_stmt_param_count (dbh->insert_entry) == 7);
memset (qbind, 0, sizeof (qbind));
@@ -800,10 +817,11 @@
if (mysql_stmt_bind_param (dbh->insert_entry, qbind))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_param",
- __FILE__, __LINE__, mysql_stmt_error (dbh->insert_entry));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_param",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->insert_entry));
delete_value (vkey);
iclose ();
mysql_thread_end ();
@@ -814,10 +832,11 @@
if (mysql_stmt_execute (dbh->insert_entry))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_execute",
- __FILE__, __LINE__, mysql_stmt_error (dbh->insert_entry));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_execute",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->insert_entry));
delete_value (vkey);
iclose ();
mysql_thread_end ();
@@ -852,7 +871,8 @@
int is_asc,
int is_prio,
int is_migr,
- unsigned int iter_select, GNUNET_DatastoreValueIterator iter,
void *closure)
+ unsigned int iter_select, GNUNET_DatastoreValueIterator iter,
+ void *closure)
{
GNUNET_DatastoreValue *datum;
int count;
@@ -964,10 +984,10 @@
if (mysql_stmt_bind_param (stmt, qbind))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_param",
- __FILE__, __LINE__, mysql_stmt_error (stmt));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_param",
+ __FILE__, __LINE__, mysql_stmt_error (stmt));
iclose ();
GNUNET_mutex_unlock (lock);
mysql_thread_end ();
@@ -976,10 +996,10 @@
if (mysql_stmt_execute (stmt))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_execute",
- __FILE__, __LINE__, mysql_stmt_error (stmt));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_execute",
+ __FILE__, __LINE__, mysql_stmt_error (stmt));
iclose ();
GNUNET_mutex_unlock (lock);
mysql_thread_end ();
@@ -988,10 +1008,10 @@
if (mysql_stmt_bind_result (stmt, rbind))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_result",
- __FILE__, __LINE__, mysql_stmt_error (stmt));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_result",
+ __FILE__, __LINE__, mysql_stmt_error (stmt));
iclose ();
mysql_thread_end ();
GNUNET_mutex_unlock (lock);
@@ -1047,7 +1067,8 @@
* iter is non-NULL and aborted the iteration
*/
static int
-iterateLowPriority (unsigned int type, GNUNET_DatastoreValueIterator iter,
void *closure)
+iterateLowPriority (unsigned int type, GNUNET_DatastoreValueIterator iter,
+ void *closure)
{
return iterateHelper (type, GNUNET_YES, GNUNET_YES, GNUNET_NO, 0, iter,
closure);
@@ -1064,7 +1085,8 @@
* iter is non-NULL and aborted the iteration
*/
static int
-iterateNonAnonymous (unsigned int type, GNUNET_DatastoreValueIterator iter,
void *closure)
+iterateNonAnonymous (unsigned int type, GNUNET_DatastoreValueIterator iter,
+ void *closure)
{
return iterateHelper (type, GNUNET_NO, GNUNET_YES, GNUNET_NO, 1, iter,
closure);
@@ -1081,7 +1103,8 @@
* iter is non-NULL and aborted the iteration
*/
static int
-iterateExpirationTime (unsigned int type, GNUNET_DatastoreValueIterator iter,
void *closure)
+iterateExpirationTime (unsigned int type, GNUNET_DatastoreValueIterator iter,
+ void *closure)
{
return iterateHelper (type, GNUNET_YES, GNUNET_NO, GNUNET_NO, 2, iter,
closure);
@@ -1158,7 +1181,7 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (query, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "MySQL looks for `%s' of type %u\n", &enc, type);
+ "MySQL looks for `%s' of type %u\n", &enc, type);
#endif
hashSize = sizeof (GNUNET_HashCode);
@@ -1233,10 +1256,10 @@
if (mysql_stmt_bind_param (stmt, qbind))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_param",
- __FILE__, __LINE__, mysql_stmt_error (stmt));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_param",
+ __FILE__, __LINE__, mysql_stmt_error (stmt));
iclose ();
mysql_thread_end ();
GNUNET_mutex_unlock (lock);
@@ -1245,10 +1268,10 @@
if (mysql_stmt_execute (stmt))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_execute",
- __FILE__, __LINE__, mysql_stmt_error (stmt));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_execute",
+ __FILE__, __LINE__, mysql_stmt_error (stmt));
iclose ();
GNUNET_mutex_unlock (lock);
mysql_thread_end ();
@@ -1257,10 +1280,10 @@
if (mysql_stmt_bind_result (stmt, rbind))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_result",
- __FILE__, __LINE__, mysql_stmt_error (stmt));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_result",
+ __FILE__, __LINE__, mysql_stmt_error (stmt));
iclose ();
mysql_thread_end ();
GNUNET_mutex_unlock (lock);
@@ -1342,10 +1365,11 @@
if (mysql_stmt_bind_param (dbh->update_entry, qbind))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error: %s\n"),
- "mysql_stmt_bind_param",
- __FILE__, __LINE__, mysql_stmt_error (dbh->update_entry));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error: %s\n"),
+ "mysql_stmt_bind_param",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->update_entry));
iclose ();
mysql_thread_end ();
GNUNET_mutex_unlock (lock);
@@ -1360,12 +1384,12 @@
if (mysql_stmt_execute (dbh->update_entry))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("`%s' failed at %s:%d with error `%s' after %llums\n"),
- "mysql_stmt_execute",
- __FILE__, __LINE__,
- mysql_stmt_error (dbh->update_entry),
- GNUNET_get_time () - start);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("`%s' failed at %s:%d with error `%s' after %llums\n"),
+ "mysql_stmt_execute",
+ __FILE__, __LINE__,
+ mysql_stmt_error (dbh->update_entry),
+ GNUNET_get_time () - start);
iclose ();
mysql_thread_end ();
GNUNET_mutex_unlock (lock);
@@ -1418,13 +1442,15 @@
mysql_query (dbh->dbf, "DROP TABLE gn071");
if (mysql_error (dbh->dbf)[0])
{
- LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
"mysql_query", dbh);
+ LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "mysql_query", dbh);
ok = GNUNET_NO;
}
mysql_query (dbh->dbf, "DROP TABLE gn072");
if (mysql_error (dbh->dbf)[0])
{
- LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
"mysql_query", dbh);
+ LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "mysql_query", dbh);
ok = GNUNET_NO;
}
if (ok == GNUNET_YES)
@@ -1458,7 +1484,9 @@
#ifndef WINDOWS
pw = getpwuid (getuid ());
if (!pw)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "getpwuid");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "getpwuid");
home_dir = GNUNET_strdup (pw->pw_dir);
#else
home_dir = (char *) GNUNET_malloc (_MAX_PATH + 1);
@@ -1469,17 +1497,20 @@
GNUNET_snprintf (cnffile, nX, "%s/.my.cnf", home_dir);
GNUNET_free (home_dir);
GNUNET_GC_get_configuration_value_filename (capi->cfg,
- "MYSQL", "CONFIG", cnffile, &home_dir);
+ "MYSQL", "CONFIG", cnffile,
+ &home_dir);
GNUNET_free (cnffile);
cnffile = home_dir;
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("Trying to use file `%s' for MySQL configuration.\n"), cnffile);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("Trying to use file `%s' for MySQL configuration.\n"),
+ cnffile);
fp = FOPEN (cnffile, "r");
if (!fp)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "fopen", cnffile);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "fopen", cnffile);
if (stats != NULL)
coreAPI->releaseService (stats);
GNUNET_free (cnffile);
@@ -1497,9 +1528,9 @@
GNUNET_free (cnffile);
GNUNET_free (dbh);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Failed to load MySQL database module. Check that MySQL is
running and configured properly!\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Failed to load MySQL database module. Check that MySQL
is running and configured properly!\n"));
dbh = NULL;
if (stats != NULL)
coreAPI->releaseService (stats);
@@ -1519,7 +1550,8 @@
(!(sql_res = mysql_use_result (dbh->dbf))) ||
(!(sql_row = mysql_fetch_row (sql_res))))
{
- LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
"mysql_query", dbh);
+ LOG_MYSQL (GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "mysql_query", dbh);
content_size = 0;
iclose (dbh);
}
@@ -1605,7 +1637,9 @@
#ifndef WINDOWS
pw = getpwuid (getuid ());
if (!pw)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "getpwuid");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "getpwuid");
home_dir = GNUNET_strdup (pw->pw_dir);
#else
home_dir = (char *) GNUNET_malloc (_MAX_PATH + 1);
@@ -1616,17 +1650,20 @@
GNUNET_snprintf (cnffile, nX, "%s/.my.cnf", home_dir);
GNUNET_free (home_dir);
GNUNET_GC_get_configuration_value_filename (uapi->cfg,
- "MYSQL", "CONFIG", cnffile, &home_dir);
+ "MYSQL", "CONFIG", cnffile,
+ &home_dir);
GNUNET_free (cnffile);
cnffile = home_dir;
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("Trying to use file `%s' for MySQL configuration.\n"), cnffile);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("Trying to use file `%s' for MySQL configuration.\n"),
+ cnffile);
fp = FOPEN (cnffile, "r");
if (!fp)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "fopen", cnffile);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "fopen", cnffile);
GNUNET_free (cnffile);
return;
}
@@ -1642,9 +1679,9 @@
GNUNET_free (cnffile);
GNUNET_free (dbh);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Failed to load MySQL database module. Check that MySQL is
running and configured properly!\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Failed to load MySQL database module. Check that MySQL
is running and configured properly!\n"));
dbh = NULL;
return;
}
Modified: GNUnet/src/applications/sqstore_mysql/mysqltest.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -110,8 +110,8 @@
static int
iteratePriority (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * val, GNUNET_SQstore_ServiceAPI
* api,
- unsigned long long uid)
+ const GNUNET_DatastoreValue * val,
+ GNUNET_SQstore_ServiceAPI * api, unsigned long long uid)
{
api->update (uid, 4, 0);
return GNUNET_OK;
@@ -133,8 +133,8 @@
static int
multipleCheck (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * val, GNUNET_DatastoreValue **
last,
- unsigned long long uid)
+ const GNUNET_DatastoreValue * val,
+ GNUNET_DatastoreValue ** last, unsigned long long uid)
{
if (*last != NULL)
{
@@ -170,8 +170,12 @@
GNUNET_free (value);
}
ASSERT (oldSize < api->getSize ());
- ASSERT (256 == api->iterateLowPriority (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
NULL, NULL));
- ASSERT (256 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
NULL, NULL));
+ ASSERT (256 ==
+ api->iterateLowPriority (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY, NULL,
+ NULL));
+ ASSERT (256 ==
+ api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY, NULL,
+ NULL));
for (i = 255; i >= 0; i--)
{
memset (&key, 256 - i, sizeof (GNUNET_HashCode));
@@ -189,31 +193,36 @@
ASSERT (oldSize > api->getSize ());
i = 0;
ASSERT (128 == api->iterateLowPriority (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
iterateUp, &i));
+ (GNUNET_DatastoreValueIterator) &
+ iterateUp, &i));
ASSERT (256 == i);
ASSERT (128 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
iterateDown,
- &i));
+ (GNUNET_DatastoreValueIterator) &
+ iterateDown, &i));
ASSERT (0 == i);
ASSERT (128 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
iterateDelete,
- api));
- ASSERT (0 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
iterateDown,
- &i));
+ (GNUNET_DatastoreValueIterator) &
+ iterateDelete, api));
+ ASSERT (0 ==
+ api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
+ (GNUNET_DatastoreValueIterator) &
+ iterateDown, &i));
i = 42;
value = initValue (i);
memset (&key, 256 - i, sizeof (GNUNET_HashCode));
api->put (&key, value);
ASSERT (1 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
priorityCheck,
- &i));
- ASSERT (1 == api->iterateAllNow ((GNUNET_DatastoreValueIterator) &
iteratePriority, api));
+ (GNUNET_DatastoreValueIterator) &
+ priorityCheck, &i));
+ ASSERT (1 ==
+ api->
+ iterateAllNow ((GNUNET_DatastoreValueIterator) & iteratePriority,
+ api));
i += 4;
ASSERT (1 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
priorityCheck,
- &i));
+ (GNUNET_DatastoreValueIterator) &
+ priorityCheck, &i));
GNUNET_free (value);
/* test multiple results */
@@ -223,11 +232,15 @@
value = NULL;
ASSERT (2 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
multipleCheck,
- &value));
+ (GNUNET_DatastoreValueIterator) &
+ multipleCheck, &value));
GNUNET_free (value);
- ASSERT (2 == api->iterateAllNow ((GNUNET_DatastoreValueIterator) &
iterateDelete, api));
- ASSERT (0 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
NULL, NULL));
+ ASSERT (2 ==
+ api->iterateAllNow ((GNUNET_DatastoreValueIterator) & iterateDelete,
+ api));
+ ASSERT (0 ==
+ api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY, NULL,
+ NULL));
api->drop ();
return GNUNET_OK;
Modified: GNUnet/src/applications/sqstore_mysql/mysqltest2.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysqltest2.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/sqstore_mysql/mysqltest2.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -170,7 +170,8 @@
static int
iterateDelete (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * val, void *cls, unsigned long
long uid)
+ const GNUNET_DatastoreValue * val, void *cls,
+ unsigned long long uid)
{
GNUNET_SQstore_ServiceAPI *api = cls;
static int dc;
Modified: GNUnet/src/applications/sqstore_sqlite/sqlite.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlite.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/sqstore_sqlite/sqlite.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -234,9 +234,9 @@
if (sqlite3_open (fn, &ret->dbh) != SQLITE_OK)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Unable to initialize SQLite: %s.\n"),
- sqlite3_errmsg (ret->dbh));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Unable to initialize SQLite: %s.\n"),
+ sqlite3_errmsg (ret->dbh));
sqlite3_close (ret->dbh);
GNUNET_free (ret);
return NULL;
@@ -276,8 +276,8 @@
NULL) != SQLITE_OK)
{
LOG_SQLITE (ret,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "sqlite_create");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite_create");
sqlite3_finalize (stmt);
GNUNET_free (ret);
return NULL;
@@ -304,7 +304,8 @@
&ret->insertContent) != SQLITE_OK))
{
LOG_SQLITE (ret,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "precompiling");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "precompiling");
if (ret->countContent != NULL)
sqlite3_finalize (ret->countContent);
if (ret->exists != NULL)
@@ -393,14 +394,16 @@
"DELETE FROM gn070 WHERE _ROWID_ = ?", &stmt) != SQLITE_OK)
{
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sq_prepare");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sq_prepare");
return GNUNET_SYSERR;
}
sqlite3_bind_int64 (stmt, 1, rid);
if (SQLITE_DONE != sqlite3_step (stmt))
{
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite3_step");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_step");
sqlite3_finalize (stmt);
return GNUNET_SYSERR;
}
@@ -434,34 +437,37 @@
sqlite3_stmt *stmtd;
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Invalid data in %s (NCS). Trying to fix (by deletion).\n"),
- _("sqlite datastore"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Invalid data in %s (NCS). Trying to fix (by
deletion).\n"),
+ _("sqlite datastore"));
if (1)
abort ();
if (SQLITE_OK != sqlite3_reset (stmt))
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite3_reset");
- if (sq_prepare (dbh,
- "DELETE FROM gn070 WHERE size < ?",
- &stmtd) == SQLITE_OK)
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_reset");
+ if (sq_prepare (dbh, "DELETE FROM gn070 WHERE size < ?", &stmtd) ==
+ SQLITE_OK)
{
if (SQLITE_OK !=
sqlite3_bind_int (stmtd, 1, sizeof (GNUNET_DatastoreValue)))
- LOG_SQLITE (handle, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- "sqlite3_bind_int");
+ LOG_SQLITE (handle,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_bind_int");
if (SQLITE_DONE != sqlite3_step (stmtd))
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "sqlite3_step");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_step");
if (SQLITE_OK != sqlite3_finalize (stmtd))
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "sqlite3_finalize");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_finalize");
}
else
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sq_prepare");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sq_prepare");
return NULL; /* error */
}
@@ -471,36 +477,41 @@
sqlite3_stmt *stmtd;
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Invalid data in %s. Trying to fix (by deletion).\n"),
- _("sqlite datastore"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Invalid data in %s. Trying to fix (by deletion).\n"),
+ _("sqlite datastore"));
if (SQLITE_OK != sqlite3_reset (stmt))
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite3_reset");
- if (sq_prepare (dbh,
- "DELETE FROM gn070 WHERE NOT ((LENGTH(hash) = ?) AND
(size = LENGTH(value) + ?))",
- &stmtd) == SQLITE_OK)
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_reset");
+ if (sq_prepare
+ (dbh,
+ "DELETE FROM gn070 WHERE NOT ((LENGTH(hash) = ?) AND (size =
LENGTH(value) + ?))",
+ &stmtd) == SQLITE_OK)
{
if (SQLITE_OK !=
sqlite3_bind_int (stmtd, 1, sizeof (GNUNET_HashCode)))
- LOG_SQLITE (handle, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- "sqlite3_bind_int");
+ LOG_SQLITE (handle,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_bind_int");
if (SQLITE_OK !=
sqlite3_bind_int (stmtd, 2, sizeof (GNUNET_DatastoreValue)))
- LOG_SQLITE (handle, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- "sqlite3_bind_int");
+ LOG_SQLITE (handle,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_bind_int");
if (SQLITE_DONE != sqlite3_step (stmtd))
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "sqlite3_step");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_step");
if (SQLITE_OK != sqlite3_finalize (stmtd))
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "sqlite3_finalize");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_finalize");
}
else
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sq_prepare");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sq_prepare");
return NULL;
}
@@ -553,7 +564,8 @@
if (i != SQLITE_OK)
{
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite_getStat");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite_getStat");
return GNUNET_SYSERR;
}
return ret;
@@ -578,7 +590,8 @@
sqlite3_bind_text (stmt, 1, key, strlen (key), SQLITE_STATIC);
if (SQLITE_DONE != sqlite3_step (stmt))
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite3_step");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_step");
sqlite3_finalize (stmt);
}
@@ -590,18 +603,20 @@
if ((SQLITE_OK !=
sqlite3_bind_text (stmt, 1, key, strlen (key), SQLITE_STATIC))
|| (SQLITE_OK != sqlite3_bind_int64 (stmt, 2, val))
- || (SQLITE_OK != sqlite3_bind_int (stmt, 3,
GNUNET_GNUNET_ECRS_BLOCKTYPE_RESERVED)))
+ || (SQLITE_OK !=
+ sqlite3_bind_int (stmt, 3, GNUNET_GNUNET_ECRS_BLOCKTYPE_RESERVED)))
{
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "sqlite3_bind_xxx");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_bind_xxx");
sqlite3_finalize (stmt);
return GNUNET_SYSERR;
}
if (sqlite3_step (stmt) != SQLITE_DONE)
{
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite3_step");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_step");
sqlite3_finalize (stmt);
return GNUNET_SYSERR;
}
@@ -637,7 +652,8 @@
int is_prio,
int is_migr,
int limit_nonanonymous,
- unsigned int iter_select, GNUNET_DatastoreValueIterator iter,
void *closure)
+ unsigned int iter_select, GNUNET_DatastoreValueIterator iter,
+ void *closure)
{
sqlite3_stmt *stmt;
int count;
@@ -678,7 +694,8 @@
if (sq_prepare (dbh, stmt_str, &stmt) != SQLITE_OK)
{
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite3_prepare");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_prepare");
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
}
@@ -743,8 +760,8 @@
datum = assembleDatum (handle, stmt, &key, &rowid);
if (SQLITE_OK != sqlite3_reset (stmt))
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "sqlite3_reset");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_reset");
if (datum == NULL)
break;
#if 0
@@ -784,8 +801,8 @@
if (ret != SQLITE_DONE)
{
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "sqlite3_step");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_step");
sqlite3_finalize (stmt);
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
@@ -811,7 +828,8 @@
* iter is non-NULL and aborted the iteration
*/
static int
-iterateLowPriority (unsigned int type, GNUNET_DatastoreValueIterator iter,
void *closure)
+iterateLowPriority (unsigned int type, GNUNET_DatastoreValueIterator iter,
+ void *closure)
{
return sqlite_iterate (type, GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_NO,
0, iter, closure);
@@ -828,7 +846,8 @@
* iter is non-NULL and aborted the iteration
*/
static int
-iterateNonAnonymous (unsigned int type, GNUNET_DatastoreValueIterator iter,
void *closure)
+iterateNonAnonymous (unsigned int type, GNUNET_DatastoreValueIterator iter,
+ void *closure)
{
return sqlite_iterate (type, GNUNET_NO, GNUNET_YES, GNUNET_NO, GNUNET_YES,
1, iter, closure);
@@ -844,7 +863,8 @@
* @return the number of items stored in the content database
*/
static int
-iterateExpirationTime (unsigned int type, GNUNET_DatastoreValueIterator iter,
void *closure)
+iterateExpirationTime (unsigned int type, GNUNET_DatastoreValueIterator iter,
+ void *closure)
{
return sqlite_iterate (type, GNUNET_YES, GNUNET_NO, GNUNET_NO, GNUNET_NO, 2,
iter, closure);
@@ -900,7 +920,8 @@
&stmt) != SQLITE_OK)
{
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite3_prepare");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_prepare");
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
}
@@ -947,9 +968,10 @@
{
/* re-computed payload! */
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER |
GNUNET_GE_ADMIN,
- "SQLite database size recomputed. New estimate is %llu, old
estimate was %llu\n",
- newpayload, payload);
+ GNUNET_GE_INFO | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN,
+ "SQLite database size recomputed. New estimate is %llu,
old estimate was %llu\n",
+ newpayload, payload);
payload = newpayload;
syncStats (handle);
}
@@ -969,7 +991,8 @@
return; /* already down */
#if DEBUG_SQLITE
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "SQLite:
closing database\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "SQLite: closing database\n");
#endif
syncStats (getDBHandle ());
@@ -984,7 +1007,8 @@
sqlite3_finalize (h->insertContent);
if (sqlite3_close (h->dbh) != SQLITE_OK)
LOG_SQLITE (h,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite_close");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite_close");
GNUNET_free (h);
}
GNUNET_free (handles);
@@ -1052,7 +1076,8 @@
if (sq_prepare (dbh, scratch, &stmt) != SQLITE_OK)
{
LOG_SQLITE (handle,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite_prepare");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite_prepare");
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
}
@@ -1139,9 +1164,9 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
GNUNET_hash_to_enc (key, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Storing in database block with type %u/key `%s'/priority
%u/expiration %llu.\n",
- ntohl (*(int *) &value[1]), &enc, ntohl (value->prio),
- GNUNET_ntohll (value->expirationTime));
+ "Storing in database block with type %u/key `%s'/priority
%u/expiration %llu.\n",
+ ntohl (*(int *) &value[1]), &enc, ntohl (value->prio),
+ GNUNET_ntohll (value->expirationTime));
#endif
if ((ntohl (value->size) < sizeof (GNUNET_DatastoreValue)))
@@ -1173,11 +1198,12 @@
SQLITE_TRANSIENT)))
{
LOG_SQLITE (dbh,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "sqlite3_bind_XXXX");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_bind_XXXX");
if (SQLITE_OK != sqlite3_reset (stmt))
LOG_SQLITE (dbh,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite3_reset");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_reset");
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
}
@@ -1192,19 +1218,22 @@
return GNUNET_NO;
}
LOG_SQLITE (dbh,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite3_step");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_step");
sqlite3_reset (stmt);
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
}
if (SQLITE_OK != sqlite3_reset (stmt))
LOG_SQLITE (dbh,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite3_reset");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_reset");
lastSync++;
payload += getContentDatastoreSize (value);
#if DEBUG_SQLITE
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "SQLite: done
writing content\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "SQLite: done writing content\n");
#endif
GNUNET_mutex_unlock (lock);
return GNUNET_OK;
@@ -1227,12 +1256,15 @@
sqlite3_bind_int64 (dbh->updPrio, 3, uid);
n = sqlite3_step (dbh->updPrio);
if (n != SQLITE_DONE)
- LOG_SQLITE (dbh, GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite3_step");
+ LOG_SQLITE (dbh,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite3_step");
sqlite3_reset (dbh->updPrio);
#if DEBUG_SQLITE
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"SQLite: block updated\n");
+ GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "SQLite: block updated\n");
#endif
GNUNET_mutex_unlock (lock);
if (n == SQLITE_BUSY)
@@ -1252,7 +1284,8 @@
ectx = capi->ectx;
#if DEBUG_SQLITE
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "SQLite:
initializing database\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "SQLite: initializing database\n");
#endif
payload = 0;
@@ -1260,10 +1293,10 @@
afsdir = NULL;
GNUNET_GC_get_configuration_value_filename (capi->cfg,
- "FS",
- "DIR",
- GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
"/data/fs/",
- &afsdir);
+ "FS",
+ "DIR",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
+ "/data/fs/", &afsdir);
dir = GNUNET_malloc (strlen (afsdir) + strlen ("/content/gnunet.dat") + 2);
strcpy (dir, afsdir);
strcat (dir, "/content/gnunet.dat");
@@ -1289,7 +1322,8 @@
{
GNUNET_GE_BREAK (ectx, 0);
LOG_SQLITE (dbh,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "sqlite_payload");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sqlite_payload");
GNUNET_mutex_destroy (lock);
GNUNET_free (fn);
fn = NULL;
@@ -1325,7 +1359,8 @@
sqlite_shutdown ();
#if DEBUG_SQLITE
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "SQLite:
database shutdown\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "SQLite: database shutdown\n");
#endif
GNUNET_mutex_destroy (lock);
lock = NULL;
@@ -1350,10 +1385,10 @@
lastSync = 0;
afsdir = NULL;
GNUNET_GC_get_configuration_value_filename (uapi->cfg,
- "FS",
- "DIR",
- GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
"/data/fs/",
- &afsdir);
+ "FS",
+ "DIR",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
+ "/data/fs/", &afsdir);
dir = GNUNET_malloc (strlen (afsdir) + 8 + 2); /* 8 = "content/" */
strcpy (dir, afsdir);
strcat (dir, "/content/");
Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -110,8 +110,8 @@
static int
iteratePriority (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * val, GNUNET_SQstore_ServiceAPI
* api,
- unsigned long long uid)
+ const GNUNET_DatastoreValue * val,
+ GNUNET_SQstore_ServiceAPI * api, unsigned long long uid)
{
api->update (uid, 4, 0);
return GNUNET_OK;
@@ -133,8 +133,8 @@
static int
multipleCheck (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * val, GNUNET_DatastoreValue **
last,
- unsigned long long uid)
+ const GNUNET_DatastoreValue * val,
+ GNUNET_DatastoreValue ** last, unsigned long long uid)
{
if (*last != NULL)
{
@@ -170,8 +170,12 @@
GNUNET_free (value);
}
ASSERT (oldSize < api->getSize ());
- ASSERT (256 == api->iterateLowPriority (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
NULL, NULL));
- ASSERT (256 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
NULL, NULL));
+ ASSERT (256 ==
+ api->iterateLowPriority (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY, NULL,
+ NULL));
+ ASSERT (256 ==
+ api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY, NULL,
+ NULL));
for (i = 255; i >= 0; i--)
{
memset (&key, 256 - i, sizeof (GNUNET_HashCode));
@@ -189,31 +193,36 @@
ASSERT (oldSize > api->getSize ());
i = 0;
ASSERT (128 == api->iterateLowPriority (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
iterateUp, &i));
+ (GNUNET_DatastoreValueIterator) &
+ iterateUp, &i));
ASSERT (256 == i);
ASSERT (128 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
iterateDown,
- &i));
+ (GNUNET_DatastoreValueIterator) &
+ iterateDown, &i));
ASSERT (0 == i);
ASSERT (128 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
iterateDelete,
- api));
- ASSERT (0 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
iterateDown,
- &i));
+ (GNUNET_DatastoreValueIterator) &
+ iterateDelete, api));
+ ASSERT (0 ==
+ api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
+ (GNUNET_DatastoreValueIterator) &
+ iterateDown, &i));
i = 42;
value = initValue (i);
memset (&key, 256 - i, sizeof (GNUNET_HashCode));
api->put (&key, value);
ASSERT (1 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
priorityCheck,
- &i));
- ASSERT (1 == api->iterateAllNow ((GNUNET_DatastoreValueIterator) &
iteratePriority, api));
+ (GNUNET_DatastoreValueIterator) &
+ priorityCheck, &i));
+ ASSERT (1 ==
+ api->
+ iterateAllNow ((GNUNET_DatastoreValueIterator) & iteratePriority,
+ api));
i += 4;
ASSERT (1 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
priorityCheck,
- &i));
+ (GNUNET_DatastoreValueIterator) &
+ priorityCheck, &i));
GNUNET_free (value);
/* test multiple results */
@@ -223,11 +232,15 @@
value = NULL;
ASSERT (2 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
- (GNUNET_DatastoreValueIterator) &
multipleCheck,
- &value));
+ (GNUNET_DatastoreValueIterator) &
+ multipleCheck, &value));
GNUNET_free (value);
- ASSERT (2 == api->iterateAllNow ((GNUNET_DatastoreValueIterator) &
iterateDelete, api));
- ASSERT (0 == api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY,
NULL, NULL));
+ ASSERT (2 ==
+ api->iterateAllNow ((GNUNET_DatastoreValueIterator) & iterateDelete,
+ api));
+ ASSERT (0 ==
+ api->iterateExpirationTime (GNUNET_GNUNET_ECRS_BLOCKTYPE_ANY, NULL,
+ NULL));
api->drop ();
return GNUNET_OK;
Modified: GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c
===================================================================
--- GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c 2007-11-25
12:06:33 UTC (rev 5760)
+++ GNUnet/src/applications/sqstore_sqlite/sqlitetest2.c 2007-11-25
12:07:29 UTC (rev 5761)
@@ -170,7 +170,8 @@
static int
iterateDelete (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * val, void *cls, unsigned long
long uid)
+ const GNUNET_DatastoreValue * val, void *cls,
+ unsigned long long uid)
{
GNUNET_SQstore_ServiceAPI *api = cls;
static int dc;
Modified: GNUnet/src/applications/state/state.c
===================================================================
--- GNUnet/src/applications/state/state.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/state/state.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -51,7 +51,8 @@
* @return the number of bytes read on success, -1 on failure
*/
static int
-stateReadContent (struct GNUNET_GE_Context *ectx, const char *name, void
**result)
+stateReadContent (struct GNUNET_GE_Context *ectx, const char *name,
+ void **result)
{
/* open file, must exist, open read only */
char *dbh = handle;
@@ -117,7 +118,8 @@
if (fd == -1)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER, "open", fil);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER, "open", fil);
GNUNET_free (fil);
return GNUNET_SYSERR; /* failed! */
}
@@ -153,14 +155,16 @@
if (fd == -1)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER, "open", fil);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER, "open", fil);
GNUNET_free (fil);
return GNUNET_SYSERR; /* failed! */
}
WRITE (fd, block, len);
if (0 != FTRUNCATE (fd, len))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_ADMIN, "ftruncate", fil);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_ADMIN, "ftruncate", fil);
GNUNET_disk_file_close (ectx, fil, fd);
GNUNET_free (fil);
return GNUNET_OK;
@@ -197,9 +201,10 @@
dbh = NULL;
if (-1 == GNUNET_GC_get_configuration_value_filename (capi->cfg,
- "GNUNETD",
- "GNUNETD_HOME",
-
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY, &dbh))
+ "GNUNETD",
+ "GNUNETD_HOME",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY,
+ &dbh))
return NULL;
GNUNET_GE_ASSERT (capi->ectx, dbh != NULL);
n = strlen (dbh) + strlen (DIR_EXT) + 5;
Modified: GNUnet/src/applications/stats/clientapi.c
===================================================================
--- GNUnet/src/applications/stats/clientapi.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/stats/clientapi.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -291,8 +291,9 @@
*/
int
GNUNET_STATS_get_statistics (struct GNUNET_GE_Context *ectx,
- struct GNUNET_ClientServerConnection *sock,
- GNUNET_STATS_StatisticsProcessor processor, void *cls)
+ struct GNUNET_ClientServerConnection *sock,
+ GNUNET_STATS_StatisticsProcessor processor,
+ void *cls)
{
CS_stats_reply_MESSAGE *statMsg;
GNUNET_MessageHeader csHdr;
@@ -340,8 +341,8 @@
if (mpos +
strlen (&
((char
- *) (((CS_stats_reply_MESSAGNUNET_GE_GENERIC *)
statMsg)->
- values))[mpos]) + 1 >
+ *) (((CS_stats_reply_MESSAGNUNET_GE_GENERIC *)
+ statMsg)->values))[mpos]) + 1 >
ntohs (statMsg->header.size) - sizeof (CS_stats_reply_MESSAGE))
{
GNUNET_GE_BREAK (ectx, 0);
@@ -355,13 +356,13 @@
((char
*) (((CS_stats_reply_MESSAGNUNET_GE_GENERIC *)
statMsg)->values))[mpos],
- GNUNET_ntohll
(((CS_stats_reply_MESSAGNUNET_GE_GENERIC *)
- statMsg)->values[i]), cls);
+ GNUNET_ntohll
(((CS_stats_reply_MESSAGNUNET_GE_GENERIC *) statMsg)->values[i]), cls);
}
mpos +=
strlen (&
- ((char *) (((CS_stats_reply_MESSAGNUNET_GE_GENERIC *)
statMsg)->
- values))[mpos]) + 1;
+ ((char
+ *) (((CS_stats_reply_MESSAGNUNET_GE_GENERIC *)
+ statMsg)->values))[mpos]) + 1;
}
count += ntohl (statMsg->statCounters);
} /* end while */
@@ -378,8 +379,10 @@
*/
int
GNUNET_STATS_get_available_protocols (struct GNUNET_GE_Context *ectx,
- struct GNUNET_ClientServerConnection *sock,
- GNUNET_STATS_ProtocolProcessor processor, void
*cls)
+ struct GNUNET_ClientServerConnection
+ *sock,
+ GNUNET_STATS_ProtocolProcessor
+ processor, void *cls)
{
CS_stats_get_supported_MESSAGE csStatMsg;
unsigned short i;
@@ -389,7 +392,8 @@
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);
+ csStatMsg.header.type =
+ htons (GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED);
for (j = 2; j < 4; j++)
{
csStatMsg.handlerType = htons (j);
Modified: GNUnet/src/applications/stats/gnunet-stats.c
===================================================================
--- GNUnet/src/applications/stats/gnunet-stats.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/stats/gnunet-stats.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -79,14 +79,14 @@
* All gnunet-transport-check command line options
*/
static struct GNUNET_CommandLineOption gnunetstatsOptions[] = {
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Print statistics about
GNUnet operations.")), /* -h */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Print statistics about
GNUnet operations.")), /* -h */
GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
GNUNET_COMMAND_LINE_OPTION_LOGGING, /* -L */
{'p', "protocols", NULL,
gettext_noop ("prints supported protocol messages"),
0, &GNUNET_getopt_configure_set_option, "STATS:PRINT-PROTOCOLS=YES"},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -123,12 +123,14 @@
}
res = GNUNET_STATS_get_statistics (ectx, sock, &printStatistics, stdout);
if ((GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg,
- "STATS",
- "PRINT-PROTOCOLS",
- GNUNET_NO))
+ "STATS",
+
"PRINT-PROTOCOLS",
+ GNUNET_NO))
&& (res == GNUNET_OK))
{
- res = GNUNET_STATS_get_available_protocols (ectx, sock, &printProtocols,
stdout);
+ res =
+ GNUNET_STATS_get_available_protocols (ectx, sock, &printProtocols,
+ stdout);
}
if (res != GNUNET_OK)
fprintf (stderr, _("Error reading information from gnunetd.\n"));
Modified: GNUnet/src/applications/stats/sqstats.c
===================================================================
--- GNUnet/src/applications/stats/sqstats.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/stats/sqstats.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -51,7 +51,8 @@
};
static int
-iter (const GNUNET_HashCode * key, const GNUNET_DatastoreValue * value, void
*cls)
+iter (const GNUNET_HashCode * key, const GNUNET_DatastoreValue * value,
+ void *cls)
{
struct CD *data = cls;
GNUNET_CronTime expire;
Modified: GNUnet/src/applications/stats/statistics.c
===================================================================
--- GNUnet/src/applications/stats/statistics.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/stats/statistics.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -231,7 +231,7 @@
stat_connected = statHandle (gettext_noop ("# of connected peers"));
stat_bytes_noise_received
= statHandle (gettext_noop ("# bytes of noise received"));
- stat_handles = statHandle(gettext_noop ("# plibc handles"));
+ stat_handles = statHandle (gettext_noop ("# plibc handles"));
}
static void
@@ -262,7 +262,7 @@
load = 0;
statSet (stat_handle_network_load_down, load);
statSet (stat_connected, coreAPI->forAllConnectedNodes (NULL, NULL));
- statSet (stat_handles, plibc_get_handle_count());
+ statSet (stat_handles, plibc_get_handle_count ());
}
@@ -308,21 +308,23 @@
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 -
start] =
+ ((CS_stats_reply_MESSAGNUNET_GE_GENERIC *) statMsg)->values[pos -
+ start] =
GNUNET_htonll (entries[pos].value);
mpos = sizeof (unsigned long long) * (end - start);
for (pos = start; pos < end; pos++)
{
memcpy (&
- ((char *) (((CS_stats_reply_MESSAGNUNET_GE_GENERIC *)
statMsg))->
+ ((char
+ *) (((CS_stats_reply_MESSAGNUNET_GE_GENERIC *) statMsg))->
values)[mpos], entries[pos].description,
entries[pos].descStrLen + 1);
mpos += entries[pos].descStrLen + 1;
}
statMsg->statCounters = htonl (end - start);
GNUNET_GE_ASSERT (NULL,
- mpos + sizeof (CS_stats_reply_MESSAGE) <
- GNUNET_MAX_BUFFER_SIZE);
+ mpos + sizeof (CS_stats_reply_MESSAGE) <
+ GNUNET_MAX_BUFFER_SIZE);
statMsg->header.size = htons (mpos + sizeof (CS_stats_reply_MESSAGE));
/* printf("writing message of size %d with stats %d to %d out of %d to
socket\n",
@@ -408,28 +410,33 @@
}
initializeStats ();
GNUNET_GE_LOG (capi->ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- _("`%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_P2P_PROTO_NOISE);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ _
+ ("`%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_P2P_PROTO_NOISE);
capi->registerClientHandler (GNUNET_CS_PROTO_STATS_GET_STATISTICS,
&sendStatistics);
- capi->registerClientHandler
(GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED,
- &handleMessageSupported);
- capi->registerClientHandler
(GNUNET_CS_PROTO_STATS_GET_CS_MESSAGNUNET_GE_SUPPORTED,
- &handleMessageSupported);
+ capi->
+ registerClientHandler
+ (GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED,
+ &handleMessageSupported);
+ capi->
+ registerClientHandler
+ (GNUNET_CS_PROTO_STATS_GET_CS_MESSAGNUNET_GE_SUPPORTED,
+ &handleMessageSupported);
capi->registerClientHandler (GNUNET_CS_PROTO_TRAFFIC_COUNT,
&processGetConnectionCountRequest);
capi->registerHandler (GNUNET_P2P_PROTO_NOISE, &processNoise);
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "stats",
- gettext_noop
- ("keeps statistics about
gnunetd's operation")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "stats",
+ gettext_noop
+ ("keeps
statistics about gnunetd's operation")));
#if HAVE_SQSTATS
init_sqstore_stats ();
#endif
@@ -446,10 +453,14 @@
GNUNET_GE_ASSERT (NULL, myCoreAPI != NULL);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_STATS_GET_STATISTICS,
&sendStatistics);
- coreAPI->unregisterClientHandler
(GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED,
- &handleMessageSupported);
- coreAPI->unregisterClientHandler
(GNUNET_CS_PROTO_STATS_GET_CS_MESSAGNUNET_GE_SUPPORTED,
- &handleMessageSupported);
+ coreAPI->
+ unregisterClientHandler
+ (GNUNET_CS_PROTO_STATS_GET_P2P_MESSAGNUNET_GE_SUPPORTED,
+ &handleMessageSupported);
+ coreAPI->
+ unregisterClientHandler
+ (GNUNET_CS_PROTO_STATS_GET_CS_MESSAGNUNET_GE_SUPPORTED,
+ &handleMessageSupported);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_TRAFFIC_COUNT,
&processGetConnectionCountRequest);
coreAPI->unregisterHandler (GNUNET_P2P_PROTO_NOISE, &processNoise);
Modified: GNUnet/src/applications/tbench/gnunet-tbench.c
===================================================================
--- GNUnet/src/applications/tbench/gnunet-tbench.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/tbench/gnunet-tbench.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -59,8 +59,8 @@
* All gnunet-tbench command line options
*/
static struct GNUNET_CommandLineOption gnunettbenchOptions[] = {
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Start GNUnet transport
benchmarking tool.")), /* -h */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Start GNUnet transport
benchmarking tool.")), /* -h */
{'g', "gnuplot", NULL,
gettext_noop ("output in gnuplot format"), 0,
&GNUNET_getopt_configure_set_one, &outputFormat},
@@ -85,7 +85,7 @@
gettext_noop ("time to wait for the completion of an iteration (in ms)"),
1,
&GNUNET_getopt_configure_set_ulong, &messageTimeOut},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
{'X', "xspace", "COUNT",
gettext_noop ("number of messages in a message block"), 1,
&GNUNET_getopt_configure_set_ulong, &messageTrainSize},
@@ -171,8 +171,8 @@
(GNUNET_MessageHeader **) & buffer))
{
GNUNET_GE_ASSERT (ectx,
- ntohs (buffer->header.size) ==
- sizeof (CS_tbench_reply_MESSAGE));
+ ntohs (buffer->header.size) ==
+ sizeof (CS_tbench_reply_MESSAGE));
if ((float) buffer->mean_loss < 0)
{
GNUNET_GE_BREAK (ectx, 0);
Modified: GNUnet/src/applications/tbench/tbench.c
===================================================================
--- GNUnet/src/applications/tbench/tbench.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/tbench/tbench.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -98,7 +98,8 @@
const P2P_tbench_MESSAGE *msg;
#if DEBUG_TBENCH
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
"Received tbench request\n");
+ GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Received tbench request\n");
#endif
if (ntohs (message->size) < sizeof (P2P_tbench_MESSAGE))
{
@@ -116,10 +117,10 @@
#if DEBUG_TBENCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Received request %u from iteration %u/%u\n",
- htonl (msg->packetNum),
- htonl (msg->iterationNum), htonl (msg->nounce));
+ GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Received request %u from iteration %u/%u\n",
+ htonl (msg->packetNum),
+ htonl (msg->iterationNum), htonl (msg->nounce));
#endif
reply = GNUNET_malloc (ntohs (message->size));
memcpy (reply, message, ntohs (message->size));
@@ -176,20 +177,20 @@
}
#if DEBUG_TBENCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Received response %u from iteration %u/%u on time!\n",
- htonl (pmsg->packetNum),
- htonl (pmsg->iterationNum), htonl (pmsg->nounce));
+ GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Received response %u from iteration %u/%u on time!\n",
+ htonl (pmsg->packetNum),
+ htonl (pmsg->iterationNum), htonl (pmsg->nounce));
#endif
}
else
{
#if DEBUG_TBENCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Received message %u from iteration %u too late (now at
iteration %u)\n",
- ntohl (pmsg->packetNum),
- ntohl (pmsg->iterationNum), currIteration);
+ GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Received message %u from iteration %u too late (now at
iteration %u)\n",
+ ntohl (pmsg->packetNum),
+ ntohl (pmsg->iterationNum), currIteration);
#endif
}
GNUNET_mutex_unlock (lock);
@@ -237,8 +238,9 @@
#if DEBUG_TBENCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Tbench received request from client.\n", msgCnt, size, iterations);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Tbench received request from client.\n", msgCnt, size,
+ iterations);
#endif
if (ntohs (message->size) != sizeof (CS_tbench_request_MESSAGE))
return GNUNET_SYSERR;
@@ -252,16 +254,16 @@
msgCnt = ntohl (msg->msgCnt);
#if DEBUG_TBENCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Tbench runs %u test messages of size %u in %u iterations.\n",
- msgCnt, size, iterations);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Tbench runs %u test messages of size %u in %u iterations.\n",
+ msgCnt, size, iterations);
#endif
GNUNET_mutex_lock (lock);
if (results != NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- "Cannot run multiple tbench sessions at the same time!\n");
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ "Cannot run multiple tbench sessions at the same
time!\n");
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
}
@@ -308,9 +310,9 @@
p2p->packetNum = htonl (packetNum);
#if DEBUG_TBENCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Sending message %u of size %u in iteration %u\n",
- packetNum, size, iteration);
+ GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Sending message %u of size %u in iteration %u\n",
+ packetNum, size, iteration);
#endif
coreAPI->unicast (&msg->receiverId, &p2p->header, ntohl
(msg->priority), 0); /* no delay */
if ((delay != 0) &&
@@ -331,8 +333,8 @@
GNUNET_free (p2p);
#if DEBUG_TBENCH
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
- "Done waiting for response.\n", packetNum, size, iteration);
+ GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "Done waiting for response.\n", packetNum, size, iteration);
#endif
sum_loss = 0;
@@ -404,26 +406,29 @@
if (GNUNET_SYSERR == capi->registerHandler (GNUNET_P2P_PROTO_TBENCH_REQUEST,
&handleTBenchReq))
ok = GNUNET_SYSERR;
- if (GNUNET_SYSERR == capi->registerClientHandler
(GNUNET_CS_PROTO_TBENCH_REQUEST,
- &csHandleTBenchRequest))
+ if (GNUNET_SYSERR ==
+ capi->registerClientHandler (GNUNET_CS_PROTO_TBENCH_REQUEST,
+ &csHandleTBenchRequest))
ok = GNUNET_SYSERR;
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "tbench",
- gettext_noop
- ("allows profiling of
direct "
- "peer-to-peer
connections")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "tbench",
+ gettext_noop
+ ("allows
profiling of direct "
+
"peer-to-peer connections")));
return ok;
}
void
done_module_tbench ()
{
- coreAPI->unregisterHandler (GNUNET_P2P_PROTO_TBENCH_REQUEST,
&handleTBenchReq);
- coreAPI->unregisterHandler (GNUNET_P2P_PROTO_TBENCH_REPLY,
&handleTBenchReply);
+ coreAPI->unregisterHandler (GNUNET_P2P_PROTO_TBENCH_REQUEST,
+ &handleTBenchReq);
+ coreAPI->unregisterHandler (GNUNET_P2P_PROTO_TBENCH_REPLY,
+ &handleTBenchReply);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_TBENCH_REQUEST,
&csHandleTBenchRequest);
GNUNET_mutex_destroy (lock);
Modified: GNUnet/src/applications/template/gnunet-template.c
===================================================================
--- GNUnet/src/applications/template/gnunet-template.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/template/gnunet-template.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -38,11 +38,11 @@
* All gnunetd command line options
*/
static struct GNUNET_CommandLineOption gnunettemplateOptions[] = {
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Template description.")),
/* -h */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Template description.")),
/* -h */
GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
GNUNET_COMMAND_LINE_OPTION_LOGGING, /* -L */
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -101,8 +101,9 @@
if (messageReceiveThread == NULL)
{
GNUNET_GE_DIE_STRERROR (ectx,
- GNUNET_GE_IMMEDIATE | GNUNET_GE_FATAL | GNUNET_GE_USER
| GNUNET_GE_ADMIN,
- "pthread_create");
+ GNUNET_GE_IMMEDIATE | GNUNET_GE_FATAL |
+ GNUNET_GE_USER | GNUNET_GE_ADMIN,
+ "pthread_create");
}
/* wait for shutdown... */
Modified: GNUnet/src/applications/template/template.c
===================================================================
--- GNUnet/src/applications/template/template.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/template/template.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -41,7 +41,8 @@
}
static int
-csHandle (struct GNUNET_ClientHandle *client, const GNUNET_MessageHeader *
message)
+csHandle (struct GNUNET_ClientHandle *client,
+ const GNUNET_MessageHeader * message)
{
return GNUNET_OK;
}
@@ -65,9 +66,10 @@
coreAPI = capi;
GNUNET_GE_LOG (capi->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("`%s' registering client handler %d and %d\n"),
- "template", GNUNET_CS_PROTO_MAX_USED, GNUNET_P2P_PROTO_MAX_USED);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("`%s' registering client handler %d and %d\n"),
+ "template", GNUNET_CS_PROTO_MAX_USED,
+ GNUNET_P2P_PROTO_MAX_USED);
if (GNUNET_SYSERR ==
capi->registerHandler (GNUNET_P2P_PROTO_MAX_USED, &handlep2pMSG))
ok = GNUNET_SYSERR;
Modified: GNUnet/src/applications/testbed/commands.c
===================================================================
--- GNUnet/src/applications/testbed/commands.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/testbed/commands.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -118,7 +118,8 @@
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, argSize);
+ memcpy (&((TESTBED_CS_MESSAGNUNET_GE_GENERIC *) msg)->data[0], arg,
+ argSize);
msgsz = GNUNET_client_connection_write (&nodes[peer].sock, &msg->header);
GNUNET_free (msg);
if (msgsz == GNUNET_SYSERR)
@@ -217,8 +218,8 @@
hdr = NULL;
if (GNUNET_SYSERR == GNUNET_client_connection_read (&nodes[currindex].sock,
-
(CS_MESSAGNUNET_GE_HEADER **) &
- hdr))
+ (CS_MESSAGNUNET_GE_HEADER
+ **) & hdr))
{
XPRINTF (" peer %s is not responding.\n", nodes[currindex].ips);
destroySocket (&nodes[currindex].sock);
@@ -344,7 +345,7 @@
sargv[6] = NULL; /* last argument */
execvp ("ssh", sargv);
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- " execvp failed: %s\n", STRERROR (errno));
+ " execvp failed: %s\n", STRERROR (errno));
exit (-1);
}
if (pid == -1)
@@ -408,8 +409,8 @@
hdr = NULL;
if (GNUNET_SYSERR == GNUNET_client_connection_read (&nodes[currindex].sock,
-
(CS_MESSAGNUNET_GE_HEADER **) &
- hdr))
+ (CS_MESSAGNUNET_GE_HEADER
+ **) & hdr))
{
XPRINTF (" peer %s is not responding.\n", nodes[currindex].ips);
destroySocket (&nodes[currindex].sock);
@@ -1005,7 +1006,8 @@
reply = NULL;
if (GNUNET_SYSERR ==
GNUNET_client_connection_read (&nodes[dst].sock,
- (CS_MESSAGNUNET_GE_HEADER **) &
reply))
+ (CS_MESSAGNUNET_GE_HEADER **) &
+ reply))
{
XPRINTF (" peer %s is not responding after %d of %d bytes.\n",
nodes[dst].ips, pos, ack);
@@ -1017,8 +1019,8 @@
sizeof (TESTBED_OUTPUT_REPLY_MESSAGE);
tmp = GNUNET_malloc (size + 1);
memcpy (tmp,
- &((TESTBED_OUTPUT_REPLY_MESSAGNUNET_GE_GENERIC *)
reply)->data[0],
- size);
+ &((TESTBED_OUTPUT_REPLY_MESSAGNUNET_GE_GENERIC *) reply)->
+ data[0], size);
tmp[size] = '\0';
XPRINTF ("%s", tmp);
GNUNET_free (tmp);
@@ -1255,7 +1257,9 @@
return -1;
}
CHECK_PEER (peer, argv[0]);
- opt = GNUNET_get_daemon_configuration_value (&nodes[peer].sock, argv[1],
argv[2]);
+ opt =
+ GNUNET_get_daemon_configuration_value (&nodes[peer].sock, argv[1],
+ argv[2]);
if (opt == NULL)
{
XPRINTF ("Error sending request to peer %d\n", peer);
@@ -1306,7 +1310,8 @@
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],
flen);
+ memcpy (((TESTBED_UPLOAD_FILE_MESSAGNUNET_GE_GENERIC *) msg)->buf, argv[2],
+ flen);
if (GNUNET_SYSERR ==
GNUNET_client_connection_write (&nodes[peer].sock, &msg->header.header))
@@ -1603,7 +1608,7 @@
#if DEBUG_TESTBED
GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- " Trying to download a hostlist from %s\n", reg);
+ " 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 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/testbed/gnunet-testbed.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -119,8 +119,10 @@
return GNUNET_SYSERR;
}
default:
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
GNUNET_GE_USER,
- _("Use --help to get a list of options.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_USER,
+ _("Use --help to get a list of options.\n"));
return -1;
} /* end of parsing commandline */
} /* while (1) */
@@ -169,9 +171,10 @@
res = CONNECT (sock, (struct sockaddr *) &soaddr, sizeof (soaddr));
if ((res < 0) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("Cannot connect to LOOPBACK port %d: %s\n"),
- PORT, STRERROR (errno));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("Cannot connect to LOOPBACK port %d: %s\n"), PORT,
+ STRERROR (errno));
closefile (sock);
sock = -1;
return GNUNET_SYSERR;
@@ -307,7 +310,8 @@
{
LOG_STRERROR (LOG_ERROR, "socket");
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("No client service started. Trying again in 30 seconds.\n"));
+ _
+ ("No client service started. Trying again in 30
seconds.\n"));
sleep (30);
}
@@ -322,9 +326,10 @@
if (BIND (ssock, (struct sockaddr *) &serverAddr, sizeof (serverAddr)) < 0)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Error (%s) binding the TCP listener to "
- "port %d. No proxy service started.\nTrying "
- "again in %d seconds...\n"), STRERROR (errno), PORT, secs);
+ _("Error (%s) binding the TCP listener to "
+ "port %d. No proxy service started.\nTrying "
+ "again in %d seconds...\n"), STRERROR (errno), PORT,
+ secs);
sleep (secs);
secs += 5; /* slow progression... */
closefile (ssock);
@@ -376,13 +381,16 @@
}
/* access control! */
GNUNET_GE_ASSERT (ectx,
- sizeof (struct in_addr) == sizeof (GNUNET_IPv4Address));
+ sizeof (struct in_addr) ==
+ sizeof (GNUNET_IPv4Address));
memcpy (&ipaddr, &clientAddr.sin_addr, sizeof (struct in_addr));
if (GNUNET_NO == isWhitelisted (ipaddr))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Rejected unauthorized connection from %u.%u.%u.%u.\n"),
- PRIP (ntohl (*(int *) &clientAddr.sin_addr)));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Rejected unauthorized connection from
%u.%u.%u.%u.\n"),
+ PRIP (ntohl (*(int *) &clientAddr.sin_addr)));
closefile (sock);
continue;
}
@@ -503,8 +511,10 @@
return GNUNET_SYSERR;
}
default:
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
GNUNET_GE_USER,
- _("Use --help to get a list of options.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_USER,
+ _("Use --help to get a list of options.\n"));
return -1;
} /* end of parsing commandline */
} /* while (1) */
Modified: GNUnet/src/applications/testbed/testbed.c
===================================================================
--- GNUnet/src/applications/testbed/testbed.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/testbed/testbed.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -48,8 +48,9 @@
{
if (GNUNET_OK != coreAPI->sendValueToClient (client, ack))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Could not send acknowledgement back to client.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Could not send acknowledgement back to client.\n"));
}
}
@@ -60,8 +61,8 @@
tb_undefined (GNUNET_ClientHandle client, TESTBED_CS_MESSAGE * msg)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Received unknown testbed message of type %u.\n"),
- ntohl (msg->msgType));
+ _("Received unknown testbed message of type %u.\n"),
+ ntohl (msg->msgType));
}
/**
@@ -73,26 +74,29 @@
GNUNET_MessageHeader noise;
TESTBED_ADD_PEER_MESSAGE *hm = (TESTBED_ADD_PEER_MESSAGE *) msg;
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "
tb_ADD_PEER\n");
+ GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ " tb_ADD_PEER\n");
if (sizeof (TESTBED_ADD_PEER_MESSAGE) > ntohs (msg->header.size))
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("size of `%s' message is too short. Ignoring.\n"),
- "ADD_PEER");
+ _("size of `%s' message is too short. Ignoring.\n"),
+ "ADD_PEER");
return;
}
if (GNUNET_sizeof_hello (&hm->helo) !=
ntohs (msg->header.size) - sizeof (TESTBED_CS_MESSAGE))
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("size of `%s' message is wrong. Ignoring.\n"), "_ADD_PEER");
+ _("size of `%s' message is wrong. Ignoring.\n"),
+ "_ADD_PEER");
return;
}
identity->addHost (&hm->helo);
noise.size = htons (sizeof (GNUNET_MessageHeader));
noise.type = htons (GNUNET_P2P_PROTO_NOISE);
- coreAPI->unicast (&hm->helo.senderIdentity, &noise, GNUNET_EXTREME_PRIORITY,
0);
+ coreAPI->unicast (&hm->helo.senderIdentity, &noise, GNUNET_EXTREME_PRIORITY,
+ 0);
sendAcknowledgement (client, GNUNET_OK);
}
@@ -116,7 +120,8 @@
* Disconnect from all other peers.
*/
static void
-tb_DEL_ALL_PEERS (GNUNET_ClientHandle client, TESTBED_DEL_ALL_PEERS_MESSAGE *
msg)
+tb_DEL_ALL_PEERS (GNUNET_ClientHandle client,
+ TESTBED_DEL_ALL_PEERS_MESSAGE * msg)
{
coreAPI->forAllConnectedNodes (&doDisconnect, NULL);
sendAcknowledgement (client, GNUNET_OK);
@@ -134,9 +139,11 @@
helo = identity->identity2Helo (coreAPI->myIdentity, proto, GNUNET_NO);
if (NULL == helo)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("TESTBED could not generate hello message for protocol %u\n"),
- proto);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("TESTBED could not generate hello message for protocol
%u\n"),
+ proto);
sendAcknowledgement (client, GNUNET_SYSERR);
}
else
@@ -151,8 +158,9 @@
reply->header.msgType = htonl (TESTBED_hello_RESPONSE);
memcpy (&reply->helo, helo, ntohs (helo->header.size));
coreAPI->sendToClient (client, &reply->header.header);
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "%s: returning from sendToClient\n", __FUNCTION__);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "%s: returning from sendToClient\n", __FUNCTION__);
GNUNET_free (helo);
GNUNET_free (reply);
}
@@ -190,7 +198,7 @@
tb_SET_BW (GNUNET_ClientHandle client, TESTBED_SET_BW_MESSAGE * msg)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "gnunet-testbed: tb_SET_BW\n");
+ "gnunet-testbed: tb_SET_BW\n");
setConfigurationInt ("LOAD", "MAXNETDOWNBPSTOTAL", ntohl (msg->in_bw));
setConfigurationInt ("LOAD", "MAXNETUPBPSTOTAL", ntohl (msg->out_bw));
triggerGlobalConfigurationRefresh ();
@@ -210,8 +218,9 @@
size = ntohs (msg->header.size);
if (size <= sizeof (TESTBED_CS_MESSAGE))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("received invalid `%s' message\n"), "LOAD_MODULE");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("received invalid `%s' message\n"), "LOAD_MODULE");
return;
}
@@ -222,19 +231,21 @@
}
name =
- STRNDUP (&((TESTBED_LOAD_MODULE_MESSAGNUNET_GE_GENERIC *)
msg)->modulename[0],
- size - sizeof (TESTBED_CS_MESSAGE));
+ STRNDUP (&((TESTBED_LOAD_MODULE_MESSAGNUNET_GE_GENERIC *) msg)->
+ modulename[0], size - sizeof (TESTBED_CS_MESSAGE));
if (strlen (name) == 0)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("received invalid `%s' message (empty module name)\n"),
- "LOAD_MODULE");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("received invalid `%s' message (empty module name)\n"),
+ "LOAD_MODULE");
return;
}
ok = coreAPI->loadApplicationModule (name);
if (ok != GNUNET_OK)
GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("loading module `%s' failed. Notifying client.\n"), name);
+ _("loading module `%s' failed. Notifying client.\n"),
+ name);
GNUNET_free (name);
sendAcknowledgement (client, ok);
}
@@ -252,8 +263,9 @@
size = ntohs (msg->header.size);
if (size <= sizeof (TESTBED_CS_MESSAGE))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("received invalid `%s' message\n"), "UNLOAD_MODULE");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("received invalid `%s' message\n"), "UNLOAD_MODULE");
return;
}
if (!testConfigurationString ("TESTBED", "ALLOW_MODULE_LOADING", "YES"))
@@ -263,19 +275,20 @@
}
name =
- STRNDUP (&((TESTBED_UNLOAD_MODULE_MESSAGNUNET_GE_GENERIC *)
msg)->modulename[0],
- size - sizeof (TESTBED_CS_MESSAGE));
+ STRNDUP (&((TESTBED_UNLOAD_MODULE_MESSAGNUNET_GE_GENERIC *) msg)->
+ modulename[0], size - sizeof (TESTBED_CS_MESSAGE));
if (strlen (name) == 0)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("received invalid `%s' message (empty module name)\n"),
- "UNLOAD_MODULE");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("received invalid `%s' message (empty module name)\n"),
+ "UNLOAD_MODULE");
return;
}
ok = coreAPI->unloadApplicationModule (name);
if (ok != GNUNET_OK)
GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("unloading module failed. Notifying client.\n"));
+ _("unloading module failed. Notifying client.\n"));
GNUNET_free (name);
sendAcknowledgement (client, ok);
}
@@ -317,7 +330,8 @@
* random).
*/
static void
-tb_DISABLE_hello (GNUNET_ClientHandle client, TESTBED_DISABLE_hello_MESSAGE *
msg)
+tb_DISABLE_hello (GNUNET_ClientHandle client,
+ TESTBED_DISABLE_hello_MESSAGE * msg)
{
GNUNET_free_non_null (setConfigurationString ("NETWORK",
"DISABLE-ADVERTISEMENTS",
@@ -334,7 +348,8 @@
* random).
*/
static void
-tb_ENABLE_hello (GNUNET_ClientHandle client, TESTBED_ENABLE_hello_MESSAGE *
msg)
+tb_ENABLE_hello (GNUNET_ClientHandle client,
+ TESTBED_ENABLE_hello_MESSAGE * msg)
{
GNUNET_free_non_null (setConfigurationString ("NETWORK",
"DISABLE-ADVERTISEMENTS",
@@ -349,7 +364,8 @@
* Allow only certain peers to connect.
*/
static void
-tb_ALLOW_CONNECT (GNUNET_ClientHandle client, TESTBED_ALLOW_CONNECT_MESSAGE *
msg)
+tb_ALLOW_CONNECT (GNUNET_ClientHandle client,
+ TESTBED_ALLOW_CONNECT_MESSAGE * msg)
{
char *value;
unsigned short size;
@@ -360,16 +376,18 @@
size = ntohs (msg->header.header.size);
if (size <= sizeof (TESTBED_CS_MESSAGE))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("received invalid `%s' message\n"), "ALLOW_CONNECT");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("received invalid `%s' message\n"), "ALLOW_CONNECT");
return;
}
count = (size - sizeof (TESTBED_CS_MESSAGE)) / sizeof (GNUNET_PeerIdentity);
if (count * sizeof (GNUNET_PeerIdentity) + sizeof (TESTBED_CS_MESSAGE) !=
size)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("received invalid `%s' message\n"), "ALLOW_CONNECT");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("received invalid `%s' message\n"), "ALLOW_CONNECT");
return;
}
if (count == 0)
@@ -383,8 +401,8 @@
for (i = 0; i < count; i++)
{
GNUNET_hash_to_enc (&
- ((TESTBED_ALLOW_CONNECT_MESSAGNUNET_GE_GENERIC *)
- msg)->peers[i].hashPubKey, &enc);
+ ((TESTBED_ALLOW_CONNECT_MESSAGNUNET_GE_GENERIC
+ *) msg)->peers[i].hashPubKey, &enc);
strcat (value, (char *) &enc);
}
}
@@ -399,7 +417,8 @@
* Deny certain peers the right to connect.
*/
static void
-tb_DENY_CONNECT (GNUNET_ClientHandle client, TESTBED_DENY_CONNECT_MESSAGE *
msg)
+tb_DENY_CONNECT (GNUNET_ClientHandle client,
+ TESTBED_DENY_CONNECT_MESSAGE * msg)
{
char *value;
unsigned short size;
@@ -410,16 +429,18 @@
size = ntohs (msg->header.header.size);
if (size <= sizeof (TESTBED_CS_MESSAGE))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("received invalid `%s' message\n"), "DENY_CONNECT");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("received invalid `%s' message\n"), "DENY_CONNECT");
return;
}
count = (size - sizeof (TESTBED_CS_MESSAGE)) / sizeof (GNUNET_PeerIdentity);
if (count * sizeof (GNUNET_PeerIdentity) + sizeof (TESTBED_CS_MESSAGE) !=
size)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("received invalid `%s' message\n"), "DENY_CONNECT");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("received invalid `%s' message\n"), "DENY_CONNECT");
return;
}
if (count == 0)
@@ -433,8 +454,8 @@
for (i = 0; i < count; i++)
{
GNUNET_hash_to_enc (&
- ((TESTBED_DENY_CONNECT_MESSAGNUNET_GE_GENERIC *)
msg)->
- peers[i].hashPubKey, &enc);
+ ((TESTBED_DENY_CONNECT_MESSAGNUNET_GE_GENERIC *)
+ msg)->peers[i].hashPubKey, &enc);
strcat (value, (char *) &enc);
}
}
@@ -520,10 +541,11 @@
return -1;
}
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "exec'ing: %s with %d arguments\n", pi->argv[0], pi->argc - 1);
+ "exec'ing: %s with %d arguments\n", pi->argv[0],
+ pi->argc - 1);
for (i = 1; i < pi->argc; i++)
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "exec argument %d is %s\n", i, pi->argv[i]);
+ "exec argument %d is %s\n", i, pi->argv[i]);
tmp = getConfigurationString ("TESTBED", "UPLOAD-DIR");
if (tmp == NULL)
tmp = GNUNET_strdup (DIR_SEPARATOR_STR);
@@ -631,12 +653,13 @@
(((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *) emsg)->
commandLine[size - sizeof (TESTBED_CS_MESSAGE) - 1] != '\0'))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("received invalid `%s' message: %s.\n"),
- "EXEC",
- (size <= sizeof (TESTBED_CS_MESSAGE))
- ? "size smaller or equal than TESTBED_CS_MESSAGE"
- : "last character in command line is not zero-terminator");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("received invalid `%s' message: %s.\n"), "EXEC",
+ (size <=
+ sizeof (TESTBED_CS_MESSAGE)) ?
+ "size smaller or equal than TESTBED_CS_MESSAGE" :
+ "last character in command line is not zero-terminator");
sendAcknowledgement (client, GNUNET_SYSERR);
return;
}
@@ -644,10 +667,12 @@
pi = GNUNET_malloc (sizeof (ProcessInfo));
pi->argc = 0;
for (pos = 0; pos < size; pos++)
- if (((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *) emsg)->commandLine[pos] ==
'\0')
+ if (((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *) emsg)->commandLine[pos] ==
+ '\0')
pi->argc++;
mainName =
- GNUNET_strdup (&((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *)
emsg)->commandLine[0]);
+ GNUNET_strdup (&((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *) emsg)->
+ commandLine[0]);
clientConfig = NULL;
if (0 == strncmp ("gnunet", mainName, strlen ("gnunet")))
clientConfig = getConfigurationString ("TESTBED", "CLIENTCONFIG");
@@ -658,7 +683,8 @@
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] ==
'\0')
+ if (((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *) emsg)->commandLine[pos] ==
+ '\0')
pi->argv[--argc2] =
GNUNET_strdup (&((TESTBED_EXEC_MESSAGNUNET_GE_GENERIC *) emsg)->
commandLine[pos + 1]);
@@ -814,12 +840,13 @@
char *tmp;
FILE *outfile;
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"tb_UPLOAD_FILE\n");
+ GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "tb_UPLOAD_FILE\n");
if (sizeof (TESTBED_UPLOAD_FILE_MESSAGE) > ntohs (msg->header.header.size))
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("size of `%s' message is too short. Ignoring.\n"),
- "UPLOAD_FILE");
+ _("size of `%s' message is too short. Ignoring.\n"),
+ "UPLOAD_FILE");
sendAcknowledgement (client, GNUNET_SYSERR);
return;
}
@@ -829,8 +856,10 @@
{
if (*s == '.' && *(s + 1) == '.')
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("\'..\' is not allowed in file name (%s).\n"), filename);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("\'..\' is not allowed in file name (%s).\n"),
+ filename);
return;
}
s++;
@@ -839,7 +868,8 @@
{
/* filename empty, not allowed! */
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Empty filename for UPLOAD_FILE message is invalid!\n"));
+ _
+ ("Empty filename for UPLOAD_FILE message is invalid!\n"));
sendAcknowledgement (client, GNUNET_SYSERR);
return;
}
@@ -847,15 +877,16 @@
{
/* filename empty, not allowed! */
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Filename for UPLOAD_FILE message is not null-terminated
(invalid!)\n"));
+ _
+ ("Filename for UPLOAD_FILE message is not null-terminated
(invalid!)\n"));
sendAcknowledgement (client, GNUNET_SYSERR);
return;
}
tmp = getConfigurationString ("TESTBED", "UPLOAD-DIR");
if (tmp == NULL)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
_("Upload refused!"));
+ GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Upload refused!"));
sendAcknowledgement (client, GNUNET_SYSERR);
return;
}
@@ -885,7 +916,8 @@
if (htonl (msg->type) != TESTBED_FILE_GNUNET_array_append)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Invalid message received at %s:%d."), __FILE__, __LINE__);
+ _("Invalid message received at %s:%d."), __FILE__,
+ __LINE__);
GNUNET_free (filename);
return;
}
@@ -899,7 +931,7 @@
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_MESSAGNUNET_GE_GENERIC *) msg)->buf + strlen
(((TESTBED_UPLOAD_FILE_MESSAGNUNET_GE_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);
@@ -914,7 +946,8 @@
/**
* General type of a message handler.
*/
-typedef void (*THandler) (GNUNET_ClientHandle client, TESTBED_CS_MESSAGE *
msg);
+typedef void (*THandler) (GNUNET_ClientHandle client,
+ TESTBED_CS_MESSAGE * msg);
/**
* @brief Entry in the handlers array that describes a testbed message handler.
@@ -989,7 +1022,8 @@
* on the testbed-message type.
*/
static void
-csHandleTestbedRequest (GNUNET_ClientHandle client, CS_MESSAGNUNET_GE_HEADER *
message)
+csHandleTestbedRequest (GNUNET_ClientHandle client,
+ CS_MESSAGNUNET_GE_HEADER * message)
{
TESTBED_CS_MESSAGE *msg;
unsigned short size;
@@ -997,13 +1031,15 @@
#if DEBUG_TESTBED
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TESTBED handleTestbedRequest\n");
+ "TESTBED handleTestbedRequest\n");
#endif
size = ntohs (message->size);
if (size < sizeof (TESTBED_CS_MESSAGE))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("received invalid testbed message of size %u\n"), size);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("received invalid testbed message of size %u\n"),
+ size);
return;
}
msg = (TESTBED_CS_MESSAGE *) message;
@@ -1013,18 +1049,20 @@
if ((handlers[id].expectedSize == 0) ||
(handlers[id].expectedSize == size))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "TESTBED received message of type %u.\n", id);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "TESTBED received message of type %u.\n", id);
handlers[id].handler (client, msg);
}
else
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _
- ("Received testbed message of type %u but unexpected size
%u, expected %u\n"),
- id, size, handlers[id].expectedSize);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Received testbed message of type %u but unexpected
size %u, expected %u\n"),
+ id, size, handlers[id].expectedSize);
}
}
else
@@ -1067,8 +1105,9 @@
reg = getConfigurationString ("TESTBED", "REGISTERURL");
if (reg == NULL)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- _("No testbed URL given, not registered.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("No testbed URL given, not registered.\n"));
return;
}
@@ -1077,8 +1116,10 @@
{
if (GNUNET_OK != GNUNET_get_host_by_name (ectx, proxy, &ip_info))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Could not resolve name of HTTP proxy `%s'.\n"), proxy);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Could not resolve name of HTTP proxy `%s'.\n"),
+ proxy);
theProxy.sin_addr.s_addr = 0;
}
else
@@ -1105,8 +1146,10 @@
if (0 != strncmp (HTTP_URL, reg, strlen (HTTP_URL)))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Invalid URL `%s' (must begin with `%s')\n"), reg, HTTP_URL);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Invalid URL `%s' (must begin with `%s')\n"), reg,
+ HTTP_URL);
return;
}
port = 80; /* default http port */
@@ -1145,10 +1188,11 @@
port = strtol (pstring, &buffer, 10);
if ((port < 0) || (port > 65536))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _
- ("Malformed http URL: `%s' at `%s'. Testbed-client not
registered.\n"),
- reg, buffer);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Malformed http URL: `%s' at `%s'. Testbed-client
not registered.\n"),
+ reg, buffer);
GNUNET_free (hostname);
GNUNET_free (reg);
GNUNET_free (pstring);
@@ -1160,7 +1204,7 @@
#if DEBUG_TESTBED
GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Trying to (un)register testbed client at %s\n", reg);
+ "Trying to (un)register testbed client at %s\n", reg);
#endif
@@ -1180,9 +1224,10 @@
/* no proxy */
if (GNUNET_OK != GNUNET_get_host_by_name (ectx, hostname, &ip_info))
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Could not register testbed, host `%s' unknown\n"),
- hostname);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Could not register testbed, host `%s' unknown\n"),
+ hostname);
GNUNET_free (reg);
GNUNET_free (hostname);
return;
@@ -1201,9 +1246,10 @@
(struct sockaddr *) &soaddr,
sizeof (soaddr)) < 0 && errno != EWOULDBLOCK)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Failed to send HTTP request to host `%s': %s\n"),
- hostname, STRERROR (errno));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Failed to send HTTP request to host `%s': %s\n"),
+ hostname, STRERROR (errno));
GNUNET_free (reg);
GNUNET_free (hostname);
closefile (sock);
@@ -1238,9 +1284,10 @@
curpos = SEND_BLOCKING_ALL (sock, command, curpos);
if (GNUNET_SYSERR == (int) curpos)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Failed so send HTTP request `%s' to host `%s': %s\n"),
- command, hostname, STRERROR (errno));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Failed so send HTTP request `%s' to host `%s': %s\n"),
+ command, hostname, STRERROR (errno));
GNUNET_free (command);
GNUNET_free (hostname);
closefile (sock);
@@ -1275,14 +1322,15 @@
closefile (sock);
if (curpos < 4)
{ /* invalid response */
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Exit register (error: no http response read).\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Exit register (error: no http response read).\n"));
}
#if DEBUG_TESTBED
GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Exit register (%d seconds before timeout)\n",
- (int) (start + 300 * GNUNET_CRON_SECONDS -
- GNUNET_get_time ()) / GNUNET_CRON_SECONDS);
+ "Exit register (%d seconds before timeout)\n",
+ (int) (start + 300 * GNUNET_CRON_SECONDS -
+ GNUNET_get_time ()) / GNUNET_CRON_SECONDS);
#endif
}
@@ -1362,26 +1410,29 @@
GNUNET_mutex_create (&lock);
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TESTBED registering handler %d!\n",
GNUNET_CS_PROTO_TESTBED_REQUEST);
+ "TESTBED registering handler %d!\n",
+ GNUNET_CS_PROTO_TESTBED_REQUEST);
coreAPI = capi;
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- capi->registerClientExitHandler (&testbedClientExitHandler));
+ GNUNET_SYSERR !=
+ capi->
+ registerClientExitHandler (&testbedClientExitHandler));
GNUNET_GE_ASSERT (ectx,
- GNUNET_SYSERR !=
- capi->registerClientHandler (GNUNET_CS_PROTO_TESTBED_REQUEST,
- (GNUNET_ClientRequestHandler) &
- csHandleTestbedRequest));
+ GNUNET_SYSERR !=
+ capi->
+ registerClientHandler (GNUNET_CS_PROTO_TESTBED_REQUEST,
+ (GNUNET_ClientRequestHandler) &
+ csHandleTestbedRequest));
httpRegister ("startup");
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "testbed",
- gettext_noop
- ("allows construction of
a P2P-testbed"
- " (incomplete)")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "testbed",
+ gettext_noop
+ ("allows
construction of a P2P-testbed"
+ "
(incomplete)")));
return GNUNET_OK;
}
@@ -1411,9 +1462,11 @@
httpRegister ("shutdown");
GNUNET_mutex_destroy (&lock);
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TESTBED unregistering handler %d\n",
GNUNET_CS_PROTO_TESTBED_REQUEST);
+ "TESTBED unregistering handler %d\n",
+ GNUNET_CS_PROTO_TESTBED_REQUEST);
coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_TESTBED_REQUEST,
- (GNUNET_ClientRequestHandler) &
csHandleTestbedRequest);
+ (GNUNET_ClientRequestHandler) &
+ csHandleTestbedRequest);
coreAPI->unregisterClientExitHandler (&testbedClientExitHandler);
coreAPI->releaseService (identity);
identity = NULL;
Modified: GNUnet/src/applications/testing/testing.c
===================================================================
--- GNUnet/src/applications/testing/testing.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/testing/testing.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -37,19 +37,20 @@
unsigned long long old;
if ((GNUNET_YES == GNUNET_GC_have_configuration_value (cfg,
- section,
- "PORT")) &&
+ section,
+ "PORT")) &&
(0 == GNUNET_GC_get_configuration_value_number (cfg,
- section,
- "PORT",
- 0, 65535, 65535, &old)))
+ section,
+ "PORT",
+ 0, 65535, 65535, &old)))
{
old += offset;
GNUNET_GE_ASSERT (NULL,
- 0 == GNUNET_GC_set_configuration_value_number (cfg,
- NULL,
- section,
- "PORT", old));
+ 0 == GNUNET_GC_set_configuration_value_number (cfg,
+ NULL,
+ section,
+ "PORT",
+ old));
}
}
@@ -113,24 +114,28 @@
updatePort (cfg, "HTTP", tra_offset);
updatePort (cfg, "SMTP", tra_offset);
GNUNET_GC_set_configuration_value_string (cfg,
- NULL,
- "PATHS", "GNUNETD_HOME", gnunetd_home);
+ NULL,
+ "PATHS", "GNUNETD_HOME",
+ gnunetd_home);
if (transports != NULL)
GNUNET_GC_set_configuration_value_string (cfg,
- NULL,
- "GNUNETD", "TRANSPORTS", transports);
+ NULL,
+ "GNUNETD", "TRANSPORTS",
+ transports);
if (applications != NULL)
GNUNET_GC_set_configuration_value_string (cfg,
- NULL,
- "GNUNETD",
- "APPLICATIONS", applications);
- GNUNET_GC_set_configuration_value_number (cfg, NULL, "NETWORK", "PORT",
app_port);
+ NULL,
+ "GNUNETD",
+ "APPLICATIONS", applications);
+ GNUNET_GC_set_configuration_value_number (cfg, NULL, "NETWORK", "PORT",
+ app_port);
dpath = GNUNET_strdup ("/tmp/gnunet-config.XXXXXX");
ret = mkstemp (dpath);
if (ret == -1)
{
GNUNET_GE_LOG_STRERROR_FILE (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
"mkstemp", dpath);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "mkstemp", dpath);
GNUNET_free (dpath);
GNUNET_GC_free (cfg);
return GNUNET_SYSERR;
@@ -149,7 +154,8 @@
cfg = GNUNET_GC_create ();
/* cfg is now client CFG for GNUNET_daemon_start */
GNUNET_snprintf (host, 128, "localhost:%u", app_port);
- GNUNET_GC_set_configuration_value_string (cfg, NULL, "NETWORK", "HOST",
host);
+ GNUNET_GC_set_configuration_value_string (cfg, NULL, "NETWORK", "HOST",
+ host);
ret = GNUNET_daemon_start (NULL, cfg, dpath, GNUNET_NO);
if (ret == -1)
@@ -224,13 +230,13 @@
ret = GNUNET_SYSERR;
GNUNET_snprintf (host, 128, "localhost:%u", port1);
- GNUNET_GC_set_configuration_value_string (cfg1, NULL, "NETWORK", "HOST",
host);
+ GNUNET_GC_set_configuration_value_string (cfg1, NULL, "NETWORK", "HOST",
+ host);
GNUNET_snprintf (host, 128, "localhost:%u", port2);
- GNUNET_GC_set_configuration_value_string (cfg2, NULL, "NETWORK", "HOST",
host);
- if ((GNUNET_OK == GNUNET_wait_for_daemon_running (NULL,
- cfg1,
- 300 *
- GNUNET_CRON_SECONDS))
+ GNUNET_GC_set_configuration_value_string (cfg2, NULL, "NETWORK", "HOST",
+ host);
+ if ((GNUNET_OK ==
+ GNUNET_wait_for_daemon_running (NULL, cfg1, 300 * GNUNET_CRON_SECONDS))
&& (GNUNET_OK ==
GNUNET_wait_for_daemon_running (NULL, cfg2,
300 * GNUNET_CRON_SECONDS)))
Modified: GNUnet/src/applications/topology_default/topology.c
===================================================================
--- GNUnet/src/applications/topology_default/topology.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/topology_default/topology.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -187,8 +187,9 @@
{
#if DEBUG_TOPOLOGY
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "No peers found for slot %u\n", index);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER, "No peers found for slot %u\n",
+ index);
#endif
return; /* no matching peers found! */
}
@@ -202,22 +203,24 @@
return; /* should happen really rarely */
if (coreAPI->computeIndex (&indexMatch.match) != index)
{
- GNUNET_GE_BREAK (NULL, 0); /* should REALLY not happen */
+ GNUNET_GE_BREAK (NULL, 0); /* should REALLY not happen */
return;
}
if (GNUNET_OK == coreAPI->queryPeerStatus (&indexMatch.match, NULL, NULL))
{
- GNUNET_GE_BREAK (NULL, 0); /* should REALLY not happen */
+ GNUNET_GE_BREAK (NULL, 0); /* should REALLY not happen */
return;
}
#if DEBUG_TOPOLOGY
IF_GELOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&indexMatch.match.hashPubKey, &enc));
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER,
- "Trying to connect to peer `%s'\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER, "Trying to connect to peer `%s'\n",
+ &enc);
#endif
if (GNUNET_NO == identity->isBlacklisted (&indexMatch.match, GNUNET_YES))
{
@@ -243,8 +246,8 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&hostId->hashPubKey, &enc));
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Received liveness confirmation from `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "Received liveness confirmation from `%s'.\n", &enc);
#endif
coreAPI->confirmSessionUp (hostId);
@@ -285,9 +288,10 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&peer->hashPubKey, &enc));
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Peer `%s' was inactive for %llus. Sending PING.\n",
- &enc, (now - act) / GNUNET_CRON_SECONDS);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Peer `%s' was inactive for %llus. Sending PING.\n",
+ &enc, (now - act) / GNUNET_CRON_SECONDS);
#endif
@@ -316,9 +320,9 @@
int autoconnect;
autoconnect = GNUNET_GC_get_configuration_value_yesno (coreAPI->cfg,
- "GNUNETD",
- "DISABLE-AUTOCONNECT",
- GNUNET_NO);
+ "GNUNETD",
+ "DISABLE-AUTOCONNECT",
+ GNUNET_NO);
slotCount = coreAPI->getSlotCount ();
if ((GNUNET_NO == autoconnect) && (saturation < 1))
{
@@ -466,12 +470,12 @@
myTopology = capi->requestService ("topology");
GNUNET_GE_ASSERT (capi->ectx, myTopology != NULL);
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "topology",
- gettext_noop
- ("maintains GNUnet
default mesh topology")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "topology",
+ gettext_noop
+ ("maintains
GNUnet default mesh topology")));
return GNUNET_OK;
}
Modified: GNUnet/src/applications/topology_f2f/topology.c
===================================================================
--- GNUnet/src/applications/topology_f2f/topology.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/topology_f2f/topology.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -208,12 +208,12 @@
if (0 == memcmp (coreAPI->myIdentity,
&indexMatch.match, sizeof (GNUNET_PeerIdentity)))
{
- GNUNET_GE_BREAK (ectx, 0); /* should not happen, at least not
often... */
+ GNUNET_GE_BREAK (ectx, 0); /* should not happen, at least not
often... */
return;
}
if (coreAPI->computeIndex (&indexMatch.match) != index)
{
- GNUNET_GE_BREAK (ectx, 0); /* should REALLY not happen */
+ GNUNET_GE_BREAK (ectx, 0); /* should REALLY not happen */
return;
}
#if DEBUG_TOPOLOGY
@@ -221,8 +221,8 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&indexMatch.match.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Topology: trying to connect to `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Topology: trying to connect to `%s'.\n", &enc);
#endif
if (GNUNET_NO == identity->isBlacklisted (&indexMatch.match, GNUNET_YES))
{
@@ -246,8 +246,8 @@
GNUNET_hash_to_enc (&hostId->hashPubKey, &enc);
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Received pong from `%s', telling core that peer is still alive.\n",
- (char *) &enc);
+ "Received pong from `%s', telling core that peer is still
alive.\n",
+ (char *) &enc);
#endif
coreAPI->confirmSessionUp (hostId);
GNUNET_free (hostId);
@@ -285,9 +285,9 @@
#if DEBUG_TOPOLOGY
GNUNET_hash_to_enc (&hi->hashPubKey, &enc);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Sending ping to `%s' to prevent connection timeout.\n",
- (char *) &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Sending ping to `%s' to prevent connection timeout.\n",
+ (char *) &enc);
#endif
if (GNUNET_OK !=
pingpong->ping (peer, ¬ifyPONG, hi, GNUNET_NO, rand ()))
@@ -309,9 +309,9 @@
int autoconnect;
autoconnect = GNUNET_GC_get_configuration_value_yesno (coreAPI->cfg,
- "GNUNETD",
- "DISABLE-AUTOCONNECT",
- GNUNET_NO);
+ "GNUNETD",
+ "DISABLE-AUTOCONNECT",
+ GNUNET_NO);
slotCount = coreAPI->getSlotCount ();
if ((GNUNET_NO == autoconnect) && (saturation < 1))
{
@@ -361,15 +361,17 @@
GNUNET_array_grow (friends, friendCount, 0);
fn = NULL;
GNUNET_GC_get_configuration_value_filename (cfg,
- "F2F",
- "FRIENDS",
- GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
"/friends", &fn);
- if ((0 == GNUNET_disk_file_test (ectx, fn)) ||
- (GNUNET_OK != GNUNET_disk_file_size (ectx, fn, &size, GNUNET_YES)))
+ "F2F",
+ "FRIENDS",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
+ "/friends", &fn);
+ if ((0 == GNUNET_disk_file_test (ectx, fn))
+ || (GNUNET_OK != GNUNET_disk_file_size (ectx, fn, &size, GNUNET_YES)))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_ERROR |
GNUNET_GE_IMMEDIATE,
- "Could not read friends list `%s'\n", fn);
+ GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_ERROR |
+ GNUNET_GE_IMMEDIATE,
+ "Could not read friends list `%s'\n", fn);
GNUNET_free (fn);
return GNUNET_SYSERR;
}
@@ -377,8 +379,8 @@
if (size != GNUNET_disk_file_read (ectx, fn, size, data))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Failed to read friends list from `%s'\n"), fn);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Failed to read friends list from `%s'\n"), fn);
GNUNET_free (fn);
GNUNET_free (data);
return GNUNET_SYSERR;
@@ -393,9 +395,9 @@
if (!isspace (enc.encoding[sizeof (GNUNET_EncName) - 1]))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Syntax error in topology specification, skipping
bytes.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Syntax error in topology specification, skipping
bytes.\n"));
continue;
}
enc.encoding[sizeof (GNUNET_EncName) - 1] = '\0';
@@ -407,10 +409,10 @@
else
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Syntax error in topology specification, skipping bytes
`%s'.\n"),
- &enc);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Syntax error in topology specification, skipping
bytes `%s'.\n"),
+ &enc);
}
pos = pos + sizeof (GNUNET_EncName);
while ((pos < size) && isspace (data[pos]))
@@ -451,7 +453,7 @@
return NULL;
}
if (0 != GNUNET_GC_attach_change_listener (coreAPI->cfg,
- &rereadConfiguration, NULL))
+ &rereadConfiguration, NULL))
{
GNUNET_GE_BREAK (ectx, 0);
capi->releaseService (identity);
@@ -512,12 +514,12 @@
myTopology = capi->requestService ("topology");
GNUNET_GE_ASSERT (ectx, myTopology != NULL);
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "topology",
- gettext_noop
- ("maintains a
friend-to-friend restricted topology")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "topology",
+ gettext_noop
+ ("maintains
a friend-to-friend restricted topology")));
return GNUNET_OK;
}
Modified: GNUnet/src/applications/tracekit/gnunet-tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/gnunet-tracekit.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/tracekit/gnunet-tracekit.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -41,7 +41,7 @@
* All gnunet-tracekit command line options
*/
static struct GNUNET_CommandLineOption gnunettracekitOptions[] = {
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
{'D', "depth", "DEPTH",
gettext_noop ("probe network to the given DEPTH"), 1,
&GNUNET_getopt_configure_set_option, "GNUNET-TRACEKIT:HOPS"},
@@ -50,13 +50,13 @@
("specify output format; 0 for human readable output, 1 for dot, 2 for
vcg"),
1,
&GNUNET_getopt_configure_set_option, "GNUNET-TRACEKIT:FORMAT"},
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Start GNUnet transport
benchmarking tool.")), /* -h */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Start GNUnet transport
benchmarking tool.")), /* -h */
GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
GNUNET_COMMAND_LINE_OPTION_LOGGING, /* -L */
{'P', "priority", "PRIO",
gettext_noop ("use PRIO for the priority of the trace request"), 1,
&GNUNET_getopt_configure_set_option, "GNUNET-TRACEKIT:PRIORITY"},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
{'W', "wait", "DELAY",
gettext_noop ("wait DELAY seconds for replies"), 1,
&GNUNET_getopt_configure_set_option, "GNUNET-TRACEKIT:WAIT"},
@@ -103,8 +103,8 @@
buffer = GNUNET_malloc (GNUNET_MAX_BUFFER_SIZE);
if (-1 ==
GNUNET_GC_get_configuration_value_number (cfg,
- "GNUNET-TRACEKIT",
- "FORMAT", 0, 2, 0, &format))
+ "GNUNET-TRACEKIT",
+ "FORMAT", 0, 2, 0, &format))
{
printf (_("Format specification invalid. "
"Use 0 for user-readable, 1 for dot, 2 for vcg.\n"));
@@ -180,8 +180,10 @@
match = GNUNET_NO;
for (j = 0; j < psCount; j++)
if (0 ==
- memcmp (&((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC *)
buffer)->
- peerList[i].hashPubKey, &peersSeen[j].hashPubKey,
+ memcmp (&
+ ((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC *)
+ buffer)->peerList[i].hashPubKey,
+ &peersSeen[j].hashPubKey,
sizeof (GNUNET_HashCode)))
match = GNUNET_YES;
if (match == GNUNET_NO)
@@ -189,14 +191,15 @@
if (psCount == psSize)
GNUNET_array_grow (peersSeen, psSize, psSize * 2);
memcpy (&peersSeen[psCount++],
- &((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC *)
buffer)->
- peerList[i].hashPubKey,
+ &((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC *)
+ buffer)->peerList[i].hashPubKey,
sizeof (GNUNET_PeerIdentity));
}
GNUNET_hash_to_enc (&
- ((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC *)
- buffer)->peerList[i].hashPubKey, &other);
+ ((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC
+ *) buffer)->peerList[i].hashPubKey,
+ &other);
switch (format)
{
case 0:
@@ -328,7 +331,8 @@
GNUNET_thread_create (&receiveThread, sock, 128 * 1024);
if (messageReceiveThread == NULL)
GNUNET_GE_DIE_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE | GNUNET_GE_ADMIN,
"pthread_create");
+ GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_ADMIN, "pthread_create");
probe.header.size = htons (sizeof (CS_tracekit_probe_MESSAGE));
probe.header.type = htons (GNUNET_CS_PROTO_TRACEKIT_PROBE);
@@ -339,8 +343,8 @@
if (GNUNET_SYSERR == GNUNET_client_connection_write (sock, &probe.header))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Could not send request to gnunetd.\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Could not send request to gnunetd.\n"));
return -1;
}
cron = cron_create (ectx);
Modified: GNUnet/src/applications/tracekit/tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/tracekit.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/tracekit/tracekit.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -70,16 +70,17 @@
hostCount * sizeof (GNUNET_PeerIdentity))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Received invalid `%s' message from `%s'.\n"),
- "P2P_tracekit_probe_MESSAGE", &sen);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Received invalid `%s' message from `%s'.\n"),
+ "P2P_tracekit_probe_MESSAGE", &sen);
return GNUNET_SYSERR;
}
reply = (P2P_tracekit_reply_MESSAGE *) message;
GNUNET_hash_to_enc (&reply->initiatorId.hashPubKey, &initiator);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT: Sending reply back to initiator `%s'.\n", &initiator);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "TRACEKIT: Sending reply back to initiator `%s'.\n",
+ &initiator);
GNUNET_mutex_lock (lock);
for (i = 0; i < MAXROUTE; i++)
{
@@ -93,8 +94,8 @@
sizeof (GNUNET_HashCode))))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT: found matching entry in routing table\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "TRACEKIT: found matching entry in routing table\n");
if (0 == memcmp (&coreAPI->myIdentity->hashPubKey,
&routeTable[i]->replyTo.hashPubKey,
sizeof (GNUNET_HashCode)))
@@ -104,8 +105,9 @@
idx = ntohl (reply->clientId);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT: I am initiator, sending to client.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "TRACEKIT: I am initiator, sending to client.\n");
if (idx >= clientCount)
{
GNUNET_GE_BREAK (ectx, 0);
@@ -114,9 +116,10 @@
if (clients[idx] == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT: received response on slot %u, but client
already exited.\n",
- idx);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "TRACEKIT: received response on slot %u, but
client already exited.\n",
+ idx);
continue; /* discard */
}
@@ -130,7 +133,8 @@
hostCount * sizeof (GNUNET_PeerIdentity));
csReply->header.type = htons (GNUNET_CS_PROTO_TRACEKIT_REPLY);
csReply->responderId = reply->responderId;
- memcpy (&((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC *) csReply)->
+ memcpy (&
+ ((CS_tracekit_reply_MESSAGNUNET_GE_GENERIC *) csReply)->
peerList[0],
&((P2P_tracekit_reply_MESSAGNUNET_GE_GENERIC *) reply)->
peerList[0], hostCount * sizeof (GNUNET_PeerIdentity));
@@ -144,10 +148,11 @@
GNUNET_hash_to_enc (&routeTable[i]->replyTo.hashPubKey, &hop);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT: forwarding to next hop `%s'\n", &hop);
- coreAPI->unicast (&routeTable[i]->replyTo,
- message, routeTable[i]->priority, 0);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "TRACEKIT: forwarding to next hop `%s'\n", &hop);
+ coreAPI->unicast (&routeTable[i]->replyTo, message,
+ routeTable[i]->priority, 0);
}
}
}
@@ -207,21 +212,22 @@
if (ntohs (message->size) != sizeof (P2P_tracekit_probe_MESSAGE))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Received invalid `%s' message from `%s'.\n"),
- "P2P_tracekit_probe_MESSAGE", &sen);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Received invalid `%s' message from `%s'.\n"),
+ "P2P_tracekit_probe_MESSAGE", &sen);
return GNUNET_SYSERR;
}
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "TRACEKIT:
received probe\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "TRACEKIT: received probe\n");
GNUNET_get_time_int32 (&now);
msg = (P2P_tracekit_probe_MESSAGE *) message;
if ((GNUNET_Int32Time) ntohl (msg->timestamp) > 3600 + now)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT: probe has timestamp in the far future (%d > %d),
dropping\n",
- ntohl (msg->timestamp), 3600 + now);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "TRACEKIT: probe has timestamp in the far future (%d >
%d), dropping\n",
+ ntohl (msg->timestamp), 3600 + now);
return GNUNET_SYSERR; /* Timestamp is more than 1h in the future.
Invalid! */
}
GNUNET_hash_to_enc (&msg->initiatorId.hashPubKey, &init);
@@ -238,9 +244,9 @@
sizeof (GNUNET_HashCode)))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT-PROBE %d from `%s' received twice (slot %d),
ignored\n",
- ntohl (msg->timestamp), &init, i);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "TRACEKIT-PROBE %d from `%s' received twice (slot
%d), ignored\n",
+ ntohl (msg->timestamp), &init, i);
GNUNET_mutex_unlock (lock);
return GNUNET_OK;
}
@@ -272,8 +278,9 @@
{
GNUNET_mutex_unlock (lock);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("TRACEKIT: routing table full, trace request dropped\n"));
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _
+ ("TRACEKIT: routing table full, trace request
dropped\n"));
return GNUNET_OK;
}
if (routeTable[sel] == NULL)
@@ -284,9 +291,9 @@
routeTable[sel]->replyTo = *sender;
GNUNET_mutex_unlock (lock);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT-PROBE started at %d by peer `%s' received, processing in
slot %d with %u hops\n",
- ntohl (msg->timestamp), &init, sel, ntohl (msg->hopsToGo));
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "TRACEKIT-PROBE started at %d by peer `%s' received,
processing in slot %d with %u hops\n",
+ ntohl (msg->timestamp), &init, sel, ntohl (msg->hopsToGo));
hops = ntohl (msg->hopsToGo);
/* forward? */
if (hops > 0)
@@ -334,7 +341,8 @@
}
static int
-csHandle (struct GNUNET_ClientHandle *client, const GNUNET_MessageHeader *
message)
+csHandle (struct GNUNET_ClientHandle *client,
+ const GNUNET_MessageHeader * message)
{
int i;
int idx;
@@ -342,17 +350,17 @@
P2P_tracekit_probe_MESSAGE p2pProbe;
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT: client sends probe request\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_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))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("TRACEKIT: received invalid `%s' message\n"),
- "CS_tracekit_probe_MESSAGE");
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("TRACEKIT: received invalid `%s' message\n"),
+ "CS_tracekit_probe_MESSAGE");
return GNUNET_SYSERR;
}
@@ -379,8 +387,8 @@
clients[idx] = client;
GNUNET_mutex_unlock (lock);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT: client joins in slot %u.\n", idx);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "TRACEKIT: client joins in slot %u.\n", idx);
p2pProbe.header.size = htons (sizeof (P2P_tracekit_probe_MESSAGE));
p2pProbe.header.type = htons (GNUNET_P2P_PROTO_TRACEKIT_PROBE);
@@ -404,8 +412,8 @@
if (clients[i] == c)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT: client in slot %u exits.\n", i);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "TRACEKIT: client in slot %u exits.\n", i);
clients[i] = NULL;
break;
}
@@ -427,10 +435,11 @@
lock = GNUNET_mutex_create (GNUNET_NO);
coreAPI = capi;
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "TRACEKIT registering handlers %d %d and %d\n",
- GNUNET_P2P_PROTO_TRACEKIT_PROBE,
- GNUNET_P2P_PROTO_TRACEKIT_REPLY, GNUNET_CS_PROTO_TRACEKIT_PROBE);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "TRACEKIT registering handlers %d %d and %d\n",
+ GNUNET_P2P_PROTO_TRACEKIT_PROBE,
+ GNUNET_P2P_PROTO_TRACEKIT_REPLY,
+ GNUNET_CS_PROTO_TRACEKIT_PROBE);
memset (routeTable, 0, MAXROUTE * sizeof (RTE *));
if (GNUNET_SYSERR == capi->registerHandler (GNUNET_P2P_PROTO_TRACEKIT_PROBE,
&handlep2pProbe))
@@ -440,16 +449,17 @@
ok = GNUNET_SYSERR;
if (GNUNET_SYSERR == capi->registerClientExitHandler (&clientExitHandler))
ok = GNUNET_SYSERR;
- if (GNUNET_SYSERR == capi->registerClientHandler
(GNUNET_CS_PROTO_TRACEKIT_PROBE,
-
(GNUNET_ClientRequestHandler) & csHandle))
+ if (GNUNET_SYSERR ==
+ capi->registerClientHandler (GNUNET_CS_PROTO_TRACEKIT_PROBE,
+ (GNUNET_ClientRequestHandler) & csHandle))
ok = GNUNET_SYSERR;
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "tracekit",
- gettext_noop
- ("allows mapping of the
network topology")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "tracekit",
+ gettext_noop
+ ("allows
mapping of the network topology")));
return ok;
}
@@ -458,10 +468,13 @@
{
int i;
- coreAPI->unregisterHandler (GNUNET_P2P_PROTO_TRACEKIT_PROBE,
&handlep2pProbe);
- coreAPI->unregisterHandler (GNUNET_P2P_PROTO_TRACEKIT_REPLY,
&handlep2pReply);
+ coreAPI->unregisterHandler (GNUNET_P2P_PROTO_TRACEKIT_PROBE,
+ &handlep2pProbe);
+ coreAPI->unregisterHandler (GNUNET_P2P_PROTO_TRACEKIT_REPLY,
+ &handlep2pReply);
coreAPI->unregisterClientExitHandler (&clientExitHandler);
- coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_TRACEKIT_PROBE, &csHandle);
+ coreAPI->unregisterClientHandler (GNUNET_CS_PROTO_TRACEKIT_PROBE,
+ &csHandle);
for (i = 0; i < MAXROUTE; i++)
{
GNUNET_free_non_null (routeTable[i]);
Modified: GNUnet/src/applications/traffic/traffic.c
===================================================================
--- GNUnet/src/applications/traffic/traffic.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/traffic/traffic.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -323,12 +323,12 @@
{
if (counters[i]->send.slots != 0)
buildSummary (&((CS_traffic_info_MESSAGNUNET_GE_GENERIC *) reply)->
- counters[count++], &counters[i]->send,
GNUNET_TRAFFIC_TYPE_SENT,
- countTimeUnits, i);
+ 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)->
- counters[count++], &counters[i]->receive,
GNUNET_TRAFFIC_TYPE_RECEIVED,
- countTimeUnits, i);
+ counters[count++], &counters[i]->receive,
+ GNUNET_TRAFFIC_TYPE_RECEIVED, countTimeUnits, i);
}
GNUNET_mutex_unlock (lock);
@@ -549,7 +549,8 @@
*/
static int
plaintextReceive (const GNUNET_PeerIdentity * receiver,
- const GNUNET_MessageHeader * header, GNUNET_TSession *
session)
+ const GNUNET_MessageHeader * header,
+ GNUNET_TSession * session)
{
unsigned short port;
@@ -573,8 +574,9 @@
coreAPI = capi;
#if DEBUG
GNUNET_GC_get_configuration_value_number (capi->cfg,
- "NETWORK",
- "PORT", 0, 65536, 2087, &server_port);
+ "NETWORK",
+ "PORT", 0, 65536, 2087,
+ &server_port);
#endif
api.get = &getTrafficStats;
for (i = 0; i < GNUNET_P2P_PROTO_MAX_USED; i++)
@@ -637,14 +639,15 @@
myCoreAPI = NULL;
return GNUNET_SYSERR;
}
- capi->registerClientHandler (GNUNET_CS_PROTO_TRAFFIC_QUERY,
&trafficQueryHandler);
+ capi->registerClientHandler (GNUNET_CS_PROTO_TRAFFIC_QUERY,
+ &trafficQueryHandler);
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "traffic",
- gettext_noop
- ("tracks bandwidth
utilization by gnunetd")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "traffic",
+ gettext_noop
+ ("tracks
bandwidth utilization by gnunetd")));
return GNUNET_OK;
}
@@ -656,9 +659,10 @@
{
GNUNET_GE_ASSERT (NULL, myCoreAPI != NULL);
GNUNET_GE_ASSERT (myCoreAPI->ectx,
- GNUNET_SYSERR !=
- myCoreAPI->unregisterClientHandler (GNUNET_CS_PROTO_TRAFFIC_QUERY,
- &trafficQueryHandler));
+ GNUNET_SYSERR !=
+ myCoreAPI->
+ unregisterClientHandler (GNUNET_CS_PROTO_TRAFFIC_QUERY,
+ &trafficQueryHandler));
myCoreAPI->releaseService (myApi);
myApi = NULL;
myCoreAPI = NULL;
Modified: GNUnet/src/applications/transport/transport.c
===================================================================
--- GNUnet/src/applications/transport/transport.c 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/applications/transport/transport.c 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -187,10 +187,10 @@
if ((prot >= tapis_count) || (tapis[prot] == NULL))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _
- ("Converting peer address to string failed, transport type %d
not supported\n"),
- ntohs (hello->protocol));
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _
+ ("Converting peer address to string failed, transport
type %d not supported\n"),
+ ntohs (hello->protocol));
return GNUNET_SYSERR;
}
return tapis[prot]->helloToAddress (hello, sa, sa_len);
@@ -241,10 +241,11 @@
if ((prot >= tapis_count) || (tapis[prot] == NULL))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER |
GNUNET_GE_ADMIN,
- _
- ("Transport connection attempt failed, transport type %d not
supported\n"),
- prot);
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN,
+ _
+ ("Transport connection attempt failed, transport type %d
not supported\n"),
+ prot);
return NULL;
}
tsession = NULL;
@@ -294,10 +295,10 @@
#if DEBUG_TRANSPORT
GNUNET_hash_to_enc (&peer->hashPubKey, &enc);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_ADMIN,
- _
- ("Transport failed to connect to peer `%s' (%u HELLOs known,
none worked)\n"),
- &enc, hc);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_ADMIN,
+ _
+ ("Transport failed to connect to peer `%s' (%u HELLOs
known, none worked)\n"),
+ &enc, hc);
#endif
}
return ret;
@@ -360,8 +361,8 @@
if (tsession == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Transmission attempted on uni-directional pipe, failing.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Transmission attempted on uni-directional pipe,
failing.\n");
return GNUNET_SYSERR; /* can't do that, can happen for
unidirectional pipes
that call core with GNUNET_TSession being
NULL. */
}
@@ -371,9 +372,10 @@
if ((tsession->ttype >= tapis_count) || (tapis[tsession->ttype] == NULL))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Transmission attempt failed, transport type %d unknown.\n"),
- tsession->ttype);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Transmission attempt failed, transport type %d
unknown.\n"),
+ tsession->ttype);
return GNUNET_SYSERR;
}
return tapis[tsession->ttype]->send (tsession, msg, size, important);
@@ -416,15 +418,16 @@
{
GNUNET_GE_BREAK (ectx, 0);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- "Illegal call to `%s', do not have token `%s'\n",
- __FUNCTION__, token);
+ GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ "Illegal call to `%s', do not have token `%s'\n",
+ __FUNCTION__, token);
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
}
GNUNET_mutex_unlock (lock);
i = tapis[tsession->ttype]->disconnect (tsession);
- GNUNET_GE_BREAK (NULL, i == GNUNET_OK); /* should never fail */
+ GNUNET_GE_BREAK (NULL, i == GNUNET_OK); /* should never fail */
return i;
}
@@ -493,8 +496,8 @@
if ((ttype >= tapis_count) || (tapis[ttype] == NULL))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("No transport of type %d known.\n"), ttype);
+ GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("No transport of type %d known.\n"), ttype);
GNUNET_mutex_unlock (tapis_lock);
return NULL;
}
@@ -552,8 +555,8 @@
if (tcount == 0)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- _("No transport succeeded in creating a hello!\n"));
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ _("No transport succeeded in creating a hello!\n"));
GNUNET_free (hellos);
return GNUNET_SYSERR;
}
@@ -574,8 +577,8 @@
GNUNET_free (hellos);
if (used == 0)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
- "No HELLOs fit in %u bytes.\n", maxLen);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ "No HELLOs fit in %u bytes.\n", maxLen);
return used;
}
@@ -709,11 +712,11 @@
ectx = capi->ectx;
if (-1 == GNUNET_GC_get_configuration_value_number (capi->cfg,
- "GNUNETD",
- "HELLOEXPIRES",
- 1,
- GNUNET_MAX_HELLO_EXPIRES / 60,
- 60, &hello_live))
+ "GNUNETD",
+ "HELLOEXPIRES",
+ 1,
+ GNUNET_MAX_HELLO_EXPIRES
+ / 60, 60, &hello_live))
return NULL;
hello_live *= 60;
@@ -736,7 +739,8 @@
ctapi.releaseService = coreAPI->releaseService;
ctapi.assertUnused = coreAPI->assertUnused;
- GNUNET_array_grow (tapis, tapis_count, GNUNET_TRANSPORT_PROTOCOL_NUMBER_UDP
+ 1);
+ GNUNET_array_grow (tapis, tapis_count,
+ GNUNET_TRANSPORT_PROTOCOL_NUMBER_UDP + 1);
tapis_lock = GNUNET_mutex_create (GNUNET_YES);
lock = GNUNET_mutex_create (GNUNET_NO);
@@ -744,15 +748,16 @@
/* now load transports */
dso = NULL;
GNUNET_GE_ASSERT (ectx,
- -1 != GNUNET_GC_get_configuration_value_string (capi->cfg,
- "GNUNETD",
- "TRANSPORTS",
- "udp tcp nat", &dso));
+ -1 != GNUNET_GC_get_configuration_value_string (capi->cfg,
+ "GNUNETD",
+
"TRANSPORTS",
+ "udp tcp
nat",
+ &dso));
if (strlen (dso) != 0)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Loading transports `%s'\n"), dso);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Loading transports `%s'\n"), dso);
next = dso;
do
{
@@ -770,8 +775,10 @@
if (lib == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- _("Could not load transport plugin `%s'\n"), pos);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ _("Could not load transport plugin `%s'\n"),
+ pos);
continue;
}
tptr =
@@ -780,11 +787,12 @@
if (tptr == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER |
- GNUNET_GE_IMMEDIATE,
- _
- ("Transport library `%s' did not provide required
function '%s%s'.\n"),
- pos, "inittransport_", pos);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE,
+ _
+ ("Transport library `%s' did not provide required
function '%s%s'.\n"),
+ pos, "inittransport_", pos);
GNUNET_plugin_unload (lib);
continue;
}
@@ -811,8 +819,8 @@
else
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Loaded transport `%s'\n"), pos);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Loaded transport `%s'\n"), pos);
}
}
while (next != NULL);
@@ -823,7 +831,8 @@
GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&coreAPI->myIdentity->hashPubKey, &myself));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER, _("I am peer
`%s'.\n"), &myself);
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("I am peer `%s'.\n"), &myself);
forEachTransport (&initHelper, NULL);
ret.start = &startTransports;
Modified: GNUnet/src/applications/vpn/gnunet-vpn.c
===================================================================
--- GNUnet/src/applications/vpn/gnunet-vpn.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/applications/vpn/gnunet-vpn.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -47,14 +47,14 @@
* All gnunet-transport-check command line options
*/
static struct GNUNET_CommandLineOption gnunetvpnOptions[] = {
- GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
- GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Print statistics about
GNUnet operations.")), /* -h */
+ GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename), /* -c */
+ GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Print statistics about
GNUnet operations.")), /* -h */
GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
GNUNET_COMMAND_LINE_OPTION_LOGGING, /* -L */
{'s', "silent", NULL,
gettext_noop ("Suppress display of asynchronous log messages"),
0, &GNUNET_getopt_configure_set_one, &silent},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -161,8 +161,8 @@
GNUNET_thread_create (&receiveThread, sock, 128 * 1024);
if (messageReceiveThread == NULL)
GNUNET_GE_DIE_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- "pthread_create");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_USER
+ | GNUNET_GE_IMMEDIATE, "pthread_create");
/* accept keystrokes from user and send to gnunetd */
Modified: GNUnet/src/applications/vpn/vpn.c
===================================================================
--- GNUnet/src/applications/vpn/vpn.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/applications/vpn/vpn.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -466,13 +466,14 @@
if (len > (65535 - sizeof (struct tun_pi)))
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("RFC4193 Frame length %d is too big for GNUnet!\n"), len);
+ _("RFC4193 Frame length %d is too big for GNUnet!\n"),
+ len);
return GNUNET_NO;
}
if (len < sizeof (struct tun_pi))
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("RFC4193 Frame length %d too small\n"), len);
+ _("RFC4193 Frame length %d too small\n"), len);
return GNUNET_NO;
}
if ((ntohs (tp->proto) == ETH_P_IP)
@@ -488,8 +489,8 @@
return GNUNET_YES;
}
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("RFC4193 Ethertype %x and IP version %x do not match!\n"),
- ntohs (tp->proto), ((struct iphdr *) fp)->version);
+ _("RFC4193 Ethertype %x and IP version %x do not match!\n"),
+ ntohs (tp->proto), ((struct iphdr *) fp)->version);
return GNUNET_NO;
}
@@ -512,7 +513,8 @@
* Convert a PeerIdentify into a "random" RFC4193 prefix
* actually we make the first 40 bits of the GNUNET_hash into the prefix!
*/
-static void id2ip (struct GNUNET_ClientHandle *cx, const GNUNET_PeerIdentity *
them)
+static void id2ip (struct GNUNET_ClientHandle *cx,
+ const GNUNET_PeerIdentity * them)
{
unsigned char a, b, c, d, e;
a = (them->hashPubKey.bits[0] >> 8) & 0xff;
@@ -520,7 +522,8 @@
c = (them->hashPubKey.bits[1] >> 8) & 0xff;
d = (them->hashPubKey.bits[1] >> 0) & 0xff;
e = (them->hashPubKey.bits[2] >> 8) & 0xff;
- cprintf (cx, GNUNET_CS_PROTO_VPN_REPLY, "fd%02x:%02x%02x:%02x%02x", a, b, c,
d, e);
+ cprintf (cx, GNUNET_CS_PROTO_VPN_REPLY, "fd%02x:%02x%02x:%02x%02x", a, b, c,
+ d, e);
}
/* convert GNUNET_PeerIdentity into network octet order IPv6 address */
@@ -556,15 +559,19 @@
int i, used, fd, id = 0;
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("RFC4193 Going to try and make a tunnel in slot %d\n"), n);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ _("RFC4193 Going to try and make a tunnel in slot %d\n"), n);
fd = open ("/dev/net/tun", O_RDWR);
if (fd < 0)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Cannot open tunnel device because of %s"), strerror (fd));
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "open");
+ _("Cannot open tunnel device because of %s"),
+ strerror (fd));
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "open");
}
memset (&ifr, 0, sizeof (ifr));
@@ -593,10 +600,12 @@
{
if ((store1 + i)->id == id)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _
- ("RFC4193 Create skips gnu%d as we are already using
it\n"),
- id);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ _
+ ("RFC4193 Create skips gnu%d as we are already
using it\n"),
+ id);
id++;
used = 1;
}
@@ -606,16 +615,22 @@
sprintf (ifr.ifr_name, "gnu%d", id);
if (ioctl (fd, TUNSETIFF, (void *) &ifr) < 0)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Cannot set tunnel name to %s because of %s\n"),
- ifr.ifr_name, strerror (errno));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _
+ ("Cannot set tunnel name to %s because of %s\n"),
+ ifr.ifr_name, strerror (errno));
id++;
used = 1;
}
else
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Configured tunnel name to %s\n"), ifr.ifr_name);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _("Configured tunnel name to %s\n"),
+ ifr.ifr_name);
}
}
}
@@ -656,17 +671,18 @@
if (ioctl (admin_fd, SIOCGIFFLAGS, &ifr) < 0)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Cannot get socket flags for gnu%d because %s\n"), id,
- strerror (errno));
+ _("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)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Cannot set socket flags for gnu%d because %s\n"), id,
- strerror (errno));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Cannot set socket flags for gnu%d because %s\n"),
+ id, strerror (errno));
}
}
@@ -675,16 +691,16 @@
if (ioctl (admin_fd, SIOCSIFMTU, &ifr) < 0)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Cannot set MTU for gnu%d because %s\n"), id,
- strerror (errno));
+ _("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)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Cannot get interface index for gnu%d because %s\n"), id,
- strerror (errno));
+ _("Cannot get interface index for gnu%d because %s\n"),
+ id, strerror (errno));
}
else
{
@@ -694,22 +710,26 @@
ifr6.ifr6_ifindex = ifr.ifr_ifindex;
id2net (&ifr6.ifr6_addr, coreAPI->myIdentity);
ifr6.ifr6_addr.s6_addr16[3] = htons (n + VC_START);
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("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]),
- ntohs (ifr6.ifr6_addr.s6_addr16[2]),
- ntohs (ifr6.ifr6_addr.s6_addr16[3]),
- ntohs (ifr6.ifr6_addr.s6_addr16[4]),
- ntohs (ifr6.ifr6_addr.s6_addr16[5]),
- ntohs (ifr6.ifr6_addr.s6_addr16[6]),
- ntohs (ifr6.ifr6_addr.s6_addr16[7]), ifr6.ifr6_prefixlen);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ _("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]),
+ ntohs (ifr6.ifr6_addr.s6_addr16[2]),
+ ntohs (ifr6.ifr6_addr.s6_addr16[3]),
+ ntohs (ifr6.ifr6_addr.s6_addr16[4]),
+ ntohs (ifr6.ifr6_addr.s6_addr16[5]),
+ ntohs (ifr6.ifr6_addr.s6_addr16[6]),
+ ntohs (ifr6.ifr6_addr.s6_addr16[7]),
+ ifr6.ifr6_prefixlen);
if (ioctl (admin_fd, SIOCSIFADDR, &ifr6) < 0)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _
- ("Cannot set interface IPv6 address for gnu%d because %s\n"),
- id, strerror (errno));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_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" */
@@ -720,22 +740,26 @@
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 */
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _
- ("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]),
- ntohs (rt.rtmsg_dst.s6_addr16[2]),
- ntohs (rt.rtmsg_dst.s6_addr16[3]),
- ntohs (rt.rtmsg_dst.s6_addr16[4]),
- ntohs (rt.rtmsg_dst.s6_addr16[5]),
- ntohs (rt.rtmsg_dst.s6_addr16[6]),
- ntohs (rt.rtmsg_dst.s6_addr16[7]), rt.rtmsg_dst_len);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ _
+ ("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]),
+ ntohs (rt.rtmsg_dst.s6_addr16[2]),
+ ntohs (rt.rtmsg_dst.s6_addr16[3]),
+ ntohs (rt.rtmsg_dst.s6_addr16[4]),
+ ntohs (rt.rtmsg_dst.s6_addr16[5]),
+ ntohs (rt.rtmsg_dst.s6_addr16[6]),
+ ntohs (rt.rtmsg_dst.s6_addr16[7]), rt.rtmsg_dst_len);
if (ioctl (admin_fd, SIOCADDRT, &rt) < 0)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Cannot add route IPv6 address for gnu%s because %s\n"),
- id, strerror (errno));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("Cannot add route IPv6 address for gnu%s because
%s\n"),
+ id, strerror (errno));
}
}
}
@@ -774,9 +798,10 @@
rstore1 = GNUNET_realloc (store1, rcapacity1);
if (rstore1 == NULL)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _
- ("RFC4193 We have run out of memory and so I can't store a
tunnel for this peer.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("RFC4193 We have run out of memory and so I can't
store a tunnel for this peer.\n"));
entries1--;
return;
}
@@ -823,9 +848,11 @@
tp = ((struct tun_pi *) fp) - 1;
gp = ((GNUNET_MessageHeader *) fp) - 1;
running = 1;
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"), fp,
- tp, gp);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ _
+ ("RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"),
+ fp, tp, gp);
GNUNET_mutex_lock (lock);
while (running)
@@ -843,7 +870,9 @@
}
else
{
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "fstat");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "fstat");
}
for (i = 0; i < entries1; i++)
{
@@ -857,8 +886,9 @@
ret = SELECT (max + 1, &readSet, &writeSet, &errorSet, &timeout);
if (ret < 0)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- "From the vpn select: %s\n", strerror (errno));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "From the vpn select: %s\n", strerror (errno));
running = 0;
break;
}
@@ -866,8 +896,9 @@
{
if (0 >= READ (signalingPipe[0], &tmp[0], MAXSIG_BUF))
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- "vpn could not read from exit control pipe\n");
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ "vpn could not read from exit control
pipe\n");
}
GNUNET_mutex_lock (lock);
for (i = 0; i < entries1; i++)
@@ -896,15 +927,19 @@
{
if (close ((store1 + i)->fd) == 0)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- _("VPN dropping connection %x\n"), i);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ _("VPN dropping connection %x\n"), i);
*(store1 + i) = *(store1 + (entries1 - 1));
entries1--;
}
else
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("VPN cannot drop connection %x\n"), i);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _("VPN cannot drop connection %x\n"), i);
}
}
}
@@ -922,8 +957,9 @@
}
*/
}
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("RFC4193 Thread exiting\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ _("RFC4193 Thread exiting\n"));
GNUNET_mutex_unlock (lock);
return NULL;
}
@@ -969,26 +1005,33 @@
tp->proto = htons (ETH_P_IPV6);
if (ntohs (fp->ip6_src.s6_addr16[0]) < 0xFD00)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("VPN IP src not anonymous. drop..\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ _("VPN IP src not anonymous. drop..\n"));
return GNUNET_OK;
}
if (ntohs (fp->ip6_dst.s6_addr16[0]) < 0xFD00)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("VPN IP not anonymous, drop.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ _("VPN IP not anonymous, drop.\n"));
return GNUNET_OK;
}
break;
case 4:
tp->proto = htons (ETH_P_IP);
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("VPN Received, not anonymous, drop.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ _("VPN Received, not anonymous, drop.\n"));
return GNUNET_OK;
default:
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("VPN Received unknown IP version %d...\n"),
- ((struct iphdr *) fp)->version);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("VPN Received unknown IP version %d...\n"),
+ ((struct iphdr *) fp)->version);
return GNUNET_OK;
}
@@ -1022,9 +1065,11 @@
/* do not normally get here... but checkensure so any future packets
could be routed... */
checkensure_peer (sender, NULL);
GNUNET_mutex_unlock (lock);
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _
- ("Could not write the tunnelled IP to the OS... Did to setup a
tunnel?\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ _
+ ("Could not write the tunnelled IP to the OS... Did to
setup a tunnel?\n"));
return GNUNET_OK;
case GNUNET_P2P_PROTO_PONG:
GNUNET_mutex_lock (lock);
@@ -1174,8 +1219,9 @@
GNUNET_mutex_lock (lock);
/* make sure realised table can take the new routes - if it wont, abort now!
*/
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("realise alloc ram\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ _("realise alloc ram\n"));
if (route_entries > realised_entries)
{
reqcapacity = sizeof (route_info) * route_entries;
@@ -1194,8 +1240,9 @@
}
}
/* add routes that are in the new table but not the old */
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("realise add routes\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ _("realise add routes\n"));
for (i = 0; i < route_entries; i++)
{
found = 0;
@@ -1245,8 +1292,9 @@
}
}
cprintf (c, GNUNET_CS_PROTO_VPN_REPLY, "Removing routes\n");
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("realise pull routes\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ _("realise pull routes\n"));
/* pull routes that are in the old table but not the new */
for (i = 0; i < realised_entries; i++)
{
@@ -1298,8 +1346,9 @@
}
}
cprintf (c, GNUNET_CS_PROTO_VPN_REPLY, "Copying table\n");
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("realise copy table\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ _("realise copy table\n"));
realised_entries = route_entries;
memcpy (realised_store, route_store, sizeof (route_info) * route_entries);
@@ -1330,8 +1379,9 @@
/* not enough ram, warn in the logs that they
* will forego receiving logging
*/
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Cannot store client info\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Cannot store client info\n"));
return;
}
clients_capacity = rcapacity;
@@ -1417,11 +1467,13 @@
id2ip (c, &id);
if ((route_store + i)->hops == 0)
{
- cprintf (c, GNUNET_CS_PROTO_VPN_REPLY, "::/48 hops 0 (This
Node)\n");
+ cprintf (c, GNUNET_CS_PROTO_VPN_REPLY,
+ "::/48 hops 0 (This Node)\n");
}
else
{
- cprintf (c, GNUNET_CS_PROTO_VPN_REPLY, "::/48 hops %d tunnel
gnu%d\n",
+ cprintf (c, GNUNET_CS_PROTO_VPN_REPLY,
+ "::/48 hops %d tunnel gnu%d\n",
(route_store + i)->hops,
(store1 + ((route_store + i)->tunnel))->id);
}
@@ -1438,16 +1490,19 @@
id2ip (c, &id);
if ((realised_store + i)->hops == 0)
{
- cprintf (c, GNUNET_CS_PROTO_VPN_REPLY, "::/48 hops 0 (This
Node)\n");
+ cprintf (c, GNUNET_CS_PROTO_VPN_REPLY,
+ "::/48 hops 0 (This Node)\n");
}
else
{
- cprintf (c, GNUNET_CS_PROTO_VPN_REPLY, "::/48 hops %d tunnel
gnu%d\n",
+ cprintf (c, GNUNET_CS_PROTO_VPN_REPLY,
+ "::/48 hops %d tunnel gnu%d\n",
(realised_store + i)->hops,
(store1 + ((realised_store + i)->tunnel))->id);
}
}
- cprintf (c, GNUNET_CS_PROTO_VPN_REALISED, "%d Realised\n",
realised_entries);
+ cprintf (c, GNUNET_CS_PROTO_VPN_REALISED, "%d Realised\n",
+ realised_entries);
GNUNET_mutex_unlock (lock);
}
/* add routes in route but not realised to OS
@@ -1476,16 +1531,19 @@
rgp->type = htons (GNUNET_P2P_PROTO_AIP_GETROUTE);
rgp->size = htons (sizeof (GNUNET_MessageHeader) + sizeof (int));
*((int *) (rgp + 1)) = htonl ((store1 + i)->route_entry);
- cprintf (c, GNUNET_CS_PROTO_VPN_REPLY, "Request level %d from peer
%d ",
+ cprintf (c, GNUNET_CS_PROTO_VPN_REPLY,
+ "Request level %d from peer %d ",
(store1 + i)->route_entry, i);
id2ip (c, &((store1 + i)->peer));
cprintf (c, GNUNET_CS_PROTO_VPN_REPLY, "\n");
- coreAPI->unicast (&((store1 + i)->peer), rgp,
GNUNET_EXTREME_PRIORITY, 60);
+ coreAPI->unicast (&((store1 + i)->peer), rgp,
+ GNUNET_EXTREME_PRIORITY, 60);
GNUNET_free (rgp);
/* } */
}
GNUNET_mutex_unlock (lock);
- cprintf (c, GNUNET_CS_PROTO_VPN_RESET, "Rebuilding routing tables
done\n");
+ cprintf (c, GNUNET_CS_PROTO_VPN_RESET,
+ "Rebuilding routing tables done\n");
}
if (ntohs (message->type) == GNUNET_CS_PROTO_VPN_TRUST)
{
@@ -1537,10 +1595,12 @@
" schedule connection.\n");
break;
case GNUNET_SYSERR:
- cprintf (c, GNUNET_CS_PROTO_VPN_REPLY, " core
refused.\n");
+ cprintf (c, GNUNET_CS_PROTO_VPN_REPLY,
+ " core refused.\n");
break;
default:
- cprintf (c, GNUNET_CS_PROTO_VPN_REPLY, " misc error.\n");
+ cprintf (c, GNUNET_CS_PROTO_VPN_REPLY,
+ " misc error.\n");
break;
}
@@ -1568,7 +1628,8 @@
}
else
{
- cprintf (c, GNUNET_CS_PROTO_VPN_ADD, "Could not allocate for
key.\n");
+ cprintf (c, GNUNET_CS_PROTO_VPN_ADD,
+ "Could not allocate for key.\n");
}
}
else
@@ -1613,8 +1674,8 @@
if (-1 == fcntl (handle, F_SETFL, flags))
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- "fcntl");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE, "fcntl");
return GNUNET_SYSERR;
}
#endif
@@ -1658,12 +1719,15 @@
admin_fd = socket (AF_INET6, SOCK_DGRAM, 0);
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("`%s' initialising RFC4913 module %d and %d\n"), "template",
- GNUNET_CS_PROTO_MAX_USED, GNUNET_P2P_PROTO_MAX_USED);
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_REQUEST,
- _("RFC4193 my First 4 hex digits of host id are %x\n"),
- capi->myIdentity->hashPubKey.bits[0]);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ _("`%s' initialising RFC4913 module %d and %d\n"),
+ "template", GNUNET_CS_PROTO_MAX_USED,
+ GNUNET_P2P_PROTO_MAX_USED);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ _("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 */
@@ -1680,7 +1744,8 @@
if (GNUNET_SYSERR ==
capi->registerHandler (GNUNET_P2P_PROTO_AIP_ROUTES, &handlep2pMSG))
return GNUNET_SYSERR;
- if (GNUNET_SYSERR == capi->registerHandler (GNUNET_P2P_PROTO_PONG,
&handlep2pMSG))
+ if (GNUNET_SYSERR ==
+ capi->registerHandler (GNUNET_P2P_PROTO_PONG, &handlep2pMSG))
return GNUNET_SYSERR;
if (GNUNET_SYSERR ==
capi->registerHandler (GNUNET_P2P_PROTO_HANG_UP, &handlep2pMSG))
@@ -1745,12 +1810,12 @@
/* use capi->unicast to send messages to connected peers */
GNUNET_GE_ASSERT (capi->ectx,
- 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
- capi->ectx,
- "ABOUT",
- "vpn",
- _
- ("enables IPv6 over
GNUnet (incomplete)")));
+ 0 == GNUNET_GC_set_configuration_value_string (capi->cfg,
+ capi->ectx,
+ "ABOUT",
+ "vpn",
+ _
+ ("enables
IPv6 over GNUnet (incomplete)")));
return GNUNET_OK;
}
@@ -1784,7 +1849,7 @@
coreAPI->unregisterClientExitHandler (&clientExitHandler);
GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("RFC4193 Waiting for tun thread to end\n"));
+ _("RFC4193 Waiting for tun thread to end\n"));
running = 0;
/* thread should wake up and exit */
@@ -1792,13 +1857,14 @@
if (ret != sizeof (char))
if (errno != EAGAIN)
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- "RFC4193 can not tell thread to exit");
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ "RFC4193 can not tell thread to exit");
/* wait for it to exit */
GNUNET_thread_join (tunThreadInfo, &returnval);
GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("RFC4193 The tun thread has ended\n"));
+ _("RFC4193 The tun thread has ended\n"));
coreAPI->releaseService (identity);
coreAPI->releaseService (session);
@@ -1814,9 +1880,10 @@
if (((store1 + i)->fd) != 0)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
- _("RFC4193 Closing tunnel %d fd %d\n"), i,
- (store1 + i)->fd);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ _("RFC4193 Closing tunnel %d fd %d\n"), i,
+ (store1 + i)->fd);
close ((store1 + i)->fd);
(store1 + i)->fd = 0;
}
Modified: GNUnet/src/include/ecrs_core.h
===================================================================
--- GNUnet/src/include/ecrs_core.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/include/ecrs_core.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -241,7 +241,8 @@
*/
int fileBlockEncode (const DBlock * data,
unsigned int len,
- const GNUNET_HashCode * query, GNUNET_DatastoreValue **
value);
+ const GNUNET_HashCode * query,
+ GNUNET_DatastoreValue ** value);
/**
* Get the query that will be used to query for
Modified: GNUnet/src/include/gnunet_blockstore.h
===================================================================
--- GNUnet/src/include/gnunet_blockstore.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_blockstore.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -59,7 +59,8 @@
* @return GNUNET_OK to continue with iteration, GNUNET_SYSERR to abort
*/
typedef int (*GNUNET_DataProcessor) (const GNUNET_HashCode * key,
- const GNUNET_DataContainer * value, void *cls);
+ const GNUNET_DataContainer * value,
+ void *cls);
/**
* GAP and DHT clients must implement this interface to tell
@@ -130,7 +131,8 @@
* @return GNUNET_OK if the value could be removed, GNUNET_SYSERR if not
(i.e. not present)
*/
int (*del) (void *closure,
- const GNUNET_HashCode * key, const GNUNET_DataContainer * value);
+ const GNUNET_HashCode * key,
+ const GNUNET_DataContainer * value);
/**
* Iterate over all keys in the local datastore
Modified: GNUnet/src/include/gnunet_bootstrap_service.h
===================================================================
--- GNUnet/src/include/gnunet_bootstrap_service.h 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/include/gnunet_bootstrap_service.h 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -41,8 +41,8 @@
* Definition of a callback function that processes
* hello messages generated by the bootstrap API.
*/
-typedef void (*GNUNET_BootstrapHelloCallback) (const GNUNET_MessageHello *
helo,
- void *arg);
+typedef void (*GNUNET_BootstrapHelloCallback) (const GNUNET_MessageHello *
+ helo, void *arg);
/**
* @return GNUNET_YES to continue, GNUNET_NO to abort
Modified: GNUnet/src/include/gnunet_chat_lib.h
===================================================================
--- GNUnet/src/include/gnunet_chat_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_chat_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -89,7 +89,7 @@
* @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
*/
typedef int (*GNUNET_CHAT_RoomIterator) (const char *room,
- const char *topic, void *cls);
+ const char *topic, void *cls);
/**
* List all of the (publically visible) chat rooms.
@@ -121,11 +121,11 @@
* accept (but user is away), GNUNET_SYSERR to signal denied delivery
*/
typedef int (*GNUNET_CHAT_MessageCallback) (void *cls,
- struct GNUNET_CHAT_Room * room,
- const char *senderNick,
- const char *message,
- GNUNET_CronTime timestamp,
- GNUNET_CHAT_MSG_OPTIONS options);
+ struct GNUNET_CHAT_Room * room,
+ const char *senderNick,
+ const char *message,
+ GNUNET_CronTime timestamp,
+ GNUNET_CHAT_MSG_OPTIONS options);
/**
* Join a chat room.
@@ -137,9 +137,10 @@
* @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,
+struct GNUNET_CHAT_Room *GNUNET_CHAT_join_room (struct GNUNET_GE_Context
+ *ectx,
+ struct GNUNET_GC_Configuration
+ *cfg, const char *nickname,
const GNUNET_RSA_PublicKey *
me,
const struct
@@ -169,17 +170,17 @@
* confirmations from anyone for this message
*/
typedef int (*GNUNET_CHAT_MessageConfirmation) (void *cls,
- struct GNUNET_CHAT_Room *
- room,
- const char *receiverNick,
- const GNUNET_RSA_PublicKey *
- receiverKey,
- const char *message,
- GNUNET_CronTime timestamp,
- GNUNET_CHAT_MSG_OPTIONS
- options, int response,
- const GNUNET_RSA_Signature *
- receipt);
+ struct GNUNET_CHAT_Room *
+ room,
+ const char *receiverNick,
+ const GNUNET_RSA_PublicKey *
+ receiverKey,
+ const char *message,
+ GNUNET_CronTime timestamp,
+ GNUNET_CHAT_MSG_OPTIONS
+ options, int response,
+ const GNUNET_RSA_Signature *
+ receipt);
/**
@@ -201,10 +202,10 @@
* Callback function to iterate over room members.
*/
typedef int (*GNUNET_CHAT_MemberIterator) (const char *nickname,
- const GNUNET_RSA_PublicKey *
- owner, const char *memberInfo,
- GNUNET_CronTime lastConfirmed,
- void *cls);
+ const GNUNET_RSA_PublicKey *
+ owner, const char *memberInfo,
+ GNUNET_CronTime lastConfirmed,
+ void *cls);
/**
* List all of the (known) chat members.
Modified: GNUnet/src/include/gnunet_collection_lib.h
===================================================================
--- GNUnet/src/include/gnunet_collection_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_collection_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -40,7 +40,8 @@
/**
* Initialize collection module.
*/
-void GNUNET_CO_init (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg);
+void GNUNET_CO_init (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
/**
* Shutdown collection module.
@@ -53,9 +54,10 @@
* an existing collection).
*/
int GNUNET_CO_collection_start (unsigned int anonymityLevel,
- unsigned int priority,
- GNUNET_Int32Time updateInterval,
- const char *name, const struct GNUNET_ECRS_MetaData
*meta);
+ unsigned int priority,
+ GNUNET_Int32Time updateInterval,
+ const char *name,
+ const struct GNUNET_ECRS_MetaData *meta);
/**
* Stop collection.
Modified: GNUnet/src/include/gnunet_core.h
===================================================================
--- GNUnet/src/include/gnunet_core.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/include/gnunet_core.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -97,19 +97,23 @@
/**
* Type of a handler for messages from clients.
*/
-typedef int (*GNUNET_ClientRequestHandler) (struct GNUNET_ClientHandle *
client,
- const GNUNET_MessageHeader * message);
+typedef int (*GNUNET_ClientRequestHandler) (struct GNUNET_ClientHandle *
+ client,
+ const GNUNET_MessageHeader *
+ message);
/**
* Method called whenever a given client disconnects.
*/
-typedef void (*GNUNET_ClientExitHandler) (struct GNUNET_ClientHandle * client);
+typedef void (*GNUNET_ClientExitHandler) (struct GNUNET_ClientHandle *
+ client);
/**
* Type of a handler for some message type.
*/
typedef int (*GNUNET_P2PRequestHandler) (const GNUNET_PeerIdentity * sender,
- const GNUNET_MessageHeader * message);
+ const GNUNET_MessageHeader *
+ message);
/**
* Type of a handler for plaintext messages. Since we cannot
@@ -117,16 +121,17 @@
* the callback.
*/
typedef int (*GNUNET_P2PPlaintextRequestHandler) (const GNUNET_PeerIdentity *
- sender,
- const GNUNET_MessageHeader *
- message, GNUNET_TSession *
session);
+ sender,
+ const GNUNET_MessageHeader *
+ message,
+ GNUNET_TSession * session);
/**
* Type of a handler for some message type.
* @param identity the id of the node
*/
-typedef void (*GNUNET_NodeIteratorCallback) (const GNUNET_PeerIdentity *
identity,
- void *data);
+typedef void (*GNUNET_NodeIteratorCallback) (const GNUNET_PeerIdentity *
+ identity, void *data);
/**
* Type of a send callback to fill up buffers.
@@ -139,8 +144,8 @@
* that buffer (must be a positive number).
*/
typedef unsigned int (*GNUNET_BufferFillCallback) (const GNUNET_PeerIdentity *
- receiver, void *position,
- unsigned int padding);
+ receiver, void *position,
+ unsigned int padding);
/**
* Callback that is used to fill in a message into the send buffer.
@@ -155,7 +160,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
typedef int (*GNUNET_BuildMessageCallback) (void *buf,
- void *closure, unsigned short len);
+ void *closure,
+ unsigned short len);
/**
* Send a message to the client identified by the handle. Note that
@@ -166,9 +172,10 @@
*
* @param force GNUNET_YES if this message MUST be queued
*/
-typedef int (*GNUNET_SendToClientCallback) (struct GNUNET_ClientHandle *
handle,
- const GNUNET_MessageHeader * message,
- int force);
+typedef int (*GNUNET_SendToClientCallback) (struct GNUNET_ClientHandle *
+ handle,
+ const GNUNET_MessageHeader *
+ message, int force);
/**
* GNUnet CORE API for applications and services that are implemented
@@ -374,7 +381,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is already a
* handler for that type
*/
- int (*registerHandler) (unsigned short type, GNUNET_P2PRequestHandler
callback);
+ int (*registerHandler) (unsigned short type,
+ GNUNET_P2PRequestHandler callback);
/**
* Unregister a method as a handler for specific message
@@ -385,7 +393,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is a different
* handler for that type
*/
- int (*unregisterHandler) (unsigned short type, GNUNET_P2PRequestHandler
callback);
+ int (*unregisterHandler) (unsigned short type,
+ GNUNET_P2PRequestHandler callback);
/**
* Is a handler registered for messages of the given type?
@@ -411,7 +420,8 @@
* handler for that type
*/
int (*registerPlaintextHandler) (unsigned short type,
- GNUNET_P2PPlaintextRequestHandler callback);
+ GNUNET_P2PPlaintextRequestHandler
+ callback);
/**
* Unregister a method as a handler for specific message
@@ -424,7 +434,8 @@
* handler for that type
*/
int (*unregisterPlaintextHandler) (unsigned short type,
- GNUNET_P2PPlaintextRequestHandler
callback);
+ GNUNET_P2PPlaintextRequestHandler
+ callback);
/* ***************** traffic management ******************* */
@@ -535,7 +546,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is already a
* handler for that type
*/
- int (*registerClientHandler) (unsigned short type,
GNUNET_ClientRequestHandler callback);
+ int (*registerClientHandler) (unsigned short type,
+ GNUNET_ClientRequestHandler callback);
/**
* Remove a method as a handler for specific message
@@ -546,7 +558,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is a different
* handler for that type
*/
- int (*unregisterClientHandler) (unsigned short type,
GNUNET_ClientRequestHandler callback);
+ int (*unregisterClientHandler) (unsigned short type,
+ GNUNET_ClientRequestHandler callback);
/**
* Register a handler to call if any client exits.
@@ -635,7 +648,9 @@
GNUNET_GE_KIND kind, const char *value);
struct GNUNET_GE_Context *(*createClientLogContext) (GNUNET_GE_KIND mask,
- struct GNUNET_ClientHandle *
handle);
+ struct
+ GNUNET_ClientHandle *
+ handle);
int (*assertUnused) (GNUNET_TSession * tsession);
@@ -648,7 +663,9 @@
*
* @param capi the core API
*/
-typedef int (*GNUNET_ApplicationPluginInitializationMethod)
(GNUNET_CoreAPIForPlugins * capi);
+typedef
+ int (*GNUNET_ApplicationPluginInitializationMethod)
+ (GNUNET_CoreAPIForPlugins * capi);
/**
* Type of the shutdown method implemented by GNUnet protocol
@@ -662,7 +679,9 @@
*
* @param capi the core API
*/
-typedef void *(*GNUNET_ServicePluginInitializationMethod)
(GNUNET_CoreAPIForPlugins * capi);
+typedef void
+ *(*GNUNET_ServicePluginInitializationMethod) (GNUNET_CoreAPIForPlugins *
+ capi);
/**
* Type of the shutdown method implemented by GNUnet service
Modified: GNUnet/src/include/gnunet_datastore_service.h
===================================================================
--- GNUnet/src/include/gnunet_datastore_service.h 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/include/gnunet_datastore_service.h 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -95,8 +95,9 @@
* GNUNET_NO to delete the item and continue (if supported)
*/
typedef int (*GNUNET_DatastoreValueIterator) (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * value, void
*closure,
- unsigned long long uid);
+ const GNUNET_DatastoreValue *
+ value, void *closure,
+ unsigned long long uid);
/**
@@ -134,7 +135,8 @@
* to justify removing something else, GNUNET_SYSERR on
* other serious error (i.e. IO permission denied)
*/
- int (*put) (const GNUNET_HashCode * key, const GNUNET_DatastoreValue *
value);
+ int (*put) (const GNUNET_HashCode * key,
+ const GNUNET_DatastoreValue * value);
/**
* Store an item in the datastore. If the item is already present,
@@ -163,7 +165,8 @@
* GNUNET_SYSERR unless the iterator aborted!
*/
int (*get) (const GNUNET_HashCode * key,
- unsigned int type, GNUNET_DatastoreValueIterator iter, void
*closure);
+ unsigned int type, GNUNET_DatastoreValueIterator iter,
+ void *closure);
/**
* Do a quick test if we MAY have the content.
@@ -182,7 +185,8 @@
/**
* Explicitly remove some content from the database.
*/
- int (*del) (const GNUNET_HashCode * query, const GNUNET_DatastoreValue *
value);
+ int (*del) (const GNUNET_HashCode * query,
+ const GNUNET_DatastoreValue * value);
} GNUNET_Datastore_ServiceAPI;
Modified: GNUnet/src/include/gnunet_dht_lib.h
===================================================================
--- GNUnet/src/include/gnunet_dht_lib.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/include/gnunet_dht_lib.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -51,11 +51,12 @@
* @return number of results on success, GNUNET_SYSERR on error (i.e. timeout)
*/
int GNUNET_DHT_get (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx,
- unsigned int type,
- const GNUNET_HashCode * key,
- GNUNET_CronTime timeout,
- GNUNET_DataProcessor resultCallback, void
*resCallbackClosure);
+ struct GNUNET_GE_Context *ectx,
+ unsigned int type,
+ const GNUNET_HashCode * key,
+ GNUNET_CronTime timeout,
+ GNUNET_DataProcessor resultCallback,
+ void *resCallbackClosure);
/**
* Perform a synchronous put operation.
@@ -66,10 +67,11 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int GNUNET_DHT_put (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx,
- const GNUNET_HashCode * key,
- unsigned int type,
- GNUNET_CronTime expire, const GNUNET_DataContainer * value);
+ struct GNUNET_GE_Context *ectx,
+ const GNUNET_HashCode * key,
+ unsigned int type,
+ GNUNET_CronTime expire,
+ const GNUNET_DataContainer * value);
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: GNUnet/src/include/gnunet_dht_service.h
===================================================================
--- GNUnet/src/include/gnunet_dht_service.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_dht_service.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -69,12 +69,12 @@
* @return handle to stop the async get
*/
struct GNUNET_DHT_GetHandle *(*get_start) (unsigned int type,
- const GNUNET_HashCode * key,
- GNUNET_CronTime timeout,
- GNUNET_DataProcessor callback,
- void *cls,
- GNUNET_DHT_OperationCompleteCallback
callbackComplete,
- void *closure);
+ const GNUNET_HashCode * key,
+ GNUNET_CronTime timeout,
+ GNUNET_DataProcessor callback,
+ void *cls,
+
GNUNET_DHT_OperationCompleteCallback
+ callbackComplete, void *closure);
/**
* Stop async DHT-get. Frees associated resources.
Modified: GNUnet/src/include/gnunet_dstore_service.h
===================================================================
--- GNUnet/src/include/gnunet_dstore_service.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_dstore_service.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -43,9 +43,9 @@
#endif
typedef void (*GNUNET_ResultProcessor) (const GNUNET_HashCode * key,
- unsigned int type,
- unsigned int size,
- const char *data, void *cls);
+ unsigned int type,
+ unsigned int size,
+ const char *data, void *cls);
/**
* @brief Definition of the SQ-Store API.
@@ -74,7 +74,8 @@
* iter is non-NULL and aborted the iteration
*/
int (*get) (const GNUNET_HashCode * key,
- unsigned int type, GNUNET_ResultProcessor handler, void
*closure);
+ unsigned int type, GNUNET_ResultProcessor handler,
+ void *closure);
} GNUNET_Dstore_ServiceAPI;
Modified: GNUnet/src/include/gnunet_ecrs_lib.h
===================================================================
--- GNUnet/src/include/gnunet_ecrs_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_ecrs_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -91,7 +91,8 @@
* @return GNUNET_OK to continue to iterate, GNUNET_SYSERR to abort
*/
typedef int (*GNUNET_ECRS_MetaDataProcessor) (EXTRACTOR_KeywordType type,
- const char *data, void *closure);
+ const char *data,
+ void *closure);
/**
* Iterator over keywords
@@ -107,7 +108,9 @@
/**
* Duplicate a MetaData token.
*/
-struct GNUNET_ECRS_MetaData *GNUNET_ECRS_meta_data_duplicate (const struct
GNUNET_ECRS_MetaData *meta);
+struct GNUNET_ECRS_MetaData *GNUNET_ECRS_meta_data_duplicate (const struct
+
GNUNET_ECRS_MetaData
+ *meta);
/**
* Free meta data.
@@ -118,7 +121,7 @@
* Test if two MDs are equal.
*/
int GNUNET_ECRS_meta_data_test_equal (const struct GNUNET_ECRS_MetaData *md1,
- const struct GNUNET_ECRS_MetaData *md2);
+ const struct GNUNET_ECRS_MetaData *md2);
/**
@@ -126,20 +129,23 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if this entry already exists
*/
int GNUNET_ECRS_meta_data_inser (struct GNUNET_ECRS_MetaData *md,
- EXTRACTOR_KeywordType type, const char *data);
+ EXTRACTOR_KeywordType type,
+ const char *data);
/**
* Remove an item.
* @return GNUNET_OK on success, GNUNET_SYSERR if the item does not exist in md
*/
int GNUNET_ECRS_meta_data_delete (struct GNUNET_ECRS_MetaData *md,
- EXTRACTOR_KeywordType type, const char *data);
+ EXTRACTOR_KeywordType type,
+ const char *data);
/**
* Add the current time as the publication date
* to the meta-data.
*/
-void GNUNET_ECRS_meta_data_add_publication_date (struct GNUNET_ECRS_MetaData
*md);
+void GNUNET_ECRS_meta_data_add_publication_date (struct GNUNET_ECRS_MetaData
+ *md);
/**
* Iterate over MD entries, excluding thumbnails.
@@ -147,15 +153,16 @@
* @return number of entries
*/
int GNUNET_ECRS_meta_data_get_contents (const struct GNUNET_ECRS_MetaData *md,
- GNUNET_ECRS_MetaDataProcessor iterator, void *closure);
+ GNUNET_ECRS_MetaDataProcessor
+ iterator, void *closure);
/**
* Get the first MD entry of the given type.
* @return NULL if we do not have any such entry,
* otherwise client is responsible for freeing the value!
*/
-char *GNUNET_ECRS_meta_data_get_by_type (const struct GNUNET_ECRS_MetaData *md,
- EXTRACTOR_KeywordType type);
+char *GNUNET_ECRS_meta_data_get_by_type (const struct GNUNET_ECRS_MetaData
+ *md, EXTRACTOR_KeywordType type);
/**
* Get the first matching MD entry of the given types.
@@ -163,7 +170,9 @@
* @return NULL if we do not have any such entry,
* otherwise client is responsible for freeing the value!
*/
-char *GNUNET_ECRS_meta_data_get_first_by_types (const struct
GNUNET_ECRS_MetaData *md, ...);
+char *GNUNET_ECRS_meta_data_get_first_by_types (const struct
+ GNUNET_ECRS_MetaData *md,
+ ...);
/**
* Get a thumbnail from the meta-data (if present).
@@ -172,8 +181,8 @@
* freed by the caller!
* @return number of bytes in thumbnail, 0 if not available
*/
-size_t GNUNET_ECRS_meta_data_get_thumbnail (const struct GNUNET_ECRS_MetaData
*md,
- unsigned char **thumb);
+size_t GNUNET_ECRS_meta_data_get_thumbnail (const struct GNUNET_ECRS_MetaData
+ *md, unsigned char **thumb);
/**
* Extract meta-data from a file.
@@ -182,9 +191,10 @@
* of meta-data items obtained
*/
int GNUNET_ECRS_meta_data_extract_from_file (struct GNUNET_GE_Context *ectx,
- struct GNUNET_ECRS_MetaData *md,
- const char *filename,
- EXTRACTOR_ExtractorList * extractors);
+ struct GNUNET_ECRS_MetaData *md,
+ const char *filename,
+ EXTRACTOR_ExtractorList *
+ extractors);
/* = 0 */
#define GNUNET_ECRS_SERIALIZE_FULL GNUNET_NO
@@ -208,15 +218,18 @@
* space)
*/
int GNUNET_ECRS_meta_data_serialize (struct GNUNET_GE_Context *ectx,
- const struct GNUNET_ECRS_MetaData *md,
- char *target, unsigned int size, int part);
+ const struct GNUNET_ECRS_MetaData *md,
+ char *target, unsigned int size,
+ int part);
/**
* Compute size of the meta-data in
* serialized form.
* @part flags (partial ok, may compress?)
*/
-unsigned int GNUNET_ECRS_meta_data_get_serialized_size (const struct
GNUNET_ECRS_MetaData *md, int part);
+unsigned int GNUNET_ECRS_meta_data_get_serialized_size (const struct
+ GNUNET_ECRS_MetaData
+ *md, int part);
/**
* Deserialize meta-data. Initializes md.
@@ -224,9 +237,13 @@
* @return MD on success, NULL on error (i.e.
* bad format)
*/
-struct GNUNET_ECRS_MetaData *GNUNET_ECRS_meta_data_deserialize (struct
GNUNET_GE_Context *ectx,
- const char *input,
- unsigned int size);
+struct GNUNET_ECRS_MetaData *GNUNET_ECRS_meta_data_deserialize (struct
+
GNUNET_GE_Context
+ *ectx,
+ const char
+ *input,
+ unsigned int
+ size);
/**
* Does the meta-data claim that this is a directory?
@@ -235,13 +252,15 @@
* @return GNUNET_YES if it is, GNUNET_NO if it is not, GNUNET_SYSERR if
* we have no mime-type information (treat as 'GNUNET_NO')
*/
-int GNUNET_ECRS_meta_data_test_for_directory (const struct
GNUNET_ECRS_MetaData *md);
+int GNUNET_ECRS_meta_data_test_for_directory (const struct
+ GNUNET_ECRS_MetaData *md);
/**
* Suggest a better filename for a file (and do the
* renaming).
*/
-char *GNUNET_ECRS_suggest_better_filename (struct GNUNET_GE_Context *ectx,
const char *filename);
+char *GNUNET_ECRS_suggest_better_filename (struct GNUNET_GE_Context *ectx,
+ const char *filename);
/* ******************** URI (uri.c) ************************ */
@@ -258,7 +277,8 @@
/**
* Convert a UTF-8 String to a URI.
*/
-struct GNUNET_ECRS_URI *GNUNET_ECRS_string_to_uri (struct GNUNET_GE_Context
*ectx, const char *uri);
+struct GNUNET_ECRS_URI *GNUNET_ECRS_string_to_uri (struct GNUNET_GE_Context
+ *ectx, const char *uri);
/**
* Free URI.
@@ -269,7 +289,9 @@
* How many keywords are ANDed in this keyword URI?
* @return 0 if this is not a keyword URI
*/
-unsigned int GNUNET_ECRS_uri_get_keyword_count_from_ksk (const struct
GNUNET_ECRS_URI *uri);
+unsigned int GNUNET_ECRS_uri_get_keyword_count_from_ksk (const struct
+ GNUNET_ECRS_URI
+ *uri);
/**
* Iterate over all keywords in this keyword URI?
@@ -277,30 +299,34 @@
* keywords iterated over until iterator aborted
*/
int GNUNET_ECRS_uri_get_keywords_from_ksk (const struct GNUNET_ECRS_URI *uri,
- GNUNET_ECRS_KeywordIterator iterator, void *cls);
+ GNUNET_ECRS_KeywordIterator
+ iterator, void *cls);
/**
* Obtain the identity of the peer offering the data
* @return -1 if this is not a location URI, otherwise GNUNET_OK
*/
-int GNUNET_ECRS_uri_get_peer_identity_from_loc (const struct GNUNET_ECRS_URI
*uri,
- GNUNET_PeerIdentity * peer);
+int GNUNET_ECRS_uri_get_peer_identity_from_loc (const struct GNUNET_ECRS_URI
+ *uri,
+ GNUNET_PeerIdentity * peer);
/**
* Obtain the URI of the content itself.
*
* @return NULL if argument is not a location URI
*/
-struct GNUNET_ECRS_URI * GNUNET_ECRS_uri_get_content_uri_from_loc (const
struct GNUNET_ECRS_URI *uri);
+struct GNUNET_ECRS_URI *GNUNET_ECRS_uri_get_content_uri_from_loc (const struct
+
GNUNET_ECRS_URI
+ *uri);
/**
* Function that produces a signature for
* a particular piece of content.
*/
typedef int (*GNUNET_ECRS_SignFunction) (void *cls,
- unsigned short size,
- const void *data,
- GNUNET_RSA_Signature * result);
+ unsigned short size,
+ const void *data,
+ GNUNET_RSA_Signature * result);
/**
* Construct a location URI.
@@ -312,30 +338,40 @@
* RSA signatures for "sender".
* @return the location URI
*/
-struct GNUNET_ECRS_URI *GNUNET_ECRS_location_to_uri (const struct
GNUNET_ECRS_URI *baseUri,
- const GNUNET_RSA_PublicKey * peer,
- GNUNET_Int32Time expirationTime,
- GNUNET_ECRS_SignFunction signer,
- void *signer_cls);
+struct GNUNET_ECRS_URI *GNUNET_ECRS_location_to_uri (const struct
+ GNUNET_ECRS_URI *baseUri,
+ const
+ GNUNET_RSA_PublicKey *
+ peer,
+ GNUNET_Int32Time
+ expirationTime,
+ GNUNET_ECRS_SignFunction
+ signer,
+ void *signer_cls);
/**
* Duplicate URI.
*/
-struct GNUNET_ECRS_URI *GNUNET_ECRS_uri_duplicate (const struct
GNUNET_ECRS_URI *uri);
+struct GNUNET_ECRS_URI *GNUNET_ECRS_uri_duplicate (const struct
+ GNUNET_ECRS_URI *uri);
/**
* Expand a keyword-URI by duplicating all keywords,
* adding the current date (YYYY-MM-DD) after each
* keyword.
*/
-struct GNUNET_ECRS_URI *GNUNET_ECRS_uri_expand_keywords_with_date (const
struct GNUNET_ECRS_URI *uri);
+struct GNUNET_ECRS_URI *GNUNET_ECRS_uri_expand_keywords_with_date (const
+ struct
+
GNUNET_ECRS_URI
+ *uri);
/**
* Convert a NULL-terminated array of keywords
* to an ECRS URI.
*/
-struct GNUNET_ECRS_URI *GNUNET_ECRS_keyword_strings_to_uri (const char
*keyword[]);
+struct GNUNET_ECRS_URI *GNUNET_ECRS_keyword_strings_to_uri (const char
+ *keyword[]);
/**
* Create an ECRS URI from a single user-supplied string of keywords.
@@ -345,7 +381,7 @@
* @return an ECRS URI for the given keywords, NULL
* if keywords is not legal (i.e. empty).
*/
-struct GNUNET_ECRS_URI *GNUNET_ECRS_keyword_string_to_uri (struct
GNUNET_GE_Context *ectx, const char *keywords); /* helper.c */
+struct GNUNET_ECRS_URI *GNUNET_ECRS_keyword_string_to_uri (struct
GNUNET_GE_Context *ectx, const char *keywords); /* helper.c */
/**
* Create an ECRS URI from a user-supplied command line of keywords.
@@ -355,7 +391,7 @@
* @return an ECRS URI for the given keywords, NULL
* if keywords is not legal (i.e. empty).
*/
-struct GNUNET_ECRS_URI *GNUNET_ECRS_keyword_command_line_to_uri (struct
GNUNET_GE_Context *ectx, unsigned int argc, const char **argv); /*
helper.c */
+struct GNUNET_ECRS_URI *GNUNET_ECRS_keyword_command_line_to_uri (struct
GNUNET_GE_Context *ectx, unsigned int argc, const char **argv); /* helper.c */
/**
* Create an ECRS URI from a user-supplied list of keywords.
@@ -365,14 +401,19 @@
* @return an ECRS URI for the given keywords, NULL
* if keywords is not legal (i.e. empty).
*/
-struct GNUNET_ECRS_URI *GNUNET_ECRS_keyword_list_to_uri (struct
GNUNET_GE_Context *ectx,
- unsigned int num_keywords,
- const char **keywords);
+struct GNUNET_ECRS_URI *GNUNET_ECRS_keyword_list_to_uri (struct
+ GNUNET_GE_Context
+ *ectx,
+ unsigned int
+ num_keywords,
+ const char
+ **keywords);
/**
* Test if two URIs are equal.
*/
-int GNUNET_ECRS_uri_test_equal (const struct GNUNET_ECRS_URI *u1, const struct
GNUNET_ECRS_URI *u2);
+int GNUNET_ECRS_uri_test_equal (const struct GNUNET_ECRS_URI *u1,
+ const struct GNUNET_ECRS_URI *u2);
/**
* Is this a namespace URI?
@@ -392,13 +433,14 @@
* Get the ID of a namespace from the given
* namespace URI.
*/
-int GNUNET_ECRS_uri_get_namespace_from_sks (const struct GNUNET_ECRS_URI *uri,
GNUNET_HashCode * nsid);
+int GNUNET_ECRS_uri_get_namespace_from_sks (const struct GNUNET_ECRS_URI *uri,
+ GNUNET_HashCode * nsid);
/**
* Get the content ID of an SKS URI.
*/
-int GNUNET_ECRS_uri_get_content_hash_from_sks (const struct GNUNET_ECRS_URI
*uri,
- GNUNET_HashCode * nsid);
+int GNUNET_ECRS_uri_get_content_hash_from_sks (const struct GNUNET_ECRS_URI
+ *uri, GNUNET_HashCode * nsid);
/**
* Is this a keyword URI?
@@ -414,7 +456,8 @@
* What is the size of the file that this URI
* refers to?
*/
-unsigned long long GNUNET_ECRS_uri_get_file_siz (const struct GNUNET_ECRS_URI
*uri);
+unsigned long long GNUNET_ECRS_uri_get_file_siz (const struct GNUNET_ECRS_URI
+ *uri);
/**
* Is this a location URI?
@@ -428,7 +471,9 @@
* in the meta-data and construct one large keyword URI
* that lists all keywords that can be found in the meta-data).
*/
-struct GNUNET_ECRS_URI *GNUNET_ECRS_meta_data_to_uri (const struct
GNUNET_ECRS_MetaData *md);
+struct GNUNET_ECRS_URI *GNUNET_ECRS_meta_data_to_uri (const struct
+ GNUNET_ECRS_MetaData
+ *md);
typedef struct
@@ -441,16 +486,20 @@
/**
* @param scls must be of type "struct GNUNET_ECRS_URI **"
*/
-int GNUNET_ECRS_getopt_configure_set_keywords
(GNUNET_CommandLineProcessorContext *
- ctx, void *scls, const char *option,
- const char *value);
+int
+GNUNET_ECRS_getopt_configure_set_keywords (GNUNET_CommandLineProcessorContext
+ * ctx, void *scls,
+ const char *option,
+ const char *value);
/**
* @param scls must be of type "struct GNUNET_ECRS_MetaData **"
*/
-int GNUNET_ECRS_getopt_configure_set_metadata
(GNUNET_CommandLineProcessorContext *
- ctx, void *scls, const char *option,
- const char *value);
+int
+GNUNET_ECRS_getopt_configure_set_metadata (GNUNET_CommandLineProcessorContext
+ * ctx, void *scls,
+ const char *option,
+ const char *value);
@@ -494,8 +543,8 @@
* @return GNUNET_SYSERR if the upload failed (i.e. not enough space
* or gnunetd not running)
*/
-int GNUNET_ECRS_file_upload (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *filename, int doIndex, unsigned int
anonymityLevel, unsigned int priority, GNUNET_CronTime expirationTime, /*
absolute time */
- GNUNET_ECRS_UploadProgressCallback upcb, void
*upcbClosure, GNUNET_ECRS_TestTerminate tt, void *ttClosure, struct
GNUNET_ECRS_URI **uri); /* upload.c */
+int GNUNET_ECRS_file_upload (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *filename, int doIndex, unsigned int
anonymityLevel, unsigned int priority, GNUNET_CronTime expirationTime,
/* absolute time */
+ GNUNET_ECRS_UploadProgressCallback upcb, void
*upcbClosure, GNUNET_ECRS_TestTerminate tt, void *ttClosure, struct
GNUNET_ECRS_URI **uri); /* upload.c */
/**
* Test if a file is indexed.
@@ -507,7 +556,8 @@
* be notified that 'something is wrong')
*/
int GNUNET_ECRS_file_test_indexed (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, const char
*filename);
+ struct GNUNET_GC_Configuration *cfg,
+ const char *filename);
/**
* @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
@@ -527,15 +577,16 @@
* @return number of files indexed, GNUNET_SYSERR if iterator aborted
*/
int GNUNET_ECRS_get_indexed_files (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- GNUNET_ECRS_FileProcessor iterator, void
*closure);
+ struct GNUNET_GC_Configuration *cfg,
+ GNUNET_ECRS_FileProcessor iterator,
+ void *closure);
/**
* Unindex a file.
*
* @return GNUNET_SYSERR if the unindexing failed (i.e. not indexed)
*/
-int GNUNET_ECRS_file_uninde (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_uninde (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 */
/**
@@ -558,7 +609,7 @@
*
* @return URI on success, NULL on error (namespace already exists)
*/
-struct GNUNET_ECRS_URI *GNUNET_ECRS_namespace_create (struct GNUNET_GE_Context
*ectx, struct GNUNET_GC_Configuration *cfg, const char *name, const struct
GNUNET_ECRS_MetaData *meta, unsigned int anonymityLevel, unsigned int priority,
GNUNET_CronTime expiration, const struct GNUNET_ECRS_URI *advertisementURI,
const GNUNET_HashCode * rootEntry); /* namespace.c */
+struct GNUNET_ECRS_URI *GNUNET_ECRS_namespace_create (struct GNUNET_GE_Context
*ectx, struct GNUNET_GC_Configuration *cfg, const char *name, const struct
GNUNET_ECRS_MetaData *meta, unsigned int anonymityLevel, unsigned int priority,
GNUNET_CronTime expiration, const struct GNUNET_ECRS_URI *advertisementURI,
const GNUNET_HashCode * rootEntry); /* namespace.c */
/**
* Check if the given namespace exists (locally).
@@ -567,8 +618,9 @@
* @return GNUNET_OK if the namespace exists, GNUNET_SYSERR if not
*/
int GNUNET_ECRS_namespace_test_exists (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *name, const GNUNET_HashCode * hc);
+ struct GNUNET_GC_Configuration *cfg,
+ const char *name,
+ const GNUNET_HashCode * hc);
/**
* Delete a local namespace. Only prevents future insertions
@@ -577,7 +629,7 @@
*
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int GNUNET_ECRS_namespace_delete (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *namespaceName); /* namespace.c */
+int GNUNET_ECRS_namespace_delete (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *namespaceName); /* namespace.c */
/**
* Callback with information about local (!) namespaces.
@@ -585,7 +637,8 @@
* ID.
*/
typedef int (*GNUNET_ECRS_NamespaceInfoProcessor) (const GNUNET_HashCode * id,
- const char *name, void *closure);
+ const char *name,
+ void *closure);
/**
* Build a list of all available local (!) namespaces
@@ -595,7 +648,7 @@
* @param list where to store the names (is allocated, caller frees)
* @return GNUNET_SYSERR on error, otherwise the number of pseudonyms in list
*/
-int GNUNET_ECRS_get_namespaces (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, GNUNET_ECRS_NamespaceInfoProcessor cb, void
*cls); /* namespace.c */
+int GNUNET_ECRS_get_namespaces (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, GNUNET_ECRS_NamespaceInfoProcessor cb, void
*cls); /* namespace.c */
/**
* Add an entry into a namespace.
@@ -607,7 +660,7 @@
* entry?
* @return URI on success, NULL on error
*/
-struct GNUNET_ECRS_URI *GNUNET_ECRS_namespace_add_content (struct
GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration *cfg, const char *name,
unsigned int anonymityLevel, unsigned int priority, GNUNET_CronTime
expirationTime, GNUNET_Int32Time creationTime, GNUNET_Int32Time updateInterval,
const GNUNET_HashCode * thisId, const GNUNET_HashCode * nextId, const struct
GNUNET_ECRS_URI *dst, const struct GNUNET_ECRS_MetaData *md); /* namespace.c */
+struct GNUNET_ECRS_URI *GNUNET_ECRS_namespace_add_content (struct
GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration *cfg, const char *name,
unsigned int anonymityLevel, unsigned int priority, GNUNET_CronTime
expirationTime, GNUNET_Int32Time creationTime, GNUNET_Int32Time updateInterval,
const GNUNET_HashCode * thisId, const GNUNET_HashCode * nextId, const struct
GNUNET_ECRS_URI *dst, const struct GNUNET_ECRS_MetaData *md); /*
namespace.c */
/**
* Add an entry into the K-space (keyword space).
@@ -618,7 +671,7 @@
* @param md what meta-data should be associated with the
* entry?
*/
-int GNUNET_ECRS_publish_under_keyword (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const struct GNUNET_ECRS_URI *uri, unsigned int
anonymityLevel, unsigned int priority, GNUNET_CronTime expirationTime, const
struct GNUNET_ECRS_URI *dst, const struct GNUNET_ECRS_MetaData *md); /*
keyspace.c */
+int GNUNET_ECRS_publish_under_keyword (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const struct GNUNET_ECRS_URI *uri, unsigned int
anonymityLevel, unsigned int priority, GNUNET_CronTime expirationTime, const
struct GNUNET_ECRS_URI *dst, const struct GNUNET_ECRS_MetaData *md); /*
keyspace.c */
/**
* The search has found another result. Callback to notify
@@ -642,7 +695,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_CronTime timeout, 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_CronTime timeout, 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
@@ -671,7 +724,7 @@
* @param uri the URI of the file (determines what to download)
* @param filename where to store the file
*/
-int GNUNET_ECRS_file_download (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const struct GNUNET_ECRS_URI *uri, const char
*filename, unsigned int anonymityLevel, GNUNET_ECRS_DownloadProgressCallback
dpcb, void *dpcbClosure, GNUNET_ECRS_TestTerminate tt, void *ttClosure); /*
download.c */
+int GNUNET_ECRS_file_download (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const struct GNUNET_ECRS_URI *uri, const char
*filename, unsigned int anonymityLevel, GNUNET_ECRS_DownloadProgressCallback
dpcb, void *dpcbClosure, GNUNET_ECRS_TestTerminate tt, void *ttClosure); /*
download.c */
/**
* GNUNET_ND_DOWNLOAD parts of a file. Note that this will store
@@ -692,7 +745,7 @@
* @param start starting offset
* @param length length of the download (starting at offset)
*/
-int GNUNET_ECRS_file_download_partial (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const struct GNUNET_ECRS_URI *uri, const char
*filename, unsigned long long offset, unsigned long long length, unsigned int
anonymityLevel, int no_temporaries, GNUNET_ECRS_DownloadProgressCallback dpcb,
void *dpcbClosure, GNUNET_ECRS_TestTerminate tt, void *ttClosure); /*
download.c */
+int GNUNET_ECRS_file_download_partial (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const struct GNUNET_ECRS_URI *uri, const char
*filename, unsigned long long offset, unsigned long long length, unsigned int
anonymityLevel, int no_temporaries, GNUNET_ECRS_DownloadProgressCallback dpcb,
void *dpcbClosure, GNUNET_ECRS_TestTerminate tt, void *ttClosure); /*
download.c */
/**
* Iterate over all entries in a directory. Note that directories
@@ -708,7 +761,7 @@
* @return number of entries on success, GNUNET_SYSERR if the
* directory is malformed
*/
-int GNUNET_ECRS_directory_list_contents (struct GNUNET_GE_Context *ectx, const
char *data, unsigned long long len, struct GNUNET_ECRS_MetaData **md,
GNUNET_ECRS_SearchResultProcessor spcb, void *spcbClosure); /* directory.c
*/
+int GNUNET_ECRS_directory_list_contents (struct GNUNET_GE_Context *ectx, const
char *data, unsigned long long len, struct GNUNET_ECRS_MetaData **md,
GNUNET_ECRS_SearchResultProcessor spcb, void *spcbClosure); /*
directory.c */
/**
* Create a directory.
@@ -723,7 +776,7 @@
* is extended with the mime-type for a GNUnet directory.
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int GNUNET_ECRS_directory_create (struct GNUNET_GE_Context *ectx, char **data,
unsigned long long *len, unsigned int count, const GNUNET_ECRS_FileInfo * fis,
struct GNUNET_ECRS_MetaData *meta); /* directory.c */
+int GNUNET_ECRS_directory_create (struct GNUNET_GE_Context *ectx, char **data,
unsigned long long *len, unsigned int count, const GNUNET_ECRS_FileInfo * fis,
struct GNUNET_ECRS_MetaData *meta); /* directory.c */
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: GNUnet/src/include/gnunet_fs_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fs_lib.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/include/gnunet_fs_lib.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -46,9 +46,15 @@
struct GNUNET_FS_SearchContext;
-struct GNUNET_FS_SearchContext *GNUNET_FS_create_search_context (struct
GNUNET_GE_Context *ectx,
- struct
GNUNET_GC_Configuration *cfg,
- struct GNUNET_Mutex *lock);
+struct GNUNET_FS_SearchContext *GNUNET_FS_create_search_context (struct
+
GNUNET_GE_Context
+ *ectx,
+ struct
+
GNUNET_GC_Configuration
+ *cfg,
+ struct
+ GNUNET_Mutex
+ *lock);
void GNUNET_FS_destroy_search_context (struct GNUNET_FS_SearchContext *ctx);
@@ -66,28 +72,38 @@
* @param callback method to call for each result
* @param prio priority to use for the search
*/
-struct GNUNET_FS_SearchHandle *GNUNET_FS_start_search (struct
GNUNET_FS_SearchContext *ctx,
- const GNUNET_PeerIdentity * target,
- unsigned int type,
- unsigned int keyCount,
- const GNUNET_HashCode * keys,
- unsigned int anonymityLevel,
- unsigned int prio,
- GNUNET_CronTime timeout,
- GNUNET_DatastoreValueIterator
callback,
- void *closure);
+struct GNUNET_FS_SearchHandle *GNUNET_FS_start_search (struct
+ GNUNET_FS_SearchContext
+ *ctx,
+ const
+ GNUNET_PeerIdentity *
+ target,
+ unsigned int type,
+ unsigned int keyCount,
+ const GNUNET_HashCode *
+ keys,
+ unsigned int
+ anonymityLevel,
+ unsigned int prio,
+ GNUNET_CronTime
+ timeout,
+
GNUNET_DatastoreValueIterator
+ callback,
+ void *closure);
/**
* Stop searching.
*/
void GNUNET_FS_stop_search (struct GNUNET_FS_SearchContext *ctx,
- struct GNUNET_FS_SearchHandle *handle);
+ struct GNUNET_FS_SearchHandle *handle);
/**
* What is the current average priority of entries
* in the routing table like? Returns -1 on error.
*/
-int GNUNET_FS_get_current_average_priority (struct
GNUNET_ClientServerConnection *sock);
+int GNUNET_FS_get_current_average_priority (struct
+ GNUNET_ClientServerConnection
+ *sock);
/**
* Insert a block. Note that while the API is VERY similar to
@@ -99,14 +115,15 @@
* @see ecrs_core.h::fileBlockEncode
*/
int GNUNET_FS_insert (struct GNUNET_ClientServerConnection *sock,
- const GNUNET_DatastoreValue * block);
+ const GNUNET_DatastoreValue * block);
/**
* Initialize to index a file. Tries to do the symlinking.
*/
int GNUNET_FS_prepare_to_inde (struct GNUNET_ClientServerConnection *sock,
- const GNUNET_HashCode * fileHc, const char *fn);
+ const GNUNET_HashCode * fileHc,
+ const char *fn);
/**
* Index a block. Note that while the API is VERY similar to
@@ -119,8 +136,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int GNUNET_FS_index (struct GNUNET_ClientServerConnection *sock,
- const GNUNET_HashCode * fileHc,
- const GNUNET_DatastoreValue * block, unsigned long long offset);
+ const GNUNET_HashCode * fileHc,
+ const GNUNET_DatastoreValue * block,
+ unsigned long long offset);
/**
* Delete a block. The arguments are the same as the ones for
@@ -131,7 +149,7 @@
* GNUNET_SYSERR on error
*/
int GNUNET_FS_delete (struct GNUNET_ClientServerConnection *sock,
- const GNUNET_DatastoreValue * block);
+ const GNUNET_DatastoreValue * block);
/**
* Unindex a file.
@@ -140,7 +158,7 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int GNUNET_FS_unindex (struct GNUNET_ClientServerConnection *sock,
- unsigned int blocksize, const GNUNET_HashCode * hc);
+ unsigned int blocksize, const GNUNET_HashCode * hc);
/**
* Test if a file of the given GNUNET_hash is indexed.
@@ -149,7 +167,7 @@
* @return GNUNET_YES if so, GNUNET_NO if not, GNUNET_SYSERR on error
*/
int GNUNET_FS_test_indexed (struct GNUNET_ClientServerConnection *sock,
- const GNUNET_HashCode * hc);
+ const GNUNET_HashCode * hc);
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: GNUnet/src/include/gnunet_fsui_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fsui_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_fsui_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -812,7 +812,8 @@
*
* @return cctx for resume events, otherwise NULL
*/
-typedef void *(*GNUNET_FSUI_EventProcessor) (void *cls, const
GNUNET_FSUI_Event * event);
+typedef void *(*GNUNET_FSUI_EventProcessor) (void *cls,
+ const GNUNET_FSUI_Event * event);
/**
* @brief Start the FSUI manager. Use the given progress callback to
@@ -845,7 +846,7 @@
* @param closure extra argument to cb
* @return NULL on error
*/
-struct GNUNET_FSUI_Context *GNUNET_FSUI_start (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg, const char *name, unsigned int
threadPoolSize, int doResume, GNUNET_FSUI_EventProcessor cb, void *closure);
/* fsui.c */
+struct GNUNET_FSUI_Context *GNUNET_FSUI_start (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg, const char *name, unsigned int
threadPoolSize, int doResume, GNUNET_FSUI_EventProcessor cb, void *closure); /*
fsui.c */
/**
* Stop all processes under FSUI control (may serialize
@@ -853,7 +854,7 @@
* uninterruptable activities complete (you may want to
* signal the user that this may take a while).
*/
-void GNUNET_FSUI_stop (struct GNUNET_FSUI_Context *ctx); /* fsui.c */
+void GNUNET_FSUI_stop (struct GNUNET_FSUI_Context *ctx); /* fsui.c */
/**
@@ -861,28 +862,28 @@
*
* @return NULL on error
*/
-struct GNUNET_FSUI_SearchList *GNUNET_FSUI_search_start (struct
GNUNET_FSUI_Context *ctx, unsigned int anonymityLevel, unsigned int maxResults,
GNUNET_CronTime timeout, const struct GNUNET_ECRS_URI *uri); /* search.c */
+struct GNUNET_FSUI_SearchList *GNUNET_FSUI_search_start (struct
GNUNET_FSUI_Context *ctx, unsigned int anonymityLevel, unsigned int maxResults,
GNUNET_CronTime timeout, const struct GNUNET_ECRS_URI *uri); /* search.c */
/**
* Abort a search.
*
* @return GNUNET_SYSERR if such a search is not known
*/
-int GNUNET_FSUI_search_abort (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_SearchList *sl); /* search.c */
+int GNUNET_FSUI_search_abort (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_SearchList *sl); /* search.c */
/**
* Stop a search.
*
* @return GNUNET_SYSERR if such a search is not known
*/
-int GNUNET_FSUI_search_stop (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_SearchList *sl); /* search.c */
+int GNUNET_FSUI_search_stop (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_SearchList *sl); /* search.c */
/**
* Start to download a file or directory.
*
* @return NULL on error
*/
-struct GNUNET_FSUI_DownloadList *GNUNET_FSUI_download_start (struct
GNUNET_FSUI_Context *ctx, unsigned int anonymityLevel, int doRecursive, const
struct GNUNET_ECRS_URI *uri, const struct GNUNET_ECRS_MetaData *meta, const
char *filename, struct GNUNET_FSUI_SearchList *parentSearch, struct
GNUNET_FSUI_DownloadList *parentDownload); /* download.c */
+struct GNUNET_FSUI_DownloadList *GNUNET_FSUI_download_start (struct
GNUNET_FSUI_Context *ctx, unsigned int anonymityLevel, int doRecursive, const
struct GNUNET_ECRS_URI *uri, const struct GNUNET_ECRS_MetaData *meta, const
char *filename, struct GNUNET_FSUI_SearchList *parentSearch, struct
GNUNET_FSUI_DownloadList *parentDownload); /* download.c */
/**
* Abort a download. If the dl is for a recursive
@@ -890,7 +891,7 @@
*
* @return GNUNET_SYSERR on error
*/
-int GNUNET_FSUI_download_abort (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_DownloadList *dl); /* download.c */
+int GNUNET_FSUI_download_abort (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_DownloadList *dl); /* download.c */
/**
* Stop a download. If the dl is for a recursive
@@ -898,7 +899,7 @@
*
* @return GNUNET_SYSERR on error
*/
-int GNUNET_FSUI_download_stop (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_DownloadList *dl); /* download.c */
+int GNUNET_FSUI_download_stop (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_DownloadList *dl); /* download.c */
/**
* Method that can be used to select files that
@@ -909,9 +910,9 @@
* upload.
*/
typedef int (*GNUNET_FSUI_DirectoryScanCallback) (void *data,
- const char *filename,
- GNUNET_DirectoryEntryCallback dec,
- void *decClosure);
+ const char *filename,
+ GNUNET_DirectoryEntryCallback
+ dec, void *decClosure);
/**
* Start uploading a file or directory.
@@ -927,20 +928,30 @@
* @param keyURI keywords for top-level file
* @return NULL on error
*/
-struct GNUNET_FSUI_UploadList *GNUNET_FSUI_upload_star (struct
GNUNET_FSUI_Context *ctx,
- const char *filename,
- GNUNET_FSUI_DirectoryScanCallback
dsc,
- void *dscClosure,
- unsigned int anonymityLevel,
- unsigned int priority,
- int doIndex,
- int doExtract,
- int individualKeywords,
- GNUNET_CronTime expiration,
- const struct GNUNET_ECRS_MetaData
- *topLevelMetaData,
- const struct GNUNET_ECRS_URI
*globalURI,
- const struct GNUNET_ECRS_URI
*keyUri);
+struct GNUNET_FSUI_UploadList *GNUNET_FSUI_upload_star (struct
+ GNUNET_FSUI_Context
+ *ctx,
+ const char *filename,
+
GNUNET_FSUI_DirectoryScanCallback
+ dsc, void *dscClosure,
+ unsigned int
+ anonymityLevel,
+ unsigned int priority,
+ int doIndex,
+ int doExtract,
+ int
+ individualKeywords,
+ GNUNET_CronTime
+ expiration,
+ const struct
+ GNUNET_ECRS_MetaData
+ *topLevelMetaData,
+ const struct
+ GNUNET_ECRS_URI
+ *globalURI,
+ const struct
+ GNUNET_ECRS_URI
+ *keyUri);
/**
@@ -949,7 +960,8 @@
*
* @return GNUNET_SYSERR on error
*/
-int GNUNET_FSUI_upload_abort (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_UploadList *ul);
+int GNUNET_FSUI_upload_abort (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_UploadList *ul);
/**
* Stop an upload. Only to be called for the top-level
@@ -957,7 +969,8 @@
*
* @return GNUNET_SYSERR on error
*/
-int GNUNET_FSUI_upload_stop (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_UploadList *ul);
+int GNUNET_FSUI_upload_stop (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_UploadList *ul);
/**
@@ -966,8 +979,11 @@
*
* @return NULL on error
*/
-struct GNUNET_FSUI_UnindexList *GNUNET_FSUI_unindex_start (struct
GNUNET_FSUI_Context *ctx,
- const char *filename);
+struct GNUNET_FSUI_UnindexList *GNUNET_FSUI_unindex_start (struct
+ GNUNET_FSUI_Context
+ *ctx,
+ const char
+ *filename);
/**
@@ -975,7 +991,8 @@
*
* @return GNUNET_SYSERR on error
*/
-int GNUNET_FSUI_unindex_abort (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_UnindexList *ul);
+int GNUNET_FSUI_unindex_abort (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_UnindexList *ul);
/**
@@ -983,7 +1000,8 @@
*
* @return GNUNET_SYSERR on error
*/
-int GNUNET_FSUI_unindex_stop (struct GNUNET_FSUI_Context *ctx, struct
GNUNET_FSUI_UnindexList *ul);
+int GNUNET_FSUI_unindex_stop (struct GNUNET_FSUI_Context *ctx,
+ struct GNUNET_FSUI_UnindexList *ul);
#if 0 /* keep Emacsens' auto-indent happy */
Modified: GNUnet/src/include/gnunet_gap_service.h
===================================================================
--- GNUnet/src/include/gnunet_gap_service.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_gap_service.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -54,10 +54,13 @@
* request.
* @param verify check that content is valid? (GNUNET_YES/GNUNET_NO)
*/
-typedef int (*GNUNET_UniqueReplyIdentifierCallback) (const
GNUNET_DataContainer * content,
- unsigned int query_type,
- int verify,
- const GNUNET_HashCode * primaryKey);
+typedef int (*GNUNET_UniqueReplyIdentifierCallback) (const
+ GNUNET_DataContainer *
+ content,
+ unsigned int query_type,
+ int verify,
+ const GNUNET_HashCode *
+ primaryKey);
/**
* Given some content, compute the unique
@@ -65,7 +68,7 @@
* to sort out duplicates.
*/
typedef int (*GNUNET_ReplyHashingCallback) (const GNUNET_DataContainer * data,
- GNUNET_HashCode * hc);
+ GNUNET_HashCode * hc);
/**
* Functions of the GAP Service API.
@@ -80,7 +83,8 @@
* @return GNUNET_SYSERR on error, GNUNET_OK on success
*/
int (*init) (GNUNET_Blockstore * datastore,
- GNUNET_UniqueReplyIdentifierCallback uri,
GNUNET_ReplyHashingCallback rhf);
+ GNUNET_UniqueReplyIdentifierCallback uri,
+ GNUNET_ReplyHashingCallback rhf);
/**
* Perform a GET operation using 'key' as the key. Note that no
Modified: GNUnet/src/include/gnunet_getoption_lib.h
===================================================================
--- GNUnet/src/include/gnunet_getoption_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_getoption_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -41,8 +41,10 @@
* Obtain option value from a peer.
* @return NULL on error
*/
-char *GNUNET_get_daemon_configuration_value (struct
GNUNET_ClientServerConnection *sock,
- const char *section, const char *option);
+char *GNUNET_get_daemon_configuration_value (struct
+ GNUNET_ClientServerConnection
+ *sock, const char *section,
+ const char *option);
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: GNUnet/src/include/gnunet_identity_lib.h
===================================================================
--- GNUnet/src/include/gnunet_identity_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_identity_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -95,12 +95,13 @@
* @return GNUNET_OK to continue to iterate, GNUNET_SYSERR to abort
*/
typedef int (*GNUNET_IDENTITY_PeerInfoCallback) (void *data,
- const GNUNET_PeerIdentity *
- identity, const void *address,
- unsigned int addr_len,
- GNUNET_CronTime last_message,
- unsigned int trust,
- unsigned int bpmFromPeer);
+ const GNUNET_PeerIdentity *
+ identity,
+ const void *address,
+ unsigned int addr_len,
+ GNUNET_CronTime last_message,
+ unsigned int trust,
+ unsigned int bpmFromPeer);
/**
* Request information about all known peers
Modified: GNUnet/src/include/gnunet_identity_service.h
===================================================================
--- GNUnet/src/include/gnunet_identity_service.h 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/include/gnunet_identity_service.h 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -59,8 +59,8 @@
* @return GNUNET_OK to continue iteration
*/
typedef int (*GNUNET_HostProcessor) (const GNUNET_PeerIdentity * identity,
- unsigned short protocol,
- int confirmed, void *data);
+ unsigned short protocol,
+ int confirmed, void *data);
/**
* @brief Definition of the Identity API.
@@ -131,7 +131,8 @@
* @param data an argument to pass to the method
* @return the number of known hosts matching
*/
- int (*forEachHost) (GNUNET_CronTime now, GNUNET_HostProcessor callback, void
*data);
+ int (*forEachHost) (GNUNET_CronTime now, GNUNET_HostProcessor callback,
+ void *data);
/**
* Obtain the public key and address of a known host. If no specific
Modified: GNUnet/src/include/gnunet_kvstore_service.h
===================================================================
--- GNUnet/src/include/gnunet_kvstore_service.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_kvstore_service.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -54,7 +54,8 @@
* @param vallen the length von val
* @return GNUNET_OK on success
*/
-typedef int (*GNUNET_KeyValueProcessor) (void *closure, void *val, int vallen);
+typedef int (*GNUNET_KeyValueProcessor) (void *closure, void *val,
+ int vallen);
/**
@@ -67,7 +68,8 @@
* @param table the name of the Key/Value-Table
* @return a handle
*/
- GNUNET_KeyValueRecord *(*getTable) (const char *database, const char *table);
+ GNUNET_KeyValueRecord *(*getTable) (const char *database,
+ const char *table);
/**
* @brief Get data from a Key/Value-Table
@@ -83,7 +85,8 @@
void *key,
int keylen,
unsigned int sort,
- unsigned int limit, GNUNET_KeyValueProcessor handler, void
*closure);
+ unsigned int limit, GNUNET_KeyValueProcessor handler,
+ void *closure);
/**
* @brief Store Key/Value-Pair in a table
@@ -106,7 +109,8 @@
* @param age age of the items to delete (may be 0)
* @return GNUNET_OK on success, GNUNET_SYSERR otherwise
*/
- int (*del) (GNUNET_KeyValueRecord * kv, void *key, int keylen, unsigned long
long age);
+ int (*del) (GNUNET_KeyValueRecord * kv, void *key, int keylen,
+ unsigned long long age);
/**
* @brief Close a handle to a Key/Value-Table
Modified: GNUnet/src/include/gnunet_namespace_lib.h
===================================================================
--- GNUnet/src/include/gnunet_namespace_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_namespace_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -44,10 +44,11 @@
* @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
*/
typedef int (*GNUNET_NS_NamespaceIterator) (void *cls,
- const char *namespaceName,
- const GNUNET_HashCode * namespaceId,
- const struct GNUNET_ECRS_MetaData * md,
- int rating);
+ const char *namespaceName,
+ const GNUNET_HashCode *
+ namespaceId,
+ const struct GNUNET_ECRS_MetaData
+ * md, int rating);
/**
* Iterator over all updateable content.
@@ -61,11 +62,13 @@
* @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
*/
typedef int (*GNUNET_NS_UpdateIterator) (void *cls,
- const GNUNET_ECRS_FileInfo * uri,
- const GNUNET_HashCode * lastId,
- const GNUNET_HashCode * nextId,
- GNUNET_Int32Time publicationFrequency,
- GNUNET_Int32Time nextPublicationTime);
+ const GNUNET_ECRS_FileInfo * uri,
+ const GNUNET_HashCode * lastId,
+ const GNUNET_HashCode * nextId,
+ GNUNET_Int32Time
+ publicationFrequency,
+ GNUNET_Int32Time
+ nextPublicationTime);
/**
* Create a new namespace (and publish an advertismement).
@@ -75,7 +78,7 @@
* @param meta meta-data about the namespace (maybe NULL)
* @return URI on success, NULL on error (namespace already exists)
*/
-struct GNUNET_ECRS_URI *GNUNET_NS_namespace_create (struct GNUNET_GE_Context
*ectx, struct GNUNET_GC_Configuration *cfg, unsigned int anonymityLevel,
unsigned int insertPriority, GNUNET_CronTime insertExpiration, const char
*namespaceName, const struct GNUNET_ECRS_MetaData *meta, const struct
GNUNET_ECRS_URI *advertisementURI, const GNUNET_HashCode * rootEntry); /*
namespace_info.c */
+struct GNUNET_ECRS_URI *GNUNET_NS_namespace_create (struct GNUNET_GE_Context
*ectx, struct GNUNET_GC_Configuration *cfg, unsigned int anonymityLevel,
unsigned int insertPriority, GNUNET_CronTime insertExpiration, const char
*namespaceName, const struct GNUNET_ECRS_MetaData *meta, const struct
GNUNET_ECRS_URI *advertisementURI, const GNUNET_HashCode * rootEntry); /*
namespace_info.c */
/**
* Delete a local namespace. Only prevents future insertions into the
@@ -83,7 +86,7 @@
*
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int GNUNET_NS_namespace_delete (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *namespaceName); /* namespace.c */
+int GNUNET_NS_namespace_delete (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *namespaceName); /* namespace.c
*/
/**
* Change the ranking of a (non-local) namespace.
@@ -94,7 +97,7 @@
* changed?
* @return new rating of the namespace
*/
-int GNUNET_NS_namespace_rank (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *ns, int delta); /*
namespace_info.c */
+int GNUNET_NS_namespace_rank (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *ns, int delta); /* namespace_info.c
*/
/**
* Add a namespace to the set of known namespaces. For all namespace
@@ -104,9 +107,10 @@
* @param ns the namespace identifier
*/
void GNUNET_NS_namespace_add_information (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const struct GNUNET_ECRS_URI *uri,
- const struct GNUNET_ECRS_MetaData *meta);
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri,
+ const struct GNUNET_ECRS_MetaData
+ *meta);
/**
@@ -114,12 +118,12 @@
* @return GNUNET_SYSERR on error, GNUNET_OK on success
*/
int GNUNET_NS_namespace_get_root (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *ns, GNUNET_HashCode * root);
+ struct GNUNET_GC_Configuration *cfg,
+ const char *ns, GNUNET_HashCode * root);
void GNUNET_NS_namespace_set_root (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const struct GNUNET_ECRS_URI *uri);
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri);
/**
* List all available (local or non-local) namespaces.
@@ -131,15 +135,16 @@
* a new namespace.
*/
int GNUNET_NS_register_discovery_callback (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- GNUNET_NS_NamespaceIterator iterator,
- void *closure);
+ struct GNUNET_GC_Configuration
+ *cfg,
+ GNUNET_NS_NamespaceIterator
+ iterator, void *closure);
/**
* Unregister namespace discovery callback.
*/
-int GNUNET_NS_unregister_discovery_callback (GNUNET_NS_NamespaceIterator
iterator,
- void *closure);
+int GNUNET_NS_unregister_discovery_callback (GNUNET_NS_NamespaceIterator
+ iterator, void *closure);
@@ -182,7 +187,7 @@
* entry?
* @return the resulting URI, NULL on error
*/
-struct GNUNET_ECRS_URI *GNUNET_NS_add_to_namespace (struct GNUNET_GE_Context
*ectx, struct GNUNET_GC_Configuration *cfg, unsigned int anonymityLevel,
unsigned int insertPriority, GNUNET_CronTime insertExpiration, const char
*name, GNUNET_Int32Time updateInterval, const GNUNET_HashCode * lastId, const
GNUNET_HashCode * thisId, const GNUNET_HashCode * nextId, const struct
GNUNET_ECRS_URI *dst, const struct GNUNET_ECRS_MetaData *md); /*
namespace_info.c */
+struct GNUNET_ECRS_URI *GNUNET_NS_add_to_namespace (struct GNUNET_GE_Context
*ectx, struct GNUNET_GC_Configuration *cfg, unsigned int anonymityLevel,
unsigned int insertPriority, GNUNET_CronTime insertExpiration, const char
*name, GNUNET_Int32Time updateInterval, const GNUNET_HashCode * lastId, const
GNUNET_HashCode * thisId, const GNUNET_HashCode * nextId, const struct
GNUNET_ECRS_URI *dst, const struct GNUNET_ECRS_MetaData *md); /*
namespace_info.c */
/**
* Compute the next ID for peridodically updated content.
@@ -191,17 +196,17 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int GNUNET_NS_compute_next_identifier (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *name,
- const GNUNET_HashCode * lastId,
- const GNUNET_HashCode * thisId,
- GNUNET_Int32Time updateInterval,
- GNUNET_HashCode * nextId);
+ struct GNUNET_GC_Configuration *cfg,
+ const char *name,
+ const GNUNET_HashCode * lastId,
+ const GNUNET_HashCode * thisId,
+ GNUNET_Int32Time updateInterval,
+ GNUNET_HashCode * nextId);
/**
* List all updateable content in a given namespace.
*/
-int GNUNET_NS_namespace_list_contents (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *name, GNUNET_NS_UpdateIterator
iterator, void *closure); /* namespace_info.c */
+int GNUNET_NS_namespace_list_contents (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const char *name, GNUNET_NS_UpdateIterator
iterator, void *closure); /* namespace_info.c */
Modified: GNUnet/src/include/gnunet_peerinfo_lib.h
===================================================================
--- GNUnet/src/include/gnunet_peerinfo_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_peerinfo_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -48,8 +48,8 @@
* @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
*/
typedef int (*GNUNET_PEERINFO_PeerProcessor) (const char *name,
- const GNUNET_PeerIdentity * id,
- unsigned int trust, void *cls);
+ const GNUNET_PeerIdentity * id,
+ unsigned int trust, void *cls);
/**
* Request information about peers.
@@ -60,9 +60,10 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int GNUNET_PEERINFO_get_information (struct GNUNET_GE_Context *ectx,
- struct GNUNET_ClientServerConnection *sock,
- int connected_only,
- GNUNET_PEERINFO_PeerProcessor processor, void *cls);
+ struct GNUNET_ClientServerConnection
+ *sock, int connected_only,
+ GNUNET_PEERINFO_PeerProcessor processor,
+ void *cls);
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: GNUnet/src/include/gnunet_protocols.h
===================================================================
--- GNUnet/src/include/gnunet_protocols.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_protocols.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -420,13 +420,13 @@
/* ************* p2p VPN messages ************* */
-#define GNUNET_P2P_PROTO_AIP_IP 64 /* contains IPv6 frame */
+#define GNUNET_P2P_PROTO_AIP_IP 64 /* contains IPv6 frame */
-#define GNUNET_P2P_PROTO_AIP_ROUTE 65 /* a route to a node */
+#define GNUNET_P2P_PROTO_AIP_ROUTE 65 /* a route to a node */
-#define GNUNET_P2P_PROTO_AIP_ROUTES 66 /* no more routes in my table */
+#define GNUNET_P2P_PROTO_AIP_ROUTES 66 /* no more routes in my table */
-#define GNUNET_P2P_PROTO_AIP_GETROUTE 67 /* request for a table entry
from a peer */
+#define GNUNET_P2P_PROTO_AIP_GETROUTE 67 /* request for a table entry
from a peer */
#define GNUNET_P2P_PROTO_MAX_USED 68
Modified: GNUnet/src/include/gnunet_rpc_lib.h
===================================================================
--- GNUnet/src/include/gnunet_rpc_lib.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/include/gnunet_rpc_lib.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -54,29 +54,35 @@
unsigned int GNUNET_RPC_parameters_count (GNUNET_RPC_CallParameters * param);
void GNUNET_RPC_parameters_add (GNUNET_RPC_CallParameters * param,
- const char *name,
- unsigned int dataLength, const void *data);
+ const char *name,
+ unsigned int dataLength, const void *data);
-void GNUNET_RPC_parameters_add_data_container (GNUNET_RPC_CallParameters *
param,
- const char *name, const GNUNET_DataContainer *
data);
+void GNUNET_RPC_parameters_add_data_container (GNUNET_RPC_CallParameters *
+ param, const char *name,
+ const GNUNET_DataContainer *
+ data);
-const char *GNUNET_RPC_parameters_get_name (GNUNET_RPC_CallParameters * param,
unsigned int i);
+const char *GNUNET_RPC_parameters_get_name (GNUNET_RPC_CallParameters * param,
+ unsigned int i);
-unsigned int GNUNET_RPC_get_index_by_name (GNUNET_RPC_CallParameters * param,
const char *name);
+unsigned int GNUNET_RPC_get_index_by_name (GNUNET_RPC_CallParameters * param,
+ const char *name);
/**
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int GNUNET_RPC_parameters_get_value_by_name (GNUNET_RPC_CallParameters * param,
- const char *name,
- unsigned int *dataLength, void **data);
+int GNUNET_RPC_parameters_get_value_by_name (GNUNET_RPC_CallParameters *
+ param, const char *name,
+ unsigned int *dataLength,
+ void **data);
/**
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int GNUNET_RPC_parameters_get_value_by_index (GNUNET_RPC_CallParameters *
param,
- unsigned int i,
- unsigned int *dataLength, void **data);
+int GNUNET_RPC_parameters_get_value_by_index (GNUNET_RPC_CallParameters *
+ param, unsigned int i,
+ unsigned int *dataLength,
+ void **data);
/**
* Return the value of the given parameter in the RPC parameter structure.
@@ -84,8 +90,9 @@
* @param param Target RPC parameter structure
* @param value set to the value of the parameter
*/
-GNUNET_DataContainer *GNUNET_RPC_parameters_get_data_container_by_index
(GNUNET_RPC_CallParameters * param,
- unsigned int i);
+GNUNET_DataContainer
+ *GNUNET_RPC_parameters_get_data_container_by_index
+ (GNUNET_RPC_CallParameters * param, unsigned int i);
/**
* Return the value of the named parameter in the RPC parameter
@@ -95,24 +102,29 @@
* @param value set to the value of the named parameter
* @return GNUNET_SYSERR on error
*/
-GNUNET_DataContainer *GNUNET_RPC_parameters_get_data_container_by_name
(GNUNET_RPC_CallParameters * param,
- const char *name);
+GNUNET_DataContainer
+ *GNUNET_RPC_parameters_get_data_container_by_name (GNUNET_RPC_CallParameters
+ * param,
+ const char *name);
/**
* Serialize the param array. target must point to at least
* GNUNET_RPC_parameters_get_serialized_size(param) bytes of memory.
*/
-void GNUNET_RPC_parameters_serialize (GNUNET_RPC_CallParameters * param, char
*target);
+void GNUNET_RPC_parameters_serialize (GNUNET_RPC_CallParameters * param,
+ char *target);
/**
* Deserialize parameters from buffer.
*/
-GNUNET_RPC_CallParameters *GNUNET_RPC_parameters_deserialize (char *buffer,
size_t size);
+GNUNET_RPC_CallParameters *GNUNET_RPC_parameters_deserialize (char *buffer,
+ size_t size);
/**
* How many bytes are required to serialize the param array?
*/
-size_t GNUNET_RPC_parameters_get_serialized_size (GNUNET_RPC_CallParameters *
param);
+size_t GNUNET_RPC_parameters_get_serialized_size (GNUNET_RPC_CallParameters *
+ param);
#if 0 /* keep Emacsens' auto-indent happy */
Modified: GNUnet/src/include/gnunet_rpc_service.h
===================================================================
--- GNUnet/src/include/gnunet_rpc_service.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_rpc_service.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -75,8 +75,12 @@
/**
* Prototype for synchronous RPC functions.
*/
-typedef void (*GNUNET_RPC_SynchronousFunction) (const GNUNET_PeerIdentity *
caller,
- GNUNET_RPC_CallParameters * arguments,
GNUNET_RPC_CallParameters * results);
+typedef void (*GNUNET_RPC_SynchronousFunction) (const GNUNET_PeerIdentity *
+ caller,
+ GNUNET_RPC_CallParameters *
+ arguments,
+ GNUNET_RPC_CallParameters *
+ results);
/**
* Opaque RPC internal per-RPC data.
@@ -87,24 +91,33 @@
* GNUNET_RSA_Signature of the callback function for the ASYNC_RPC to
* be called upon completion of the ASYNC function.
*/
-typedef void (*GNUNET_RPC_CompleteCallback) (GNUNET_RPC_CallParameters *
results,
- int errorCode,
- struct GNUNET_RPC_CallHandle *
context);
+typedef void (*GNUNET_RPC_CompleteCallback) (GNUNET_RPC_CallParameters *
+ results, int errorCode,
+ struct GNUNET_RPC_CallHandle *
+ context);
/**
* Prototype for asynchronous RPC functions.
*/
-typedef void (*GNUNET_RPC_AsynchronousFunction) (const GNUNET_PeerIdentity *
caller,
- GNUNET_RPC_CallParameters * arguments,
- GNUNET_RPC_CompleteCallback callback,
- struct GNUNET_RPC_CallHandle * context);
+typedef void (*GNUNET_RPC_AsynchronousFunction) (const GNUNET_PeerIdentity *
+ caller,
+ GNUNET_RPC_CallParameters *
+ arguments,
+ GNUNET_RPC_CompleteCallback
+ callback,
+ struct GNUNET_RPC_CallHandle
+ * context);
/**
* Function to call once an asynchronous RPC completes.
*/
-typedef void (*GNUNET_RPC_AsynchronousCompletionCallback) (const
GNUNET_PeerIdentity * responder,
- GNUNET_RPC_CallParameters * results, void
*closure);
+typedef void (*GNUNET_RPC_AsynchronousCompletionCallback) (const
+ GNUNET_PeerIdentity
+ * responder,
+
GNUNET_RPC_CallParameters
+ * results,
+ void *closure);
struct GNUNET_RPC_RequestHandle;
@@ -131,18 +144,21 @@
/**
* Unregister a synchronous RPC function.
*/
- int (*RPC_unregister) (const char *name, GNUNET_RPC_SynchronousFunction
func);
+ int (*RPC_unregister) (const char *name,
+ GNUNET_RPC_SynchronousFunction func);
/**
* Register an asynchronous RPC function.
*/
- int (*RPC_register_async) (const char *name, GNUNET_RPC_AsynchronousFunction
func);
+ int (*RPC_register_async) (const char *name,
+ GNUNET_RPC_AsynchronousFunction func);
/**
* Unregister an asynchronous RPC function.
*/
- int (*RPC_unregister_async) (const char *name,
GNUNET_RPC_AsynchronousFunction func);
+ int (*RPC_unregister_async) (const char *name,
+ GNUNET_RPC_AsynchronousFunction func);
/**
* Start an asynchronous RPC.
@@ -154,12 +170,14 @@
* @return value required to stop the RPC (and the RPC must
* be explicitly stopped to free resources!)
*/
- struct GNUNET_RPC_RequestHandle *(*RPC_start) (const GNUNET_PeerIdentity *
receiver,
- const char *name,
- GNUNET_RPC_CallParameters * request_param,
- unsigned int importance,
- GNUNET_CronTime timeout,
- GNUNET_RPC_AsynchronousCompletionCallback
callback, void *closure);
+ struct GNUNET_RPC_RequestHandle *(*RPC_start) (const GNUNET_PeerIdentity *
+ receiver, const char *name,
+ GNUNET_RPC_CallParameters *
+ request_param,
+ unsigned int importance,
+ GNUNET_CronTime timeout,
+
GNUNET_RPC_AsynchronousCompletionCallback
+ callback, void *closure);
/**
* Stop an asynchronous RPC.
Modified: GNUnet/src/include/gnunet_setup_lib.h
===================================================================
--- GNUnet/src/include/gnunet_setup_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_setup_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -213,9 +213,14 @@
* @param specification name of the guile file containing the spec
* @return NULL on error (i.e. specification file not found)
*/
-struct GNUNET_GNS_Context *GNUNET_GNS_load_specification (struct
GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration
*cfg,
- const char *specification);
+struct GNUNET_GNS_Context *GNUNET_GNS_load_specification (struct
+ GNUNET_GE_Context
+ *ectx,
+ struct
+
GNUNET_GC_Configuration
+ *cfg,
+ const char
+ *specification);
/**
* Obtain the GNUNET_GNS_TreeNode from the GNS system. The tree is only valid
@@ -225,7 +230,9 @@
*
* @return NULL on error
*/
-struct GNUNET_GNS_TreeNode *GNUNET_GNS_get_tree_root (struct
GNUNET_GNS_Context *ctx);
+struct GNUNET_GNS_TreeNode *GNUNET_GNS_get_tree_root (struct
+ GNUNET_GNS_Context
+ *ctx);
/**
* Free resources associated with the GNS context.
@@ -238,8 +245,9 @@
*
* @param node the node that has changed
*/
-typedef void (*GNUNET_GNS_TreeChangeListener) (const struct
GNUNET_GNS_TreeNode * node,
- void *cls);
+typedef void (*GNUNET_GNS_TreeChangeListener) (const struct
+ GNUNET_GNS_TreeNode * node,
+ void *cls);
/**
* Register a tree change listener with GNS.
@@ -248,8 +256,8 @@
*/
void
GNUNET_GNS_register_tree_change_listener (struct GNUNET_GNS_Context *ctx,
- GNUNET_GNS_TreeChangeListener listener,
- void *cls);
+ GNUNET_GNS_TreeChangeListener
+ listener, void *cls);
/**
* Release a tree change listener from GNS (do not call the listener
@@ -257,8 +265,8 @@
*/
void
GNUNET_GNS_unregister_tree_change_listener (struct GNUNET_GNS_Context *ctx,
- GNUNET_GNS_TreeChangeListener listener,
- void *cls);
+ GNUNET_GNS_TreeChangeListener
+ listener, void *cls);
/**
* Convert the default value of the given tree entry to
@@ -266,7 +274,8 @@
*
* @return NULL on error
*/
-char *GNUNET_GNS_get_default_value_as_string (GNUNET_GNS_TreeNodeKindAndType
type,
- const GNUNET_GNS_Value * value);
+char *GNUNET_GNS_get_default_value_as_string (GNUNET_GNS_TreeNodeKindAndType
+ type,
+ const GNUNET_GNS_Value * value);
#endif
Modified: GNUnet/src/include/gnunet_sqstore_service.h
===================================================================
--- GNUnet/src/include/gnunet_sqstore_service.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_sqstore_service.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -64,7 +64,8 @@
*
* @return GNUNET_OK on success, GNUNET_SYSERR on error, GNUNET_NO on
temporary error
*/
- int (*put) (const GNUNET_HashCode * key, const GNUNET_DatastoreValue *
value);
+ int (*put) (const GNUNET_HashCode * key,
+ const GNUNET_DatastoreValue * value);
/**
* Iterate over the results for a particular key
@@ -78,7 +79,8 @@
* iter is non-NULL and aborted the iteration
*/
int (*get) (const GNUNET_HashCode * key,
- unsigned int type, GNUNET_DatastoreValueIterator iter, void
*closure);
+ unsigned int type, GNUNET_DatastoreValueIterator iter,
+ void *closure);
/**
* Update the priority for a particular key in the datastore. If
@@ -115,7 +117,8 @@
* iter is non-NULL and aborted the iteration
*/
int (*iterateLowPriority) (unsigned int type,
- GNUNET_DatastoreValueIterator iter, void
*closure);
+ GNUNET_DatastoreValueIterator iter,
+ void *closure);
/**
* Iterate over content with anonymity zero.
@@ -127,7 +130,8 @@
* iter is non-NULL and aborted the iteration
*/
int (*iterateNonAnonymous) (unsigned int type,
- GNUNET_DatastoreValueIterator iter, void
*closure);
+ GNUNET_DatastoreValueIterator iter,
+ void *closure);
/**
* Iterate over the items in the datastore in ascending
@@ -140,7 +144,8 @@
* iter is non-NULL and aborted the iteration
*/
int (*iterateExpirationTime) (unsigned int type,
- GNUNET_DatastoreValueIterator iter, void
*closure);
+ GNUNET_DatastoreValueIterator iter,
+ void *closure);
/**
@@ -151,7 +156,8 @@
* @return the number of results, GNUNET_SYSERR if the
* iter is non-NULL and aborted the iteration
*/
- int (*iterateMigrationOrder) (GNUNET_DatastoreValueIterator iter, void
*closure);
+ int (*iterateMigrationOrder) (GNUNET_DatastoreValueIterator iter,
+ void *closure);
/**
* Iterate over all the items in the datastore
Modified: GNUnet/src/include/gnunet_state_service.h
===================================================================
--- GNUnet/src/include/gnunet_state_service.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_state_service.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -50,7 +50,8 @@
* (*result should be NULL, sufficient space is allocated)
* @return the number of bytes read on success, -1 on failure
*/
- int (*read) (struct GNUNET_GE_Context * ectx, const char *name, void
**result);
+ int (*read) (struct GNUNET_GE_Context * ectx, const char *name,
+ void **result);
/**
* Append content to file.
Modified: GNUnet/src/include/gnunet_stats_lib.h
===================================================================
--- GNUnet/src/include/gnunet_stats_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_stats_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -56,7 +56,8 @@
* @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
*/
typedef int (*GNUNET_STATS_StatisticsProcessor) (const char *name,
- unsigned long long value, void *cls);
+ unsigned long long value,
+ void *cls);
/**
* Request statistics from TCP socket.
@@ -65,8 +66,9 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int GNUNET_STATS_get_statistics (struct GNUNET_GE_Context *ectx,
- struct GNUNET_ClientServerConnection *sock,
- GNUNET_STATS_StatisticsProcessor processor, void
*cls);
+ struct GNUNET_ClientServerConnection *sock,
+ GNUNET_STATS_StatisticsProcessor processor,
+ void *cls);
/**
* @param type the type ID of the message
@@ -74,7 +76,7 @@
* @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
*/
typedef int (*GNUNET_STATS_ProtocolProcessor) (unsigned short type,
- int isP2P, void *cls);
+ int isP2P, void *cls);
/**
* Request available protocols from TCP socket.
@@ -83,9 +85,10 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int GNUNET_STATS_get_available_protocols (struct GNUNET_GE_Context *ectx,
- struct GNUNET_ClientServerConnection *sock,
- GNUNET_STATS_ProtocolProcessor processor,
- void *cls);
+ struct GNUNET_ClientServerConnection
+ *sock,
+ GNUNET_STATS_ProtocolProcessor
+ processor, void *cls);
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: GNUnet/src/include/gnunet_testing_lib.h
===================================================================
--- GNUnet/src/include/gnunet_testing_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_testing_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -105,14 +105,20 @@
*
* @return handle used to stop the daemons, NULL on error
*/
-struct GNUNET_TESTING_DaemonContext *GNUNET_TESTING_start_daemons (const char
*transports,
- const char *applications,
- const char
- *gnunetd_home_prefix,
- unsigned short
- app_baseport,
- unsigned short delta,
- unsigned int count);
+struct GNUNET_TESTING_DaemonContext *GNUNET_TESTING_start_daemons (const char
+ *transports,
+ const char
+
*applications,
+ const char
+
*gnunetd_home_prefix,
+ unsigned
+ short
+
app_baseport,
+ unsigned
+ short
+ delta,
+ unsigned
+ int count);
/**
* Stop all of the daemons started with the start function.
Modified: GNUnet/src/include/gnunet_transport.h
===================================================================
--- GNUnet/src/include/gnunet_transport.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_transport.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -260,8 +260,8 @@
* @param may_reuse can an existing connection be re-used?
* @return GNUNET_OK on success, GNUNET_SYSERR if the operation failed
*/
- int (*connect) (const GNUNET_MessageHello * hello, GNUNET_TSession **
tsession,
- int may_reuse);
+ int (*connect) (const GNUNET_MessageHello * hello,
+ GNUNET_TSession ** tsession, int may_reuse);
/**
* Send a message to the specified remote node.
@@ -348,7 +348,8 @@
* GNUNET_NO if the transport would just drop the message,
* GNUNET_SYSERR if the size/session is invalid
*/
- int (*testWouldTry) (GNUNET_TSession * tsession, unsigned int size, int
important);
+ int (*testWouldTry) (GNUNET_TSession * tsession, unsigned int size,
+ int important);
} TransportAPI;
Modified: GNUnet/src/include/gnunet_transport_service.h
===================================================================
--- GNUnet/src/include/gnunet_transport_service.h 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/include/gnunet_transport_service.h 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -90,8 +90,8 @@
* (must match when disconnect is called)
* @return session handle on success, NULL on error
*/
- GNUNET_TSession *(*connect) (const GNUNET_MessageHello * hello, const char
*token,
- int may_reuse);
+ GNUNET_TSession *(*connect) (const GNUNET_MessageHello * hello,
+ const char *token, int may_reuse);
/**
* Connect to another peer, picking any transport that
@@ -105,7 +105,7 @@
* @return session handle on success, NULL on error
*/
GNUNET_TSession *(*connectFreely) (const GNUNET_PeerIdentity * peer,
- int allowTempList, const char *token);
+ int allowTempList, const char *token);
/**
* A (core) Session is to be associated with a transport session. The
@@ -207,7 +207,8 @@
* GNUNET_NO if the transport would just drop the message,
* GNUNET_SYSERR if the size/session is invalid
*/
- int (*testWouldTry) (GNUNET_TSession * tsession, unsigned int size, int
important);
+ int (*testWouldTry) (GNUNET_TSession * tsession, unsigned int size,
+ int important);
/**
* Verify that this session is associated (with the given
Modified: GNUnet/src/include/gnunet_uritrack_lib.h
===================================================================
--- GNUnet/src/include/gnunet_uritrack_lib.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_uritrack_lib.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -43,26 +43,26 @@
* @param onOff GNUNET_YES to enable tracking, GNUNET_NO to disable
* disabling tracking
*/
-void GNUNET_URITRACK_toggle_tracking (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, int onOff); /* file_info.c */
+void GNUNET_URITRACK_toggle_tracking (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, int onOff); /* file_info.c */
/**
* Deletes all entries in the URITRACK tracking cache.
*/
-void GNUNET_URITRACK_clear (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg); /* file_info.c */
+void GNUNET_URITRACK_clear (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg); /* file_info.c */
/**
* Get the URITRACK URI tracking status.
*
* @return GNUNET_YES of tracking is enabled, GNUNET_NO if not
*/
-int GNUNET_URITRACK_get_tracking_status (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg); /* file_info.c */
+int GNUNET_URITRACK_get_tracking_status (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg); /* file_info.c */
/**
* Makes a URI available for directory building. This function is
* automatically called by all URITRACK functions and only in the
* interface for clients that call ECRS directly.
*/
-void GNUNET_URITRACK_track (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const GNUNET_ECRS_FileInfo * fi); /*
file_info.c */
+void GNUNET_URITRACK_track (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, const GNUNET_ECRS_FileInfo * fi); /*
file_info.c */
/**
* List all URIs.
@@ -70,7 +70,7 @@
* @param need_metadata GNUNET_YES if metadata should be
* provided, GNUNET_NO if metadata is not needed (faster)
*/
-int GNUNET_URITRACK_list (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, int need_metadata,
GNUNET_ECRS_SearchResultProcessor iterator, void *closure); /* file_info.c */
+int GNUNET_URITRACK_list (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg, int need_metadata,
GNUNET_ECRS_SearchResultProcessor iterator, void *closure); /* file_info.c */
/**
* Register a handler that is called whenever
@@ -78,12 +78,12 @@
* the database, the callback will be called
* for all existing URIs as well.
*/
-int GNUNET_URITRACK_register_track_callback (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg, GNUNET_ECRS_SearchResultProcessor
iterator, void *closure); /* callbacks.c */
+int GNUNET_URITRACK_register_track_callback (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg, GNUNET_ECRS_SearchResultProcessor
iterator, void *closure); /* callbacks.c */
/**
* Unregister a URI callback.
*/
-int GNUNET_URITRACK_unregister_track_callback
(GNUNET_ECRS_SearchResultProcessor iterator, void *closure); /* callbacks.c
*/
+int GNUNET_URITRACK_unregister_track_callback
(GNUNET_ECRS_SearchResultProcessor iterator, void *closure); /*
callbacks.c */
/**
* Possible ways in which a given URI has been used or encountered.
@@ -114,15 +114,16 @@
*/
enum GNUNET_URITRACK_STATE
GNUNET_URITRACK_get_state (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, const struct
GNUNET_ECRS_URI *uri);
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri);
/**
* Add additional information about a given URI's past.
*/
void GNUNET_URITRACK_add_state (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const struct GNUNET_ECRS_URI *uri,
- enum GNUNET_URITRACK_STATE state);
+ struct GNUNET_GC_Configuration *cfg,
+ const struct GNUNET_ECRS_URI *uri,
+ enum GNUNET_URITRACK_STATE state);
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: GNUnet/src/include/gnunet_util_boot.h
===================================================================
--- GNUnet/src/include/gnunet_util_boot.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_util_boot.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -56,12 +56,14 @@
const char *binaryName,
char **configurationFileName,
const struct GNUNET_CommandLineOption *options,
- struct GNUNET_GE_Context **ectx, struct
GNUNET_GC_Configuration **cfg);
+ struct GNUNET_GE_Context **ectx,
+ struct GNUNET_GC_Configuration **cfg);
/**
* Free resources allocated during GNUnet_init.
*/
-void GNUNET_fini (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg);
+void GNUNET_fini (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: GNUnet/src/include/gnunet_util_config.h
===================================================================
--- GNUnet/src/include/gnunet_util_config.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_util_config.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -57,7 +57,7 @@
* be reported
*/
void GNUNET_GC_set_error_context (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx);
+ struct GNUNET_GE_Context *ectx);
/**
* Parse a configuration file, add all of the options in the
@@ -65,7 +65,7 @@
* @return 0 on success, -1 on error
*/
int GNUNET_GC_parse_configuration (struct GNUNET_GC_Configuration *cfg,
- const char *filename);
+ const char *filename);
/**
* Test if there are configuration options that were
@@ -79,7 +79,7 @@
* @return 0 on success, -1 on error
*/
int GNUNET_GC_write_configuration (struct GNUNET_GC_Configuration *cfg,
- const char *filename);
+ const char *filename);
/**
* Get a configuration value that should be a number.
@@ -88,20 +88,21 @@
* @param default default value (use indicated by return value)
* @return 0 on success, -1 on error, 1 for default
*/
-int GNUNET_GC_get_configuration_value_number (struct GNUNET_GC_Configuration
*cfg,
- const char *section,
- const char *option,
- unsigned long long min,
- unsigned long long max,
- unsigned long long def,
- unsigned long long *number);
+int GNUNET_GC_get_configuration_value_number (struct GNUNET_GC_Configuration
+ *cfg, const char *section,
+ const char *option,
+ unsigned long long min,
+ unsigned long long max,
+ unsigned long long def,
+ unsigned long long *number);
/**
* Test if we have a value for a particular option
* @return GNUNET_YES if so, GNUNET_NO if not.
*/
int GNUNET_GC_have_configuration_value (struct GNUNET_GC_Configuration *cfg,
- const char *section, const char *option);
+ const char *section,
+ const char *option);
/**
* Get a configuration value that should be a string.
@@ -111,10 +112,10 @@
* value, or NULL if option is not specified and no default given
* @return 0 on success, -1 on error, 1 for default
*/
-int GNUNET_GC_get_configuration_value_string (struct GNUNET_GC_Configuration
*cfg,
- const char *section,
- const char *option,
- const char *def, char **value);
+int GNUNET_GC_get_configuration_value_string (struct GNUNET_GC_Configuration
+ *cfg, const char *section,
+ const char *option,
+ const char *def, char **value);
/**
* Get a configuration value that should be the name of a file
@@ -126,10 +127,11 @@
* value, or NULL if option is not specified and no default given
* @return 0 on success, -1 on error, 1 for default
*/
-int GNUNET_GC_get_configuration_value_filename (struct GNUNET_GC_Configuration
*cfg,
- const char *section,
- const char *option,
- const char *def, char **value);
+int GNUNET_GC_get_configuration_value_filename (struct GNUNET_GC_Configuration
+ *cfg, const char *section,
+ const char *option,
+ const char *def,
+ char **value);
/**
* Get a configuration value that should be in a set of
@@ -142,11 +144,12 @@
* or NULL if option is not specified and no default given
* @return 0 on success, -1 on error, 1 for default
*/
-int GNUNET_GC_get_configuration_value_choice (struct GNUNET_GC_Configuration
*cfg,
- const char *section,
- const char *option,
- const char **choices,
- const char *def, const char **value);
+int GNUNET_GC_get_configuration_value_choice (struct GNUNET_GC_Configuration
+ *cfg, const char *section,
+ const char *option,
+ const char **choices,
+ const char *def,
+ const char **value);
/**
* Get a configuration value that should be in a set of
@@ -156,9 +159,9 @@
* will NOT be aliased, maybe NULL)
* @return GNUNET_YES, GNUNET_NO or GNUNET_SYSERR
*/
-int GNUNET_GC_get_configuration_value_yesno (struct GNUNET_GC_Configuration
*cfg,
- const char *section,
- const char *option, int def);
+int GNUNET_GC_get_configuration_value_yesno (struct GNUNET_GC_Configuration
+ *cfg, const char *section,
+ const char *option, int def);
/**
* Expand an expression of the form "$FOO/BAR" to "DIRECTORY/BAR"
@@ -168,19 +171,20 @@
* @param old string to $-expand (will be freed!)
* @return $-expanded string
*/
-char *GNUNET_GC_configuration_expand_dollar (struct GNUNET_GC_Configuration
*cfg,
- char *old);
+char *GNUNET_GC_configuration_expand_dollar (struct GNUNET_GC_Configuration
+ *cfg, char *old);
/**
* Set a configuration value that should be a number.
* @return 0 on success, -1 on error (i.e. out of memory,
* or update refused by registered callback)
*/
-int GNUNET_GC_set_configuration_value_number (struct GNUNET_GC_Configuration
*cfg,
- struct GNUNET_GE_Context *ectx,
- const char *section,
- const char *option,
- unsigned long long number);
+int GNUNET_GC_set_configuration_value_number (struct GNUNET_GC_Configuration
+ *cfg,
+ struct GNUNET_GE_Context *ectx,
+ const char *section,
+ const char *option,
+ unsigned long long number);
/**
@@ -189,10 +193,12 @@
* @return 0 on success, -1 on error (i.e. out of memory,
* or update refused by registered callback)
*/
-int GNUNET_GC_set_configuration_value_string (struct GNUNET_GC_Configuration
*cfg,
- struct GNUNET_GE_Context *ectx,
- const char *section,
- const char *option, const char *value);
+int GNUNET_GC_set_configuration_value_string (struct GNUNET_GC_Configuration
+ *cfg,
+ struct GNUNET_GE_Context *ectx,
+ const char *section,
+ const char *option,
+ const char *value);
/**
* Set a configuration value that should be in a set of
@@ -201,11 +207,12 @@
* @return 0 on success, -1 on error (i.e. out of memory,
* or update refused by registered callback)
*/
-int GNUNET_GC_set_configuration_value_choice (struct GNUNET_GC_Configuration
*cfg,
- struct GNUNET_GE_Context *ectx,
- const char *section,
- const char *option,
- const char *choice);
+int GNUNET_GC_set_configuration_value_choice (struct GNUNET_GC_Configuration
+ *cfg,
+ struct GNUNET_GE_Context *ectx,
+ const char *section,
+ const char *option,
+ const char *choice);
/**
* Callback function that is called if a configuration option
@@ -217,9 +224,10 @@
* refused
*/
typedef int (*GNUNET_GC_ChangeListener) (void *ctx,
- struct GNUNET_GC_Configuration * cfg,
- struct GNUNET_GE_Context * ectx,
- const char *section, const char *option);
+ struct GNUNET_GC_Configuration * cfg,
+ struct GNUNET_GE_Context * ectx,
+ const char *section,
+ const char *option);
/**
* Attach a callback that is notified whenever a
@@ -228,7 +236,8 @@
* @return 0 on success, -1 on error
*/
int GNUNET_GC_attach_change_listener (struct GNUNET_GC_Configuration *cfg,
- GNUNET_GC_ChangeListener callback, void *ctx);
+ GNUNET_GC_ChangeListener callback,
+ void *ctx);
/**
* Attach a callback that is notified whenever a
@@ -236,7 +245,8 @@
* @return 0 on success, -1 on error, 1 for no such handler registered
*/
int GNUNET_GC_detach_change_listener (struct GNUNET_GC_Configuration *cfg,
- GNUNET_GC_ChangeListener callback, void *ctx);
+ GNUNET_GC_ChangeListener callback,
+ void *ctx);
/**
* Create a GNUNET_GC_Configuration
Modified: GNUnet/src/include/gnunet_util_containers.h
===================================================================
--- GNUnet/src/include/gnunet_util_containers.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_util_containers.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -69,7 +69,8 @@
* element (number of bits set per element in the set)
* @return the bloomfilter
*/
-struct GNUNET_BloomFilter *GNUNET_bloomfilter_load (struct GNUNET_GE_Context
*ectx,
+struct GNUNET_BloomFilter *GNUNET_bloomfilter_load (struct GNUNET_GE_Context
+ *ectx,
const char *filename,
unsigned int size,
unsigned int k);
Modified: GNUnet/src/include/gnunet_util_disk.h
===================================================================
--- GNUnet/src/include/gnunet_util_disk.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_util_disk.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -85,8 +85,8 @@
/**
* Wrapper around "close()". Closes a file.
*/
-void GNUNET_disk_file_close (struct GNUNET_GE_Context *ectx, const char
*filename,
- int fd);
+void GNUNET_disk_file_close (struct GNUNET_GE_Context *ectx,
+ const char *filename, int fd);
/**
* Read the contents of a binary file into a buffer.
@@ -162,7 +162,8 @@
* @return GNUNET_YES if yes, GNUNET_NO if does not exist, GNUNET_SYSERR
* on any error and if exists but not directory
*/
-int GNUNET_disk_directory_test (struct GNUNET_GE_Context *ectx, const char
*fil);
+int GNUNET_disk_directory_test (struct GNUNET_GE_Context *ectx,
+ const char *fil);
/**
* Remove all files in a directory (rm -rf). Call with
@@ -180,7 +181,8 @@
* @param dir the directory to create
* @returns GNUNET_SYSERR on failure, GNUNET_OK otherwise
*/
-int GNUNET_disk_directory_create (struct GNUNET_GE_Context *ectx, const char
*dir);
+int GNUNET_disk_directory_create (struct GNUNET_GE_Context *ectx,
+ const char *dir);
/**
* @brief Removes special characters as ':' from a filename.
Modified: GNUnet/src/include/gnunet_util_error.h
===================================================================
--- GNUnet/src/include/gnunet_util_error.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_util_error.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -52,13 +52,13 @@
{
GNUNET_GE_NOTHING = 0x00000000,
/* type of event */
- GNUNET_GE_FATAL = 0x00000001, /* FATAL/FAILURE/NOTHING */
+ GNUNET_GE_FATAL = 0x00000001, /* FATAL/FAILURE/NOTHING */
GNUNET_GE_ERROR = 0x00000002,
GNUNET_GE_WARNING = 0x00000004,
- GNUNET_GE_INFO = 0x00000008, /* normal program response */
- GNUNET_GE_STATUS = 0x00000010, /* status message */
- GNUNET_GE_DEBUG = 0x00000020, /* DEBUG/CRON/EVERYTHING */
- GNUNET_GE_EVENTKIND = 0x000000FF, /* bitmask */
+ GNUNET_GE_INFO = 0x00000008, /* normal program response */
+ GNUNET_GE_STATUS = 0x00000010, /* status message */
+ GNUNET_GE_DEBUG = 0x00000020, /* DEBUG/CRON/EVERYTHING */
+ GNUNET_GE_EVENTKIND = 0x000000FF, /* bitmask */
/* who should see the message? */
/**
@@ -67,53 +67,54 @@
* daemon, messages tagged just as GNUNET_GE_USER will
* be discarded.
*/
- GNUNET_GE_USER = 0x01000000, /* current user, if possible */
+ GNUNET_GE_USER = 0x01000000, /* current user, if possible */
/**
* These messages are sent to the logfile for the
* administrator. Note that normal users may not
* always look there.
*/
- GNUNET_GE_ADMIN = 0x02000000, /* system administrator */
+ GNUNET_GE_ADMIN = 0x02000000, /* system administrator */
/**
* These messages are usually not logged or given
* to the user. They can be obtained when the tool
* is run in debug mode.
*/
- GNUNET_GE_DEVELOPER = 0x04000000, /* GNUnet developers (bug!) */
+ GNUNET_GE_DEVELOPER = 0x04000000, /* GNUnet developers (bug!) */
/**
* Mask for the type of user that should see the
* message.
*/
- GNUNET_GE_USERKIND = 0x0F000000, /* bitmask */
+ GNUNET_GE_USERKIND = 0x0F000000, /* bitmask */
/* how event should be routed */
/**
* The message should only be shown upon specific
* request.
*/
- GNUNET_GE_REQUEST = 0x20000000, /* display on request only (i.e.
low-priority log, user demands verbose events) */
+ GNUNET_GE_REQUEST = 0x20000000, /* display on request only (i.e.
low-priority log, user demands verbose events) */
/**
* This type of message is not urgent and is likely
* to occur in bulk. Suitable for logging to a file
* or in a generic, scrolling message window.
*/
- GNUNET_GE_BULK = 0x40000000, /* display in bulk output (i.e.
log-file, scroll window, console) */
+ GNUNET_GE_BULK = 0x40000000, /* display in bulk output (i.e. log-file,
scroll window, console) */
/**
* This is a message that is urgent and should be
* communicated as soon as possible. Sending an
* e-mail alert or opening a pop-up window maybe
* appropriate.
*/
- GNUNET_GE_IMMEDIATE = 0x80000000, /* display immediately (i.e. pop-up,
e-mail) */
+ GNUNET_GE_IMMEDIATE = 0x80000000, /* display immediately (i.e. pop-up,
e-mail) */
/**
* Mask for the routing type.
*/
- GNUNET_GE_ROUTEKIND = 0xF0000000, /* bitmask */
+ GNUNET_GE_ROUTEKIND = 0xF0000000, /* bitmask */
GNUNET_GE_ALL = 0xFFFFFFFF,
- GNUNET_GE_INVALID = 0x08000000, /* unused bit */
+ GNUNET_GE_INVALID = 0x08000000, /* unused bit */
} GNUNET_GE_KIND;
-void GNUNET_GE_LOG (struct GNUNET_GE_Context *ctx, GNUNET_GE_KIND kind, const
char *message, ...);
+void GNUNET_GE_LOG (struct GNUNET_GE_Context *ctx, GNUNET_GE_KIND kind,
+ const char *message, ...);
/**
* @brief Get user confirmation (e.g. before the app shuts down and closes the
@@ -127,8 +128,8 @@
* User-defined handler for log events.
*/
typedef void (*GNUNET_GE_LogHandler) (void *ctx,
- GNUNET_GE_KIND kind,
- const char *date, const char *msg);
+ GNUNET_GE_KIND kind,
+ const char *date, const char *msg);
/**
* User-defined method to free handler context.
@@ -149,11 +150,15 @@
* to be passed to this handler
* @param liberator callback to free ctx, maybe NULL
*/
-struct GNUNET_GE_Context *GNUNET_GE_create_context_callback (GNUNET_GE_KIND
mask,
- GNUNET_GE_LogHandler handler,
- void *ctx,
- GNUNET_GE_CtxFree liberator,
- GNUNET_GE_Confirm confirm);
+struct GNUNET_GE_Context *GNUNET_GE_create_context_callback (GNUNET_GE_KIND
+ mask,
+
GNUNET_GE_LogHandler
+ handler,
+ void *ctx,
+ GNUNET_GE_CtxFree
+ liberator,
+ GNUNET_GE_Confirm
+ confirm);
/**
* Free a log context.
@@ -195,8 +200,12 @@
* Create a context that sends events to two other contexts.
* Note that the client must stop using ctx1/ctx2 henceforth.
*/
-struct GNUNET_GE_Context *GNUNET_GE_create_context_multiplexer (struct
GNUNET_GE_Context *ctx1,
- struct GNUNET_GE_Context
*ctx2);
+struct GNUNET_GE_Context *GNUNET_GE_create_context_multiplexer (struct
+
GNUNET_GE_Context
+ *ctx1,
+ struct
+
GNUNET_GE_Context
+ *ctx2);
const char *GNUNET_GE_strerror (int errnum);
Modified: GNUnet/src/include/gnunet_util_error_loggers.h
===================================================================
--- GNUnet/src/include/gnunet_util_error_loggers.h 2007-11-25 12:06:33 UTC
(rev 5760)
+++ GNUnet/src/include/gnunet_util_error_loggers.h 2007-11-25 12:07:29 UTC
(rev 5761)
@@ -52,11 +52,16 @@
* value specifies after how many days logs should be deleted)
* (use 0 for no rotation)
*/
-struct GNUNET_GE_Context *GNUNET_GE_create_context_logfile (struct
GNUNET_GE_Context *ectx,
- GNUNET_GE_KIND mask,
- const char *filename,
- const char *owner,
- int logDate, int logrotate);
+struct GNUNET_GE_Context *GNUNET_GE_create_context_logfile (struct
+ GNUNET_GE_Context
+ *ectx,
+ GNUNET_GE_KIND
+ mask,
+ const char
+ *filename,
+ const char *owner,
+ int logDate,
+ int logrotate);
/**
@@ -64,21 +69,28 @@
*
* @param mask which events should be logged?
*/
-struct GNUNET_GE_Context *GNUNET_GE_create_context_stderr (int logDate,
GNUNET_GE_KIND mask);
+struct GNUNET_GE_Context *GNUNET_GE_create_context_stderr (int logDate,
+ GNUNET_GE_KIND
+ mask);
/**
* Create a logger that writes events to stderr
*
* @param mask which events should be logged?
*/
-struct GNUNET_GE_Context *GNUNET_GE_create_context_stdout (int logDate,
GNUNET_GE_KIND mask);
+struct GNUNET_GE_Context *GNUNET_GE_create_context_stdout (int logDate,
+ GNUNET_GE_KIND
+ mask);
/**
* Create a logger that keeps events in memory (to be
* queried later in bulk).
*/
-struct GNUNET_GE_Context *GNUNET_GE_create_context_memory (GNUNET_GE_KIND mask,
- struct GNUNET_GE_Memory *memory);
+struct GNUNET_GE_Context *GNUNET_GE_create_context_memory (GNUNET_GE_KIND
+ mask,
+ struct
+ GNUNET_GE_Memory
+ *memory);
#if FICTION
/**
@@ -90,13 +102,16 @@
* @param bulkSize for GNUNET_GE_BULK messages, how many lines of messages
* should be accumulated before an e-mail is transmitted?
*/
-struct GNUNET_GE_Context *GNUNET_GE_create_context_email (struct
GNUNET_GE_Context *ectx,
- GNUNET_GE_KIND mask,
- const char *address,
- const char *server,
- unsigned short port,
- int logDate,
- unsigned int bulkSize);
+struct GNUNET_GE_Context *GNUNET_GE_create_context_email (struct
+ GNUNET_GE_Context
+ *ectx,
+ GNUNET_GE_KIND mask,
+ const char *address,
+ const char *server,
+ unsigned short port,
+ int logDate,
+ unsigned int
+ bulkSize);
#endif
/**
@@ -117,14 +132,15 @@
* Also clears the memory.
*/
void GNUNET_GE_memory_poll (struct GNUNET_GE_Memory *memory,
- GNUNET_GE_LogHandler handler, void *ctx);
+ GNUNET_GE_LogHandler handler, void *ctx);
void GNUNET_GE_memory_reset (struct GNUNET_GE_Memory *memory);
/**
* Get a particular log message from the store.
*/
-const char *GNUNET_GE_memory_get (struct GNUNET_GE_Memory *memory, unsigned
int index);
+const char *GNUNET_GE_memory_get (struct GNUNET_GE_Memory *memory,
+ unsigned int index);
void GNUNET_GE_memory_free (struct GNUNET_GE_Memory *memory);
Modified: GNUnet/src/include/gnunet_util_network.h
===================================================================
--- GNUnet/src/include/gnunet_util_network.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_util_network.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -436,7 +436,8 @@
*/
struct GNUNET_SelectHandle *GNUNET_select_create (const char *desc,
int is_udp,
- struct GNUNET_GE_Context
*ectx,
+ struct GNUNET_GE_Context
+ *ectx,
struct GNUNET_LoadMonitor
*mon, int sock,
unsigned int max_addr_len,
Modified: GNUnet/src/include/gnunet_util_os.h
===================================================================
--- GNUnet/src/include/gnunet_util_os.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/include/gnunet_util_os.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -85,7 +85,8 @@
struct GNUNET_LoadMonitor;
-struct GNUNET_IPC_Semaphore *GNUNET_IPC_semaphore_create (struct
GNUNET_GE_Context
+struct GNUNET_IPC_Semaphore *GNUNET_IPC_semaphore_create (struct
+ GNUNET_GE_Context
*ectx,
const char
*basename,
@@ -105,8 +106,8 @@
/**
* Load plugin
*/
-struct GNUNET_PluginHandle *GNUNET_plugin_load (struct GNUNET_GE_Context *ectx,
- const char *libprefix,
+struct GNUNET_PluginHandle *GNUNET_plugin_load (struct GNUNET_GE_Context
+ *ectx, const char *libprefix,
const char *dsoname);
/**
@@ -123,7 +124,8 @@
void GNUNET_plugin_unload (struct GNUNET_PluginHandle *plugin);
-struct GNUNET_LoadMonitor *GNUNET_network_monitor_create (struct
GNUNET_GE_Context
+struct GNUNET_LoadMonitor *GNUNET_network_monitor_create (struct
+ GNUNET_GE_Context
*ectx,
struct
GNUNET_GC_Configuration
@@ -177,7 +179,8 @@
* Set our process priority
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int GNUNET_set_process_priority (struct GNUNET_GE_Context *ectx, const char
*str);
+int GNUNET_set_process_priority (struct GNUNET_GE_Context *ectx,
+ const char *str);
/**
* @brief Make "application" start automatically
@@ -325,7 +328,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int GNUNET_pid_file_write (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, unsigned int
pid);
+ struct GNUNET_GC_Configuration *cfg,
+ unsigned int pid);
/**
* Delete the PID file (to be called when the daemon
@@ -344,7 +348,8 @@
* to complete the detachment protocol (handshake)
*/
int GNUNET_terminal_detach (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg, int *filedes);
+ struct GNUNET_GC_Configuration *cfg,
+ int *filedes);
/**
* Complete the handshake of detaching from the terminal.
Modified: GNUnet/src/include/gnunet_util_string.h
===================================================================
--- GNUnet/src/include/gnunet_util_string.h 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/include/gnunet_util_string.h 2007-11-25 12:07:29 UTC (rev
5761)
@@ -184,7 +184,8 @@
* @returns the full file name,
* NULL is returned on error
*/
-char *GNUNET_expand_file_name (struct GNUNET_GE_Context *ectx, const char
*fil);
+char *GNUNET_expand_file_name (struct GNUNET_GE_Context *ectx,
+ const char *fil);
/* ************** internal implementations, use macros above! ************** */
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/connection.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -675,9 +675,10 @@
{
if (root->session.tsession != NULL)
GNUNET_GE_ASSERT (NULL,
- GNUNET_OK ==
- transport->assertAssociated (root->session.tsession,
- __FILE__));
+ GNUNET_OK ==
+ transport->assertAssociated (root->session.
+ tsession,
+ __FILE__));
root = root->overflowChain;
}
}
@@ -971,9 +972,10 @@
{
#if DEBUG_POLICY
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Network load is too high (%d%%, priority is %u, require %d), "
- "dropping outgoing.\n", load, priority, delta * delta * delta);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Network load is too high (%d%%, priority is %u, require
%d), "
+ "dropping outgoing.\n", load, priority,
+ delta * delta * delta);
#endif
return GNUNET_SYSERR; /* drop */
}
@@ -981,9 +983,10 @@
{
#if DEBUG_POLICY
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Network load is ok (%d%%, priority is %u >= %d), "
- "sending outgoing.\n", load, priority, delta * delta * delta);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Network load is ok (%d%%, priority is %u >= %d), "
+ "sending outgoing.\n", load, priority,
+ delta * delta * delta);
#endif
return GNUNET_OK; /* allow */
}
@@ -1041,8 +1044,8 @@
{
#if DEBUG_CONNECTION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Send frequency too high (CPU load), send deferred.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Send frequency too high (CPU load), send deferred.\n");
#endif
return GNUNET_NO; /* frequency too high, wait */
}
@@ -1201,18 +1204,20 @@
{
GNUNET_GE_BREAK (ectx, 0);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
- _("`%s' selected %d out of %d messages (MTU: %d).\n"),
- __FUNCTION__,
- j,
- be->sendBufferSize,
- be->session.mtu - sizeof (P2P_PACKET_HEADER));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_DEVELOPER,
+ _
+ ("`%s' selected %d out of %d messages (MTU: %d).\n"),
+ __FUNCTION__, j, be->sendBufferSize,
+ be->session.mtu - sizeof (P2P_PACKET_HEADER));
for (j = 0; j < be->sendBufferSize; j++)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
- _("Message details: %u: length %d, priority: %d\n"),
- j, be->sendBuffer[j]->len, be->sendBuffer[j]->pri);
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_DEVELOPER,
+ _
+ ("Message details: %u: length %d, priority: %d\n"),
+ j, be->sendBuffer[j]->len, be->sendBuffer[j]->pri);
return 0;
}
@@ -1225,9 +1230,10 @@
{
#if DEBUG_CONNECTION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "bandwidth limits prevent sending (send window %u too
small).\n",
- be->available_send_window);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "bandwidth limits prevent sending (send window %u
too small).\n",
+ be->available_send_window);
#endif
return 0; /* can not send, BPS available is too small */
}
@@ -1284,11 +1290,11 @@
{
#if DEBUG_CONNECTION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "expiring message, expired %ds ago, queue size is %llu
(bandwidth stressed)\n",
- (int) ((GNUNET_get_time () -
- entry->transmissionTime) / GNUNET_CRON_SECONDS),
- usedBytes);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "expiring message, expired %ds ago, queue size is
%llu (bandwidth stressed)\n",
+ (int) ((GNUNET_get_time () -
+ entry->transmissionTime) /
+ GNUNET_CRON_SECONDS), usedBytes);
#endif
if (stats != NULL)
{
@@ -1370,9 +1376,11 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&be->session.sender.hashPubKey,
&enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Core selected message of type %u and size %u for sending
to peer `%s'.\n",
- ntohs (hdr->type), ntohs (hdr->size), &enc);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "Core selected message of type %u and size %u for
sending to peer `%s'.\n",
+ ntohs (hdr->type), ntohs (hdr->size), &enc);
}
#endif
}
@@ -1631,7 +1639,8 @@
ret = transport->testWouldTry (be->session.tsession,
totalMessageSize,
(priority >=
- GNUNET_EXTREME_PRIORITY) ? GNUNET_YES :
GNUNET_NO);
+ GNUNET_EXTREME_PRIORITY) ? GNUNET_YES :
+ GNUNET_NO);
/* ret: GNUNET_YES: ok to send, GNUNET_NO: not ready yet, GNUNET_SYSERR:
session down
or serious internal error */
if (ret == GNUNET_SYSERR)
@@ -1650,9 +1659,11 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&be->session.sender.hashPubKey,
&enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- "Session is DOWN for `%s' due to transport disconnect\n",
- &enc);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Session is DOWN for `%s' due to transport
disconnect\n",
+ &enc);
#endif
#if STRICT_STAT_DOWN
be->status = STAT_DOWN;
@@ -1725,10 +1736,10 @@
SendEntry *entry = entries[i];
GNUNET_GE_ASSERT (ectx,
- (entry != NULL) &&
- (entry->knapsackSolution == GNUNET_YES) &&
- (entry->callback == NULL) &&
- (p + entry->len <= totalMessageSize));
+ (entry != NULL) &&
+ (entry->knapsackSolution == GNUNET_YES) &&
+ (entry->callback == NULL) &&
+ (p + entry->len <= totalMessageSize));
memcpy (&plaintextMsg[p], entry->closure, entry->len);
p += entry->len;
}
@@ -1853,8 +1864,10 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&be->session.sender.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Session is DOWN for `%s' due to transmission error\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Session is DOWN for `%s' due to transmission error\n",
+ &enc);
#endif
tsession = be->session.tsession;
be->session.tsession = NULL;
@@ -1928,8 +1941,8 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&be->session.sender.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "not connected to `%s', message dropped\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "not connected to `%s', message dropped\n", &enc);
#endif
GNUNET_free (se->closure);
GNUNET_free (se);
@@ -2133,8 +2146,8 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
GNUNET_hash_to_enc (&be->session.sender.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Shutting down connection with `%s'\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Shutting down connection with `%s'\n", &enc);
#endif
if (be->status == STAT_DOWN)
return; /* nothing to do */
@@ -2147,8 +2160,9 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&be->session.sender.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Session DOWN for `%s' due to HANGUP received\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Session DOWN for `%s' due to HANGUP received\n", &enc);
#endif
hangup.header.type = htons (GNUNET_P2P_PROTO_HANG_UP);
hangup.header.size = htons (sizeof (P2P_hangup_MESSAGE));
@@ -2368,9 +2382,10 @@
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
GNUNET_hash_to_enc (&entries[u]->session.sender.
hashPubKey, &enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_BULK |
GNUNET_GE_USER,
- "peer `%s' transmitted above limit: %llu bpm > %u bpm\n",
- &enc, adjustedRR[u], entries[u]->idealized_limit);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "peer `%s' transmitted above limit: %llu bpm > %u
bpm\n",
+ &enc, adjustedRR[u], entries[u]->idealized_limit);
}
#endif
/* Check for peers grossly exceeding send limits. Be a bit
@@ -2391,11 +2406,13 @@
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&entries[u]->session.sender.
hashPubKey, &enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_INFO | GNUNET_GE_BULK |
GNUNET_GE_DEVELOPER,
- "blacklisting `%s': sent repeatedly %llu bpm "
- "(limit %u bpm, target %u bpm)\n", &enc, adjustedRR[u],
- entries[u]->max_transmitted_limit,
- entries[u]->idealized_limit);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_INFO | GNUNET_GE_BULK |
+ GNUNET_GE_DEVELOPER,
+ "blacklisting `%s': sent repeatedly %llu bpm "
+ "(limit %u bpm, target %u bpm)\n", &enc,
+ adjustedRR[u], entries[u]->max_transmitted_limit,
+ entries[u]->idealized_limit);
#endif
identity->blacklistHost (&entries[u]->session.sender, 24 * 60 *
60, /* 1 day */
GNUNET_YES);
@@ -2609,11 +2626,11 @@
GNUNET_hash_to_enc (&entries[u]->session.sender.hashPubKey,
&enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
- "inbound limit for peer %u: %4s set to %u bpm (ARR: %lld,
uptime: %llus, value: %lf)\n",
- u, &enc, entries[u]->idealized_limit, adjustedRR[u],
- (GNUNET_get_time () -
- entries[u]->time_established) / GNUNET_CRON_SECONDS,
- entries[u]->current_connection_value);
+ "inbound limit for peer %u: %4s set to %u bpm (ARR: %lld,
uptime: %llus, value: %lf)\n",
+ u, &enc, entries[u]->idealized_limit, adjustedRR[u],
+ (GNUNET_get_time () -
+ entries[u]->time_established) / GNUNET_CRON_SECONDS,
+ entries[u]->current_connection_value);
#endif
if ((timeDifference > 50)
&&
@@ -2649,9 +2666,11 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&be->session.sender.hashPubKey,
&enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- "Number of connections too high, shutting down low-traffic
connection to `%s' (had only %u bpm)\n",
- &enc, be->idealized_limit);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Number of connections too high, shutting down
low-traffic connection to `%s' (had only %u bpm)\n",
+ &enc, be->idealized_limit);
#endif
/* We need to avoid giving a too low limit (especially 0, which
would indicate a plaintext msg). So we set the limit to the
@@ -2751,13 +2770,16 @@
/* switch state form UP to DOWN: too much inactivity */
IF_GELOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&root->session.sender.
hashPubKey, &enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- "Closing connection with `%s': "
- "too much inactivity (%llu ms)\n", &enc,
- now - root->isAlive);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Closing connection with `%s': "
+ "too much inactivity (%llu ms)\n", &enc,
+ now - root->isAlive);
#endif
/* peer timed out -- shutdown connection */
identity->blacklistHost (&root->session.sender,
@@ -2843,14 +2865,17 @@
GNUNET_EncName enc;
IF_GELOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&root->session.sender.
hashPubKey, &enc));
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- "closing connection to %s: %s not answered.\n",
- &enc,
- (root->status ==
- STAT_SETKEY_SENT) ? "SETKEY" : "PING");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "closing connection to %s: %s not
answered.\n",
+ &enc,
+ (root->status ==
+ STAT_SETKEY_SENT) ? "SETKEY" : "PING");
#endif
/* do not try to reconnect any time soon,
but allow the other peer to connect to
@@ -2914,8 +2939,9 @@
GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&sender->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
- _("Message from `%s' discarded: invalid format.\n"), &enc);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
+ _("Message from `%s' discarded: invalid format.\n"),
+ &enc);
EXIT ();
return GNUNET_SYSERR;
}
@@ -2942,9 +2968,9 @@
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&sender->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
- "Decrypting message from host `%s' failed, no sessionkey
(yet)!\n",
- &enc);
+ GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
+ "Decrypting message from host `%s' failed, no sessionkey
(yet)!\n",
+ &enc);
#endif
/* try to establish a connection, that way, we don't keep
getting bogus messages until the other one times out. */
@@ -2967,9 +2993,9 @@
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&sender->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
- "Decrypting message from host `%s' failed, wrong sessionkey!\n",
- &enc);
+ GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
+ "Decrypting message from host `%s' failed, wrong
sessionkey!\n",
+ &enc);
#endif
addHost (sender, GNUNET_YES);
GNUNET_mutex_unlock (lock);
@@ -3001,10 +3027,11 @@
{
#if DEBUG_CONNECTION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- _("Invalid sequence number"
- " %u <= %u, dropping message.\n"),
- sequenceNumber, be->lastSequenceNumberReceived);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ _("Invalid sequence number"
+ " %u <= %u, dropping message.\n"), sequenceNumber,
+ be->lastSequenceNumberReceived);
#endif
GNUNET_mutex_unlock (lock);
EXIT ();
@@ -3023,8 +3050,8 @@
{
#if DEBUG_CONNECTION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Message received more than one day old. Dropped.\n"));
+ GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Message received more than one day old. Dropped.\n"));
#endif
GNUNET_mutex_unlock (lock);
EXIT ();
@@ -3076,8 +3103,8 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&sender->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "received HANGUP from `%s'\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
+ "received HANGUP from `%s'\n", &enc);
#endif
GNUNET_mutex_lock (lock);
be = lookForHost (sender);
@@ -3175,9 +3202,10 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&peer->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Received confirmation that session is UP for `%s'\n",
- &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Received confirmation that session is UP for `%s'\n",
+ &enc);
#endif
be->time_established = GNUNET_get_time ();
be->status = STAT_UP;
@@ -3328,7 +3356,8 @@
* @param sender the identity of the other node
*/
void
-considerTakeover (const GNUNET_PeerIdentity * sender, GNUNET_TSession *
tsession)
+considerTakeover (const GNUNET_PeerIdentity * sender,
+ GNUNET_TSession * tsession)
{
BufferEntry *be;
unsigned int cost;
@@ -3370,8 +3399,8 @@
(GNUNET_OK == transport->associate (tsession, __FILE__)))
{
GNUNET_GE_ASSERT (NULL,
- GNUNET_OK == transport->assertAssociated (tsession,
- __FILE__));
+ GNUNET_OK == transport->assertAssociated (tsession,
+ __FILE__));
ts = be->session.tsession;
if (ts != NULL)
{
@@ -3408,11 +3437,11 @@
if (0 != strcmp (section, "LOAD"))
return 0; /* fast path */
- if (-1 == GNUNET_GC_get_configuration_value_number (cfg, "LOAD",
"MAXNETDOWNBPSTOTAL", 0, ((unsigned long long) -1) / 60, 50000, /* default:
50 kbps */
- &new_max_bpm))
+ if (-1 == GNUNET_GC_get_configuration_value_number (cfg, "LOAD",
"MAXNETDOWNBPSTOTAL", 0, ((unsigned long long) -1) / 60, 50000, /*
default: 50 kbps */
+ &new_max_bpm))
return GNUNET_SYSERR;
- GNUNET_GC_get_configuration_value_number (cfg, "LOAD", "MAXNETUPBPSTOTAL",
0, ((unsigned long long) -1) / 60, 50000, /* default: 50 kbps */
- &max_bpm_up);
+ GNUNET_GC_get_configuration_value_number (cfg, "LOAD", "MAXNETUPBPSTOTAL",
0, ((unsigned long long) -1) / 60, 50000, /* default: 50 kbps */
+ &max_bpm_up);
max_bpm_up *= 60; /* bps -> bpm */
GNUNET_mutex_lock (lock);
new_max_bpm = 60 * new_max_bpm;
@@ -3437,11 +3466,11 @@
olen = CONNECTION_MAX_HOSTS_;
CONNECTION_MAX_HOSTS_ = newMAXHOSTS;
GNUNET_GE_BREAK (ectx,
- 0 == GNUNET_GC_set_configuration_value_number (cfg,
- ectx,
- "gnunetd",
-
"connection-max-hosts",
-
CONNECTION_MAX_HOSTS_));
+ 0 == GNUNET_GC_set_configuration_value_number (cfg,
+ ectx,
+
"gnunetd",
+
"connection-max-hosts",
+
CONNECTION_MAX_HOSTS_));
newBuffer =
(BufferEntry **) GNUNET_malloc (sizeof (BufferEntry *) *
newMAXHOSTS);
@@ -3470,16 +3499,17 @@
CONNECTION_buffer_ = newBuffer;
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "connection goal is %s%d peers (%llu BPM bandwidth
downstream)\n",
- (olen == 0) ? "" : "now ", CONNECTION_MAX_HOSTS_, max_bpm);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "connection goal is %s%d peers (%llu BPM bandwidth
downstream)\n",
+ (olen == 0) ? "" : "now ", CONNECTION_MAX_HOSTS_,
+ max_bpm);
}
}
disable_random_padding = GNUNET_GC_get_configuration_value_yesno (cfg,
-
"GNUNETD-EXPERIMENTAL",
- "PADDING",
- GNUNET_NO);
+
"GNUNETD-EXPERIMENTAL",
+ "PADDING",
+ GNUNET_NO);
GNUNET_mutex_unlock (lock);
return 0;
}
@@ -3496,16 +3526,18 @@
cfg = c;
load_monitor = m;
cron = cm;
- GNUNET_GE_ASSERT (ectx, GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD == sizeof
(P2P_PACKET_HEADER));
+ GNUNET_GE_ASSERT (ectx,
+ GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD ==
+ sizeof (P2P_PACKET_HEADER));
GNUNET_GE_ASSERT (ectx, sizeof (P2P_hangup_MESSAGE) == 68);
ENTRY ();
scl_nextHead = NULL;
scl_nextTail = NULL;
connectionConfigChangeCallback (NULL, cfg, ectx, "LOAD", "NOTHING");
GNUNET_GE_ASSERT (ectx,
- 0 == GNUNET_GC_attach_change_listener (cfg,
- &connectionConfigChangeCallback,
- NULL));
+ 0 == GNUNET_GC_attach_change_listener (cfg,
+
&connectionConfigChangeCallback,
+ NULL));
GNUNET_GE_ASSERT (ectx, CONNECTION_MAX_HOSTS_ != 0);
registerp2pHandler (GNUNET_P2P_PROTO_HANG_UP, &handleHANGUP);
GNUNET_cron_add_job (cron,
@@ -3595,7 +3627,8 @@
SendCallbackList *scl;
ENTRY ();
- GNUNET_GC_detach_change_listener (cfg, &connectionConfigChangeCallback,
NULL);
+ GNUNET_GC_detach_change_listener (cfg, &connectionConfigChangeCallback,
+ NULL);
GNUNET_cron_del_job (cron, &cronDecreaseLiveness, CDL_FREQUENCY, NULL);
for (i = 0; i < CONNECTION_MAX_HOSTS_; i++)
{
@@ -3607,8 +3640,8 @@
{
#if DEBUG_CONNECTION
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Closing connection: shutdown\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Closing connection: shutdown\n");
#endif
shutdownConnection (be);
prev = be;
@@ -3712,17 +3745,16 @@
if (tmp->session.tsession != NULL)
ttype = tmp->session.tsession->ttype;
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "CONNECTION-TABLE: %3d-%1d-%2d-%4ds"
- " (of %ds) BPM %4llu %8ut-%3u: %s-%s-%s\n",
- i,
- tmp->status,
- ttype,
- (int) ((GNUNET_get_time () -
- tmp->isAlive) / GNUNET_CRON_SECONDS),
- SECONDS_INACTIVE_DROP, tmp->recently_received,
- tmp->idealized_limit, tmp->sendBufferSize, &hostName,
- &skey_local, &skey_remote);
+ GNUNET_GE_INFO | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "CONNECTION-TABLE: %3d-%1d-%2d-%4ds"
+ " (of %ds) BPM %4llu %8ut-%3u: %s-%s-%s\n", i,
+ tmp->status, ttype,
+ (int) ((GNUNET_get_time () -
+ tmp->isAlive) / GNUNET_CRON_SECONDS),
+ SECONDS_INACTIVE_DROP, tmp->recently_received,
+ tmp->idealized_limit, tmp->sendBufferSize,
+ &hostName, &skey_local, &skey_remote);
}
tmp = tmp->overflowChain;
}
@@ -3944,8 +3976,8 @@
if (len == 0)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
- "Empty message send (hopefully used to initiate connection
attempt)\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
+ "Empty message send (hopefully used to initiate
connection attempt)\n");
EXIT ();
return;
}
@@ -4054,9 +4086,10 @@
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
GNUNET_hash_to_enc (&node->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_DEVELOPER,
- "Closing connection to `%s' as requested by application.\n",
- &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_DEVELOPER,
+ "Closing connection to `%s' as requested by
application.\n",
+ &enc);
#endif
/* do not try to reconnect any time soon! */
identity->blacklistHost (&be->session.sender,
Modified: GNUnet/src/server/connection.h
===================================================================
--- GNUnet/src/server/connection.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/connection.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -121,7 +121,8 @@
* @param msg the message to transmit, should contain MESSAGNUNET_GE_HEADERs
* @return GNUNET_OK on success, GNUNET_SYSERR on failure
*/
-int sendPlaintext (GNUNET_TSession * tsession, const char *msg, unsigned int
size);
+int sendPlaintext (GNUNET_TSession * tsession, const char *msg,
+ unsigned int size);
/**
* Compute the hashtable index of a host id.
Modified: GNUnet/src/server/core.c
===================================================================
--- GNUnet/src/server/core.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/core.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -106,7 +106,8 @@
pos = NULL;
if (-1 == GNUNET_GC_get_configuration_value_string (applicationCore.cfg,
- "MODULES", rpos, rpos, &pos))
+ "MODULES", rpos, rpos,
+ &pos))
return GNUNET_SYSERR;
GNUNET_GE_ASSERT (applicationCore.ectx, pos != NULL);
name = GNUNET_malloc (strlen (pos) + strlen ("module_") + 1);
@@ -122,9 +123,11 @@
if (nxt->applicationInitialized == GNUNET_YES)
{
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- _("Application module `%s' already initialized!\n"),
- name);
+ GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ _
+ ("Application module `%s' already
initialized!\n"),
+ name);
GNUNET_free (name);
return GNUNET_SYSERR;
}
@@ -174,9 +177,11 @@
{
/* undo loading */
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- _("Failed to load plugin `%s' at %s:%d. Unloading plugin.\n"),
- name, __FILE__, __LINE__);
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK,
+ _
+ ("Failed to load plugin `%s' at %s:%d. Unloading
plugin.\n"),
+ name, __FILE__, __LINE__);
/* Note: we cannot assert that shutdownList == nxt here,
so we have to traverse the list again! */
nxt->applicationInitialized = GNUNET_NO;
@@ -192,7 +197,7 @@
spos = spos->next;
if (spos == NULL)
{
- GNUNET_GE_BREAK (applicationCore.ectx, 0); /* should never
happen! */
+ GNUNET_GE_BREAK (applicationCore.ectx, 0); /* should
never happen! */
return ok;
}
}
@@ -223,26 +228,31 @@
if (pos == NULL)
{
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK |
GNUNET_GE_DEVELOPER,
- _("Could not shutdown `%s': application not loaded\n"), name);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK |
+ GNUNET_GE_DEVELOPER,
+ _("Could not shutdown `%s': application not loaded\n"),
+ name);
return GNUNET_SYSERR;
}
if (pos->applicationInitialized != GNUNET_YES)
{
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK |
GNUNET_GE_DEVELOPER,
- _("Could not shutdown application `%s': not initialized\n"),
- name);
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK |
+ GNUNET_GE_DEVELOPER,
+ _
+ ("Could not shutdown application `%s': not
initialized\n"),
+ name);
return GNUNET_SYSERR;
}
mptr = GNUNET_plugin_resolve_function (pos->library, "done_", GNUNET_YES);
if (mptr == NULL)
{
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- _("Could not find '%s%s' method in library `%s'.\n"),
- "done_", pos->dsoName, pos->dsoName);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ _("Could not find '%s%s' method in library `%s'.\n"),
+ "done_", pos->dsoName, pos->dsoName);
return GNUNET_SYSERR;
}
mptr ();
@@ -284,7 +294,8 @@
/* subtyping, GNUnet style */
pos = NULL;
if (-1 == GNUNET_GC_get_configuration_value_string (applicationCore.cfg,
- "MODULES", rpos, rpos, &pos))
+ "MODULES", rpos, rpos,
+ &pos))
return NULL;
GNUNET_GE_ASSERT (applicationCore.ectx, pos != NULL);
name = GNUNET_malloc (strlen (pos) + strlen ("module_") + 1);
@@ -349,7 +360,8 @@
nxt->servicePTR = NULL;
shutdownList = nxt;
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST, "Loading
service `%s'\n", pos);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Loading service `%s'\n", pos);
api = mptr (&applicationCore);
if (api != NULL)
{
@@ -358,8 +370,9 @@
else
{
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- "Failed to load service `%s'\n", pos);
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "Failed to load service `%s'\n",
+ pos);
nxt->serviceCount = 0;
}
GNUNET_free (pos);
@@ -383,8 +396,9 @@
if (pos == NULL)
{
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_BULK | GNUNET_GE_DEVELOPER | GNUNET_GE_ERROR,
- _("Could not release %p: service not loaded\n"), service);
+ GNUNET_GE_BULK | GNUNET_GE_DEVELOPER | GNUNET_GE_ERROR,
+ _("Could not release %p: service not loaded\n"),
+ service);
return GNUNET_SYSERR;
}
if (pos->serviceCount > 1)
@@ -393,8 +407,8 @@
return GNUNET_OK; /* service still in use elsewhere! */
}
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Unloading service `%s'.\n", pos->dsoName);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "Unloading service `%s'.\n", pos->dsoName);
mptr =
GNUNET_plugin_resolve_function (pos->library, "release_", GNUNET_YES);
if (mptr == NULL)
@@ -437,10 +451,10 @@
ok = GNUNET_OK;
dso = NULL;
if (-1 == GNUNET_GC_get_configuration_value_string (applicationCore.cfg,
- "GNUNETD",
- "APPLICATIONS",
- "advertising fs getoption stats
traffic",
- &dso))
+ "GNUNETD",
+ "APPLICATIONS",
+ "advertising fs
getoption stats traffic",
+ &dso))
return GNUNET_SYSERR;
GNUNET_GE_ASSERT (applicationCore.ectx, dso != NULL);
next = dso;
@@ -463,8 +477,8 @@
if (strlen (pos) > 0)
{
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Loading application `%s'\n", pos);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Loading application `%s'\n", pos);
if (GNUNET_OK != loadApplicationModule (pos))
ok = GNUNET_SYSERR;
}
@@ -490,9 +504,10 @@
(GNUNET_OK != unloadApplicationModule (pos->dsoName)))
{
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- _("Could not properly shutdown application `%s'.\n"),
- pos->dsoName);
+ GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ _("Could not properly shutdown application `%s'.\n"),
+ pos->dsoName);
ok = GNUNET_SYSERR;
}
pos = nxt;
@@ -627,8 +642,9 @@
while (pos != NULL)
{
GNUNET_GE_LOG (applicationCore.ectx,
- GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- _("Could not properly unload service `%s'!\n"), pos->dsoName);
+ GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ _("Could not properly unload service `%s'!\n"),
+ pos->dsoName);
pos = pos->next;
}
doneTCPServer ();
Modified: GNUnet/src/server/gnunet-peer-info.c
===================================================================
--- GNUnet/src/server/gnunet-peer-info.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/server/gnunet-peer-info.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -54,7 +54,7 @@
{'n', "numeric", NULL,
gettext_noop ("don't resolve host names"),
0, &GNUNET_getopt_configure_set_one, &no_resolve},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -116,8 +116,8 @@
if (NULL == hello)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Could not get address of peer `%s'.\n"), &enc);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Could not get address of peer `%s'.\n"), &enc);
return GNUNET_OK;
}
if (GNUNET_SYSERR == GNUNET_RSA_verify (&hello->senderIdentity,
@@ -129,8 +129,8 @@
&hello->publicKey))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("hello message invalid (signature invalid).\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("hello message invalid (signature invalid).\n"));
}
addr = NULL;
addr_len = 0;
@@ -149,8 +149,8 @@
if (info == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Could not get address of peer `%s'.\n"), &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Could not get address of peer `%s'.\n"), &enc);
printf (_("Peer `%s' with trust %8u\n"),
(char *) &enc, identity->getHostTrust (id));
return GNUNET_OK;
@@ -178,10 +178,11 @@
return -1;
}
GNUNET_GE_ASSERT (ectx,
- 0 == GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- "TCPSERVER",
- "DISABLE", "YES"));
+ 0 == GNUNET_GC_set_configuration_value_string (cfg,
+ ectx,
+ "TCPSERVER",
+ "DISABLE",
+ "YES"));
cron = cron_create (ectx);
initCore (ectx, cfg, cron, NULL);
identity = requestService ("identity");
Modified: GNUnet/src/server/gnunet-transport-check.c
===================================================================
--- GNUnet/src/server/gnunet-transport-check.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/server/gnunet-transport-check.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -132,11 +132,11 @@
}
GNUNET_free (helo);
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "TRANSPORT-CHECK",
- "REPEAT",
- 1,
- (unsigned long) -1,
- 1, &repeat))
+ "TRANSPORT-CHECK",
+ "REPEAT",
+ 1,
+ (unsigned long) -1,
+ 1, &repeat))
{
*res = GNUNET_SYSERR;
return;
@@ -222,9 +222,9 @@
if (GNUNET_NO == transport->isAvailable (ntohs (xhello->protocol)))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _(" Transport %d is not being tested\n"),
- ntohs (xhello->protocol));
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _(" Transport %d is not being tested\n"),
+ ntohs (xhello->protocol));
return;
}
if (ntohs (xhello->protocol) == GNUNET_TRANSPORT_PROTOCOL_NUMBER_NAT)
@@ -232,9 +232,10 @@
stats[1]++; /* one more with transport 'available' */
GNUNET_GC_get_configuration_value_number (cfg,
- "GNUNET",
- "VERBOSE",
- 0, (unsigned long long) -1, 0, &verbose);
+ "GNUNET",
+ "VERBOSE",
+ 0, (unsigned long long) -1, 0,
+ &verbose);
if (verbose > 0)
{
char *str;
@@ -311,7 +312,8 @@
fprintf (stderr, ".");
/* check: received pong? */
#if DEBUG_TRANSPORT_CHECK
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"Waiting for PONG\n");
+ GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Waiting for PONG\n");
#endif
terminate = GNUNET_NO;
GNUNET_cron_add_job (cron, &semUp, timeout, 5 * GNUNET_CRON_SECONDS, sem);
@@ -368,7 +370,7 @@
{'u', "user", "LOGIN",
gettext_noop ("run as user LOGIN"),
1, &GNUNET_getopt_configure_set_option, "GNUNETD:USER"},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
{'X', "Xrepeat", "X",
gettext_noop ("repeat each test X times"),
@@ -396,20 +398,22 @@
}
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "TRANSPORT-CHECK",
- "SIZE",
- 1, 60000, 12, &expectedSize))
+ "TRANSPORT-CHECK",
+ "SIZE",
+ 1, 60000, 12,
+ &expectedSize))
{
GNUNET_fini (ectx, cfg);
return 1;
}
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "TRANSPORT-CHECK",
- "TIMEOUT",
- 1,
- 60 * GNUNET_CRON_SECONDS,
- 3 * GNUNET_CRON_SECONDS,
- &timeout))
+ "TRANSPORT-CHECK",
+ "TIMEOUT",
+ 1,
+ 60 *
+ GNUNET_CRON_SECONDS,
+ 3 * GNUNET_CRON_SECONDS,
+ &timeout))
{
GNUNET_fini (ectx, cfg);
return 1;
@@ -423,9 +427,9 @@
trans = NULL;
if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
- "GNUNETD",
- "TRANSPORTS",
- "udp tcp http", &trans))
+ "GNUNETD",
+ "TRANSPORTS",
+ "udp tcp http", &trans))
{
GNUNET_free (expectedValue);
GNUNET_fini (ectx, cfg);
@@ -440,11 +444,16 @@
if (!ping)
{
/* disable blacklists (loopback is often blacklisted)... */
- GNUNET_GC_set_configuration_value_string (cfg, ectx, "TCP", "BLACKLIST",
"");
- GNUNET_GC_set_configuration_value_string (cfg, ectx, "TCP6",
"BLACKLIST", "");
- GNUNET_GC_set_configuration_value_string (cfg, ectx, "UDP", "BLACKLIST",
"");
- GNUNET_GC_set_configuration_value_string (cfg, ectx, "UDP6",
"BLACKLIST", "");
- GNUNET_GC_set_configuration_value_string (cfg, ectx, "HTTP",
"BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (cfg, ectx, "TCP", "BLACKLIST",
+ "");
+ GNUNET_GC_set_configuration_value_string (cfg, ectx, "TCP6",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (cfg, ectx, "UDP", "BLACKLIST",
+ "");
+ GNUNET_GC_set_configuration_value_string (cfg, ectx, "UDP6",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (cfg, ectx, "HTTP",
+ "BLACKLIST", "");
}
cron = cron_create (ectx);
if (GNUNET_OK != initCore (ectx, cfg, cron, NULL))
@@ -463,9 +472,10 @@
GNUNET_cron_start (cron);
GNUNET_GC_get_configuration_value_number (cfg,
- "TRANSPORT-CHECK",
- "X-REPEAT",
- 1, (unsigned long long) -1, 1, &Xrepeat);
+ "TRANSPORT-CHECK",
+ "X-REPEAT",
+ 1, (unsigned long long) -1, 1,
+ &Xrepeat);
res = GNUNET_OK;
if (ping)
{
Modified: GNUnet/src/server/gnunet-update.c
===================================================================
--- GNUnet/src/server/gnunet-update.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/gnunet-update.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -77,7 +77,8 @@
pos = NULL;
if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
- "MODULES", rpos, rpos, &pos))
+ "MODULES", rpos, rpos,
+ &pos))
return GNUNET_SYSERR;
GNUNET_GE_ASSERT (ectx, pos != NULL);
@@ -117,10 +118,10 @@
dso = NULL;
if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
- "GNUNETD",
- "APPLICATIONS",
- "advertising fs getoption stats
traffic",
- &dso))
+ "GNUNETD",
+ "APPLICATIONS",
+ "advertising fs
getoption stats traffic",
+ &dso))
return;
GNUNET_GE_ASSERT (ectx, dso != NULL);
next = dso;
@@ -141,12 +142,13 @@
if (strlen (pos) > 0)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Updating data for module `%s'\n"), pos);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Updating data for module `%s'\n"), pos);
if (GNUNET_OK != updateModule (pos))
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Failed to update data for module `%s'\n"), pos);
+ GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Failed to update data for module `%s'\n"), pos);
}
}
while (next != NULL);
@@ -192,8 +194,9 @@
cron = cron_create (ectx);
if (initCore (ectx, cfg, cron, NULL) != GNUNET_OK)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- _("Core initialization failed.\n"));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ _("Core initialization failed.\n"));
return;
}
@@ -246,7 +249,7 @@
gettext_noop
("run in client mode (for getting client configuration values)"),
0, &set_client_config, NULL},
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -268,7 +271,8 @@
return -1;
}
get = NULL;
- GNUNET_GC_get_configuration_value_string (cfg, "GNUNET-UPDATE", "GET", "",
&get);
+ GNUNET_GC_get_configuration_value_string (cfg, "GNUNET-UPDATE", "GET", "",
+ &get);
if (strlen (get) > 0)
doGet (get);
else
Modified: GNUnet/src/server/gnunetd.c
===================================================================
--- GNUnet/src/server/gnunetd.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/gnunetd.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -79,12 +79,12 @@
waitForSignalHandler (struct GNUNET_GE_Context *ectx)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- _("`%s' startup complete.\n"), "gnunetd");
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ _("`%s' startup complete.\n"), "gnunetd");
GNUNET_shutdown_wait_for ();
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- _("`%s' is shutting down.\n"), "gnunetd");
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ _("`%s' is shutting down.\n"), "gnunetd");
}
/**
@@ -117,8 +117,8 @@
if (GNUNET_OK != initCore (ectx, cfg, cron, mon))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Core initialization failed.\n"));
+ GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ _("Core initialization failed.\n"));
GNUNET_cron_destroy (cron);
GNUNET_network_monitor_destroy (mon);
@@ -191,7 +191,7 @@
gettext_noop ("specify username as which gnunetd should run"), 1,
&GNUNET_getopt_configure_set_option, "GNUNETD:USERNAME"},
#endif
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -220,17 +220,19 @@
GNUNET_fini (ectx, cfg);
return 1;
}
- GNUNET_pid_file_write(ectx, cfg, getpid());
- if (GNUNET_OK != changeUser (ectx, cfg)) {
- GNUNET_pid_file_delete(ectx, cfg);
- GNUNET_fini (ectx, cfg);
- return 1;
- }
- if (GNUNET_OK != checkPermissions (ectx, cfg)) {
- GNUNET_pid_file_delete (ectx, cfg);
- GNUNET_fini (ectx, cfg);
- return 1;
- }
+ GNUNET_pid_file_write (ectx, cfg, getpid ());
+ if (GNUNET_OK != changeUser (ectx, cfg))
+ {
+ GNUNET_pid_file_delete (ectx, cfg);
+ GNUNET_fini (ectx, cfg);
+ return 1;
+ }
+ if (GNUNET_OK != checkPermissions (ectx, cfg))
+ {
+ GNUNET_pid_file_delete (ectx, cfg);
+ GNUNET_fini (ectx, cfg);
+ return 1;
+ }
if (GNUNET_YES == debug_flag)
{
int dev;
@@ -240,12 +242,12 @@
GNUNET_GE_setDefaultContext (NULL);
GNUNET_GE_free_context (ectx);
GNUNET_GC_get_configuration_value_string (cfg,
- "LOGGING",
- "USER-LEVEL",
- "WARNING", &user_log_level);
+ "LOGGING",
+ "USER-LEVEL",
+ "WARNING", &user_log_level);
dev = GNUNET_GC_get_configuration_value_yesno (cfg,
- "LOGGING", "DEVELOPER",
- GNUNET_NO);
+ "LOGGING", "DEVELOPER",
+ GNUNET_NO);
ull = GNUNET_GE_getKIND (user_log_level);
ull |= (ull - 1); /* set bits for all lower log-levels */
if (dev == GNUNET_YES)
@@ -254,8 +256,10 @@
ectx = GNUNET_GE_create_context_stderr (GNUNET_YES, GNUNET_GE_ALL);
else
ectx = GNUNET_GE_create_context_stderr (GNUNET_YES,
- GNUNET_GE_USER | GNUNET_GE_ADMIN
- | ull | GNUNET_GE_BULK |
GNUNET_GE_IMMEDIATE);
+ GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | ull |
+ GNUNET_GE_BULK |
+ GNUNET_GE_IMMEDIATE);
GNUNET_GE_setDefaultContext (ectx);
GNUNET_free (user_log_level);
}
@@ -263,10 +267,10 @@
if (GNUNET_OK != checkUpToDate (ectx, cfg))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_USER | GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE,
- _
- ("Configuration or GNUnet version changed. You need to run
`%s'!\n"),
- "gnunet-update");
+ GNUNET_GE_USER | GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE,
+ _
+ ("Configuration or GNUnet version changed. You need to
run `%s'!\n"),
+ "gnunet-update");
GNUNET_pid_file_delete (ectx, cfg);
GNUNET_fini (ectx, cfg);
return 1;
@@ -274,8 +278,8 @@
#ifdef MINGW
if (GNUNET_GC_get_configuration_value_yesno (cfg,
- "GNUNETD", "WINSERVICE",
- GNUNET_NO) == GNUNET_YES)
+ "GNUNETD", "WINSERVICE",
+ GNUNET_NO) == GNUNET_YES)
{
SERVICE_TABLE_ENTRY DispatchTable[] = { {"GNUnet", ServiceMain}
, {NULL, NULL}
Modified: GNUnet/src/server/handler.c
===================================================================
--- GNUnet/src/server/handler.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/handler.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -425,9 +425,11 @@
GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
GNUNET_hash_to_enc (&sender->hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Received corrupt message from peer `%s'in %s:%d.\n"),
- &enc, __FILE__, __LINE__);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ _
+ ("Received corrupt message from peer `%s'in
%s:%d.\n"),
+ &enc, __FILE__, __LINE__);
}
else
{
@@ -460,8 +462,9 @@
IF_GELOG (ectx, GNUNET_GE_DEBUG,
GNUNET_hash_to_enc (&sender->hashPubKey, &enc));
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG,
- "Received %s message of type %u from peer `%s'\n",
- wasEncrypted ? "encrypted" : "plaintext", ptyp, &enc);
+ "Received %s message of type %u from peer `%s'\n",
+ wasEncrypted ? "encrypted" : "plaintext", ptyp,
+ &enc);
}
#endif
if (GNUNET_YES == wasEncrypted)
@@ -471,9 +474,10 @@
if ((ptyp >= max_registeredType) || (NULL == handlers[ptyp][0]))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "Encrypted message of type '%d' not understood (no
handler registered).\n",
- ptyp);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER |
+ GNUNET_GE_REQUEST,
+ "Encrypted message of type '%d' not understood
(no handler registered).\n",
+ ptyp);
continue; /* no handler registered, go to next part */
}
#if MEASURE_TIME
@@ -490,9 +494,10 @@
{
#if DEBUG_HANDLER
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Handler aborted message processing after receiving
message of type '%d'.\n",
- ptyp);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ "Handler aborted message processing after
receiving message of type '%d'.\n",
+ ptyp);
#endif
GNUNET_free_non_null (copy);
copy = NULL;
@@ -504,8 +509,10 @@
#if VALIDATE_CLIENT
if (0 != memcmp (old_value, part, plen))
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER |
GNUNET_GE_IMMEDIATE,
- "Handler %d at %p violated const!\n", ptyp, callback);
+ GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE,
+ "Handler %d at %p violated const!\n", ptyp,
+ callback);
GNUNET_free (old_value);
#endif
@@ -527,9 +534,10 @@
(NULL == plaintextHandlers[ptyp][0]))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_REQUEST | GNUNET_GE_DEBUG | GNUNET_GE_USER,
- "Plaintext message of type '%d' not understood (no
handler registered).\n",
- ptyp);
+ GNUNET_GE_REQUEST | GNUNET_GE_DEBUG |
+ GNUNET_GE_USER,
+ "Plaintext message of type '%d' not understood
(no handler registered).\n",
+ ptyp);
continue; /* no handler registered, go to next part */
}
#if MEASURE_TIME
@@ -542,9 +550,10 @@
{
#if DEBUG_HANDLER
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Handler aborted message processing after receiving
message of type '%d'.\n",
- ptyp);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ "Handler aborted message processing after
receiving message of type '%d'.\n",
+ ptyp);
#endif
GNUNET_free_non_null (copy);
copy = NULL;
@@ -659,11 +668,11 @@
discarded++;
if (0 == discarded % 64)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
- "Accepted: %u discarded: %u blacklisted: %u, ratio: %f\n",
- accepted,
- discarded,
- blacklisted, 1.0 * accepted / (blacklisted + discarded + 1));
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ "Accepted: %u discarded: %u blacklisted: %u, ratio:
%f\n",
+ accepted, discarded, blacklisted,
+ 1.0 * accepted / (blacklisted + discarded + 1));
if (globalLock_ != NULL)
GNUNET_mutex_unlock (globalLock_);
#endif
@@ -677,20 +686,21 @@
GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
GNUNET_hash_to_enc (&mp->sender.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
- "Strictly blacklisted peer `%s' sent message, dropping for
now.\n",
- (char *) &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ "Strictly blacklisted peer `%s' sent message, dropping
for now.\n",
+ (char *) &enc);
#endif
#if TRACK_DISCARD
GNUNET_mutex_lock (globalLock_);
blacklisted++;
if (0 == blacklisted % 64)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
- "Accepted: %u discarded: %u blacklisted: %u, ratio: %f\n",
- accepted,
- discarded,
- blacklisted, 1.0 * accepted / (blacklisted + discarded + 1));
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ "Accepted: %u discarded: %u blacklisted: %u, ratio:
%f\n",
+ accepted, discarded, blacklisted,
+ 1.0 * accepted / (blacklisted + discarded + 1));
GNUNET_mutex_unlock (globalLock_);
#endif
GNUNET_free (mp->msg);
@@ -705,8 +715,10 @@
we're shut down! */
#if 0
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
- "Discarding message of size %u -- buffer full!\n", mp->size);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ "Discarding message of size %u -- buffer full!\n",
+ mp->size);
#endif
GNUNET_free (mp->msg);
GNUNET_free (mp);
@@ -716,11 +728,11 @@
discarded++;
if (0 == discarded % 64)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
- "Accepted: %u discarded: %u blacklisted: %u, ratio: %f\n",
- accepted,
- discarded,
- blacklisted, 1.0 * accepted / (blacklisted + discarded + 1));
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ "Accepted: %u discarded: %u blacklisted: %u, ratio:
%f\n",
+ accepted, discarded, blacklisted,
+ 1.0 * accepted / (blacklisted + discarded + 1));
if (globalLock_ != NULL)
GNUNET_mutex_unlock (globalLock_);
#endif
@@ -739,11 +751,12 @@
accepted++;
if (0 == accepted % 64)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
- "Accepted: %u discarded: %u blacklisted: %u, ratio: %f\n",
- accepted,
- discarded,
- blacklisted, 1.0 * accepted / (blacklisted + discarded + 1));
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ "Accepted: %u discarded: %u blacklisted: %u, ratio: %f\n",
+ accepted,
+ discarded,
+ blacklisted,
+ 1.0 * accepted / (blacklisted + discarded + 1));
#endif
GNUNET_mutex_unlock (globalLock_);
GNUNET_semaphore_up (bufferQueueRead_);
@@ -867,10 +880,11 @@
if (count_by_type[i] == 0)
continue;
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
- "%10u msgs of type %2u took %16llu ms (%llu on average)\n",
- count_by_type[i],
- i, time_by_type[i], time_by_type[i] / count_by_type[i]);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_REQUEST,
+ "%10u msgs of type %2u took %16llu ms (%llu on
average)\n",
+ count_by_type[i], i, time_by_type[i],
+ time_by_type[i] / count_by_type[i]);
}
#endif
}
Modified: GNUnet/src/server/handler.h
===================================================================
--- GNUnet/src/server/handler.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/handler.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -59,7 +59,8 @@
*/
void injectMessage (const GNUNET_PeerIdentity * sender,
const char *msg,
- unsigned int size, int wasEncrypted, GNUNET_TSession *
session);
+ unsigned int size, int wasEncrypted,
+ GNUNET_TSession * session);
/**
* Processing of a message from the transport layer (receive
Modified: GNUnet/src/server/startup.c
===================================================================
--- GNUnet/src/server/startup.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/startup.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -55,9 +55,10 @@
{
#ifdef MINGW
if (!cfg || GNUNET_GC_get_configuration_value_yesno (cfg,
- "GNUNETD",
- "WINSERVICE",
- GNUNET_NO) == GNUNET_YES)
+ "GNUNETD",
+ "WINSERVICE",
+ GNUNET_NO) ==
+ GNUNET_YES)
{
/* If GNUnet runs as service, only the
Service Control Manager is allowed
@@ -128,15 +129,17 @@
int
-changeUser (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+changeUser (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *user;
user = NULL;
if (0 == GNUNET_GC_get_configuration_value_string (cfg,
- "GNUNETD",
- "USER",
- "", &user) && strlen (user))
+ "GNUNETD",
+ "USER",
+ "", &user)
+ && strlen (user))
{
if (GNUNET_OK != GNUNET_change_user (ectx, user))
{
@@ -149,15 +152,16 @@
}
int
-setFdLimit (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+setFdLimit (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
unsigned long long limit;
limit = 0;
if (0 == GNUNET_GC_get_configuration_value_number (cfg,
- "GNUNETD",
- "FDLIMIT",
- 0, 65536, 1024, &limit))
+ "GNUNETD",
+ "FDLIMIT",
+ 0, 65536, 1024, &limit))
{
if (GNUNET_OK != GNUNET_set_fd_limit (ectx, (int) limit))
{
@@ -174,7 +178,8 @@
* @param cfg configuration manager
*/
void
-capFSQuotaSize (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+capFSQuotaSize (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
#ifdef WINDOWS
unsigned long long quota, cap;
@@ -182,18 +187,19 @@
DWORD flags;
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "FS",
- "QUOTA",
- 0,
- ((unsigned long long) -1) /
- 1024 / 1024, 1024, "a))
+ "FS",
+ "QUOTA",
+ 0,
+ ((unsigned long long)
+ -1) / 1024 / 1024,
+ 1024, "a))
return;
GNUNET_GC_get_configuration_value_filename (cfg,
- "FS",
- "DIR",
- GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
"/data/fs/",
- &afsdir);
+ "FS",
+ "DIR",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
+ "/data/fs/", &afsdir);
GNUNET_GE_ASSERT (ectx, strlen (afsdir) > 2);
/* get root directory */
@@ -203,9 +209,11 @@
NULL, 0, NULL, NULL, &flags, fs, _MAX_PATH + 1))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- _("Unable to obtain filesystem information for `%s': %u\n"),
- afsdir, GetLastError ());
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _
+ ("Unable to obtain filesystem information for `%s':
%u\n"),
+ afsdir, GetLastError ());
return;
}
@@ -220,9 +228,10 @@
{
/* unknown FS */
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- _("Filesystem `%s' of partition `%s' is unknown. Please "
- "contact address@hidden"), fs, afsdir);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _("Filesystem `%s' of partition `%s' is unknown. Please "
+ "contact address@hidden"), fs, afsdir);
if (!(flags & FILE_PERSISTENT_ACLS))
cap = 1500;
@@ -233,13 +242,15 @@
if ((cap != 0) && (cap < quota))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- _
- ("Limiting datastore size to %llu GB, because the `%s'
filesystem does "
- "not support larger files. Please consider storing the database
on "
- "a NTFS partition!\n"), cap / 1000, fs);
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _
+ ("Limiting datastore size to %llu GB, because the `%s'
filesystem does "
+ "not support larger files. Please consider storing the
database on "
+ "a NTFS partition!\n"), cap / 1000, fs);
- GNUNET_GC_set_configuration_value_number (cfg, ectx, "FS", "QUOTA", cap);
+ GNUNET_GC_set_configuration_value_number (cfg, ectx, "FS", "QUOTA",
+ cap);
}
#endif
}
@@ -271,9 +282,10 @@
if (0 != ACCESS (fn, mode))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- _("Insufficient access permissions for `%s': %s\n"),
- fn, STRERROR (errno));
+ GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE,
+ _("Insufficient access permissions for `%s': %s\n"), fn,
+ STRERROR (errno));
GNUNET_free (fn);
return GNUNET_SYSERR;
}
@@ -284,7 +296,8 @@
#define CHECK(a,b,c,d,e) if (GNUNET_OK != checkPermission(ectx, cfg, a, b, c,
d, e)) return GNUNET_SYSERR;
int
-checkPermissions (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg)
+checkPermissions (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
CHECK ("PATHS", "GNUNETD_HOME", "/var/lib/gnunet", GNUNET_YES, W_OK | X_OK);
CHECK ("GNUNETD", "LOGFILE", "$GNUNETD_HOME/daemon-logs", GNUNET_NO, W_OK);
Modified: GNUnet/src/server/startup.h
===================================================================
--- GNUnet/src/server/startup.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/startup.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -31,11 +31,14 @@
#include "gnunet_util.h"
#include "platform.h"
-int changeUser (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg);
+int changeUser (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
-int setFdLimit (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg);
+int setFdLimit (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
-int checkPermissions (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg);
+int checkPermissions (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
/**
* @brief Cap datastore limit to the filesystem's capabilities
@@ -43,7 +46,8 @@
* @param ectx error handler
* @param cfg configuration manager
*/
-void capFSQuotaSize (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg);
+void capFSQuotaSize (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
/**
* Shutdown gnunetd
Modified: GNUnet/src/server/tcpserver.c
===================================================================
--- GNUnet/src/server/tcpserver.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/tcpserver.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -106,14 +106,15 @@
if (ntohs (msg->size) != sizeof (GNUNET_MessageHeader))
{
GNUNET_GE_LOG (NULL,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("The `%s' request received from client is malformed.\n"),
- "shutdown");
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("The `%s' request received from client is malformed.\n"),
+ "shutdown");
return GNUNET_SYSERR;
}
GNUNET_GE_LOG (NULL,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
- "shutdown request accepted from client\n");
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_REQUEST,
+ "shutdown request accepted from client\n");
ret = sendTCPResultToClient (client, GNUNET_OK);
shutdown_gnunetd (cfg, 0);
return ret;
@@ -201,8 +202,8 @@
{
#if DEBUG_TCPHANDLER
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
- "%s: sending reply to client\n", __FUNCTION__);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_REQUEST,
+ "%s: sending reply to client\n", __FUNCTION__);
#endif
return GNUNET_select_write (selector, handle->sock, message, GNUNET_YES,
force);
@@ -232,9 +233,9 @@
if (ptyp >= max_registeredType)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- "%s: Message of type %d not understood: no handler registered\n",
- __FUNCTION__, ptyp, max_registeredType);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "%s: Message of type %d not understood: no handler
registered\n",
+ __FUNCTION__, ptyp, max_registeredType);
GNUNET_mutex_unlock (handlerlock);
return GNUNET_SYSERR;
}
@@ -242,9 +243,9 @@
if (callback == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- "%s: Message of type %d not understood: no handler registered\n",
- __FUNCTION__, ptyp);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "%s: Message of type %d not understood: no handler
registered\n",
+ __FUNCTION__, ptyp);
GNUNET_mutex_unlock (handlerlock);
return GNUNET_SYSERR;
}
@@ -257,9 +258,9 @@
{
#if 0
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- "%s: Message of type %d caused error in handler\n",
- __FUNCTION__, ptyp);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "%s: Message of type %d caused error in handler\n",
+ __FUNCTION__, ptyp);
#endif
GNUNET_mutex_unlock (handlerlock);
return GNUNET_SYSERR;
@@ -267,9 +268,10 @@
#if TIME_HANDLERS
if (GNUNET_get_time () - start > GNUNET_CRON_SECONDS)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_DEVELOPER | GNUNET_GE_IMMEDIATE,
- "Handling message of type %u took %llu s\n",
- ptyp, (GNUNET_get_time () - start) / GNUNET_CRON_SECONDS);
+ GNUNET_GE_INFO | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE,
+ "Handling message of type %u took %llu s\n", ptyp,
+ (GNUNET_get_time () - start) / GNUNET_CRON_SECONDS);
#endif
}
GNUNET_mutex_unlock (handlerlock);
@@ -285,8 +287,9 @@
unsigned long long port;
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "NETWORK",
- "PORT", 1, 65535, 2087, &port))
+ "NETWORK",
+ "PORT", 1, 65535, 2087,
+ &port))
port = 0;
return (unsigned short) port;
}
@@ -306,8 +309,8 @@
if (listenerFD < 0)
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- "socket");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_IMMEDIATE, "socket");
return GNUNET_SYSERR;
}
/* fill in the inet address structure */
@@ -316,16 +319,22 @@
serverAddr.sin_addr.s_addr = htonl (INADDR_ANY);
serverAddr.sin_port = htons (listenerPort);
if (SETSOCKOPT (listenerFD, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0)
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "setsockopt");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "setsockopt");
/* bind the socket */
if (BIND (listenerFD,
(struct sockaddr *) &serverAddr, sizeof (serverAddr)) < 0)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "bind");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "bind");
GNUNET_GE_LOG (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- _("`%s' failed for port %d. Is gnunetd already running?\n"),
- "bind", listenerPort);
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _
+ ("`%s' failed for port %d. Is gnunetd already
running?\n"),
+ "bind", listenerPort);
CLOSE (listenerFD);
return GNUNET_SYSERR;
}
@@ -387,19 +396,20 @@
/* move to reload-configuration method! */
ch = NULL;
if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
- "NETWORK",
- "TRUSTED",
- "127.0.0.0/8;", &ch))
+ "NETWORK",
+ "TRUSTED",
+ "127.0.0.0/8;", &ch))
return GNUNET_SYSERR;
GNUNET_GE_ASSERT (ectx, ch != NULL);
trustedNetworks_ = GNUNET_parse_ipv4_network_specification (ectx, ch);
if (trustedNetworks_ == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- _
- ("Malformed network specification in the configuration in
section `%s' for entry `%s': %s\n"),
- "NETWORK", "TRUSTED", ch);
+ GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE,
+ _
+ ("Malformed network specification in the configuration in
section `%s' for entry `%s': %s\n"),
+ "NETWORK", "TRUSTED", ch);
GNUNET_free (ch);
return GNUNET_SYSERR;
}
@@ -407,9 +417,9 @@
registerCSHandler (GNUNET_CS_PROTO_SHUTDOWN_REQUEST, &shutdownHandler);
if ((GNUNET_NO == GNUNET_GC_get_configuration_value_yesno (cfg,
- "TCPSERVER",
- "DISABLE",
- GNUNET_NO)) &&
+ "TCPSERVER",
+ "DISABLE",
+ GNUNET_NO)) &&
(GNUNET_OK != startTCPServer ()))
{
doneTCPServer ();
@@ -453,9 +463,10 @@
{
GNUNET_mutex_unlock (handlerlock);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- _("%s failed, message type %d already in use.\n"),
- __FUNCTION__, type);
+ GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ _("%s failed, message type %d already in use.\n"),
+ __FUNCTION__, type);
return GNUNET_SYSERR;
}
}
@@ -479,7 +490,8 @@
* handler for that type
*/
int
-unregisterCSHandler (unsigned short type, GNUNET_ClientRequestHandler callback)
+unregisterCSHandler (unsigned short type,
+ GNUNET_ClientRequestHandler callback)
{
GNUNET_mutex_lock (handlerlock);
if (type < max_registeredType)
@@ -594,13 +606,14 @@
}
struct GNUNET_GE_Context *
-createClientLogContext (GNUNET_GE_KIND mask, struct GNUNET_ClientHandle
*handle)
+createClientLogContext (GNUNET_GE_KIND mask,
+ struct GNUNET_ClientHandle *handle)
{
return GNUNET_GE_create_context_callback (mask,
- &logClientLogContext,
- handle,
- &freeClientLogContext,
- &confirmClientLogContext);
+ &logClientLogContext,
+ handle,
+ &freeClientLogContext,
+ &confirmClientLogContext);
}
/* end of tcpserver.c */
Modified: GNUnet/src/server/tcpserver.h
===================================================================
--- GNUnet/src/server/tcpserver.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/tcpserver.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -33,7 +33,8 @@
* Initialize the TCP port and listen for incoming client connections.
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int initTCPServer (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg);
+int initTCPServer (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
/**
* Stop the server (but do not yet destroy the data structures)
@@ -57,7 +58,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is already a
* handler for that type
*/
-int registerCSHandler (unsigned short type, GNUNET_ClientRequestHandler
callback);
+int registerCSHandler (unsigned short type,
+ GNUNET_ClientRequestHandler callback);
/**
* Unregister a method as a handler for specific message
@@ -70,7 +72,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if there is no or another
* handler for that type
*/
-int unregisterCSHandler (unsigned short type, GNUNET_ClientRequestHandler
callback);
+int unregisterCSHandler (unsigned short type,
+ GNUNET_ClientRequestHandler callback);
int registerClientExitHandler (GNUNET_ClientExitHandler callback);
@@ -120,7 +123,8 @@
unsigned int isCSHandlerRegistered (unsigned short type);
struct GNUNET_GE_Context *createClientLogContext (GNUNET_GE_KIND mask,
- struct GNUNET_ClientHandle *handle);
+ struct GNUNET_ClientHandle
+ *handle);
#endif
/* end of tcpserver.h */
Modified: GNUnet/src/server/version.c
===================================================================
--- GNUnet/src/server/version.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/version.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -96,16 +96,18 @@
}
static char *
-getVersionFileName (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg)
+getVersionFileName (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *en;
char *cn;
en = NULL;
if (-1 == GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNETD",
- "GNUNETD_HOME",
-
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY, &en))
+ "GNUNETD",
+ "GNUNETD_HOME",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY,
+ &en))
return NULL;
GNUNET_GE_ASSERT (ectx, en != NULL);
cn = GNUNET_malloc (strlen (en) + strlen (VERSIONFILE) + 1);
@@ -125,7 +127,8 @@
* @return GNUNET_OK if we are
*/
int
-checkUpToDate (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+checkUpToDate (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char version[MAX_VS];
int len;
@@ -136,9 +139,9 @@
if (fn == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- _
- ("Failed to determine filename used to store GNUnet version
information!\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Failed to determine filename used to store GNUnet
version information!\n"));
return GNUNET_OK; /* uh uh */
}
if (GNUNET_disk_file_test (ectx, fn) != GNUNET_YES)
Modified: GNUnet/src/server/version.h
===================================================================
--- GNUnet/src/server/version.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/server/version.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -33,11 +33,13 @@
* Check if we are up-to-date.
* @return GNUNET_OK if we are
*/
-int checkUpToDate (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg);
+int checkUpToDate (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
/**
* We are up-to-date.
*/
-void upToDate (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg);
+void upToDate (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg);
#endif
Modified: GNUnet/src/setup/gnunet-setup.c
===================================================================
--- GNUnet/src/setup/gnunet-setup.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/setup/gnunet-setup.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -57,7 +57,7 @@
gettext_noop ("generate configuration for gnunetd, the GNUnet daemon"),
0, &GNUNET_getopt_configure_set_one, &config_daemon},
GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("Tool to setup GNUnet.")),
/* -h */
- GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (PACKAGNUNET_GE_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_VERBOSE,
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -87,8 +87,9 @@
if (val != NULL)
{
GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- pos->section, pos->option, val);
+ ectx,
+ pos->section, pos->option,
+ val);
GNUNET_free (val);
}
}
@@ -151,9 +152,12 @@
int i;
ectx = GNUNET_GE_create_context_stderr (GNUNET_NO,
- GNUNET_GE_WARNING | GNUNET_GE_ERROR |
GNUNET_GE_FATAL |
- GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_DEVELOPER |
- GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK);
+ GNUNET_GE_WARNING | GNUNET_GE_ERROR
+ | GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN |
+ GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK);
GNUNET_GE_setDefaultContext (ectx);
GNUNET_os_init (ectx);
cfg = GNUNET_GC_create ();
@@ -176,8 +180,8 @@
return -1;
}
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("No interface specified, using default\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ _("No interface specified, using default\n"));
operation = "config";
#if HAVE_DIALOG
operation = "menuconfig";
@@ -214,8 +218,9 @@
if (((0 != ACCESS (cfgFilename, W_OK)) &&
((errno != ENOENT) || (0 != ACCESS (dirname, W_OK)))))
GNUNET_GE_DIE_STRERROR_FILE (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- "access", dirname);
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ "access", dirname);
GNUNET_free (dirname);
if (0 == ACCESS (cfgFilename, F_OK))
@@ -252,8 +257,9 @@
cfgFilename) != GNUNET_YES)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- _("`%s' is not available."), operation);
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ _("`%s' is not available."), operation);
GNUNET_GNS_free_specification (gns);
GNUNET_GC_free (cfg);
GNUNET_GE_free_context (ectx);
Modified: GNUnet/src/setup/gnunet-win-tool.c
===================================================================
--- GNUnet/src/setup/gnunet-win-tool.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/setup/gnunet-win-tool.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -63,7 +63,7 @@
{'R', "filehash", "hash",
gettext_noop ("display a file's hash value"),
1, &GNUNET_getopt_configure_set_string, &hashFile},
- GNUNET_COMMAND_LINE_OPTION_VERSION (WINTOOL_VERSION), /* -v */
+ GNUNET_COMMAND_LINE_OPTION_VERSION (WINTOOL_VERSION), /* -v */
GNUNET_COMMAND_LINE_OPTION_END,
};
@@ -353,13 +353,15 @@
/* startup */
ectx = GNUNET_GE_create_context_stderr (GNUNET_NO,
- GNUNET_GE_WARNING | GNUNET_GE_ERROR |
GNUNET_GE_FATAL |
- GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_DEVELOPER |
- GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK);
- res = GNUNET_parse_options ("gnunet-win-tool [OPTIONS] [KEYWORDS]",
- ectx,
- NULL,
- gnunetwinOptions, (unsigned int) argc, argv);
+ GNUNET_GE_WARNING | GNUNET_GE_ERROR
+ | GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN |
+ GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK);
+ res =
+ GNUNET_parse_options ("gnunet-win-tool [OPTIONS] [KEYWORDS]", ectx, NULL,
+ gnunetwinOptions, (unsigned int) argc, argv);
if (res == GNUNET_SYSERR)
{
GNUNET_GE_free_context (ectx);
Modified: GNUnet/src/setup/gtk/gconf.c
===================================================================
--- GNUnet/src/setup/gtk/gconf.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/setup/gtk/gconf.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -64,7 +64,8 @@
static const char *cfg_filename;
static void
-addToTree (GtkTreeStore * model, GtkTreeIter * parent, struct
GNUNET_GNS_TreeNode *pos)
+addToTree (GtkTreeStore * model, GtkTreeIter * parent,
+ struct GNUNET_GNS_TreeNode *pos)
{
GtkTreeIter it;
GtkTreeIter it2;
@@ -364,7 +365,8 @@
gtk_tree_model_get (model,
&iter,
SETUP_SECTION, §ion, SETUP_OPTION, &option, -1);
- GNUNET_GC_set_configuration_value_string (cfg, ectx, section, option,
new_value);
+ GNUNET_GC_set_configuration_value_string (cfg, ectx, section, option,
+ new_value);
updateTreeModel (gns);
free (section);
free (option);
Modified: GNUnet/src/setup/gtk/glade_support.c
===================================================================
--- GNUnet/src/setup/gtk/glade_support.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/setup/gtk/glade_support.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -88,8 +88,9 @@
ret = glade_xml_new (gladeFile, dialog_name, PACKAGNUNET_GE_NAME);
if (ret == NULL)
GNUNET_GE_DIE_STRERROR_FILE (NULL,
- GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_FATAL |
GNUNET_GE_IMMEDIATE,
- "open", gladeFile);
+ GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE,
+ "open", gladeFile);
GNUNET_free (gladeFile);
glade_xml_signal_autoconnect_full (ret, &connector, ret);
return ret;
@@ -123,8 +124,9 @@
myXML = glade_xml_new (gladeFile, name, PACKAGNUNET_GE_NAME);
if (mainXML_ == NULL)
GNUNET_GE_DIE_STRERROR_FILE (NULL,
- GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_FATAL |
GNUNET_GE_IMMEDIATE,
- "open", gladeFile);
+ GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE,
+ "open", gladeFile);
GNUNET_free (gladeFile);
glade_xml_signal_autoconnect_full (myXML, &connector, myXML);
msgSave = glade_xml_get_widget (myXML, name);
Modified: GNUnet/src/setup/gtk/ngconf.c
===================================================================
--- GNUnet/src/setup/gtk/ngconf.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/setup/gtk/ngconf.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -97,11 +97,11 @@
{
struct GNUNET_GNS_TreeNode *pos = user_data;
GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- pos->section,
- pos->option,
- gtk_toggle_button_get_active
- (togglebutton) ? "YES" : "NO");
+ ectx,
+ pos->section,
+ pos->option,
+ gtk_toggle_button_get_active
+ (togglebutton) ? "YES" : "NO");
update_visibility ();
}
@@ -113,7 +113,8 @@
opt = g_object_get_data (G_OBJECT (button), "SC-value");
GNUNET_GC_set_configuration_value_string (cfg,
- ectx, pos->section, pos->option, opt);
+ ectx, pos->section, pos->option,
+ opt);
update_visibility ();
}
@@ -129,7 +130,8 @@
val = NULL;
GNUNET_GC_get_configuration_value_string (cfg,
- pos->section, pos->option, NULL, &val);
+ pos->section, pos->option, NULL,
+ &val);
GNUNET_GE_ASSERT (ectx, val != NULL);
opt = g_object_get_data (G_OBJECT (button), "MC-value");
if (gtk_toggle_button_get_active (button))
@@ -155,7 +157,8 @@
strcat (ret, &s[strlen (opt)]);
}
GNUNET_GC_set_configuration_value_string (cfg,
- ectx, pos->section, pos->option, ret);
+ ectx, pos->section, pos->option,
+ ret);
GNUNET_free (ret);
GNUNET_free (val);
update_visibility ();
@@ -166,9 +169,10 @@
{
struct GNUNET_GNS_TreeNode *pos = user_data;
GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- pos->section,
- pos->option, gtk_entry_get_text (entry));
+ ectx,
+ pos->section,
+ pos->option,
+ gtk_entry_get_text (entry));
update_visibility ();
}
@@ -460,7 +464,8 @@
GNUNET_GC_Configuration
*c,
struct
- GNUNET_GNS_Context *gns, const char *filename, int
is_daemon)
+ GNUNET_GNS_Context *gns, const char *filename,
+ int is_daemon)
{
GtkWidget *mainWindow;
cfg = c;
@@ -504,7 +509,8 @@
GNUNET_GC_Configuration
*cfg,
struct
- GNUNET_GNS_Context *gns, const char *filename, int
is_daemon)
+ GNUNET_GNS_Context *gns, const char *filename,
+ int is_daemon)
{
g_thread_init (NULL);
gtk_init (&argc, (char ***) &argv);
Modified: GNUnet/src/setup/gtk/wizard_gtk.c
===================================================================
--- GNUnet/src/setup/gtk/wizard_gtk.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/setup/gtk/wizard_gtk.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -122,9 +122,10 @@
nic = entry;
#endif
GNUNET_GC_set_configuration_value_string (editCfg,
- err_ctx, "NETWORK", "INTERFACE", nic);
- GNUNET_GC_set_configuration_value_string (editCfg,
- err_ctx, "LOAD", "INTERFACES", nic);
+ err_ctx, "NETWORK", "INTERFACE",
+ nic);
+ GNUNET_GC_set_configuration_value_string (editCfg, err_ctx, "LOAD",
+ "INTERFACES", nic);
}
static int
@@ -173,8 +174,8 @@
if (cls.nic_item_count != 0)
{
GNUNET_GC_get_configuration_value_string (editCfg,
- "NETWORK",
- "INTERFACE", "eth0", &val);
+ "NETWORK",
+ "INTERFACE", "eth0", &val);
gtk_combo_box_append_text (GTK_COMBO_BOX (cls.cmbNIC), val);
gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter);
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (cls.cmbNIC), &iter);
@@ -185,17 +186,16 @@
gtk_widget_set_usize (cls.cmbNIC, 10, -1);
entIP = lookup_widget ("entIP");
- GNUNET_GC_get_configuration_value_string (editCfg, "NETWORK", "IP", "",
&val);
+ GNUNET_GC_get_configuration_value_string (editCfg, "NETWORK", "IP", "",
+ &val);
gtk_entry_set_text (GTK_ENTRY (entIP), val);
GNUNET_free (val);
chkFW = lookup_widget ("chkFW");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkFW),
- GNUNET_GC_get_configuration_value_yesno
(editCfg,
- "NAT",
- "LIMITED",
- GNUNET_NO)
- == GNUNET_YES);
+ GNUNET_GC_get_configuration_value_yesno
+ (editCfg, "NAT", "LIMITED",
+ GNUNET_NO) == GNUNET_YES);
gtk_widget_show (curwnd);
}
@@ -218,24 +218,26 @@
radShare = lookup_widget ("radShare");
entCPU = lookup_widget ("entCPU");
GNUNET_GC_get_configuration_value_string (editCfg,
- "LOAD",
- "MAXNETUPBPSTOTAL", "50000", &val);
+ "LOAD",
+ "MAXNETUPBPSTOTAL", "50000",
+ &val);
gtk_entry_set_text (GTK_ENTRY (entUp), val);
GNUNET_free (val);
GNUNET_GC_get_configuration_value_string (editCfg,
- "LOAD",
- "MAXNETDOWNBPSTOTAL", "50000", &val);
+ "LOAD",
+ "MAXNETDOWNBPSTOTAL", "50000",
+ &val);
gtk_entry_set_text (GTK_ENTRY (entDown), val);
GNUNET_free (val);
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON
((GNUNET_GC_get_configuration_value_yesno (editCfg,
- "LOAD",
- "BASICLIMITING",
- GNUNET_NO) == GNUNET_YES)
+ "LOAD",
+ "BASICLIMITING",
+ GNUNET_NO) == GNUNET_YES)
? radGNUnet : radShare), TRUE);
GNUNET_GC_get_configuration_value_string (editCfg,
- "LOAD", "MAXCPULOAD", "50", &val);
+ "LOAD", "MAXCPULOAD", "50", &val);
gtk_entry_set_text (GTK_ENTRY (entCPU), val);
GNUNET_free (val);
@@ -259,14 +261,15 @@
if (NULL != user_name)
{
GNUNET_GC_get_configuration_value_string (editCfg,
- "GNUNETD", "USER", "gnunet", &uname);
+ "GNUNETD", "USER", "gnunet",
+ &uname);
}
if (NULL != group_name)
{
GNUNET_GC_get_configuration_value_string (editCfg,
- "GNUNETD",
- "GROUP", "gnunet", &gname);
+ "GNUNETD",
+ "GROUP", "gnunet", &gname);
}
#ifndef MINGW
@@ -348,27 +351,24 @@
chkStart = lookup_widget ("chkStart");
chkEnh = lookup_widget ("chkEnh");
- GNUNET_GC_get_configuration_value_string (editCfg, "FS", "QUOTA", "1024",
&val);
+ GNUNET_GC_get_configuration_value_string (editCfg, "FS", "QUOTA", "1024",
+ &val);
gtk_entry_set_text (GTK_ENTRY (entQuota), val);
GNUNET_free (val);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkMigr),
- GNUNET_GC_get_configuration_value_yesno
(editCfg,
- "FS",
-
"ACTIVEMIGRATION",
- GNUNET_YES)
- == GNUNET_YES);
+ GNUNET_GC_get_configuration_value_yesno
+ (editCfg, "FS", "ACTIVEMIGRATION",
+ GNUNET_YES) == GNUNET_YES);
if (GNUNET_configure_autostart (err_ctx, 1, 1, NULL, NULL, NULL))
gtk_widget_set_sensitive (chkStart, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkStart),
- GNUNET_GC_get_configuration_value_yesno
(editCfg,
- "GNUNETD",
- "AUTOSTART",
- GNUNET_NO)
- == GNUNET_YES);
+ GNUNET_GC_get_configuration_value_yesno
+ (editCfg, "GNUNETD", "AUTOSTART",
+ GNUNET_NO) == GNUNET_YES);
if (doOpenEnhConfigurator)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkEnh), 1);
@@ -508,7 +508,8 @@
gchar *ret;
ret = gtk_editable_get_chars (editable, 0, -1);
- GNUNET_GC_set_configuration_value_string (editCfg, err_ctx, "NETWORK", "IP",
ret);
+ GNUNET_GC_set_configuration_value_string (editCfg, err_ctx, "NETWORK", "IP",
+ ret);
g_free (ret);
}
@@ -516,9 +517,10 @@
void
on_chkFW_toggledsetup_gtk (GtkToggleButton * togglebutton, gpointer user_data)
{
- GNUNET_GC_set_configuration_value_choice (editCfg, err_ctx, "NAT", "LIMITED",
- gtk_toggle_button_get_active
- (togglebutton) ? "YES" : "NO");
+ GNUNET_GC_set_configuration_value_choice (editCfg, err_ctx, "NAT",
+ "LIMITED",
+ gtk_toggle_button_get_active
+ (togglebutton) ? "YES" : "NO");
}
void
@@ -528,8 +530,8 @@
ret = gtk_editable_get_chars (editable, 0, -1);
GNUNET_GC_set_configuration_value_string (editCfg,
- err_ctx,
- "LOAD", "MAXNETUPBPSTOTAL", ret);
+ err_ctx,
+ "LOAD", "MAXNETUPBPSTOTAL", ret);
g_free (ret);
}
@@ -541,8 +543,9 @@
ret = gtk_editable_get_chars (editable, 0, -1);
GNUNET_GC_set_configuration_value_string (editCfg,
- err_ctx,
- "LOAD", "MAXNETDOWNBPSTOTAL", ret);
+ err_ctx,
+ "LOAD", "MAXNETDOWNBPSTOTAL",
+ ret);
g_free (ret);
}
@@ -552,11 +555,11 @@
gpointer user_data)
{
GNUNET_GC_set_configuration_value_choice (editCfg,
- err_ctx,
- "LOAD",
- "BASICLIMITING",
- gtk_toggle_button_get_active
- (togglebutton) ? "YES" : "NO");
+ err_ctx,
+ "LOAD",
+ "BASICLIMITING",
+ gtk_toggle_button_get_active
+ (togglebutton) ? "YES" : "NO");
}
@@ -565,11 +568,11 @@
gpointer user_data)
{
GNUNET_GC_set_configuration_value_choice (editCfg,
- err_ctx,
- "LOAD",
- "BASICLIMITING",
- gtk_toggle_button_get_active
- (togglebutton) ? "NO" : "YES");
+ err_ctx,
+ "LOAD",
+ "BASICLIMITING",
+ gtk_toggle_button_get_active
+ (togglebutton) ? "NO" : "YES");
}
@@ -581,8 +584,8 @@
ret = gtk_editable_get_chars (editable, 0, -1);
num = atoi (ret);
- GNUNET_GC_set_configuration_value_number (editCfg, err_ctx, "LOAD",
"MAXCPULOAD",
- num);
+ GNUNET_GC_set_configuration_value_number (editCfg, err_ctx, "LOAD",
+ "MAXCPULOAD", num);
g_free (ret);
}
@@ -591,11 +594,11 @@
gpointer user_data)
{
GNUNET_GC_set_configuration_value_choice (editCfg,
- err_ctx,
- "FS",
- "ACTIVEMIGRATION",
- gtk_toggle_button_get_active
- (togglebutton) ? "YES" : "NO");
+ err_ctx,
+ "FS",
+ "ACTIVEMIGRATION",
+ gtk_toggle_button_get_active
+ (togglebutton) ? "YES" : "NO");
}
void
@@ -604,7 +607,8 @@
gchar *ret;
ret = gtk_editable_get_chars (editable, 0, -1);
- GNUNET_GC_set_configuration_value_string (editCfg, err_ctx, "FS", "QUOTA",
ret);
+ GNUNET_GC_set_configuration_value_string (editCfg, err_ctx, "FS", "QUOTA",
+ ret);
g_free (ret);
}
@@ -615,9 +619,10 @@
{
doAutoStart = gtk_toggle_button_get_active (togglebutton);
GNUNET_GC_set_configuration_value_choice (editCfg,
- err_ctx,
- "GNUNETD",
- "AUTOSTART", doAutoStart ? "YES" : "NO");
+ err_ctx,
+ "GNUNETD",
+ "AUTOSTART",
+ doAutoStart ? "YES" : "NO");
}
@@ -642,8 +647,8 @@
ret = gtk_editable_get_chars (editable, 0, -1);
GNUNET_GE_ASSERT (err_ctx, ret != NULL);
- GNUNET_GC_set_configuration_value_string (editCfg, err_ctx, "GNUNETD",
"USER",
- ret);
+ GNUNET_GC_set_configuration_value_string (editCfg, err_ctx, "GNUNETD",
+ "USER", ret);
GNUNET_free_non_null (user_name);
if (strlen (ret) != 0)
user_name = GNUNET_strdup (ret);
@@ -662,7 +667,7 @@
ret = gtk_editable_get_chars (editable, 0, -1);
GNUNET_GE_ASSERT (err_ctx, ret != NULL);
GNUNET_GC_set_configuration_value_string (editCfg,
- err_ctx, "GNUNETD", "GROUP", ret);
+ err_ctx, "GNUNETD", "GROUP", ret);
if (strlen (ret) != 0)
group_name = GNUNET_strdup (ret);
else
Modified: GNUnet/src/setup/lib/gns.c
===================================================================
--- GNUnet/src/setup/lib/gns.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/setup/lib/gns.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -100,18 +100,18 @@
if (pos == NULL)
{
GNUNET_GE_LOG (g->ectx,
- GNUNET_GE_DEVELOPER | GNUNET_GE_BULK | GNUNET_GE_ERROR,
- "Tree lookup for unknown option `%s' in section `%s'!\n",
- option, section);
+ GNUNET_GE_DEVELOPER | GNUNET_GE_BULK | GNUNET_GE_ERROR,
+ "Tree lookup for unknown option `%s' in section `%s'!\n",
+ option, section);
return 0; /* or refuse? */
}
/* first, check if value is valid */
if ((pos->type & GNUNET_GNS_KIND_MASK) != GNUNET_GNS_KIND_LEAF)
{
GNUNET_GE_LOG (g->ectx,
- GNUNET_GE_DEVELOPER | GNUNET_GE_BULK | GNUNET_GE_ERROR,
- "Tree value change for non-leaf option `%s' in section `%s'!\n",
- option, section);
+ GNUNET_GE_DEVELOPER | GNUNET_GE_BULK | GNUNET_GE_ERROR,
+ "Tree value change for non-leaf option `%s' in section
`%s'!\n",
+ option, section);
return 0;
}
switch (pos->type & GNUNET_GNS_TYPE_MASK)
@@ -121,9 +121,10 @@
int val;
val = GNUNET_GC_get_configuration_value_yesno (cfg,
- section,
- option,
- pos->value.Boolean.def);
+ section,
+ option,
+ pos->value.Boolean.
+ def);
if (val == GNUNET_SYSERR)
{
return GNUNET_SYSERR;
@@ -136,15 +137,21 @@
unsigned long long val;
if (GNUNET_SYSERR == GNUNET_GC_get_configuration_value_number (cfg,
- section,
- option,
- pos->value.
- UInt64.min,
- pos->value.
- UInt64.max,
- pos->value.
- UInt64.def,
- &val))
+ section,
+ option,
+ pos->
+ value.
+ UInt64.
+ min,
+ pos->
+ value.
+ UInt64.
+ max,
+ pos->
+ value.
+ UInt64.
+ def,
+ &val))
{
return GNUNET_SYSERR;
}
@@ -157,7 +164,8 @@
double d;
s = NULL;
- GNUNET_GC_get_configuration_value_string (cfg, section, option, NULL,
&s);
+ GNUNET_GC_get_configuration_value_string (cfg, section, option, NULL,
+ &s);
if (s == NULL)
{
pos->value.Double.val = pos->value.Double.def;
@@ -167,9 +175,10 @@
if (1 != sscanf (s, "%lf", &d))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_USER | GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE,
- "`%s' is not a valid double-precision floating point
number.\n",
- s);
+ GNUNET_GE_USER | GNUNET_GE_ERROR |
+ GNUNET_GE_IMMEDIATE,
+ "`%s' is not a valid double-precision floating
point number.\n",
+ s);
GNUNET_free (s);
return GNUNET_SYSERR;
}
@@ -184,11 +193,13 @@
char *val;
if (GNUNET_SYSERR == GNUNET_GC_get_configuration_value_string (cfg,
- section,
- option,
- pos->value.
- String.def,
- &val))
+ section,
+ option,
+ pos->
+ value.
+ String.
+ def,
+ &val))
return GNUNET_SYSERR;
GNUNET_free (pos->value.String.val);
pos->value.String.val = val;
@@ -199,15 +210,20 @@
const char *ival;
if (GNUNET_SYSERR == GNUNET_GC_get_configuration_value_choice (cfg,
- section,
- option,
- (const char
- **) pos->
- value.String.
- legalRange,
- pos->value.
- String.def,
- &ival))
+ section,
+ option,
+ (const
+ char
+ **)
+ pos->
+ value.
+ String.
+
legalRange,
+ pos->
+ value.
+ String.
+ def,
+ &ival))
return GNUNET_SYSERR;
GNUNET_free (pos->value.String.val);
pos->value.String.val = GNUNET_strdup (ival);
@@ -276,8 +292,8 @@
*/
struct GNUNET_GNS_Context *
GNUNET_GNS_load_specification (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- const char *specification)
+ struct GNUNET_GC_Configuration *cfg,
+ const char *specification)
{
struct GNUNET_GNS_Context *ctx;
struct GNUNET_GNS_TreeNode *root;
@@ -290,13 +306,14 @@
ctx->cfg = cfg;
ctx->root = root;
ctx->in_notify = 0;
- if (-1 == GNUNET_GC_attach_change_listener (cfg, &configChangeListener, ctx))
+ if (-1 ==
+ GNUNET_GC_attach_change_listener (cfg, &configChangeListener, ctx))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _
- ("Configuration does not satisfy constraints of configuration
specification file `%s'!\n"),
- specification);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ _
+ ("Configuration does not satisfy constraints of
configuration specification file `%s'!\n"),
+ specification);
GNUNET_free (ctx);
free_tree (root);
return NULL;
@@ -337,7 +354,8 @@
*/
void
GNUNET_GNS_register_tree_change_listener (struct GNUNET_GNS_Context *ctx,
- GNUNET_GNS_TreeChangeListener listener,
void *cls)
+ GNUNET_GNS_TreeChangeListener
+ listener, void *cls)
{
GNS_TCL *n;
@@ -354,8 +372,8 @@
*/
void
GNUNET_GNS_unregister_tree_change_listener (struct GNUNET_GNS_Context *ctx,
- GNUNET_GNS_TreeChangeListener listener,
- void *cls)
+ GNUNET_GNS_TreeChangeListener
+ listener, void *cls)
{
GNS_TCL *pos;
GNS_TCL *prev;
@@ -385,7 +403,8 @@
* @return NULL on error
*/
char *
-GNUNET_GNS_get_default_value_as_string (GNUNET_GNS_TreeNodeKindAndType type,
const GNUNET_GNS_Value * value)
+GNUNET_GNS_get_default_value_as_string (GNUNET_GNS_TreeNodeKindAndType type,
+ const GNUNET_GNS_Value * value)
{
char buf[48];
Modified: GNUnet/src/setup/lib/tree.c
===================================================================
--- GNUnet/src/setup/lib/tree.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/setup/lib/tree.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -91,7 +91,8 @@
/* **************************** tree API ****************** */
struct GNUNET_GNS_TreeNode *
-tree_lookup (struct GNUNET_GNS_TreeNode *root, const char *section, const char
*option)
+tree_lookup (struct GNUNET_GNS_TreeNode *root, const char *section,
+ const char *option)
{
int i;
struct GNUNET_GNS_TreeNode *ret;
@@ -297,11 +298,13 @@
tree->option = scm_to_locale_string (option);
tree->description = scm_to_locale_string (description);
tree->help = scm_to_locale_string (help);
- tree->children = GNUNET_malloc (sizeof (struct GNUNET_GNS_TreeNode *) *
(clen + 1));
+ tree->children =
+ GNUNET_malloc (sizeof (struct GNUNET_GNS_TreeNode *) * (clen + 1));
for (i = 0; i < clen; i++)
{
child = scm_list_ref (children, scm_from_signed_integer (i));
- tree->children[i] = (struct GNUNET_GNS_TreeNode *) SCM_SMOB_DATA (child);
+ tree->children[i] =
+ (struct GNUNET_GNS_TreeNode *) SCM_SMOB_DATA (child);
}
tree->children[clen] = NULL;
tree->type = (clen == 0) ? GNUNET_GNS_KIND_LEAF : GNUNET_GNS_KIND_NODE;
@@ -423,7 +426,8 @@
VisibilityChangeListener vcl,
void *ctx,
struct GNUNET_GE_Context *ectx,
- struct GNUNET_GNS_TreeNode *root, struct
GNUNET_GNS_TreeNode *change)
+ struct GNUNET_GNS_TreeNode *root,
+ struct GNUNET_GNS_TreeNode *change)
{
TC tc;
Modified: GNUnet/src/setup/lib/tree.h
===================================================================
--- GNUnet/src/setup/lib/tree.h 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/setup/lib/tree.h 2007-11-25 12:07:29 UTC (rev 5761)
@@ -29,12 +29,14 @@
* Set all values to defaults.
*/
struct GNUNET_GNS_TreeNode *tree_parse (struct GNUNET_GE_Context *ectx,
- const char *specification);
+ const char *specification);
struct GNUNET_GNS_TreeNode *tree_lookup (struct GNUNET_GNS_TreeNode *root,
- const char *section, const char *option);
+ const char *section,
+ const char *option);
-typedef void (*VisibilityChangeListener) (void *ctx, struct
GNUNET_GNS_TreeNode * tree);
+typedef void (*VisibilityChangeListener) (void *ctx,
+ struct GNUNET_GNS_TreeNode * tree);
/**
* A value in the tree has been changed.
@@ -44,4 +46,5 @@
VisibilityChangeListener vcl,
void *ctx,
struct GNUNET_GE_Context *ectx,
- struct GNUNET_GNS_TreeNode *root, struct
GNUNET_GNS_TreeNode *change);
+ struct GNUNET_GNS_TreeNode *root,
+ struct GNUNET_GNS_TreeNode *change);
Modified: GNUnet/src/setup/lib/wizard_util.c
===================================================================
--- GNUnet/src/setup/lib/wizard_util.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/setup/lib/wizard_util.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -37,8 +37,8 @@
{
char *nic;
- GNUNET_GC_get_configuration_value_string (cfg, "NETWORK", "INTERFACE",
"eth0",
- &nic);
+ GNUNET_GC_get_configuration_value_string (cfg, "NETWORK", "INTERFACE",
+ "eth0", &nic);
#ifdef WINDOWS
/* default NIC for unixes */
Modified: GNUnet/src/setup/ncurses/mconf.c
===================================================================
--- GNUnet/src/setup/ncurses/mconf.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/setup/ncurses/mconf.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -50,7 +50,8 @@
static void
run_menu (struct GNUNET_GNS_Context *ctx,
- struct GNUNET_GNS_TreeNode *pos, struct GNUNET_GC_Configuration *cfg)
+ struct GNUNET_GNS_TreeNode *pos,
+ struct GNUNET_GC_Configuration *cfg)
{
int st;
int i;
@@ -167,12 +168,15 @@
case DLG_EXIT_OK:
case DLG_EXIT_CANCEL:
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- pos->section,
- pos->option,
- st ==
- DLG_EXIT_OK ?
- "YES" : "NO"))
+ ectx,
+ pos->
+ section,
+ pos->
+ option,
+ st ==
+
DLG_EXIT_OK
+ ? "YES" :
+ "NO"))
{
show_help (pos->option,
gettext_noop
@@ -202,10 +206,13 @@
{
case DLG_EXIT_OK:
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- pos->section,
- pos->option,
- fitem.text))
+ ectx,
+ pos->
+ section,
+ pos->
+ option,
+ fitem.
+ text))
{
show_help (pos->option,
gettext_noop
@@ -266,12 +273,15 @@
{
case DLG_EXIT_OK:
if (0 != GNUNET_GC_set_configuration_value_choice (cfg,
- ectx,
- pos->section,
- pos->option,
- val->String.
- legalRange
- [msel]))
+ ectx,
+ pos->
+ section,
+ pos->
+ option,
+ val->
+ String.
+ legalRange
+ [msel]))
{
show_help (pos->option,
gettext_noop
@@ -348,10 +358,12 @@
if (strlen (tmp) > 0)
tmp[strlen (tmp) - 1] = '\0';
if (0 != GNUNET_GC_set_configuration_value_choice (cfg,
- ectx,
- pos->section,
- pos->option,
- tmp))
+ ectx,
+ pos->
+ section,
+ pos->
+ option,
+ tmp))
{
GNUNET_free (tmp);
show_help (pos->option,
@@ -393,10 +405,13 @@
break;
}
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- pos->section,
- pos->option,
- fitem.text))
+ ectx,
+ pos->
+ section,
+ pos->
+ option,
+ fitem.
+ text))
{
show_help (pos->option,
gettext_noop
@@ -444,11 +459,12 @@
continue;
}
if (0 != GNUNET_GC_set_configuration_value_number (cfg,
- ectx,
- pos->
- section,
- pos->option,
- lval))
+ ectx,
+ pos->
+
section,
+ pos->
+
option,
+ lval))
{
show_help (pos->option,
gettext_noop
Modified: GNUnet/src/setup/ncurses/wizard_curs.c
===================================================================
--- GNUnet/src/setup/ncurses/wizard_curs.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/setup/ncurses/wizard_curs.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -101,11 +101,12 @@
case DLG_EXIT_OK:
case DLG_EXIT_CANCEL:
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- section,
- option,
- ret == DLG_EXIT_OK
- ? "YES" : "NO"))
+ ectx,
+ section,
+ option,
+ ret ==
+ DLG_EXIT_OK ?
+ "YES" : "NO"))
{
show_error (_("Internal error! (Choice invalid?)"));
break;
@@ -167,9 +168,10 @@
{
case DLG_EXIT_OK:
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- section,
- option, fitem.text))
+ ectx,
+ section,
+ option,
+ fitem.text))
{
show_error (_("Internal error! (Choice invalid?)"));
ret = 2;
@@ -281,11 +283,11 @@
{
case DLG_EXIT_OK:
if (0 != GNUNET_GC_set_configuration_value_choice (cfg,
- ectx,
- "NETWORK",
- "INTERFACE",
- nic_items[msel].
- name))
+ ectx,
+ "NETWORK",
+ "INTERFACE",
+ nic_items
+ [msel].name))
{
show_error (_("Internal error! (Choice invalid?)"));
break;
@@ -461,25 +463,24 @@
ret = GNUNET_SYSERR;
}
user_name = NULL;
- GNUNET_GC_get_configuration_value_string (cfg, "GNUNETD", "USER", "",
&user_name);
- GNUNET_GC_get_configuration_value_string (cfg,
- "GNUNETD", "GROUP", "", &group_name);
- if (((strlen (user_name) > 0) ||
- (strlen (group_name) > 0)) &&
- (GNUNET_OK == GNUNET_configure_user_account (GNUNET_YES,
- GNUNET_YES,
- user_name,
- group_name)) &&
- (GNUNET_OK !=
- GNUNET_configure_user_account (GNUNET_NO, GNUNET_YES, user_name,
- group_name)))
+ GNUNET_GC_get_configuration_value_string (cfg, "GNUNETD", "USER", "",
+ &user_name);
+ GNUNET_GC_get_configuration_value_string (cfg, "GNUNETD", "GROUP", "",
+ &group_name);
+ if (((strlen (user_name) > 0) || (strlen (group_name) > 0))
+ && (GNUNET_OK ==
+ GNUNET_configure_user_account (GNUNET_YES, GNUNET_YES, user_name,
+ group_name))
+ && (GNUNET_OK !=
+ GNUNET_configure_user_account (GNUNET_NO, GNUNET_YES, user_name,
+ group_name)))
{
showCursErr (_("Unable to create user account for daemon."), "");
ret = GNUNET_SYSERR;
}
- if ((GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg, "GNUNETD",
"AUTOSTART", GNUNET_NO)) && (GNUNET_YES != GNUNET_configure_autostart (ectx,
GNUNET_NO, GNUNET_YES, "gnunetd", /* specify full path? */
-
user_name,
-
group_name)))
+ if ((GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg, "GNUNETD",
"AUTOSTART", GNUNET_NO)) && (GNUNET_YES != GNUNET_configure_autostart (ectx,
GNUNET_NO, GNUNET_YES, "gnunetd", /* specify full path? */
+
user_name,
+
group_name)))
{
showCursErr (_("Unable to setup autostart for daemon."), "");
ret = GNUNET_SYSERR;
Modified: GNUnet/src/setup/text/conf.c
===================================================================
--- GNUnet/src/setup/text/conf.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/setup/text/conf.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -93,7 +93,8 @@
}
static void
-printChoice (int indent, GNUNET_GNS_TreeNodeKindAndType type, GNUNET_GNS_Value
* val)
+printChoice (int indent, GNUNET_GNS_TreeNodeKindAndType type,
+ GNUNET_GNS_Value * val)
{
int i;
char defLet;
@@ -462,9 +463,10 @@
value = getValueAsString (tree->type, &tree->value);
if ((0 != strcmp (value, ovalue)) &&
(0 != GNUNET_GC_set_configuration_value_string (cfg,
- ectx,
- tree->section,
- tree->option, value)))
+ ectx,
+ tree->section,
+ tree->option,
+ value)))
{
GNUNET_free (value);
GNUNET_free (ovalue);
@@ -532,7 +534,8 @@
struct GNUNET_PluginHandle *self,
struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GNS_Context *gns, const char *filename, int
is_daemon)
+ struct GNUNET_GNS_Context *gns, const char *filename,
+ int is_daemon)
{
struct GNUNET_GNS_TreeNode *root;
struct termios oldT;
@@ -610,7 +613,8 @@
struct GNUNET_PluginHandle *self,
struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GNS_Context *gns, const char *filename, int
is_daemon)
+ struct GNUNET_GNS_Context *gns, const char *filename,
+ int is_daemon)
{
return GNUNET_GC_write_configuration (cfg, filename);
}
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/http.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -503,8 +503,8 @@
{
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Rejecting HTTP connection\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Rejecting HTTP connection\n");
#endif
EXIT ();
return MHD_NO;
@@ -516,15 +516,16 @@
{
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Rejecting HTTP connection\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Rejecting HTTP connection\n");
#endif
EXIT ();
return MHD_NO;
}
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK, "Accepting
HTTP connection\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Accepting HTTP connection\n");
#endif
EXIT ();
return MHD_YES;
@@ -720,8 +721,9 @@
ENTER ();
if (-1 == GNUNET_GC_get_configuration_value_number (coreAPI->cfg,
- "HTTP",
- "PORT", 0, 65535, 1080, &port))
+ "HTTP",
+ "PORT", 0, 65535, 1080,
+ &port))
port = 1080;
EXIT ();
return (unsigned short) port;
@@ -737,14 +739,16 @@
unsigned long long port;
ENTER ();
- if (!GNUNET_GC_have_configuration_value (coreAPI->cfg, "HTTP",
"ADVERTISED-PORT"))
+ if (!GNUNET_GC_have_configuration_value
+ (coreAPI->cfg, "HTTP", "ADVERTISED-PORT"))
{
port = getGNUnetHTTPPort ();
}
else if (-1 == GNUNET_GC_get_configuration_value_number (coreAPI->cfg,
- "HTTP",
- "ADVERTISED-PORT", 0,
- 65535, 80, &port))
+ "HTTP",
+ "ADVERTISED-PORT",
+ 0, 65535, 80,
+ &port))
port = getGNUnetHTTPPort ();
EXIT ();
return (unsigned short) port;
@@ -848,8 +852,8 @@
{
#if DEBUG_HTTP
GNUNET_GE_LOG (NULL,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP port is 0, will only send using HTTP.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP port is 0, will only send using HTTP.\n");
#endif
EXIT ();
return NULL; /* HTTP transport is configured SEND-only! */
@@ -866,15 +870,16 @@
{
GNUNET_free (msg);
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("HTTP: Could not determine my public IP address.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ _("HTTP: Could not determine my public IP address.\n"));
return NULL;
}
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP uses IP address %u.%u.%u.%u.\n",
- GNUNET_PRIP (ntohl (*(int *) &haddr->ip)));
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP uses IP address %u.%u.%u.%u.\n",
+ GNUNET_PRIP (ntohl (*(int *) &haddr->ip)));
#endif
haddr->port = htons (port);
haddr->reserved = htons (0);
@@ -941,8 +946,8 @@
GNUNET_mutex_unlock (mgd->lock);
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP returns %u bytes in MHD GET handler.\n", max);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP returns %u bytes in MHD GET handler.\n", max);
#endif
if (stats != NULL)
stats->change (stat_bytesSent, max);
@@ -1040,9 +1045,9 @@
{
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP/MHD creates new session for request from `%s'.\n",
- &url[1]);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP/MHD creates new session for request from `%s'.\n",
+ &url[1]);
#endif
httpSession = GNUNET_malloc (sizeof (HTTPSession));
memset (httpSession, 0, sizeof (HTTPSession));
@@ -1068,8 +1073,8 @@
{
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP/MHD receives GET request from `%s'.\n", &url[1]);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP/MHD receives GET request from `%s'.\n", &url[1]);
#endif
/* handle get; create response object if we do not
@@ -1100,9 +1105,9 @@
{
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP/MHD receives PUT request from `%s' with %u bytes.\n",
- &url[1], *upload_data_size);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP/MHD receives PUT request from `%s' with %u
bytes.\n",
+ &url[1], *upload_data_size);
#endif
put = httpSession->cs.server.puts;
while ((put != NULL) && (put->session != session))
@@ -1130,8 +1135,8 @@
/* end of upload, send response! */
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP/MHD queues dummy response to completed PUT
request.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP/MHD queues dummy response to completed PUT
request.\n");
#endif
STEP ();
response =
@@ -1187,9 +1192,9 @@
mp->size = ntohs (hdr->size) - sizeof (GNUNET_MessageHeader);
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP/MHD passes %u bytes to core (received via PUT
request).\n",
- mp->size);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP/MHD passes %u bytes to core (received via PUT
request).\n",
+ mp->size);
#endif
coreAPI->receive (mp);
put->rbuff2 = NULL;
@@ -1202,7 +1207,7 @@
return MHD_YES;
}
GNUNET_mutex_unlock (httpSession->lock);
- GNUNET_GE_BREAK_OP (NULL, 0); /* invalid request */
+ GNUNET_GE_BREAK_OP (NULL, 0); /* invalid request */
EXIT ();
return MHD_NO;
}
@@ -1226,8 +1231,9 @@
httpSession->cs.client.last_get_activity = GNUNET_get_time ();
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP/CURL receives %u bytes as response to GET.\n", size * nmemb);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP/CURL receives %u bytes as response to GET.\n",
+ size * nmemb);
#endif
while (have > 0)
{
@@ -1302,8 +1308,8 @@
put->pos += max;
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP/CURL sends %u bytes in PUT request.\n", max);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP/CURL sends %u bytes in PUT request.\n", max);
#endif
if (stats != NULL)
stats->change (stat_bytesSent, max);
@@ -1399,10 +1405,10 @@
if (mret != CURLM_OK)
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_add_handle",
- __FILE__, __LINE__, curl_multi_strerror (mret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
+ "curl_multi_add_handle", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
curl_easy_cleanup (curl_get);
EXIT ();
return GNUNET_SYSERR;
@@ -1412,8 +1418,8 @@
httpSession->cs.client.get = curl_get;
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP/CURL initiated GET request.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP/CURL initiated GET request.\n");
#endif
EXIT ();
return GNUNET_OK;
@@ -1428,8 +1434,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if the operation failed
*/
static int
-httpConnect (const GNUNET_MessageHello * hello, GNUNET_TSession ** tsessionPtr,
- int may_reuse)
+httpConnect (const GNUNET_MessageHello * hello,
+ GNUNET_TSession ** tsessionPtr, int may_reuse)
{
const HostAddress *haddr = (const HostAddress *) &hello[1];
GNUNET_TSession *tsession;
@@ -1489,9 +1495,9 @@
*tsessionPtr = tsession;
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP/CURL initiated connection to `%s'.\n",
- httpSession->cs.client.url);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP/CURL initiated connection to `%s'.\n",
+ httpSession->cs.client.url);
#endif
EXIT ();
return GNUNET_OK;
@@ -1570,10 +1576,10 @@
if (mret != CURLM_OK)
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_add_handle",
- __FILE__, __LINE__, curl_multi_strerror (mret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
+ "curl_multi_add_handle", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
GNUNET_mutex_unlock (httplock);
EXIT ();
return GNUNET_SYSERR;
@@ -1582,9 +1588,9 @@
put->curl_put = curl_put;
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP/CURL initiated PUT request to `%s'.\n",
- httpSession->cs.client.url);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP/CURL initiated PUT request to `%s'.\n",
+ httpSession->cs.client.url);
#endif
EXIT ();
return GNUNET_OK;
@@ -1605,7 +1611,8 @@
* GNUNET_SYSERR if the size/session is invalid
*/
static int
-httpTestWouldTry (GNUNET_TSession * tsession, const unsigned int size, int
important)
+httpTestWouldTry (GNUNET_TSession * tsession, const unsigned int size,
+ int important)
{
HTTPSession *httpSession = tsession->internal;
struct MHDGetData *get;
@@ -1731,9 +1738,9 @@
hopefully have one or will have one soon) */
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP/MHD queues %u bytes to be sent as response to GET as soon as
possible.\n",
- size);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP/MHD queues %u bytes to be sent as response to GET as
soon as possible.\n",
+ size);
#endif
#if DO_GET
GNUNET_mutex_lock (httpSession->lock);
@@ -1836,9 +1843,10 @@
#if DO_GET
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP transport destroys old (%llu ms) unused client
session\n",
- now - s->cs.client.last_get_activity);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "HTTP transport destroys old (%llu ms) unused
client session\n",
+ now - s->cs.client.last_get_activity);
#endif
#endif
destroy_tsession (tsessions[i]);
@@ -1940,8 +1948,9 @@
#if DO_GET
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP transport destroys unused server session\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "HTTP transport destroys unused server
session\n");
#endif
#endif
destroy_tsession (tsessions[i]);
@@ -1976,8 +1985,8 @@
ENTER ();
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP transport select thread started\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP transport select thread started\n");
#endif
while (GNUNET_YES == http_running)
{
@@ -1993,10 +2002,10 @@
if (mret != CURLM_OK)
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_fdset",
- __FILE__, __LINE__, curl_multi_strerror (mret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
+ "curl_multi_fdset", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
break;
}
STEP ();
@@ -2042,10 +2051,10 @@
read (signal_pipe[0], buf, 1);
if ((mret != CURLM_OK) && (mret != CURLM_CALL_MULTI_PERFORM))
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_perform",
- __FILE__, __LINE__, curl_multi_strerror (mret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
+ "curl_multi_perform", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
STEP ();
if (mhd_daemon != NULL)
MHD_run (mhd_daemon);
@@ -2054,8 +2063,8 @@
}
#if DEBUG_HTTP
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "HTTP transport select thread exits.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "HTTP transport select thread exits.\n");
#endif
EXIT ();
return NULL;
@@ -2114,7 +2123,8 @@
curl_thread = GNUNET_thread_create (&curl_runner, NULL, 32 * 1024);
if (curl_thread == NULL)
GNUNET_GE_DIE_STRERROR (coreAPI->ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
"pthread_create");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "pthread_create");
EXIT ();
return GNUNET_OK;
}
@@ -2181,7 +2191,8 @@
GNUNET_mutex_lock (httplock);
GNUNET_free_non_null (filteredNetworks_);
ch = NULL;
- GNUNET_GC_get_configuration_value_string (cfg, "HTTP", "BLACKLIST", "", &ch);
+ GNUNET_GC_get_configuration_value_string (cfg, "HTTP", "BLACKLIST", "",
+ &ch);
filteredNetworks_ = GNUNET_parse_ipv4_network_specification (ectx, ch);
GNUNET_free (ch);
GNUNET_mutex_unlock (httplock);
@@ -2228,7 +2239,7 @@
httplock = GNUNET_mutex_create (GNUNET_YES);
curllock = GNUNET_mutex_create (GNUNET_YES);
if (0 != GNUNET_GC_attach_change_listener (coreAPI->cfg,
- &reloadConfiguration, NULL))
+ &reloadConfiguration, NULL))
{
GNUNET_mutex_destroy (httplock);
return NULL;
@@ -2236,7 +2247,8 @@
if (0 != curl_global_init (CURL_GLOBAL_WIN32))
{
GNUNET_GE_BREAK (NULL, 0);
- GNUNET_GC_detach_change_listener (coreAPI->cfg, &reloadConfiguration,
NULL);
+ GNUNET_GC_detach_change_listener (coreAPI->cfg, &reloadConfiguration,
+ NULL);
GNUNET_mutex_destroy (httplock);
return NULL;
}
@@ -2244,18 +2256,19 @@
tsessionArrayLength = 0;
GNUNET_array_grow (tsessions, tsessionArrayLength, 32);
if (GNUNET_GC_get_configuration_value_yesno (coreAPI->cfg,
- "HTTP", "UPNP",
- GNUNET_YES) == GNUNET_YES)
+ "HTTP", "UPNP",
+ GNUNET_YES) == GNUNET_YES)
{
upnp = coreAPI->requestService ("upnp");
if (upnp == NULL)
{
GNUNET_GE_LOG (coreAPI->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _
- ("The UPnP service could not be loaded. To disable UPnP, set
the "
- "configuration option \"UPNP\" in section \"HTTP\" to
\"NO\"\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _
+ ("The UPnP service could not be loaded. To disable
UPnP, set the "
+ "configuration option \"UPNP\" in section \"HTTP\"
to \"NO\"\n"));
}
}
@@ -2269,7 +2282,8 @@
= stats->create (gettext_noop ("# bytes dropped by HTTP (outgoing)"));
}
GNUNET_GC_get_configuration_value_string (coreAPI->cfg,
- "GNUNETD", "HTTP-PROXY", "", &proxy);
+ "GNUNETD", "HTTP-PROXY", "",
+ &proxy);
httpAPI.protocolNumber = GNUNET_TRANSPORT_PROTOCOL_NUMBER_HTTP;
httpAPI.mtu = 0;
Modified: GNUnet/src/transports/ip.c
===================================================================
--- GNUnet/src/transports/ip.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/ip.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -39,7 +39,8 @@
*/
int
getPublicIPAddress (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx, GNUNET_IPv4Address *
address)
+ struct GNUNET_GE_Context *ectx,
+ GNUNET_IPv4Address * address)
{
static GNUNET_IPv4Address myAddress;
static GNUNET_CronTime last;
@@ -56,8 +57,9 @@
if (ips == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Failed to obtain my (external) %s address!\n"), "IP");
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Failed to obtain my (external) %s address!\n"),
+ "IP");
lastError = now;
return GNUNET_SYSERR;
}
Modified: GNUnet/src/transports/ip6.c
===================================================================
--- GNUnet/src/transports/ip6.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/ip6.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -60,8 +60,8 @@
if (0 != gethostname (hostname, MAX_HOSTNAME))
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "gethostname");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "gethostname");
return GNUNET_SYSERR;
}
/* GNUNET_GE_LOG(ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
@@ -72,9 +72,10 @@
if (ip == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("Could not find IP of host `%s': %s\n"),
- hostname, hstrerror (h_errno));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ _("Could not find IP of host `%s': %s\n"), hostname,
+ hstrerror (h_errno));
return GNUNET_SYSERR;
}
if (ip->h_addrtype != AF_INET6)
@@ -82,7 +83,8 @@
GNUNET_GE_BREAK (ectx, 0);
return GNUNET_SYSERR;
}
- GNUNET_GE_ASSERT (ectx, sizeof (struct in6_addr) == sizeof (identity->addr));
+ GNUNET_GE_ASSERT (ectx,
+ sizeof (struct in6_addr) == sizeof (identity->addr));
memcpy (&identity->addr[0], ip->h_addr_list[0], sizeof (struct in6_addr));
return GNUNET_OK;
}
@@ -97,14 +99,15 @@
struct ifaddrs *ifa_first;
if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
- "NETWORK",
- "INTERFACE",
- "eth0", &interfaces))
+ "NETWORK",
+ "INTERFACE",
+ "eth0", &interfaces))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("No interface specified in section `%s' under `%s'!\n"),
- "NETWORK", "INTERFACE");
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("No interface specified in section `%s' under `%s'!\n"),
+ "NETWORK", "INTERFACE");
return GNUNET_SYSERR; /* that won't work! */
}
@@ -133,9 +136,9 @@
freeifaddrs (ifa_first);
}
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Could not obtain IP for interface `%s' using `%s'.\n"),
- interfaces, "getifaddrs");
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Could not obtain IP for interface `%s' using `%s'.\n"),
+ interfaces, "getifaddrs");
GNUNET_free (interfaces);
return GNUNET_SYSERR;
}
@@ -158,16 +161,18 @@
{
ipString = NULL;
GNUNET_GC_get_configuration_value_string (cfg,
- "NETWORK", "IP6", "", &ipString);
+ "NETWORK", "IP6", "",
+ &ipString);
if (strlen (ipString) > 0)
{
ip = gethostbyname2 (ipString, AF_INET6);
if (ip == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Could not resolve `%s': %s\n"),
- ipString, hstrerror (h_errno));
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ _("Could not resolve `%s': %s\n"), ipString,
+ hstrerror (h_errno));
}
else if (ip->h_addrtype != AF_INET6)
{
@@ -177,9 +182,10 @@
else
{
GNUNET_GE_ASSERT (ectx,
- sizeof (struct in6_addr) == sizeof (address->addr));
- memcpy (&address->addr[0],
- ip->h_addr_list[0], sizeof (struct in6_addr));
+ sizeof (struct in6_addr) ==
+ sizeof (address->addr));
+ memcpy (&address->addr[0], ip->h_addr_list[0],
+ sizeof (struct in6_addr));
retval = GNUNET_OK;
}
}
@@ -201,7 +207,8 @@
*/
int
getPublicIP6Address (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx, GNUNET_IPv6Address *
address)
+ struct GNUNET_GE_Context *ectx,
+ GNUNET_IPv6Address * address)
{
static GNUNET_IPv6Address myAddress;
static GNUNET_CronTime last;
@@ -217,8 +224,9 @@
{
lastError = now;
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Failed to obtain my (external) %s address!\n"), "IPv6");
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Failed to obtain my (external) %s address!\n"),
+ "IPv6");
return GNUNET_SYSERR;
}
last = now;
Modified: GNUnet/src/transports/nat.c
===================================================================
--- GNUnet/src/transports/nat.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/nat.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -67,8 +67,8 @@
(ntohs (hello->header.type) != GNUNET_P2P_PROTO_HELLO))
return GNUNET_SYSERR; /* obviously invalid */
if (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (coreAPI->cfg,
- "NAT", "LIMITED",
- GNUNET_NO))
+ "NAT", "LIMITED",
+ GNUNET_NO))
{
/* if WE are a NAT and this is not our hello,
it is invalid since NAT-to-NAT is not possible! */
@@ -94,8 +94,8 @@
GNUNET_MessageHello *msg;
if (GNUNET_NO == GNUNET_GC_get_configuration_value_yesno (coreAPI->cfg,
- "NAT", "LIMITED",
- GNUNET_NO))
+ "NAT", "LIMITED",
+ GNUNET_NO))
return NULL;
msg = GNUNET_malloc (sizeof (GNUNET_MessageHello) + sizeof (HostAddress));
msg->senderAddressSize = htons (sizeof (HostAddress));
Modified: GNUnet/src/transports/smtp.c
===================================================================
--- GNUnet/src/transports/smtp.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/smtp.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -212,7 +212,7 @@
*output = GNUNET_malloc ((len * 3 / 4) + 8);
#if DEBUG_SMTP
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "base64_decode decoding len=%d\n", len);
+ "base64_decode decoding len=%d\n", len);
#endif
for (i = 0; i < len; ++i)
{
@@ -273,7 +273,9 @@
GNUNET_GE_ASSERT (ectx, pipename != NULL);
UNLINK (pipename);
if (0 != mkfifo (pipename, S_IWUSR | S_IRUSR))
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_ADMIN | GNUNET_GE_BULK |
GNUNET_GE_FATAL, "mkfifo");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK |
+ GNUNET_GE_FATAL, "mkfifo");
LINESIZE = ((smtpAPI.mtu * 4 / 3) + 8) * (MAX_CHAR_PER_LINE + 2) /
MAX_CHAR_PER_LINE; /* maximum size of a line supported */
line = GNUNET_malloc (LINESIZE + 2); /* 2 bytes for off-by-one errors, just
to be safe... */
@@ -353,13 +355,16 @@
if (ntohs (mp->size) != size)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("Received malformed message via SMTP (size
mismatch).\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_BULK |
+ GNUNET_GE_USER,
+ _
+ ("Received malformed message via SMTP (size
mismatch).\n"));
#if DEBUG_SMTP
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Size returned by base64=%d, in the msg=%d.\n",
- size, ntohl (mp->size));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
+ GNUNET_GE_USER,
+ "Size returned by base64=%d, in the msg=%d.\n",
+ size, ntohl (mp->size));
#endif
goto END;
}
@@ -370,8 +375,8 @@
memcpy (&coreMP->sender, &mp->sender, sizeof (GNUNET_PeerIdentity));
#if DEBUG_SMTP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "SMTP message passed to the core.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "SMTP message passed to the core.\n");
#endif
coreAPI->receive (coreMP);
@@ -380,7 +385,8 @@
END:
#if DEBUG_SMTP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER, "SMTP
message processed.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "SMTP message processed.\n");
#endif
if (fdes != NULL)
fclose (fdes);
@@ -420,8 +426,10 @@
else
{
#if DEBUG_SMTP
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Verified SMTP helo from `%s'.\n", &maddr->senderAddress[0]);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Verified SMTP helo from `%s'.\n",
+ &maddr->senderAddress[0]);
#endif
return GNUNET_OK;
}
@@ -449,8 +457,9 @@
static int once;
if (once == 0)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- "No email-address specified, cannot create SMTP
advertisement.\n");
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "No email-address specified, cannot create SMTP
advertisement.\n");
once = 1;
}
return NULL;
@@ -459,16 +468,18 @@
if (filter == NULL)
{
GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("No filter for E-mail specified, cannot create SMTP
advertisement.\n"));
+ _
+ ("No filter for E-mail specified, cannot create SMTP
advertisement.\n"));
GNUNET_free (email);
return NULL;
}
if (strlen (filter) > FILTER_STRING_SIZE)
{
filter[FILTER_STRING_SIZE] = '\0';
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("SMTP filter string to long, capped to `%s'\n"), filter);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("SMTP filter string to long, capped to `%s'\n"),
+ filter);
}
i = (strlen (email) + 8) & (~7); /* make multiple of 8 */
msg =
@@ -495,7 +506,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if the operation failed
*/
static int
-smtpConnect (const GNUNET_MessageHello * hello, GNUNET_TSession ** tsessionPtr)
+smtpConnect (const GNUNET_MessageHello * hello,
+ GNUNET_TSession ** tsessionPtr)
{
GNUNET_TSession *tsession;
@@ -568,9 +580,10 @@
if (smtp_sock == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- _("Failed to initialize libesmtp: %s.\n"),
- smtp_strerror (smtp_errno (), ebuf, EBUF_LEN));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _("Failed to initialize libesmtp: %s.\n"),
+ smtp_strerror (smtp_errno (), ebuf, EBUF_LEN));
return NULL;
}
smtpServer = "localhost:587"; /* fixme */
@@ -587,14 +600,14 @@
ebody = NULL;
#if DEBUG_SMTP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Base64-encoding %d byte message.\n", ssize);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Base64-encoding %d byte message.\n", ssize);
#endif
ssize = base64_encode (msg, ssize, &ebody);
#if DEBUG_SMTP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Base64-encoded message size is %d bytes.\n", ssize);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Base64-encoded message size is %d bytes.\n", ssize);
#endif
GNUNET_free (msg);
res = GNUNET_SYSERR;
@@ -603,9 +616,9 @@
if (message == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "Failed to create smtp message: %s\n",
- smtp_strerror (smtp_errno (), ebuf, EBUF_LEN));
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "Failed to create smtp message: %s\n",
+ smtp_strerror (smtp_errno (), ebuf, EBUF_LEN));
return GNUNET_SYSERR;
}
smtp_size_set_estimate (message, ssize);
@@ -627,8 +640,9 @@
}
if (res != GNUNET_OK)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("Sending E-mail to `%s' failed.\n"), &haddr->senderAddress[0]);
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Sending E-mail to `%s' failed.\n"),
+ &haddr->senderAddress[0]);
incrementBytesSent (ssize);
GNUNET_free (ebody);
smtp_destroy_session (smtp_sock);
@@ -667,7 +681,9 @@
dispatchThread =
GNUNET_thread_create (&listenAndDistribute, NULL, 1024 * 4);
if (dispatchThread == NULL)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_ADMIN | GNUNET_GE_BULK |
GNUNET_GE_FATAL, "pthread_create");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK |
+ GNUNET_GE_FATAL, "pthread_create");
return GNUNET_OK;
}
@@ -727,10 +743,10 @@
mtu = MESSAGNUNET_GE_SIZE;
if (mtu < 1200)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _
- ("MTU for `%s' is probably too low (fragmentation not
implemented!)\n"),
- "SMTP");
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("MTU for `%s' is probably too low (fragmentation not
implemented!)\n"),
+ "SMTP");
if (mtu > MESSAGNUNET_GE_SIZE)
mtu = MESSAGNUNET_GE_SIZE;
smtpAPI.protocolNumber = GNUNET_TRANSPORT_PROTOCOL_NUMBER_SMTP;
Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/tcp.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -114,8 +114,9 @@
{
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "Rejecting connection (invalid address length %u)\n", addr_len);
+ GNUNET_GE_DEBUG | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "Rejecting connection (invalid address length %u)\n",
+ addr_len);
#endif
return GNUNET_SYSERR;
}
@@ -127,9 +128,9 @@
#if DEBUG_TCP
if (ret != GNUNET_NO)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "Rejecting connection from address %u.%u.%u.%u (blacklisted)\n",
- GNUNET_PRIP (ntohl (*(int *) addr)));
+ GNUNET_GE_DEBUG | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "Rejecting connection from address %u.%u.%u.%u
(blacklisted)\n",
+ GNUNET_PRIP (ntohl (*(int *) addr)));
#endif
return ret;
}
@@ -156,8 +157,9 @@
{
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "Rejecting connection (invalid address length %u)\n", addr_len);
+ GNUNET_GE_DEBUG | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "Rejecting connection (invalid address length %u)\n",
+ addr_len);
#endif
return GNUNET_SYSERR;
}
@@ -170,9 +172,9 @@
{
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "Rejecting HELLO from address %u.%u.%u.%u (not whitelisted)\n",
- GNUNET_PRIP (ntohl (*(int *) addr)));
+ GNUNET_GE_DEBUG | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "Rejecting HELLO from address %u.%u.%u.%u (not
whitelisted)\n",
+ GNUNET_PRIP (ntohl (*(int *) addr)));
#endif
}
return ret;
@@ -200,8 +202,9 @@
unsigned long long port;
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "TCP",
- "PORT", 0, 65535, 2086, &port))
+ "TCP",
+ "PORT", 0, 65535, 2086,
+ &port))
{
if ((pse = getservbyname ("gnunet", "tcp")))
port = htons (pse->s_port);
@@ -239,8 +242,8 @@
GNUNET_hash_to_enc (&hello->senderIdentity.hashPubKey, &enc);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "Rejecting HELLO from `%s'\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "Rejecting HELLO from `%s'\n", &enc);
#endif
return GNUNET_SYSERR; /* obviously invalid */
}
@@ -271,8 +274,8 @@
once = 1;
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "TCP port is 0, will only send using TCP.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "TCP port is 0, will only send using TCP.\n");
#endif
}
return NULL; /* TCP transport is configured SEND-only! */
@@ -288,8 +291,9 @@
{
GNUNET_free (msg);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("TCP: Could not determine my public IP address.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ _("TCP: Could not determine my public IP address.\n"));
return NULL;
}
haddr->port = htons (port);
@@ -297,9 +301,9 @@
if (0 != memcmp (haddr, &last_addr, sizeof (HostAddress)))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "TCP uses IP address %u.%u.%u.%u.\n",
- GNUNET_PRIP (ntohl (*(int *) &haddr->ip)));
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "TCP uses IP address %u.%u.%u.%u.\n",
+ GNUNET_PRIP (ntohl (*(int *) &haddr->ip)));
last_addr = *haddr;
}
msg->senderAddressSize = htons (sizeof (HostAddress));
@@ -357,15 +361,17 @@
haddr = (HostAddress *) & hello[1];
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Creating TCP connection to %u.%u.%u.%u:%u.\n",
- GNUNET_PRIP (ntohl (*(int *) &haddr->ip.addr)),
- ntohs (haddr->port));
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Creating TCP connection to %u.%u.%u.%u:%u.\n",
+ GNUNET_PRIP (ntohl (*(int *) &haddr->ip.addr)),
+ ntohs (haddr->port));
#endif
sock = SOCKET (PF_INET, SOCK_STREAM, 6); /* 6: TCP */
if (sock == -1)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "socket");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "socket");
return GNUNET_SYSERR;
}
s = socket_create (ectx, coreAPI->load_monitor, sock);
@@ -382,25 +388,29 @@
memset (&soaddr, 0, sizeof (soaddr));
soaddr.sin_family = AF_INET;
- GNUNET_GE_ASSERT (ectx, sizeof (struct in_addr) == sizeof
(GNUNET_IPv4Address));
+ GNUNET_GE_ASSERT (ectx,
+ sizeof (struct in_addr) == sizeof (GNUNET_IPv4Address));
memcpy (&soaddr.sin_addr, &haddr->ip, sizeof (GNUNET_IPv4Address));
soaddr.sin_port = haddr->port;
i = CONNECT (sock, (struct sockaddr *) &soaddr, sizeof (soaddr));
if ((i < 0) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("Cannot connect to %u.%u.%u.%u:%u: %s\n"),
- GNUNET_PRIP (ntohl (*(int *) &haddr->ip)),
- ntohs (haddr->port), STRERROR (errno));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ _("Cannot connect to %u.%u.%u.%u:%u: %s\n"),
+ GNUNET_PRIP (ntohl (*(int *) &haddr->ip)),
+ ntohs (haddr->port), STRERROR (errno));
GNUNET_socket_destroy (s);
return GNUNET_SYSERR;
}
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "Establishing connection to %u.%u.%u.%u:%u\n",
- GNUNET_PRIP (ntohl (*(int *) &haddr->ip)), ntohs (haddr->port));
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ "Establishing connection to %u.%u.%u.%u:%u\n",
+ GNUNET_PRIP (ntohl (*(int *) &haddr->ip)),
+ ntohs (haddr->port));
#endif
return tcpConnectHelper (hello, s, tcpAPI.protocolNumber, tsessionPtr);
}
@@ -428,27 +438,34 @@
s = SOCKET (PF_INET, SOCK_STREAM, 0);
if (s < 0)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "socket");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "socket");
return GNUNET_SYSERR;
}
if (SETSOCKOPT (s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0)
GNUNET_GE_DIE_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "setsockopt");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "setsockopt");
memset ((char *) &serverAddr, 0, sizeof (serverAddr));
serverAddr.sin_family = AF_INET;
serverAddr.sin_addr.s_addr = htonl (INADDR_ANY);
serverAddr.sin_port = htons (getGNUnetTCPPort ());
if (BIND (s, (struct sockaddr *) &serverAddr, sizeof (serverAddr)) < 0)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "bind");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "bind");
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
- _("Failed to start transport service on port %d.\n"),
- getGNUnetTCPPort ());
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE,
+ _("Failed to start transport service on port %d.\n"),
+ getGNUnetTCPPort ());
if (0 != CLOSE (s))
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "close");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "close");
return GNUNET_SYSERR;
}
}
@@ -553,18 +570,19 @@
return NULL;
}
coreAPI = core;
- if (GNUNET_GC_get_configuration_value_yesno (cfg, "TCP", "UPNP", GNUNET_YES)
==
- GNUNET_YES)
+ if (GNUNET_GC_get_configuration_value_yesno (cfg, "TCP", "UPNP", GNUNET_YES)
+ == GNUNET_YES)
{
upnp = coreAPI->requestService ("upnp");
if (upnp == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _
- ("The UPnP service could not be loaded. To disable UPnP, set
the "
- "configuration option \"UPNP\" in section \"TCP\" to
\"NO\"\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _
+ ("The UPnP service could not be loaded. To disable
UPnP, set the "
+ "configuration option \"UPNP\" in section \"TCP\" to
\"NO\"\n"));
}
}
Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/tcp6.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -174,8 +174,9 @@
unsigned long long port;
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "TCP6",
- "PORT", 1, 65535, 2086, &port))
+ "TCP6",
+ "PORT", 1, 65535, 2086,
+ &port))
{
if ((pse = getservbyname ("gnunet", "tcp6")))
port = htons (pse->s_port);
@@ -230,7 +231,8 @@
if (0 == port)
{
#if DEBUG_TCP6
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG, "TCP6 port is 0, will only send
using TCP6\n");
+ GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG,
+ "TCP6 port is 0, will only send using TCP6\n");
#endif
return NULL; /* TCP6 transport is configured SEND-only! */
}
@@ -243,8 +245,8 @@
{
GNUNET_free (msg);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Could not determine my public IPv6 address.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Could not determine my public IPv6 address.\n"));
return NULL;
}
haddr->port = htons (port);
@@ -263,8 +265,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR if the operation failed
*/
static int
-tcp6Connect (const GNUNET_MessageHello * hello, GNUNET_TSession ** tsessionPtr,
- int may_reuse)
+tcp6Connect (const GNUNET_MessageHello * hello,
+ GNUNET_TSession ** tsessionPtr, int may_reuse)
{
int i;
Host6Address *haddr;
@@ -311,19 +313,20 @@
if (rtn != 0)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _("`%s': unknown service: %s\n"),
- __FUNCTION__, gai_strerror (rtn));
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _("`%s': unknown service: %s\n"),
+ __FUNCTION__, gai_strerror (rtn));
return GNUNET_SYSERR;
}
#if DEBUG_TCP6
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG,
- "Creating TCP6 connection to %s:%d\n",
- inet_ntop (AF_INET6,
- haddr,
- &hostname, INET6_ADDRSTRLEN), ntohs (haddr->port));
+ GNUNET_GE_DEBUG,
+ "Creating TCP6 connection to %s:%d\n",
+ inet_ntop (AF_INET6,
+ haddr,
+ &hostname, INET6_ADDRSTRLEN),
+ ntohs (haddr->port));
#endif
sock = -1;
@@ -335,7 +338,9 @@
sock = SOCKET (res->ai_family, res->ai_socktype, res->ai_protocol);
if (sock < 0)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "socket");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "socket");
sock = -1;
continue;
}
@@ -350,7 +355,9 @@
i = CONNECT (sock, res->ai_addr, res->ai_addrlen);
if ((i < 0) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK))
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "connect");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "connect");
GNUNET_socket_destroy (s);
s = NULL;
sock = -1;
@@ -388,12 +395,15 @@
s = SOCKET (PF_INET6, SOCK_STREAM, 0);
if (s < 0)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "socket");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "socket");
return GNUNET_SYSERR;
}
if (SETSOCKOPT (s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0)
GNUNET_GE_DIE_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "setsockopt");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "setsockopt");
memset ((char *) &serverAddr, 0, sizeof (serverAddr));
serverAddr.sin6_family = AF_INET6;
serverAddr.sin6_flowinfo = 0;
@@ -401,15 +411,19 @@
serverAddr.sin6_port = htons (getGNUnetTCP6Port ());
if (BIND (s, (struct sockaddr *) &serverAddr, sizeof (serverAddr)) < 0)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "bind");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "bind");
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
- _("Failed to start transport service on port %d.\n"),
- getGNUnetTCP6Port ());
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE,
+ _("Failed to start transport service on port %d.\n"),
+ getGNUnetTCP6Port ());
if (0 != CLOSE (s))
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "close");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "close");
return GNUNET_SYSERR;
}
}
@@ -451,10 +465,12 @@
GNUNET_mutex_lock (tcpblacklistlock);
GNUNET_free_non_null (filteredNetworks_);
GNUNET_free_non_null (allowedNetworks_);
- GNUNET_GC_get_configuration_value_string (cfg, "TCP6", "BLACKLIST", "", &ch);
+ GNUNET_GC_get_configuration_value_string (cfg, "TCP6", "BLACKLIST", "",
+ &ch);
filteredNetworks_ = GNUNET_parse_ipv6_network_specification (ectx, ch);
GNUNET_free (ch);
- GNUNET_GC_get_configuration_value_string (cfg, "TCP6", "WHITELIST", "", &ch);
+ GNUNET_GC_get_configuration_value_string (cfg, "TCP6", "WHITELIST", "",
+ &ch);
if (strlen (ch) > 0)
allowedNetworks_ = GNUNET_parse_ipv6_network_specification (ectx, ch);
else
Modified: GNUnet/src/transports/tcp_helper.c
===================================================================
--- GNUnet/src/transports/tcp_helper.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/tcp_helper.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -143,7 +143,9 @@
pos = pos->next;
}
GNUNET_mutex_unlock (tcplock);
- GNUNET_GE_ASSERT (ectx, GNUNET_OK == coreAPI->assertUnused
(tcpsession->tsession));
+ GNUNET_GE_ASSERT (ectx,
+ GNUNET_OK ==
+ coreAPI->assertUnused (tcpsession->tsession));
GNUNET_mutex_lock (tcplock);
GNUNET_free (tcpsession->tsession);
GNUNET_free (tcpsession);
@@ -172,8 +174,8 @@
GNUNET_mutex_unlock (tcplock);
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "TCP disconnect closes socket session.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "TCP disconnect closes socket session.\n");
#endif
GNUNET_select_disconnect (selector, tcpsession->sock);
GNUNET_mutex_lock (tcplock);
@@ -253,9 +255,9 @@
if ((ntohs (welcome->header.type) != 0) || (len != sizeof (TCPWelcome)))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _
- ("Received malformed message instead of welcome message.
Closing.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Received malformed message instead of welcome
message. Closing.\n"));
tcpDisconnect (tsession);
return GNUNET_SYSERR;
}
@@ -272,9 +274,9 @@
if (len <= sizeof (GNUNET_MessageHeader))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _
- ("Received malformed message from tcp-peer connection.
Closing.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Received malformed message from tcp-peer
connection. Closing.\n"));
tcpDisconnect (tsession);
return GNUNET_SYSERR;
}
@@ -311,13 +313,14 @@
{
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Rejecting TCP connection (blacklisted).\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Rejecting TCP connection (blacklisted).\n");
#endif
return NULL;
}
#if DEBUG_TCP
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
"Accepting TCP connection.\n");
+ GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Accepting TCP connection.\n");
#endif
tcpSession = GNUNET_malloc (sizeof (TCPSession));
memset (tcpSession, 0, sizeof (TCPSession));
@@ -371,8 +374,8 @@
GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
GNUNET_hash_to_enc (&tcpSession->sender.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Closed TCP socket of `%s'.\n", &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Closed TCP socket of `%s'.\n", &enc);
#endif
GNUNET_mutex_lock (tcplock);
GNUNET_mutex_lock (tcpSession->lock);
@@ -420,9 +423,9 @@
GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
GNUNET_hash_to_enc (&tcpSession->sender.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Cannot send message - TCP socket of `%s' already closed!\n",
- &enc);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Cannot send message - TCP socket of `%s' already
closed!\n",
+ &enc);
#endif
return GNUNET_SYSERR;
}
@@ -432,8 +435,8 @@
stats->change (stat_bytesDropped, size);
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Could not sent TCP message -- tcp transport is down.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Could not sent TCP message -- tcp transport is down.\n");
#endif
return GNUNET_SYSERR;
}
@@ -448,8 +451,8 @@
stats->change (stat_bytesDropped, size);
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Could not sent TCP message -- other side closed connection.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Could not sent TCP message -- other side closed
connection.\n");
#endif
return GNUNET_SYSERR; /* other side closed connection */
}
@@ -459,8 +462,8 @@
memcpy (&mp[1], msg, size);
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Transport asks select to queue message of size %u\n", size);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Transport asks select to queue message of size %u\n", size);
#endif
ok =
GNUNET_select_write (selector, tcpSession->sock, mp, GNUNET_NO,
@@ -486,7 +489,8 @@
* GNUNET_SYSERR if the size/session is invalid
*/
static int
-tcpTestWouldTry (GNUNET_TSession * tsession, const unsigned int size, int
important)
+tcpTestWouldTry (GNUNET_TSession * tsession, const unsigned int size,
+ int important)
{
TCPSession *tcpSession = tsession->internal;
@@ -557,8 +561,8 @@
{
#if DEBUG_TCP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Could not sent TCP welcome message, closing connection.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Could not sent TCP welcome message, closing
connection.\n");
#endif
/* disconnect caller -- error! */
tcpDisconnect (tsession);
Modified: GNUnet/src/transports/test.c
===================================================================
--- GNUnet/src/transports/test.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/test.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -199,34 +199,37 @@
if (NULL != strstr (trans, "-"))
strstr (trans, ".")[0] = '\0';
/* disable blacklists (loopback is often blacklisted)... */
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP",
"BLACKLIST",
- "");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP", "UPNP",
"NO");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP6",
"BLACKLIST",
- "");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP",
"BLACKLIST",
- "");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP", "UPNP",
"NO");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP6",
"BLACKLIST",
- "");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "HTTP",
"BLACKLIST",
- "");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "HTTP", "UPNP",
"NO");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP", "UPNP",
+ "NO");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP6",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP", "UPNP",
+ "NO");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP6",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "HTTP",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "HTTP", "UPNP",
+ "NO");
if (pid == 0)
pos = OFFSET;
else
pos = 0;
GNUNET_GC_set_configuration_value_number (api.cfg, api.ectx, "TCP", "PORT",
- 4444 + pos);
+ 4444 + pos);
GNUNET_GC_set_configuration_value_number (api.cfg, api.ectx, "TCP6", "PORT",
- 4445 + pos);
+ 4445 + pos);
GNUNET_GC_set_configuration_value_number (api.cfg, api.ectx, "UDP", "PORT",
- 4446 + pos);
+ 4446 + pos);
GNUNET_GC_set_configuration_value_number (api.cfg, api.ectx, "UDP6", "PORT",
- 4447 + pos);
+ 4447 + pos);
GNUNET_GC_set_configuration_value_number (api.cfg, api.ectx, "HTTP", "PORT",
- 4448 + pos);
+ 4448 + pos);
GNUNET_create_random_hash (&me.hashPubKey);
plugin = GNUNET_plugin_load (api.ectx, "libgnunettransport_", trans);
GNUNET_free (trans);
@@ -259,7 +262,8 @@
goto cleanup;
}
transport->startTransportServer ();
- GNUNET_GE_ASSERT (NULL, (transport->mtu >= expectedSize) || (transport->mtu
== 0));
+ GNUNET_GE_ASSERT (NULL, (transport->mtu >= expectedSize)
+ || (transport->mtu == 0));
GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); /* give other process
time to start */
if (pid == 0)
{
Modified: GNUnet/src/transports/test_repeat.c
===================================================================
--- GNUnet/src/transports/test_repeat.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/test_repeat.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -202,34 +202,37 @@
if (NULL != strstr (trans, "-"))
strstr (trans, ".")[0] = '\0';
/* disable blacklists (loopback is often blacklisted)... */
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP",
"BLACKLIST",
- "");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP", "UPNP",
"NO");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP6",
"BLACKLIST",
- "");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP",
"BLACKLIST",
- "");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP", "UPNP",
"NO");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP6",
"BLACKLIST",
- "");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "HTTP",
"BLACKLIST",
- "");
- GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "HTTP", "UPNP",
"NO");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP", "UPNP",
+ "NO");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "TCP6",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP", "UPNP",
+ "NO");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "UDP6",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "HTTP",
+ "BLACKLIST", "");
+ GNUNET_GC_set_configuration_value_string (api.cfg, api.ectx, "HTTP", "UPNP",
+ "NO");
if (pid == 0)
pos = OFFSET;
else
pos = 0;
GNUNET_GC_set_configuration_value_number (api.cfg, api.ectx, "TCP", "PORT",
- 4444 + pos);
+ 4444 + pos);
GNUNET_GC_set_configuration_value_number (api.cfg, api.ectx, "TCP6", "PORT",
- 4445 + pos);
+ 4445 + pos);
GNUNET_GC_set_configuration_value_number (api.cfg, api.ectx, "UDP", "PORT",
- 4446 + pos);
+ 4446 + pos);
GNUNET_GC_set_configuration_value_number (api.cfg, api.ectx, "UDP6", "PORT",
- 4447 + pos);
+ 4447 + pos);
GNUNET_GC_set_configuration_value_number (api.cfg, api.ectx, "HTTP", "PORT",
- 4448 + pos);
+ 4448 + pos);
GNUNET_create_random_hash (&me.hashPubKey);
plugin = GNUNET_plugin_load (api.ectx, "libgnunettransport_", trans);
GNUNET_free (trans);
@@ -262,7 +265,8 @@
goto cleanup;
}
transport->startTransportServer ();
- GNUNET_GE_ASSERT (NULL, (transport->mtu >= expectedSize) || (transport->mtu
== 0));
+ GNUNET_GE_ASSERT (NULL, (transport->mtu >= expectedSize)
+ || (transport->mtu == 0));
GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS); /* give other process
time to start */
if (pid == 0)
{
Modified: GNUnet/src/transports/udp.c
===================================================================
--- GNUnet/src/transports/udp.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/udp.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -83,8 +83,9 @@
unsigned long long port;
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "UDP",
- "PORT", 1, 65535, 2086, &port))
+ "UDP",
+ "PORT", 1, 65535, 2086,
+ &port))
{
if ((pse = getservbyname ("gnunet", "udp")))
port = htons (pse->s_port);
@@ -107,13 +108,16 @@
sock = SOCKET (PF_INET, SOCK_DGRAM, 17);
if (sock < 0)
{
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "socket");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "socket");
return -1;
}
if (SETSOCKOPT (sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0)
{
GNUNET_GE_DIE_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "setsockopt");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "setsockopt");
return -1;
}
GNUNET_GE_ASSERT (NULL, port != 0);
@@ -123,11 +127,15 @@
sin.sin_port = htons (port);
if (BIND (sock, (struct sockaddr *) &sin, sizeof (sin)) < 0)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "bind");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "bind");
GNUNET_GE_LOG (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
- _("Failed to bind to UDP port %d.\n"), port);
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "bind");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ _("Failed to bind to UDP port %d.\n"), port);
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "bind");
return -1;
}
/* do not bind if port == 0, then we use
@@ -202,9 +210,9 @@
{
#if DEBUG_UDP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Rejecting traffic from %u.%u.%u.%u.\n",
- GNUNET_PRIP (ntohl (*(int *) addr)));
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Rejecting traffic from %u.%u.%u.%u.\n",
+ GNUNET_PRIP (ntohl (*(int *) addr)));
#endif
return GNUNET_YES;
}
@@ -240,19 +248,19 @@
{
#if DEBUG_UDP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Rejecting UDP HELLO from %u.%u.%u.%u:%u due to
configuration.\n",
- GNUNET_PRIP (ntohl (*(int *) &haddr->ip.addr)),
- ntohs (haddr->port));
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Rejecting UDP HELLO from %u.%u.%u.%u:%u due to
configuration.\n",
+ GNUNET_PRIP (ntohl (*(int *) &haddr->ip.addr)),
+ ntohs (haddr->port));
#endif
return GNUNET_SYSERR; /* obviously invalid */
}
#if DEBUG_UDP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Verified UDP HELLO from %u.%u.%u.%u:%u.\n",
- GNUNET_PRIP (ntohl (*(int *) &haddr->ip.addr)),
- ntohs (haddr->port));
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Verified UDP HELLO from %u.%u.%u.%u:%u.\n",
+ GNUNET_PRIP (ntohl (*(int *) &haddr->ip.addr)),
+ ntohs (haddr->port));
#endif
return GNUNET_OK;
}
@@ -288,8 +296,9 @@
{
GNUNET_free (msg);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("UDP: Could not determine my public IP address.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ _("UDP: Could not determine my public IP address.\n"));
return NULL;
}
haddr->port = htons (port);
@@ -297,9 +306,9 @@
if (0 != memcmp (haddr, &last_addr, sizeof (HostAddress)))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "UDP uses IP address %u.%u.%u.%u.\n",
- GNUNET_PRIP (ntohl (*(int *) &haddr->ip)));
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "UDP uses IP address %u.%u.%u.%u.\n",
+ GNUNET_PRIP (ntohl (*(int *) &haddr->ip)));
last_addr = *haddr;
}
msg->senderAddressSize = htons (sizeof (HostAddress));
@@ -357,14 +366,15 @@
sin.sin_family = AF_INET;
sin.sin_port = haddr->port;
- GNUNET_GE_ASSERT (ectx, sizeof (struct in_addr) == sizeof
(GNUNET_IPv4Address));
+ GNUNET_GE_ASSERT (ectx,
+ sizeof (struct in_addr) == sizeof (GNUNET_IPv4Address));
memcpy (&sin.sin_addr, &haddr->ip, sizeof (GNUNET_IPv4Address));
#if DEBUG_UDP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
- "Sending message of %d bytes via UDP to %u.%u.%u.%u:%u.\n",
- ssize, GNUNET_PRIP (ntohl (*(int *) &sin.sin_addr)),
- ntohs (sin.sin_port));
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Sending message of %d bytes via UDP to %u.%u.%u.%u:%u.\n",
+ ssize, GNUNET_PRIP (ntohl (*(int *) &sin.sin_addr)),
+ ntohs (sin.sin_port));
#endif
#ifndef MINGW
if (GNUNET_YES == GNUNET_socket_send_to (udp_sock,
@@ -385,11 +395,11 @@
else
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _
- ("Failed to send message of size %d via UDP to %u.%u.%u.%u:%u:
%s\n"),
- ssize, GNUNET_PRIP (ntohl (*(int *) &sin.sin_addr)),
- ntohs (sin.sin_port), STRERROR (errno));
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _
+ ("Failed to send message of size %d via UDP to
%u.%u.%u.%u:%u: %s\n"),
+ ssize, GNUNET_PRIP (ntohl (*(int *) &sin.sin_addr)),
+ ntohs (sin.sin_port), STRERROR (errno));
if (stats != NULL)
stats->change (stat_bytesDropped, ssize);
}
@@ -434,7 +444,9 @@
#endif
if (sock == -1)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "socket");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "socket");
GNUNET_select_destroy (selector);
selector = NULL;
return GNUNET_SYSERR;
@@ -512,30 +524,34 @@
GNUNET_GE_ASSERT (ectx, sizeof (UDPMessage) == 68);
coreAPI = core;
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "UDP",
- "MTU",
- sizeof (UDPMessage)
- +
GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD
- +
- sizeof (GNUNET_MessageHeader) +
- 32, 65500, MESSAGNUNET_GE_SIZE,
&mtu))
+ "UDP",
+ "MTU",
+ sizeof (UDPMessage)
+ +
+
GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD
+ +
+ sizeof
+ (GNUNET_MessageHeader) +
+ 32, 65500,
+ MESSAGNUNET_GE_SIZE,
+ &mtu))
{
return NULL;
}
if (mtu < 1200)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("MTU %llu for `%s' is probably too low!\n"), mtu, "UDP");
- if (GNUNET_GC_get_configuration_value_yesno (cfg, "UDP", "UPNP", GNUNET_YES)
==
- GNUNET_YES)
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ _("MTU %llu for `%s' is probably too low!\n"), mtu, "UDP");
+ if (GNUNET_GC_get_configuration_value_yesno (cfg, "UDP", "UPNP", GNUNET_YES)
+ == GNUNET_YES)
{
upnp = coreAPI->requestService ("upnp");
if (upnp == NULL)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- "The UPnP service could not be loaded. To disable UPnP, set
the "
- "configuration option \"UPNP\" in section \"UDP\" to
\"NO\"\n");
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ "The UPnP service could not be loaded. To disable UPnP,
set the "
+ "configuration option \"UPNP\" in section \"UDP\" to
\"NO\"\n");
}
stats = coreAPI->requestService ("stats");
if (stats != NULL)
Modified: GNUnet/src/transports/udp6.c
===================================================================
--- GNUnet/src/transports/udp6.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/udp6.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -83,8 +83,9 @@
unsigned long long port;
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "UDP6",
- "PORT", 1, 65535, 2086, &port))
+ "UDP6",
+ "PORT", 1, 65535, 2086,
+ &port))
{
if ((pse = getservbyname ("gnunet", "udp")))
port = htons (pse->s_port);
@@ -106,9 +107,13 @@
sock = SOCKET (PF_INET6, SOCK_DGRAM, 17);
if (sock < 0)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "socket");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "socket");
if (SETSOCKOPT (sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "setsockopt");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "setsockopt");
if (port != 0)
{
memset (&sin, 0, sizeof (sin));
@@ -117,11 +122,16 @@
memcpy (&sin.sin6_addr, &in6addr_any, sizeof (GNUNET_IPv6Address));
if (BIND (sock, (struct sockaddr *) &sin, sizeof (sin)) < 0)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "bind");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "bind");
GNUNET_GE_LOG (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
- _("Failed to bind to UDP port %d.\n"), port);
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "bind");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE,
+ _("Failed to bind to UDP port %d.\n"), port);
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "bind");
}
} /* do not bind if port == 0, then we use
send-only! */
return sock;
@@ -227,11 +237,11 @@
{
#if DEBUG_UDP6
char inet6[INET6_ADDRSTRLEN];
- GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_USER,
- "Verified UDP6 hello from %u.%u.%u.%u:%u.\n",
- inet_ntop (AF_INET6,
- &haddr->ip,
- inet6, INET6_ADDRSTRLEN), ntohs (haddr->port));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Verified UDP6 hello from %u.%u.%u.%u:%u.\n",
+ inet_ntop (AF_INET6, &haddr->ip, inet6,
+ INET6_ADDRSTRLEN), ntohs (haddr->port));
#endif
return GNUNET_OK;
}
@@ -262,8 +272,9 @@
{
GNUNET_free (msg);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING,
- _("UDP6: Could not determine my public IPv6 address.\n"));
+ GNUNET_GE_WARNING,
+ _
+ ("UDP6: Could not determine my public IPv6 address.\n"));
return NULL;
}
haddr->port = htons (port);
@@ -326,11 +337,12 @@
memcpy (&sin.sin6_addr, &haddr->ip.addr, sizeof (GNUNET_IPv6Address));
#if DEBUG_UDP6
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG,
- "Sending message of %u bytes via UDP6 to %s:%d..\n",
- ssize,
- inet_ntop (AF_INET6,
- &sin, inet6, INET6_ADDRSTRLEN), ntohs (sin.sin_port));
+ GNUNET_GE_DEBUG,
+ "Sending message of %u bytes via UDP6 to %s:%d..\n",
+ ssize,
+ inet_ntop (AF_INET6,
+ &sin, inet6, INET6_ADDRSTRLEN),
+ ntohs (sin.sin_port));
#endif
if (GNUNET_YES == GNUNET_socket_send_to (udp_sock,
GNUNET_NC_NONBLOCKING,
@@ -385,7 +397,9 @@
sock = SOCKET (PF_INET, SOCK_DGRAM, 17);
if (sock == -1)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "socket");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "socket");
GNUNET_select_destroy (selector);
selector = NULL;
return GNUNET_SYSERR;
@@ -404,10 +418,12 @@
GNUNET_mutex_lock (configLock);
GNUNET_free_non_null (filteredNetworks_);
- GNUNET_GC_get_configuration_value_string (cfg, "UDP6", "BLACKLIST", "", &ch);
+ GNUNET_GC_get_configuration_value_string (cfg, "UDP6", "BLACKLIST", "",
+ &ch);
filteredNetworks_ = GNUNET_parse_ipv6_network_specification (ectx, ch);
GNUNET_free (ch);
- GNUNET_GC_get_configuration_value_string (cfg, "UDP6", "WHITELIST", "", &ch);
+ GNUNET_GC_get_configuration_value_string (cfg, "UDP6", "WHITELIST", "",
+ &ch);
if (strlen (ch) > 0)
allowedNetworks_ = GNUNET_parse_ipv6_network_specification (ectx, ch);
else
@@ -460,19 +476,24 @@
reloadConfiguration ();
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "UDP6",
- "MTU",
- sizeof (UDPMessage) +
-
GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD +
- sizeof (GNUNET_MessageHeader) +
- 32, 65500, MESSAGNUNET_GE_SIZE,
&mtu))
+ "UDP6",
+ "MTU",
+ sizeof (UDPMessage) +
+
GNUNET_P2P_MESSAGNUNET_GE_OVERHEAD
+ +
+ sizeof
+ (GNUNET_MessageHeader) +
+ 32, 65500,
+ MESSAGNUNET_GE_SIZE,
+ &mtu))
{
return NULL;
}
if (mtu < 1200)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("MTU %llu for `%s' is probably too low!\n"), mtu, "UDP6");
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ _("MTU %llu for `%s' is probably too low!\n"), mtu,
+ "UDP6");
stats = coreAPI->requestService ("stats");
if (stats != NULL)
{
Modified: GNUnet/src/transports/udp_helper.c
===================================================================
--- GNUnet/src/transports/udp_helper.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/udp_helper.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -91,14 +91,15 @@
if (len <= sizeof (UDPMessage))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _
- ("Received malformed message from udp-peer connection.
Closing.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Received malformed message from udp-peer connection.
Closing.\n"));
return GNUNET_SYSERR;
}
#if DEBUG_UDP
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK, "Received %d
bytes via UDP\n", len);
+ GNUNET_GE_DEBUG | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "Received %d bytes via UDP\n", len);
#endif
um = (const UDPMessage *) msg;
mp = GNUNET_malloc (sizeof (P2P_PACKET));
Modified: GNUnet/src/transports/upnp/error.c
===================================================================
--- GNUnet/src/transports/upnp/error.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/upnp/error.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -8,8 +8,8 @@
gaim_debug_error (char *facility, char *format, ...)
{
GNUNET_GE_LOG (NULL,
- GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "%s: %s\n", facility, format);
+ GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "%s: %s\n", facility, format);
}
/**
@@ -18,5 +18,6 @@
void
gaim_debug_info (char *facility, char *format, ...)
{
- GNUNET_GE_LOG (NULL, GNUNET_GE_INFO | GNUNET_GE_ADMIN | GNUNET_GE_BULK, "%s:
%s\n", facility, format);
+ GNUNET_GE_LOG (NULL, GNUNET_GE_INFO | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "%s: %s\n", facility, format);
}
Modified: GNUnet/src/transports/upnp/upnp.c
===================================================================
--- GNUnet/src/transports/upnp/upnp.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/transports/upnp/upnp.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -425,11 +425,12 @@
#if 0
if (ret != CURLE_OK)
GNUNET_GE_LOG (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- _("%s failed for url `%s' and post-data `%s' at %s:%d: `%s'\n"),
- "curl_easy_perform",
- control_info.control_url,
- soapMessage, __FILE__, __LINE__, curl_easy_strerror (ret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ _
+ ("%s failed for url `%s' and post-data `%s' at %s:%d:
`%s'\n"),
+ "curl_easy_perform", control_info.control_url, soapMessage,
+ __FILE__, __LINE__, curl_easy_strerror (ret));
#endif
curl_slist_free_all (headers);
curl_easy_cleanup (curl);
@@ -471,8 +472,8 @@
temp2 = temp + sizeof (control_info.publicip) - 1;
memcpy (control_info.publicip, temp + 1, temp2 - (temp + 1));
GNUNET_GE_LOG (NULL,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("upnp: NAT Returned IP: %s\n"), control_info.publicip);
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("upnp: NAT Returned IP: %s\n"), control_info.publicip);
return len;
}
@@ -536,10 +537,10 @@
ret = curl_easy_perform (curl);
if (ret != CURLE_OK)
GNUNET_GE_LOG (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- _("%s failed at %s:%d: `%s'\n"),
- "curl_easy_perform",
- __FILE__, __LINE__, curl_easy_strerror (ret));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, _("%s failed at %s:%d: `%s'\n"),
+ "curl_easy_perform", __FILE__, __LINE__,
+ curl_easy_strerror (ret));
curl_easy_cleanup (curl);
curl_global_cleanup ();
if (control_info.control_url == NULL)
@@ -650,7 +651,8 @@
dd.full_url[endDescURL - startDescURL] = '\0';
proxy = NULL;
GNUNET_GC_get_configuration_value_string (cfg,
- "GNUNETD", "HTTP-PROXY", "", &proxy);
+ "GNUNETD", "HTTP-PROXY", "",
+ &proxy);
ret = gaim_upnp_parse_description (proxy, &dd);
GNUNET_free (dd.full_url);
GNUNET_array_grow (dd.buf, dd.buf_len, 0);
@@ -713,11 +715,12 @@
}
proxy = NULL;
GNUNET_GC_get_configuration_value_string (cfg,
- "GNUNETD", "HTTP-PROXY", "", &proxy);
- ret = gaim_upnp_generate_action_message_and_send (proxy,
- action_name,
- action_params,
- &ignore_response, NULL);
+ "GNUNETD", "HTTP-PROXY", "",
+ &proxy);
+ ret =
+ gaim_upnp_generate_action_message_and_send (proxy, action_name,
+ action_params,
+ &ignore_response, NULL);
GNUNET_free (action_params);
GNUNET_free (proxy);
Modified: GNUnet/src/transports/upnp/upnptest.c
===================================================================
--- GNUnet/src/transports/upnp/upnptest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/transports/upnp/upnptest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -46,9 +46,12 @@
GNUNET_ServicePluginShutdownMethod done;
ectx = GNUNET_GE_create_context_stderr (GNUNET_NO,
- GNUNET_GE_WARNING | GNUNET_GE_ERROR |
GNUNET_GE_FATAL |
- GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_DEVELOPER |
- GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK);
+ GNUNET_GE_WARNING | GNUNET_GE_ERROR
+ | GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN |
+ GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK);
GNUNET_GE_setDefaultContext (ectx);
cfg = GNUNET_GC_create ();
GNUNET_GE_ASSERT (ectx, cfg != NULL);
Modified: GNUnet/src/util/boot/startup.c
===================================================================
--- GNUnet/src/util/boot/startup.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/boot/startup.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -58,7 +58,8 @@
* @return 0 on success, 1 on error
*/
static int
-configure_logging (struct GNUNET_GE_Context **ectx, struct
GNUNET_GC_Configuration *cfg)
+configure_logging (struct GNUNET_GE_Context **ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *admin_log_file;
char *admin_log_level;
@@ -69,8 +70,8 @@
struct GNUNET_GE_Context *tetx;
unsigned long long logrotate;
int dev;
- char * user;
- char * rdir;
+ char *user;
+ char *rdir;
size_t len;
size_t pos;
@@ -79,55 +80,64 @@
admin_log_level = NULL;
user_log_level = NULL;
user = NULL;
- GNUNET_GC_get_configuration_value_string (cfg, "GNUNETD", "USER", "", &user);
- if (strlen(user) == 0) {
- GNUNET_free(user);
- user = NULL;
- }
+ GNUNET_GC_get_configuration_value_string (cfg, "GNUNETD", "USER", "",
+ &user);
+ if (strlen (user) == 0)
+ {
+ GNUNET_free (user);
+ user = NULL;
+ }
logrotate = 7;
if (-1 == GNUNET_GC_get_configuration_value_number (cfg,
- "GNUNETD",
- "KEEPLOG",
- 0, 36500, 3, &logrotate))
+ "GNUNETD",
+ "KEEPLOG",
+ 0, 36500, 3,
+ &logrotate))
return 1; /* error! */
GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNETD",
- "LOGFILE",
- GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
"/logs",
- &admin_log_file);
- if (user != NULL) {
- rdir = GNUNET_expand_file_name (NULL, admin_log_file);
- GNUNET_GE_ASSERT(NULL, rdir != NULL);
- len = strlen (rdir);
- pos = 1;
- while (pos < len) {
- if (rdir[pos] == DIR_SEPARATOR) {
- rdir[pos] = '\0';
- if (mkdir(rdir, S_IRUSR | S_IWUSR| S_IXUSR) == 0) {
- GNUNET_file_change_owner(nctx,
- rdir,
- user);
- } else if (errno != EEXIST) {
- GNUNET_GE_LOG_STRERROR_FILE (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "mkdir", rdir);
- }
- rdir[pos] = DIR_SEPARATOR;
- }
- pos++;
+ "GNUNETD",
+ "LOGFILE",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
+ "/logs", &admin_log_file);
+ if (user != NULL)
+ {
+ rdir = GNUNET_expand_file_name (NULL, admin_log_file);
+ GNUNET_GE_ASSERT (NULL, rdir != NULL);
+ len = strlen (rdir);
+ pos = 1;
+ while (pos < len)
+ {
+ if (rdir[pos] == DIR_SEPARATOR)
+ {
+ rdir[pos] = '\0';
+ if (mkdir (rdir, S_IRUSR | S_IWUSR | S_IXUSR) == 0)
+ {
+ GNUNET_file_change_owner (nctx, rdir, user);
+ }
+ else if (errno != EEXIST)
+ {
+ GNUNET_GE_LOG_STRERROR_FILE (NULL,
+ GNUNET_GE_ERROR |
+ GNUNET_GE_USER |
+ GNUNET_GE_BULK, "mkdir", rdir);
+ }
+ rdir[pos] = DIR_SEPARATOR;
+ }
+ pos++;
+ }
+ GNUNET_free (rdir);
}
- GNUNET_free(rdir);
- }
GNUNET_GC_get_configuration_value_string (cfg,
- "LOGGING",
- "ADMIN-LEVEL",
- "WARNING", &admin_log_level);
+ "LOGGING",
+ "ADMIN-LEVEL",
+ "WARNING", &admin_log_level);
GNUNET_GC_get_configuration_value_string (cfg,
- "LOGGING",
- "USER-LEVEL",
- "WARNING", &user_log_level);
+ "LOGGING",
+ "USER-LEVEL",
+ "WARNING", &user_log_level);
dev =
- GNUNET_GC_get_configuration_value_yesno (cfg, "LOGGING", "DEVELOPER",
GNUNET_NO);
+ GNUNET_GC_get_configuration_value_yesno (cfg, "LOGGING", "DEVELOPER",
+ GNUNET_NO);
all = convertLogLevel (admin_log_level);
ull = convertLogLevel (user_log_level);
if (dev == GNUNET_YES)
@@ -140,26 +150,28 @@
if (all != 0)
{
nctx = GNUNET_GE_create_context_logfile (NULL,
- all
- | GNUNET_GE_ADMIN
- | GNUNET_GE_BULK
- | GNUNET_GE_IMMEDIATE,
- admin_log_file,
- user, GNUNET_YES, (int) logrotate);
+ all
+ | GNUNET_GE_ADMIN
+ | GNUNET_GE_BULK
+ | GNUNET_GE_IMMEDIATE,
+ admin_log_file,
+ user, GNUNET_YES,
+ (int) logrotate);
}
GNUNET_free (admin_log_file);
if (ull != 0)
{
tetx = GNUNET_GE_create_context_stderr (GNUNET_YES,
- ull
- | GNUNET_GE_USERKIND
- | GNUNET_GE_BULK | GNUNET_GE_IMMEDIATE);
+ ull
+ | GNUNET_GE_USERKIND
+ | GNUNET_GE_BULK |
+ GNUNET_GE_IMMEDIATE);
if (nctx == NULL)
nctx = tetx;
else
nctx = GNUNET_GE_create_context_multiplexer (nctx, tetx);
}
- GNUNET_free_non_null(user);
+ GNUNET_free_non_null (user);
GNUNET_GE_setDefaultContext (nctx);
GNUNET_GE_free_context (*ectx);
*ectx = nctx;
@@ -181,7 +193,8 @@
const char *binaryName,
char **cfgFileName,
const struct GNUNET_CommandLineOption *options,
- struct GNUNET_GE_Context **ectx, struct GNUNET_GC_Configuration
**cfg)
+ struct GNUNET_GE_Context **ectx,
+ struct GNUNET_GC_Configuration **cfg)
{
int i;
char *path;
@@ -202,9 +215,12 @@
/* during startup, log all warnings and higher
for anybody to stderr */
*ectx = GNUNET_GE_create_context_stderr (GNUNET_YES,
- GNUNET_GE_WARNING | GNUNET_GE_ERROR |
GNUNET_GE_FATAL |
- GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_DEVELOPER |
- GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK);
+ GNUNET_GE_WARNING | GNUNET_GE_ERROR
+ | GNUNET_GE_FATAL | GNUNET_GE_USER
+ | GNUNET_GE_ADMIN |
+ GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK);
GNUNET_GE_setDefaultContext (*ectx);
GNUNET_os_init (*ectx);
*cfg = GNUNET_GC_create ();
@@ -231,9 +247,9 @@
ret = system (run);
if (0 != ret)
GNUNET_GE_LOG (*ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Failed to run %s: %s %d\n"),
- run, strerror (errno), WEXITSTATUS (ret));
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ _("Failed to run %s: %s %d\n"),
+ run, strerror (errno), WEXITSTATUS (ret));
GNUNET_free (run);
}
if (0 != GNUNET_GC_parse_configuration (*cfg, *cfgFileName))
@@ -241,13 +257,14 @@
/* if PATHS/GNUNETD_HOME is not set, set it to
the default value! */
GNUNET_GC_get_configuration_value_string (*cfg,
- "PATHS",
- "GNUNETD_HOME",
- "/var/lib/gnunet", &path);
+ "PATHS",
+ "GNUNETD_HOME",
+ "/var/lib/gnunet", &path);
GNUNET_free (path);
GNUNET_GC_get_configuration_value_string (*cfg,
- "PATHS",
- "GNUNET_HOME", "~/.gnunet", &path);
+ "PATHS",
+ "GNUNET_HOME", "~/.gnunet",
+ &path);
GNUNET_free (path);
if (configure_logging (ectx, *cfg) != 0)
return -1;
@@ -258,7 +275,8 @@
* Free resources allocated during GNUnet_init.
*/
void
-GNUNET_fini (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+GNUNET_fini (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
GNUNET_GC_free (cfg);
GNUNET_GE_setDefaultContext (NULL);
Modified: GNUnet/src/util/config/config.c
===================================================================
--- GNUnet/src/util/config/config.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/config/config.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -161,13 +161,15 @@
}
void
-GNUNET_GC_set_error_context (struct GNUNET_GC_Configuration *cfg, struct
GNUNET_GE_Context *ectx)
+GNUNET_GC_set_error_context (struct GNUNET_GC_Configuration *cfg,
+ struct GNUNET_GE_Context *ectx)
{
cfg->ectx = ectx;
}
int
-GNUNET_GC_parse_configuration (struct GNUNET_GC_Configuration *cfg, const char
*filename)
+GNUNET_GC_parse_configuration (struct GNUNET_GC_Configuration *cfg,
+ const char *filename)
{
int dirty;
char line[256];
@@ -187,8 +189,9 @@
if (NULL == (fp = FOPEN (fn, "r")))
{
GNUNET_GE_LOG_STRERROR_FILE (cfg->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK |
- GNUNET_GE_REQUEST, "fopen", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK |
+ GNUNET_GE_REQUEST, "fopen", fn);
GNUNET_mutex_unlock (cfg->lock);
GNUNET_free (fn);
return -1;
@@ -257,12 +260,13 @@
using a command-line option; only set it
if we do not have a value already... */
if ((GNUNET_NO == GNUNET_GC_have_configuration_value (cfg,
- section,
- tag)) &&
+ section,
+ tag)) &&
(0 != GNUNET_GC_set_configuration_value_string (cfg,
- cfg->ectx,
- section,
- tag, &value[i])))
+ cfg->ectx,
+ section,
+ tag,
+ &value[i])))
ret = -1; /* could not set value */
}
else if (1 == sscanf (line, " %63[^= ] =[^\n]", tag))
@@ -273,20 +277,23 @@
using a command-line option; only set it
if we do not have a value already... */
if ((GNUNET_NO == GNUNET_GC_have_configuration_value (cfg,
- section,
- tag)) &&
+ section,
+ tag)) &&
(0 != GNUNET_GC_set_configuration_value_string (cfg,
- cfg->ectx,
- section, tag, "")))
+ cfg->ectx,
+ section, tag,
+ "")))
ret = -1; /* could not set value */
}
else
{
/* parse error */
GNUNET_GE_LOG (cfg->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE |
GNUNET_GE_BULK,
- _("Syntax error in configuration file `%s' at line %d.\n"),
- filename, nr);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK,
+ _
+ ("Syntax error in configuration file `%s' at line
%d.\n"),
+ filename, nr);
ret = -1;
break;
}
@@ -294,8 +301,10 @@
if (0 != fclose (fp))
{
GNUNET_GE_LOG_STRERROR_FILE (cfg->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
| GNUNET_GE_IMMEDIATE |
- GNUNET_GE_BULK | GNUNET_GE_REQUEST, "fclose",
filename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK | GNUNET_GE_REQUEST,
+ "fclose", filename);
ret = -1;
}
/* restore dirty flag - anything we set in the meantime
@@ -313,7 +322,8 @@
}
int
-GNUNET_GC_write_configuration (struct GNUNET_GC_Configuration *data, const
char *filename)
+GNUNET_GC_write_configuration (struct GNUNET_GC_Configuration *data,
+ const char *filename)
{
GNUNET_GC_Section *sec;
GNUNET_GC_Entry *e;
@@ -331,7 +341,8 @@
if (NULL == (fp = FOPEN (fn, "w")))
{
GNUNET_GE_LOG_STRERROR_FILE (data->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "fopen", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "fopen", fn);
GNUNET_free (fn);
return -1;
}
@@ -380,13 +391,16 @@
}
if (error != 0)
GNUNET_GE_LOG_STRERROR_FILE (data->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK |
- GNUNET_GE_REQUEST, "fprintf", filename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK |
+ GNUNET_GE_REQUEST, "fprintf", filename);
if (0 != fclose (fp))
{
GNUNET_GE_LOG_STRERROR_FILE (data->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
| GNUNET_GE_IMMEDIATE |
- GNUNET_GE_BULK | GNUNET_GE_REQUEST, "fclose",
filename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK | GNUNET_GE_REQUEST,
+ "fclose", filename);
error = 1;
}
if (error == 0)
@@ -420,7 +434,8 @@
* Call only with lock held!
*/
static GNUNET_GC_Entry *
-findEntry (GNUNET_GC_Configuration * data, const char *section, const char
*key)
+findEntry (GNUNET_GC_Configuration * data, const char *section,
+ const char *key)
{
int i;
GNUNET_GC_Section *sec;
@@ -435,10 +450,12 @@
}
int
-GNUNET_GC_set_configuration_value_string (struct GNUNET_GC_Configuration *data,
- struct GNUNET_GE_Context *ectx,
- const char *section,
- const char *option, const char *value)
+GNUNET_GC_set_configuration_value_string (struct GNUNET_GC_Configuration
+ *data,
+ struct GNUNET_GE_Context *ectx,
+ const char *section,
+ const char *option,
+ const char *value)
{
GNUNET_GC_Section *sec;
GNUNET_GC_Section nsec;
@@ -503,7 +520,7 @@
if (0 != data->listeners[i].listener (data->listeners[i].ctx,
data,
ectx, section, option))
- GNUNET_GE_ASSERT (ectx, 0); /* refused the refusal!? */
+ GNUNET_GE_ASSERT (ectx, 0); /* refused the refusal!? */
e = findEntry (data, section, option); /* side-effects of
callback are possible! */
i++;
}
@@ -522,34 +539,35 @@
}
if (ret == -1)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_USER | GNUNET_GE_BULK | GNUNET_GE_WARNING,
- _
- ("Setting option `%s' in section `%s' to value `%s' was
refused.\n"),
- option, section, value);
+ GNUNET_GE_USER | GNUNET_GE_BULK | GNUNET_GE_WARNING,
+ _
+ ("Setting option `%s' in section `%s' to value `%s' was
refused.\n"),
+ option, section, value);
GNUNET_mutex_unlock (data->lock);
return ret;
}
int
GNUNET_GC_set_configuration_value_number (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx,
- const char *section,
- const char *option,
- unsigned long long number)
+ struct GNUNET_GE_Context *ectx,
+ const char *section,
+ const char *option,
+ unsigned long long number)
{
char s[64];
GNUNET_snprintf (s, 64, "%llu", number);
- return GNUNET_GC_set_configuration_value_string (cfg, ectx, section, option,
s);
+ return GNUNET_GC_set_configuration_value_string (cfg, ectx, section, option,
+ s);
}
int
GNUNET_GC_get_configuration_value_number (struct GNUNET_GC_Configuration *cfg,
- const char *section,
- const char *option,
- unsigned long long min,
- unsigned long long max,
- unsigned long long def,
- unsigned long long *number)
+ const char *section,
+ const char *option,
+ unsigned long long min,
+ unsigned long long max,
+ unsigned long long def,
+ unsigned long long *number)
{
GNUNET_GC_Entry *e;
const char *val;
@@ -569,20 +587,21 @@
else
{
GNUNET_GE_LOG (cfg->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Configuration value '%llu' for '%s' "
- "in section '%s' is out of legal bounds
[%llu,%llu]\n"),
- *number, option, section, min, max);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ _("Configuration value '%llu' for '%s' "
+ "in section '%s' is out of legal bounds
[%llu,%llu]\n"),
+ *number, option, section, min, max);
ret = -1; /* error */
}
}
else
{
GNUNET_GE_LOG (cfg->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Configuration value '%s' for '%s'"
- " in section '%s' should be a number\n"),
- val, option, section, min, max);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Configuration value '%s' for '%s'"
+ " in section '%s' should be a number\n"),
+ val, option, section, min, max);
ret = -1; /* error */
}
}
@@ -590,7 +609,8 @@
{
*number = def;
GNUNET_GC_set_configuration_value_number (cfg,
- cfg->ectx, section, option, def);
+ cfg->ectx, section, option,
+ def);
ret = 1; /* default */
}
GNUNET_mutex_unlock (cfg->lock);
@@ -599,9 +619,9 @@
int
GNUNET_GC_get_configuration_value_string (struct GNUNET_GC_Configuration *cfg,
- const char *section,
- const char *option,
- const char *def, char **value)
+ const char *section,
+ const char *option,
+ const char *def, char **value)
{
GNUNET_GC_Entry *e;
const char *val;
@@ -621,14 +641,16 @@
{
GNUNET_mutex_unlock (cfg->lock);
GNUNET_GE_LOG (cfg->ectx,
- GNUNET_GE_USER | GNUNET_GE_IMMEDIATE | GNUNET_GE_ERROR,
- "Configuration value for option `%s' in section `%s'
required.\n",
- option, section);
+ GNUNET_GE_USER | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_ERROR,
+ "Configuration value for option `%s' in section `%s'
required.\n",
+ option, section);
return -1;
}
*value = GNUNET_strdup (def);
GNUNET_GC_set_configuration_value_string (cfg,
- cfg->ectx, section, option, def);
+ cfg->ectx, section, option,
+ def);
ret = 1; /* default */
}
GNUNET_mutex_unlock (cfg->lock);
@@ -637,10 +659,10 @@
int
GNUNET_GC_get_configuration_value_choice (struct GNUNET_GC_Configuration *cfg,
- const char *section,
- const char *option,
- const char **choices,
- const char *def, const char **value)
+ const char *section,
+ const char *option,
+ const char **choices,
+ const char *def, const char **value)
{
GNUNET_GC_Entry *e;
const char *val;
@@ -662,10 +684,10 @@
if (choices[i] == NULL)
{
GNUNET_GE_LOG (cfg->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Configuration value '%s' for '%s'"
- " in section '%s' is not in set of legal choices\n"),
- val, option, section);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Configuration value '%s' for '%s'"
+ " in section '%s' is not in set of legal
choices\n"),
+ val, option, section);
ret = -1; /* error */
}
else
@@ -692,7 +714,7 @@
*/
int
GNUNET_GC_have_configuration_value (struct GNUNET_GC_Configuration *cfg,
- const char *section, const char *option)
+ const char *section, const char *option)
{
GNUNET_GC_Entry *e;
int ret;
@@ -716,7 +738,8 @@
* @return $-expanded string
*/
char *
-GNUNET_GC_configuration_expand_dollar (struct GNUNET_GC_Configuration *cfg,
char *orig)
+GNUNET_GC_configuration_expand_dollar (struct GNUNET_GC_Configuration *cfg,
+ char *orig)
{
int i;
char *prefix;
@@ -738,11 +761,13 @@
post = &orig[i + 1];
}
prefix = NULL;
- if (GNUNET_YES == GNUNET_GC_have_configuration_value (cfg, "PATHS",
&orig[1]))
+ if (GNUNET_YES ==
+ GNUNET_GC_have_configuration_value (cfg, "PATHS", &orig[1]))
{
if (0 != GNUNET_GC_get_configuration_value_string (cfg,
- "PATHS",
- &orig[1], NULL, &prefix))
+ "PATHS",
+ &orig[1], NULL,
+ &prefix))
{
GNUNET_GE_BREAK (NULL, 0);
return orig;
@@ -782,16 +807,18 @@
* @return 0 on success, -1 on error, 1 for default
*/
int
-GNUNET_GC_get_configuration_value_filename (struct GNUNET_GC_Configuration
*data,
- const char *section,
- const char *option,
- const char *def, char **value)
+GNUNET_GC_get_configuration_value_filename (struct GNUNET_GC_Configuration
+ *data, const char *section,
+ const char *option,
+ const char *def, char **value)
{
int ret;
char *tmp;
tmp = NULL;
- ret = GNUNET_GC_get_configuration_value_string (data, section, option, def,
&tmp);
+ ret =
+ GNUNET_GC_get_configuration_value_string (data, section, option, def,
+ &tmp);
if (tmp != NULL)
{
tmp = GNUNET_GC_configuration_expand_dollar (data, tmp);
@@ -807,17 +834,19 @@
int
GNUNET_GC_set_configuration_value_choice (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx,
- const char *section,
- const char *option, const char *choice)
+ struct GNUNET_GE_Context *ectx,
+ const char *section,
+ const char *option,
+ const char *choice)
{
return GNUNET_GC_set_configuration_value_string (cfg, ectx, section, option,
- choice);
+ choice);
}
int
GNUNET_GC_attach_change_listener (struct GNUNET_GC_Configuration *cfg,
- GNUNET_GC_ChangeListener callback, void *ctx)
+ GNUNET_GC_ChangeListener callback,
+ void *ctx)
{
GNUNET_GC_Listener l;
int i;
@@ -847,7 +876,8 @@
int
GNUNET_GC_detach_change_listener (struct GNUNET_GC_Configuration *cfg,
- GNUNET_GC_ChangeListener callback, void *ctx)
+ GNUNET_GC_ChangeListener callback,
+ void *ctx)
{
int i;
GNUNET_GC_Listener *l;
@@ -892,19 +922,20 @@
*/
int
GNUNET_GC_get_configuration_value_yesno (struct GNUNET_GC_Configuration *cfg,
- const char *section,
- const char *option, int def)
+ const char *section,
+ const char *option, int def)
{
static const char *yesno[] = { "YES", "NO", NULL };
const char *val;
int ret;
ret = GNUNET_GC_get_configuration_value_choice (cfg,
- section,
- option,
- yesno,
- def == GNUNET_YES ? "YES" : "NO",
- &val);
+ section,
+ option,
+ yesno,
+ def ==
+ GNUNET_YES ? "YES" : "NO",
+ &val);
if (ret == -1)
return GNUNET_SYSERR;
if (val == yesno[0])
Modified: GNUnet/src/util/config/configtest.c
===================================================================
--- GNUnet/src/util/config/configtest.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/config/configtest.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -36,13 +36,15 @@
char *c;
unsigned long long l;
- if (0 != GNUNET_GC_get_configuration_value_string (cfg, "test", "b", NULL,
&c))
+ if (0 !=
+ GNUNET_GC_get_configuration_value_string (cfg, "test", "b", NULL, &c))
return 1;
if (0 != strcmp ("b", c))
return 1;
GNUNET_free (c);
if (0 != GNUNET_GC_get_configuration_value_number (cfg,
- "test", "five", 0, 10, 9, &l))
+ "test", "five", 0, 10, 9,
+ &l))
return 1;
if (5 != l)
return 1;
@@ -60,9 +62,12 @@
int failureCount = 0;
ectx = GNUNET_GE_create_context_stderr (GNUNET_NO,
- GNUNET_GE_WARNING | GNUNET_GE_ERROR |
GNUNET_GE_FATAL |
- GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_DEVELOPER |
- GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK);
+ GNUNET_GE_WARNING | GNUNET_GE_ERROR
+ | GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN |
+ GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK);
GNUNET_GE_setDefaultContext (ectx);
cfg = GNUNET_GC_create ();
if (0 != GNUNET_GC_parse_configuration (cfg, "testconfig.conf"))
Modified: GNUnet/src/util/config_impl/configtest.c
===================================================================
--- GNUnet/src/util/config_impl/configtest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/util/config_impl/configtest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -36,13 +36,15 @@
char *c;
unsigned long long l;
- if (0 != GNUNET_GC_get_configuration_value_string (cfg, "test", "b", NULL,
&c))
+ if (0 !=
+ GNUNET_GC_get_configuration_value_string (cfg, "test", "b", NULL, &c))
return 1;
if (0 != strcmp ("b", c))
return 1;
GNUNET_free (c);
if (0 != GNUNET_GC_get_configuration_value_number (cfg,
- "test", "five", 0, 10, 9, &l))
+ "test", "five", 0, 10, 9,
+ &l))
return 1;
if (5 != l)
return 1;
@@ -60,9 +62,12 @@
int failureCount = 0;
ectx = GNUNET_GE_create_context_stderr (GNUNET_NO,
- GNUNET_GE_WARNING | GNUNET_GE_ERROR |
GNUNET_GE_FATAL |
- GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_DEVELOPER |
- GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK);
+ GNUNET_GE_WARNING | GNUNET_GE_ERROR
+ | GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN |
+ GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK);
GNUNET_GE_setDefaultContext (ectx);
cfg = GNUNET_GC_create ();
if (0 != GNUNET_GC_parse_configuration (cfg, "testconfig.conf"))
Modified: GNUnet/src/util/containers/bloomfilter.c
===================================================================
--- GNUnet/src/util/containers/bloomfilter.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/util/containers/bloomfilter.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -168,7 +168,8 @@
if (fileSlot != (unsigned int) LSEEK (fd, fileSlot, SEEK_SET))
GNUNET_GE_DIE_STRERROR (NULL,
- GNUNET_GE_ADMIN | GNUNET_GE_USER | GNUNET_GE_FATAL |
GNUNET_GE_IMMEDIATE, "lseek");
+ GNUNET_GE_ADMIN | GNUNET_GE_USER | GNUNET_GE_FATAL
+ | GNUNET_GE_IMMEDIATE, "lseek");
value = 0;
READ (fd, &value, 1);
@@ -188,10 +189,12 @@
value = ((high << 4) | low);
if (fileSlot != (unsigned int) LSEEK (fd, fileSlot, SEEK_SET))
GNUNET_GE_DIE_STRERROR (NULL,
- GNUNET_GE_ADMIN | GNUNET_GE_USER | GNUNET_GE_FATAL |
GNUNET_GE_IMMEDIATE, "lseek");
+ GNUNET_GE_ADMIN | GNUNET_GE_USER | GNUNET_GE_FATAL
+ | GNUNET_GE_IMMEDIATE, "lseek");
if (1 != WRITE (fd, &value, 1))
GNUNET_GE_DIE_STRERROR (NULL,
- GNUNET_GE_ADMIN | GNUNET_GE_USER | GNUNET_GE_FATAL |
GNUNET_GE_IMMEDIATE, "write");
+ GNUNET_GE_ADMIN | GNUNET_GE_USER | GNUNET_GE_FATAL
+ | GNUNET_GE_IMMEDIATE, "write");
}
@@ -248,7 +251,8 @@
LSEEK (fd, fileSlot, SEEK_SET);
if (1 != WRITE (fd, &value, 1))
GNUNET_GE_DIE_STRERROR (NULL,
- GNUNET_GE_ADMIN | GNUNET_GE_USER | GNUNET_GE_FATAL |
GNUNET_GE_IMMEDIATE, "write");
+ GNUNET_GE_ADMIN | GNUNET_GE_USER | GNUNET_GE_FATAL
+ | GNUNET_GE_IMMEDIATE, "write");
}
#define BUFFSIZE 65536
@@ -288,8 +292,9 @@
if (res == -1)
{
GNUNET_GE_DIE_STRERROR (NULL,
- GNUNET_GE_ADMIN | GNUNET_GE_USER | GNUNET_GE_FATAL
| GNUNET_GE_IMMEDIATE,
- "write");
+ GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_FATAL | GNUNET_GE_IMMEDIATE,
+ "write");
GNUNET_free (buffer);
return GNUNET_SYSERR;
}
Modified: GNUnet/src/util/cron/cron.c
===================================================================
--- GNUnet/src/util/cron/cron.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/cron/cron.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -210,7 +210,9 @@
noJob (void *unused)
{
#if DEBUG_CRON
- GNUNET_GE_LOG (NULL, GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK, "In noJob.\n");
+ GNUNET_GE_LOG (NULL,
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "In noJob.\n");
#endif
}
@@ -220,7 +222,9 @@
void *unused;
#if DEBUG_CRON
- GNUNET_GE_LOG (cron->ectx, GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK, "Stopping cron\n");
+ GNUNET_GE_LOG (cron->ectx,
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Stopping cron\n");
#endif
cron->cron_shutdown = GNUNET_YES;
GNUNET_cron_add_job (cron, &noJob, 0, 0, NULL);
@@ -229,7 +233,9 @@
cron->cron_signal = NULL;
GNUNET_thread_join (cron->cron_handle, &unused);
#if DEBUG_CRON
- GNUNET_GE_LOG (NULL, GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK, "Cron stopped\n");
+ GNUNET_GE_LOG (NULL,
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Cron stopped\n");
#endif
}
@@ -263,7 +269,8 @@
(cron->cron_shutdown == GNUNET_NO) &&
(GNUNET_NO != GNUNET_thread_test_self (cron->cron_handle)))
return;
- GNUNET_GE_ASSERT (NULL, GNUNET_NO == GNUNET_thread_test_self
(cron->cron_handle));
+ GNUNET_GE_ASSERT (NULL,
+ GNUNET_NO == GNUNET_thread_test_self (cron->cron_handle));
GNUNET_mutex_lock (cron->inBlockLock_);
cron->inBlock++;
if (cron->inBlock == 1)
@@ -325,9 +332,10 @@
{
tab = &cron->deltaList_[jobId];
GNUNET_GE_LOG (NULL,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "%3u: delta %8lld CU --- method %p --- repeat %8u CU\n",
- jobId, tab->delta - now, (int) tab->method, tab->deltaRepeat);
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "%3u: delta %8lld CU --- method %p --- repeat %8u CU\n",
+ jobId, tab->delta - now, (int) tab->method,
+ tab->deltaRepeat);
jobId = tab->next;
}
GNUNET_mutex_unlock (cron->deltaListLock_);
@@ -345,8 +353,8 @@
#if DEBUG_CRON
GNUNET_GE_LOG (NULL,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Advancing job %p-%p\n", method, data);
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Advancing job %p-%p\n", method, data);
#endif
GNUNET_mutex_lock (cron->deltaListLock_);
jobId = cron->firstUsed_;
@@ -395,8 +403,8 @@
#if DEBUG_CRON
GNUNET_GE_LOG (cron->ectx,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Adding job %p-%p to fire in %d CU\n", method, data, delta);
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Adding job %p-%p to fire in %d CU\n", method, data, delta);
#endif
GNUNET_mutex_lock (cron->deltaListLock_);
@@ -506,25 +514,25 @@
{
#if DEBUG_CRON
GNUNET_GE_LOG (cron->ectx,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "adding periodic job %p-%p to run again in %u\n",
- method, data, repeat);
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "adding periodic job %p-%p to run again in %u\n",
+ method, data, repeat);
#endif
GNUNET_cron_add_job (cron, method, repeat, repeat, data);
}
/* run */
#if DEBUG_CRON
GNUNET_GE_LOG (cron->ectx,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "running job %p-%p\n", method, data);
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "running job %p-%p\n", method, data);
#endif
method (data);
GNUNET_mutex_lock (cron->deltaListLock_);
cron->runningJob_ = NULL;
#if DEBUG_CRON
GNUNET_GE_LOG (cron->ectx,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "job %p-%p done\n", method, data);
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "job %p-%p done\n", method, data);
#endif
}
@@ -554,15 +562,15 @@
{
#if DEBUG_CRON
GNUNET_GE_LOG (cron->ectx,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "running cron job, table is\n");
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, "running cron job, table is\n");
printCronTab (cron);
#endif
runJob (cron);
#if DEBUG_CRON
GNUNET_GE_LOG (cron->ectx,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "job run, new table is\n");
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, "job run, new table is\n");
printCronTab (cron);
#endif
}
@@ -573,9 +581,9 @@
next = next - now; /* how long to sleep */
#if DEBUG_CRON
GNUNET_GE_LOG (cron->ectx,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Sleeping at %llu for %llu CU (%llu s, %llu CU)\n",
- now, next, next / GNUNET_CRON_SECONDS, next);
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Sleeping at %llu for %llu CU (%llu s, %llu CU)\n",
+ now, next, next / GNUNET_CRON_SECONDS, next);
#endif
if (next > MAXSLEEP)
next = MAXSLEEP;
@@ -583,15 +591,16 @@
GNUNET_thread_sleep (next);
#if DEBUG_CRON
GNUNET_GE_LOG (cron->ectx,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "woke up at %llu - %lld CS late\n",
- GNUNET_get_time (), GNUNET_get_time () - (now + next));
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "woke up at %llu - %lld CS late\n",
+ GNUNET_get_time (), GNUNET_get_time () - (now + next));
#endif
}
GNUNET_semaphore_up (cron->cron_signal);
#if DEBUG_CRON
GNUNET_GE_LOG (cron->ectx,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK, "Cron
thread exits.\n");
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Cron thread exits.\n");
printCronTab (cron);
#endif
return NULL;
@@ -635,8 +644,8 @@
GNUNET_thread_create (&cron_main_method, cron, 256 * 1024);
if (cron->cron_handle == 0)
GNUNET_GE_DIE_STRERROR (cron->ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "pthread_create");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN | GNUNET_GE_USER
+ | GNUNET_GE_BULK, "pthread_create");
}
int
@@ -649,8 +658,8 @@
#if DEBUG_CRON
GNUNET_GE_LOG (cron->ectx,
- GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "deleting job %p-%p\n", method, data);
+ GNUNET_GE_STATUS | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "deleting job %p-%p\n", method, data);
#endif
GNUNET_mutex_lock (cron->deltaListLock_);
jobId = cron->firstUsed_;
Modified: GNUnet/src/util/crypto/hashing.c
===================================================================
--- GNUnet/src/util/crypto/hashing.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/crypto/hashing.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -397,8 +397,9 @@
if (fh == -1)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
| GNUNET_GE_REQUEST,
- "open", filename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_REQUEST,
+ "open", filename);
return GNUNET_SYSERR;
}
sha512_init (&ctx);
@@ -412,12 +413,14 @@
if (delta != READ (fh, buf, delta))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "read", filename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "read", filename);
if (0 != CLOSE (fh))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "close", filename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "close", filename);
GNUNET_free (buf);
return GNUNET_SYSERR;
}
@@ -429,8 +432,9 @@
}
if (0 != CLOSE (fh))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "close", filename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "close",
+ filename);
sha512_final (&ctx, (unsigned char *) ret);
GNUNET_free (buf);
return GNUNET_OK;
@@ -489,7 +493,7 @@
if (vbit < 5)
{
bits <<= (5 - vbit); /* zero-padding */
- GNUNET_GE_ASSERT (NULL, vbit == 2); /* padding by 3: 512+3 mod 5 ==
0 */
+ GNUNET_GE_ASSERT (NULL, vbit == 2); /* padding by 3: 512+3 mod 5
== 0 */
vbit = 5;
}
GNUNET_GE_ASSERT (NULL, wpos < sizeof (GNUNET_EncName) - 1);
@@ -605,9 +609,9 @@
GNUNET_AES_InitializationVector * iv)
{
GNUNET_GE_ASSERT (NULL,
- sizeof (GNUNET_HashCode) >=
- GNUNET_SESSIONKEY_LEN +
- sizeof (GNUNET_AES_InitializationVector));
+ sizeof (GNUNET_HashCode) >=
+ GNUNET_SESSIONKEY_LEN +
+ sizeof (GNUNET_AES_InitializationVector));
memcpy (skey, hc, GNUNET_SESSIONKEY_LEN);
skey->crc32 = htonl (GNUNET_crc32_n (skey, GNUNET_SESSIONKEY_LEN));
memcpy (iv, &((char *) hc)[GNUNET_SESSIONKEY_LEN],
Modified: GNUnet/src/util/crypto/hostkey_gcrypt.c
===================================================================
--- GNUnet/src/util/crypto/hostkey_gcrypt.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/util/crypto/hostkey_gcrypt.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -902,9 +902,10 @@
if (rc)
{
GNUNET_GE_LOG (NULL,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK |
GNUNET_GE_DEVELOPER,
- _("RSA signature verification failed at %s:%d: %s\n"),
- __FILE__, __LINE__, gcry_strerror (rc));
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK |
+ GNUNET_GE_DEVELOPER,
+ _("RSA signature verification failed at %s:%d: %s\n"),
+ __FILE__, __LINE__, gcry_strerror (rc));
unlockGcrypt ();
return GNUNET_SYSERR;
}
Modified: GNUnet/src/util/crypto/kblockkey.c
===================================================================
--- GNUnet/src/util/crypto/kblockkey.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/crypto/kblockkey.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -244,7 +244,8 @@
set_highbit (x, nbits - 2);
mpz_clrbit (x, nbits - 2);
}
- GNUNET_GE_ASSERT (NULL, mpz_cmp (x, nminus1) < 0 && mpz_cmp_ui (x,
1) > 0);
+ GNUNET_GE_ASSERT (NULL, mpz_cmp (x, nminus1) < 0
+ && mpz_cmp_ui (x, 1) > 0);
}
mpz_powm (y, x, q, n);
if (mpz_cmp_ui (y, 1) && mpz_cmp (y, nminus1))
Modified: GNUnet/src/util/crypto/symcipher_gcrypt.c
===================================================================
--- GNUnet/src/util/crypto/symcipher_gcrypt.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/util/crypto/symcipher_gcrypt.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -97,8 +97,8 @@
if (rc)
{
LOG_GCRY (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- "gcry_cipher_open", rc);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, "gcry_cipher_open", rc);
unlockGcrypt ();
return -1;
}
@@ -107,8 +107,8 @@
if (rc && ((char) rc != GPG_ERR_WEAK_KEY))
{
LOG_GCRY (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- "gcry_cipher_setkey", rc);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, "gcry_cipher_setkey", rc);
gcry_cipher_close (handle);
unlockGcrypt ();
return -1;
@@ -118,8 +118,8 @@
if (rc && ((char) rc != GPG_ERR_WEAK_KEY))
{
LOG_GCRY (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- "gcry_cipher_setiv", rc);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, "gcry_cipher_setiv", rc);
gcry_cipher_close (handle);
unlockGcrypt ();
return -1;
@@ -129,8 +129,8 @@
if (rc)
{
LOG_GCRY (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- "gcry_cipher_encrypt", rc);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, "gcry_cipher_encrypt", rc);
gcry_cipher_close (handle);
unlockGcrypt ();
return -1;
@@ -171,8 +171,8 @@
if (rc)
{
LOG_GCRY (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- "gcry_cipher_open", rc);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, "gcry_cipher_open", rc);
unlockGcrypt ();
return -1;
}
@@ -181,8 +181,8 @@
if (rc && ((char) rc != GPG_ERR_WEAK_KEY))
{
LOG_GCRY (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- "gcry_cipher_setkey", rc);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, "gcry_cipher_setkey", rc);
gcry_cipher_close (handle);
unlockGcrypt ();
return -1;
@@ -193,8 +193,8 @@
if (rc && ((char) rc != GPG_ERR_WEAK_KEY))
{
LOG_GCRY (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- "gcry_cipher_setiv", rc);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, "gcry_cipher_setiv", rc);
gcry_cipher_close (handle);
unlockGcrypt ();
return -1;
@@ -203,8 +203,8 @@
if (rc)
{
LOG_GCRY (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- "gcry_cipher_decrypt", rc);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, "gcry_cipher_decrypt", rc);
gcry_cipher_close (handle);
unlockGcrypt ();
return -1;
Modified: GNUnet/src/util/crypto/symciphertest.c
===================================================================
--- GNUnet/src/util/crypto/symciphertest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/util/crypto/symciphertest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -159,7 +159,8 @@
int failureCount = 0;
GNUNET_GE_ASSERT (NULL,
- strlen (INITVALUE) > sizeof (GNUNET_AES_InitializationVector));
+ strlen (INITVALUE) >
+ sizeof (GNUNET_AES_InitializationVector));
failureCount += testSymcipher ();
failureCount += verifyCrypto ();
Modified: GNUnet/src/util/disk/storage.c
===================================================================
--- GNUnet/src/util/disk/storage.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/disk/storage.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -111,7 +111,8 @@
if (0 != STAT64 (fn, &buf))
{
GNUNET_GE_LOG_STRERROR_FILE (gfsd->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_REQUEST, "stat64", fn);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_REQUEST, "stat64", fn);
GNUNET_free (fn);
return GNUNET_SYSERR;
}
@@ -119,7 +120,8 @@
if (0 != STAT (fn, &buf))
{
GNUNET_GE_LOG_STRERROR_FILE (gfsd->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_REQUEST, "stat", fn);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_REQUEST, "stat", fn);
GNUNET_free (fn);
return GNUNET_SYSERR;
}
@@ -172,7 +174,8 @@
* @return -1 on errors, otherwise the number of free blocks
*/
long
-GNUNET_disk_get_blocks_available (struct GNUNET_GE_Context *ectx, const char
*part)
+GNUNET_disk_get_blocks_available (struct GNUNET_GE_Context *ectx,
+ const char *part)
{
#ifdef SOLARIS
struct statvfs buf;
@@ -180,8 +183,9 @@
if (0 != statvfs (part, &buf))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "statfs", part);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "statfs",
+ part);
return -1;
}
return buf.f_bavail;
@@ -195,9 +199,9 @@
if (!GetDiskFreeSpace (szDrive, &dwDummy, &dwDummy, &dwBlocks, &dwDummy))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- _("`%s' failed for drive `%s': %u\n"),
- "GetDiskFreeSpace", szDrive, GetLastError ());
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, _("`%s' failed for drive `%s': %u\n"),
+ "GetDiskFreeSpace", szDrive, GetLastError ());
return -1;
}
@@ -207,8 +211,9 @@
if (0 != statfs (part, &s))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "statfs", part);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "statfs",
+ part);
return -1;
}
return s.f_bavail;
@@ -233,8 +238,9 @@
if (errno != ENOENT)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_REQUEST,
- "stat", fil);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_REQUEST,
+ "stat", fil);
return GNUNET_SYSERR;
}
return GNUNET_NO;
@@ -244,8 +250,9 @@
if (ACCESS (fil, R_OK | X_OK) < 0)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_REQUEST,
- "access", fil);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_REQUEST,
+ "access", fil);
return GNUNET_SYSERR;
}
return GNUNET_YES;
@@ -274,8 +281,9 @@
if (errno != ENOENT)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_REQUEST,
- "stat", rdir);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_REQUEST,
+ "stat", rdir);
GNUNET_free (rdir);
return GNUNET_SYSERR;
}
@@ -290,8 +298,9 @@
if (ACCESS (rdir, R_OK) < 0)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_REQUEST,
- "access", rdir);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_REQUEST,
+ "access", rdir);
GNUNET_free (rdir);
return GNUNET_SYSERR;
}
@@ -360,8 +369,9 @@
if ((ret != 0) && (errno != EEXIST))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "mkdir", rdir);
+ GNUNET_GE_ERROR |
+ GNUNET_GE_USER |
+ GNUNET_GE_BULK, "mkdir", rdir);
GNUNET_free (rdir);
return GNUNET_SYSERR;
}
@@ -480,7 +490,8 @@
if (n != WRITE (handle, buffer, n))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "write", fn);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "write", fn);
GNUNET_disk_file_close (ectx, fn, handle);
GNUNET_free (fn);
return GNUNET_SYSERR;
@@ -489,7 +500,8 @@
if (0 != CHMOD (fn, atoo (mode)))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "chmod", fn);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "chmod", fn);
}
GNUNET_free (fn);
return GNUNET_OK;
@@ -520,14 +532,15 @@
if (0 != STAT (dirName, &istat))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "stat", dirName);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "stat", dirName);
return GNUNET_SYSERR;
}
if (!S_ISDIR (istat.st_mode))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Expected `%s' to be a directory!\n"), dirName);
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Expected `%s' to be a directory!\n"), dirName);
return GNUNET_SYSERR;
}
errno = 0;
@@ -535,8 +548,8 @@
if ((errno == EACCES) || (dinfo == NULL))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "opendir", dirName);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "opendir", dirName);
return GNUNET_SYSERR;
}
while ((finfo = readdir (dinfo)) != NULL)
@@ -589,7 +602,8 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-GNUNET_disk_directory_remove (struct GNUNET_GE_Context *ectx, const char
*fileName)
+GNUNET_disk_directory_remove (struct GNUNET_GE_Context *ectx,
+ const char *fileName)
{
struct stat istat;
@@ -604,8 +618,9 @@
(GNUNET_YES != GNUNET_disk_directory_test (ectx, fileName)))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "rmdir", fileName);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "rmdir",
+ fileName);
return GNUNET_SYSERR;
}
if (GNUNET_SYSERR ==
@@ -614,19 +629,22 @@
if (0 != RMDIR (fileName))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "rmdir", fileName);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "rmdir",
+ fileName);
return GNUNET_SYSERR;
}
return GNUNET_OK;
}
void
-GNUNET_disk_file_close (struct GNUNET_GE_Context *ectx, const char *filename,
int fd)
+GNUNET_disk_file_close (struct GNUNET_GE_Context *ectx, const char *filename,
+ int fd)
{
if (0 != CLOSE (fd))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
"close", filename);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "close", filename);
}
int
@@ -645,8 +663,10 @@
errno = ENOENT;
SetLastError (lRet);
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
- GNUNET_GE_BULK, "plibc_conv_to_win_path",
filename);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "plibc_conv_to_win_path",
+ filename);
return -1;
}
fn = GNUNET_strdup (szFile);
@@ -670,7 +690,9 @@
#endif
ret = OPEN (fn, oflag, mode);
if (ret == -1)
- GNUNET_GE_LOG_STRERROR_FILE (ectx, GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "open", fn);
+ GNUNET_GE_LOG_STRERROR_FILE (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "open", fn);
GNUNET_free (fn);
return ret;
}
Modified: GNUnet/src/util/error/error.c
===================================================================
--- GNUnet/src/util/error/error.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/error/error.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -58,7 +58,8 @@
}
void
-GNUNET_GE_LOG (struct GNUNET_GE_Context *ctx, GNUNET_GE_KIND kind, const char
*message, ...)
+GNUNET_GE_LOG (struct GNUNET_GE_Context *ctx, GNUNET_GE_KIND kind,
+ const char *message, ...)
{
va_list va;
char date[64];
@@ -74,7 +75,8 @@
return;
if ((ctx == NULL) &&
(((kind & (GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK)) == 0) ||
- ((kind & (GNUNET_GE_FATAL | GNUNET_GE_ERROR | GNUNET_GE_WARNING)) ==
0)))
+ ((kind & (GNUNET_GE_FATAL | GNUNET_GE_ERROR | GNUNET_GE_WARNING)) ==
+ 0)))
return;
va_start (va, message);
@@ -131,9 +133,10 @@
*/
struct GNUNET_GE_Context *
GNUNET_GE_create_context_callback (GNUNET_GE_KIND mask,
- GNUNET_GE_LogHandler handler,
- void *ctx,
- GNUNET_GE_CtxFree liberator, GNUNET_GE_Confirm
confirm)
+ GNUNET_GE_LogHandler handler,
+ void *ctx,
+ GNUNET_GE_CtxFree liberator,
+ GNUNET_GE_Confirm confirm)
{
GNUNET_GE_Context *ret;
@@ -253,7 +256,8 @@
} CPair;
static void
-multiplexer (void *ctx, GNUNET_GE_KIND kind, const char *date, const char *msg)
+multiplexer (void *ctx, GNUNET_GE_KIND kind, const char *date,
+ const char *msg)
{
CPair *pair = ctx;
@@ -291,7 +295,7 @@
*/
struct GNUNET_GE_Context *
GNUNET_GE_create_context_multiplexer (struct GNUNET_GE_Context *ctx1,
- struct GNUNET_GE_Context *ctx2)
+ struct GNUNET_GE_Context *ctx2)
{
CPair *cls;
GNUNET_GE_Context *ret;
Modified: GNUnet/src/util/getopt/getopt.c
===================================================================
--- GNUnet/src/util/getopt/getopt.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/getopt/getopt.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -1067,8 +1067,9 @@
if (i == count)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Use --help to get a list of options.\n"));
+ GNUNET_GE_INFO | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _("Use --help to get a list of options.\n"));
cont = GNUNET_SYSERR;
}
}
Modified: GNUnet/src/util/getopt/setoption.c
===================================================================
--- GNUnet/src/util/getopt/setoption.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/getopt/setoption.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -48,15 +48,16 @@
if (value == NULL)
value = "YES";
ret = GNUNET_GC_set_configuration_value_string (cfg,
- ctx->ectx, section, option, value);
+ ctx->ectx, section, option,
+ value);
if (ret != 0)
{
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_USER | GNUNET_GE_BULK | GNUNET_GE_ERROR,
- _
- ("Setting option `%s' in section `%s' to `%s' when processing
command line option `%s' was denied.\n"),
- option, section, value, cmdLineOption);
+ GNUNET_GE_USER | GNUNET_GE_BULK | GNUNET_GE_ERROR,
+ _
+ ("Setting option `%s' in section `%s' to `%s' when
processing command line option `%s' was denied.\n"),
+ option, section, value, cmdLineOption);
GNUNET_free (section);
return GNUNET_SYSERR;
}
@@ -81,18 +82,19 @@
option[0] = '\0';
option++;
ret = GNUNET_GC_get_configuration_value_number (cfg,
- section,
- option,
- 0,
- (unsigned long long) -1L, 0, &old);
+ section,
+ option,
+ 0,
+ (unsigned long long) -1L, 0,
+ &old);
if (ret == GNUNET_SYSERR)
{
GNUNET_free (section);
return GNUNET_SYSERR;
}
ret = GNUNET_GC_set_configuration_value_number (cfg,
- ctx->ectx,
- section, option, old + 1);
+ ctx->ectx,
+ section, option, old + 1);
GNUNET_free (section);
if (ret == 0)
ret = GNUNET_OK;
@@ -132,8 +134,8 @@
if (1 != SSCANF (value, "%llu", val))
{
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
- _("You must pass a number to the `%s' option.\n"), "-X");
+ GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
+ _("You must pass a number to the `%s' option.\n"), "-X");
return GNUNET_SYSERR;
}
return GNUNET_OK;
@@ -149,8 +151,8 @@
if (1 != SSCANF (value, "%u", val))
{
GNUNET_GE_LOG (ctx->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
- _("You must pass a number to the `%s' option.\n"), "-X");
+ GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE | GNUNET_GE_USER,
+ _("You must pass a number to the `%s' option.\n"), "-X");
return GNUNET_SYSERR;
}
return GNUNET_OK;
Modified: GNUnet/src/util/loggers/file.c
===================================================================
--- GNUnet/src/util/loggers/file.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/loggers/file.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -262,12 +262,16 @@
{
ret = fprintf (fctx->handle,
"%s %s: %s",
- date, GNUNET_GE_kindToString (kind &
GNUNET_GE_EVENTKIND), msg);
+ date,
+ GNUNET_GE_kindToString (kind & GNUNET_GE_EVENTKIND),
+ msg);
}
else
{
ret = fprintf (fctx->handle,
- "%s: %s", GNUNET_GE_kindToString (kind &
GNUNET_GE_EVENTKIND), msg);
+ "%s: %s",
+ GNUNET_GE_kindToString (kind & GNUNET_GE_EVENTKIND),
+ msg);
}
if (ret < 0)
fprintf (stderr,
@@ -306,9 +310,10 @@
*/
struct GNUNET_GE_Context *
GNUNET_GE_create_context_logfile (struct GNUNET_GE_Context *ectx,
- GNUNET_GE_KIND mask,
- const char *filename,
- const char *owner, int logDate, int logrotate)
+ GNUNET_GE_KIND mask,
+ const char *filename,
+ const char *owner, int logDate,
+ int logrotate)
{
FileContext *fctx;
FILE *fd;
@@ -328,8 +333,9 @@
if (fd == NULL)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
| GNUNET_GE_IMMEDIATE |
- GNUNET_GE_BULK, "fopen", name);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK, "fopen", name);
GNUNET_free (name);
return NULL; /* ERROR! */
}
@@ -347,7 +353,8 @@
fctx->lock = GNUNET_mutex_create (GNUNET_YES);
purge_old_logs (fctx, name);
return GNUNET_GE_create_context_callback (mask,
- &filelogger, fctx, &fileclose, NULL);
+ &filelogger, fctx, &fileclose,
+ NULL);
}
@@ -372,7 +379,8 @@
fctx->first_start = GNUNET_NO;
fctx->lock = GNUNET_mutex_create (GNUNET_YES);
return GNUNET_GE_create_context_callback (mask,
- &filelogger, fctx, &fileclose, NULL);
+ &filelogger, fctx, &fileclose,
+ NULL);
}
@@ -397,6 +405,7 @@
fctx->logstart = 0;
fctx->lock = GNUNET_mutex_create (GNUNET_YES);
return GNUNET_GE_create_context_callback (mask,
- &filelogger, fctx, &fileclose, NULL);
+ &filelogger, fctx, &fileclose,
+ NULL);
}
Modified: GNUnet/src/util/loggers/memory.c
===================================================================
--- GNUnet/src/util/loggers/memory.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/loggers/memory.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -46,7 +46,8 @@
} GNUNET_GE_Memory;
static void
-memorylogger (void *cls, GNUNET_GE_KIND kind, const char *date, const char
*msg)
+memorylogger (void *cls, GNUNET_GE_KIND kind, const char *date,
+ const char *msg)
{
GNUNET_GE_Memory *ctx = cls;
unsigned int max;
@@ -69,7 +70,8 @@
{
ctx->messages[ctx->pos].msg =
GNUNET_strdup (_("Out of memory (for logging)"));
- ctx->messages[ctx->pos].mask = GNUNET_GE_STATUS | GNUNET_GE_USER |
GNUNET_GE_BULK;
+ ctx->messages[ctx->pos].mask =
+ GNUNET_GE_STATUS | GNUNET_GE_USER | GNUNET_GE_BULK;
}
else
{
@@ -85,9 +87,11 @@
* queried later in bulk).
*/
struct GNUNET_GE_Context *
-GNUNET_GE_create_context_memory (GNUNET_GE_KIND mask, struct GNUNET_GE_Memory
*memory)
+GNUNET_GE_create_context_memory (GNUNET_GE_KIND mask,
+ struct GNUNET_GE_Memory *memory)
{
- return GNUNET_GE_create_context_callback (mask, &memorylogger, memory, NULL,
NULL);
+ return GNUNET_GE_create_context_callback (mask, &memorylogger, memory, NULL,
+ NULL);
}
/**
@@ -131,7 +135,8 @@
* Also clears the memory.
*/
void
-GNUNET_GE_memory_poll (struct GNUNET_GE_Memory *memory, GNUNET_GE_LogHandler
handler, void *ctx)
+GNUNET_GE_memory_poll (struct GNUNET_GE_Memory *memory,
+ GNUNET_GE_LogHandler handler, void *ctx)
{
int i;
Modified: GNUnet/src/util/loggers/smtp.c
===================================================================
--- GNUnet/src/util/loggers/smtp.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/loggers/smtp.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -36,11 +36,11 @@
*/
struct GNUNET_GE_Context *
GNUNET_GE_create_context_email (struct GNUNET_GE_Context *ectx,
- GNUNET_GE_MASK mask,
- const char *address,
- const char *server,
- unsigned short port,
- int logDate, unsigned int bulkSize)
+ GNUNET_GE_MASK mask,
+ const char *address,
+ const char *server,
+ unsigned short port,
+ int logDate, unsigned int bulkSize)
{
return NULL;
}
Modified: GNUnet/src/util/network/io.c
===================================================================
--- GNUnet/src/util/network/io.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/network/io.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -82,9 +82,9 @@
if (he == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _("Could not find IP of host `%s': %s\n"),
- hostname, hstrerror (h_errno));
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _("Could not find IP of host `%s': %s\n"),
+ hostname, hstrerror (h_errno));
GNUNET_mutex_unlock (lock);
return GNUNET_SYSERR;
}
@@ -127,10 +127,13 @@
(errno != EHOSTDOWN) && (errno != EHOSTUNREACH) &&
#endif
(errno != ENOTCONN))
- GNUNET_GE_LOG_STRERROR (s->ectx, GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "shutdown");
+ GNUNET_GE_LOG_STRERROR (s->ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "shutdown");
if (0 != CLOSE (s->handle))
GNUNET_GE_LOG_STRERROR (s->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_DEVELOPER
| GNUNET_GE_BULK, "close");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER | GNUNET_GE_BULK, "close");
s->handle = -1;
s->checksum = 1;
}
@@ -155,11 +158,13 @@
#endif
(errno != ENOTCONN))
GNUNET_GE_LOG_STRERROR (s->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
"shutdown");
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "shutdown");
if (0 != CLOSE (s->handle))
GNUNET_GE_LOG_STRERROR (s->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "close");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "close");
}
GNUNET_free (s);
}
@@ -282,7 +287,9 @@
return (pos == 0) ? GNUNET_NO : GNUNET_YES;
}
#if DEBUG_IO
- GNUNET_GE_LOG_STRERROR (s->ectx, GNUNET_GE_DEBUG | GNUNET_GE_USER |
GNUNET_GE_REQUEST, "recv");
+ GNUNET_GE_LOG_STRERROR (s->ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_USER |
+ GNUNET_GE_REQUEST, "recv");
#endif
*read = pos;
return GNUNET_SYSERR;
@@ -360,8 +367,9 @@
return (pos == 0) ? GNUNET_NO : GNUNET_YES;
}
GNUNET_GE_LOG_STRERROR (s->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK |
GNUNET_GE_DEVELOPER,
- "recvfrom");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
+ "recvfrom");
*read = pos;
return GNUNET_SYSERR;
}
@@ -433,7 +441,9 @@
return (pos == 0) ? GNUNET_NO : GNUNET_YES;
}
#if DEBUG_IO
- GNUNET_GE_LOG_STRERROR (s->ectx, GNUNET_GE_DEBUG | GNUNET_GE_USER |
GNUNET_GE_REQUEST, "send");
+ GNUNET_GE_LOG_STRERROR (s->ectx,
+ GNUNET_GE_DEBUG | GNUNET_GE_USER |
+ GNUNET_GE_REQUEST, "send");
#endif
*sent = pos;
return GNUNET_SYSERR;
@@ -512,7 +522,8 @@
}
#if DEBUG_IO
GNUNET_GE_LOG_STRERROR (s->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_USER |
GNUNET_GE_REQUEST, "sendto");
+ GNUNET_GE_DEBUG | GNUNET_GE_USER |
+ GNUNET_GE_REQUEST, "sendto");
#endif
*sent = pos;
return GNUNET_SYSERR;
Modified: GNUnet/src/util/network/ip.c
===================================================================
--- GNUnet/src/util/network/ip.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/network/ip.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -59,8 +59,8 @@
if (0 != gethostname (hostname, MAX_HOSTNAME))
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "gethostname");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "gethostname");
return GNUNET_SYSERR;
}
ret = GNUNET_get_host_by_name (ectx, hostname, identity);
@@ -77,14 +77,15 @@
struct ifaddrs *ifa_first;
if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
- "NETWORK",
- "INTERFACE",
- "eth0", &interfaces))
+ "NETWORK",
+ "INTERFACE",
+ "eth0", &interfaces))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("No interface specified in section `%s' under `%s'!\n"),
- "NETWORK", "INTERFACE");
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("No interface specified in section `%s' under `%s'!\n"),
+ "NETWORK", "INTERFACE");
return GNUNET_SYSERR; /* that won't work! */
}
@@ -113,9 +114,9 @@
freeifaddrs (ifa_first);
}
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Could not obtain IP for interface `%s' using `%s'.\n"),
- interfaces, "getifaddrs");
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Could not obtain IP for interface `%s' using `%s'.\n"),
+ interfaces, "getifaddrs");
GNUNET_free (interfaces);
return GNUNET_SYSERR;
}
@@ -126,7 +127,8 @@
#define MAX_INTERFACES 16
static int
getAddressFromIOCTL (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx, GNUNET_IPv4Address *
identity)
+ struct GNUNET_GE_Context *ectx,
+ GNUNET_IPv4Address * identity)
{
char *interfaces;
#ifndef MINGW
@@ -139,14 +141,15 @@
int i;
if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
- "NETWORK",
- "INTERFACE",
- "eth0", &interfaces))
+ "NETWORK",
+ "INTERFACE",
+ "eth0", &interfaces))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- _("No interface specified in section `%s' under `%s'!\n"),
- "NETWORK", "INTERFACE");
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _
+ ("No interface specified in section `%s' under `%s'!\n"),
+ "NETWORK", "INTERFACE");
return GNUNET_SYSERR; /* that won't work! */
}
#ifndef MINGW
@@ -155,7 +158,8 @@
{
GNUNET_free (interfaces);
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "socket");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "socket");
return GNUNET_SYSERR;
}
memset (&ifc, 0, sizeof (struct ifconf));
@@ -165,9 +169,12 @@
if (ioctl (sockfd, SIOCGIFCONF, &ifc) == -1)
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK, "ioctl");
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "ioctl");
if (0 != CLOSE (sockfd))
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "close");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "close");
GNUNET_free (interfaces);
return GNUNET_SYSERR;
}
@@ -188,14 +195,18 @@
&(((struct sockaddr_in *) &ifr[i].ifr_addr)->sin_addr),
sizeof (struct in_addr));
if (0 != CLOSE (sockfd))
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "close");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "close");
GNUNET_free (interfaces);
return GNUNET_OK;
}
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- _("Could not find interface `%s' using `%s', "
- "trying to find another interface.\n"), interfaces, "ioctl");
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_BULK,
+ _("Could not find interface `%s' using `%s', "
+ "trying to find another interface.\n"), interfaces,
+ "ioctl");
/* if no such interface exists, take any interface but loopback */
for (i = 0; i < ifCount; i++)
{
@@ -211,17 +222,20 @@
&(((struct sockaddr_in *) &ifr[i].ifr_addr)->sin_addr),
sizeof (struct in_addr));
if (0 != CLOSE (sockfd))
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "close");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "close");
GNUNET_free (interfaces);
return GNUNET_OK;
}
if (0 != CLOSE (sockfd))
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "close");
- GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Could not obtain IP for interface `%s' using `%s'.\n"),
- interfaces, "ioctl");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "close");
+ GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Could not obtain IP for interface `%s' using `%s'.\n"),
+ interfaces, "ioctl");
GNUNET_free (interfaces);
return GNUNET_SYSERR;
#else /* MinGW */
@@ -266,20 +280,22 @@
if (!iAddrCount)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Could not find an IP address for "
- "interface `%s'.\n"), interfaces);
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Could not find an IP address for "
+ "interface `%s'.\n"), interfaces);
GlobalFree (pTable);
GlobalFree (pAddrTable);
return GNUNET_SYSERR;
}
else if (iAddrCount > 1)
- GNUNET_GE_LOG (ectx, GNUNET_GE_WARNING | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("There is more than one IP address specified"
- " for interface `%s'.\nGNUnet will "
- "use %u.%u.%u.%u.\n"), interfaces,
- GNUNET_PRIP (ntohl (dwIP)));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("There is more than one IP address specified"
+ " for interface `%s'.\nGNUnet will "
+ "use %u.%u.%u.%u.\n"), interfaces,
+ GNUNET_PRIP (ntohl (dwIP)));
identity->addr = dwIP;
@@ -296,10 +312,11 @@
pHost = GETHOSTBYNAME ("www.example.com");
if (!pHost)
{
- GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER,
- _("Could not resolve `%s' to "
- "determine our IP address: %s\n"),
- "www.example.com", STRERROR (errno));
+ GNUNET_GE_LOG (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ _("Could not resolve `%s' to "
+ "determine our IP address: %s\n"),
+ "www.example.com", STRERROR (errno));
return GNUNET_SYSERR;
}
@@ -311,14 +328,18 @@
(SOCKADDR *) & theHost,
sizeof (theHost)) == SOCKET_ERROR && errno != EWOULDBLOCK)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER, "connect");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_USER, "connect");
return GNUNET_SYSERR;
}
i = sizeof (theHost);
if (GETSOCKNAME (s, (SOCKADDR *) & theHost, &i) == SOCKET_ERROR)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK |
GNUNET_GE_USER, "getsockname");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_BULK |
+ GNUNET_GE_USER, "getsockname");
return GNUNET_SYSERR;
}
closesocket (s);
@@ -326,8 +347,8 @@
}
GNUNET_GE_LOG (ectx, GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- _("GNUnet now uses the IP address %u.%u.%u.%u.\n"),
- GNUNET_PRIP (ntohl (identity->addr)));
+ _("GNUnet now uses the IP address %u.%u.%u.%u.\n"),
+ GNUNET_PRIP (ntohl (identity->addr)));
return GNUNET_OK;
#endif
@@ -341,7 +362,8 @@
*/
char *
GNUNET_get_local_ip (struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx, GNUNET_IPv4Address * addr)
+ struct GNUNET_GE_Context *ectx,
+ GNUNET_IPv4Address * addr)
{
GNUNET_IPv4Address address;
char *ipString;
@@ -352,7 +374,8 @@
if (GNUNET_GC_have_configuration_value (cfg, "NETWORK", "IP"))
{
ipString = NULL;
- GNUNET_GC_get_configuration_value_string (cfg, "NETWORK", "IP", "",
&ipString);
+ GNUNET_GC_get_configuration_value_string (cfg, "NETWORK", "IP", "",
+ &ipString);
if (strlen (ipString) > 0)
{
retval = GNUNET_get_host_by_name (ectx, ipString, &address);
Modified: GNUnet/src/util/network/ipcheck.c
===================================================================
--- GNUnet/src/util/network/ipcheck.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/network/ipcheck.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -101,8 +101,10 @@
if (temps[j] > 0xFF)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Invalid format for IP: `%s'\n"), &routeList[pos]);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _("Invalid format for IP: `%s'\n"),
+ &routeList[pos]);
GNUNET_free (result);
return NULL;
}
@@ -129,8 +131,10 @@
if (temps[j] > 0xFF)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Invalid format for IP: `%s'\n"), &routeList[pos]);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _("Invalid format for IP: `%s'\n"),
+ &routeList[pos]);
GNUNET_free (result);
return NULL;
}
@@ -157,10 +161,11 @@
else
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _
- ("Invalid network notation ('/%d' is not legal in IPv4
CIDR)."),
- slash);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _
+ ("Invalid network notation ('/%d' is not legal in
IPv4 CIDR)."),
+ slash);
GNUNET_free (result);
return NULL; /* error */
}
@@ -176,8 +181,10 @@
if (temps[j] > 0xFF)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Invalid format for IP: `%s'\n"), &routeList[pos]);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _("Invalid format for IP: `%s'\n"),
+ &routeList[pos]);
GNUNET_free (result);
return NULL;
}
@@ -200,16 +207,16 @@
continue;
}
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Invalid format for IP: `%s'\n"), &routeList[pos]);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ _("Invalid format for IP: `%s'\n"), &routeList[pos]);
GNUNET_free (result);
return NULL; /* error */
}
if (pos < strlen (routeList))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Invalid format for IP: `%s'\n"), &routeList[pos]);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ _("Invalid format for IP: `%s'\n"), &routeList[pos]);
GNUNET_free (result);
return NULL; /* oops */
}
@@ -255,9 +262,10 @@
if (routeList[len - 1] != ';')
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Invalid network notation (does not end with ';': `%s')\n"),
- routeList);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ _
+ ("Invalid network notation (does not end with ';':
`%s')\n"),
+ routeList);
GNUNET_free (routeList);
return NULL;
}
@@ -287,9 +295,10 @@
if (ret <= 0)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Wrong format `%s' for netmask: %s\n"),
- &routeList[slash + 1], STRERROR (errno));
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _("Wrong format `%s' for netmask: %s\n"),
+ &routeList[slash + 1], STRERROR (errno));
GNUNET_free (result);
GNUNET_free (routeList);
return NULL;
@@ -300,9 +309,10 @@
if (ret <= 0)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- _("Wrong format `%s' for network: %s\n"),
- &routeList[slash + 1], STRERROR (errno));
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE,
+ _("Wrong format `%s' for network: %s\n"),
+ &routeList[slash + 1], STRERROR (errno));
GNUNET_free (result);
GNUNET_free (routeList);
return NULL;
Modified: GNUnet/src/util/network/select.c
===================================================================
--- GNUnet/src/util/network/select.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/network/select.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -193,11 +193,14 @@
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK, "Signaling
select %p.\n", sh);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Signaling select %p.\n", sh);
#endif
ret = WRITE (sh->signal_pipe[1], &i, sizeof (char));
if (ret != sizeof (char))
- GNUNET_GE_LOG_STRERROR (sh->ectx, GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "write");
+ GNUNET_GE_LOG_STRERROR (sh->ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "write");
}
/**
@@ -223,9 +226,9 @@
s->locked = 2;
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Destroying session %p of select %p with %u in read and %u in write
buffer.\n",
- s, sh, s->rsize, s->wsize);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Destroying session %p of select %p with %u in read and %u in
write buffer.\n",
+ s, sh, s->rsize, s->wsize);
#endif
#if 0
if ((s->pos > 0) || (s->wapos > s->wspos))
@@ -283,9 +286,9 @@
session->rsize - session->pos, &recvd);
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Receiving from session %p of select %p return %d-%u (%s).\n",
- sh, session, ret, recvd, STRERROR (errno));
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Receiving from session %p of select %p return %d-%u (%s).\n",
+ sh, session, ret, recvd, STRERROR (errno));
#endif
if (ret != GNUNET_OK)
{
@@ -302,9 +305,9 @@
if (len < sizeof (GNUNET_MessageHeader))
{
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _
- ("Received malformed message (too small) from connection.
Closing.\n"));
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Received malformed message (too small) from
connection. Closing.\n"));
destroySession (sh, session);
return GNUNET_SYSERR;
}
@@ -360,9 +363,9 @@
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Write and process called for session %p of select %p status %d.\n",
- sh, session, sh->shutdown);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Write and process called for session %p of select %p status
%d.\n",
+ sh, session, sh->shutdown);
#endif
sock = session->sock;
while (sh->shutdown == GNUNET_NO)
@@ -373,14 +376,15 @@
session->wapos - session->wspos, &size);
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Sending %d bytes from session %p of select %p return %d.\n",
- session->wapos - session->wspos, sh, session, ret);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Sending %d bytes from session %p of select %p return
%d.\n",
+ session->wapos - session->wspos, sh, session, ret);
#endif
if (ret == GNUNET_SYSERR)
{
GNUNET_GE_LOG_STRERROR (sh->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK, "send");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "send");
destroySession (sh, session);
return GNUNET_SYSERR;
}
@@ -457,8 +461,9 @@
if (-1 == FSTAT (sh->signal_pipe[0], &buf))
{
GNUNET_GE_LOG_STRERROR (sh->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
- "fstat");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK,
+ "fstat");
sh->signal_pipe[0] = -1; /* prevent us from error'ing all the
time */
}
else
@@ -473,9 +478,10 @@
{
GNUNET_socket_destroy (sh->listen_sock);
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_USER | GNUNET_GE_ERROR | GNUNET_GE_BULK,
- _("select listen socket for `%s' not valid!\n"),
- sh->description);
+ GNUNET_GE_USER | GNUNET_GE_ERROR |
+ GNUNET_GE_BULK,
+ _("select listen socket for `%s' not valid!\n"),
+ sh->description);
sh->listen_sock = NULL; /* prevent us from error'ing all the
time */
}
else
@@ -492,9 +498,10 @@
{
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Select %p destroys invalid client handle %p\n",
- sh, session);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ "Select %p destroys invalid client handle %p\n",
+ sh, session);
#endif
destroySession (sh, session);
}
@@ -520,13 +527,15 @@
if (errno == EBADF)
{
GNUNET_GE_LOG_STRERROR (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK, "select");
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, "select");
}
else
{
GNUNET_GE_DIE_STRERROR (sh->ectx,
- GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
- "select");
+ GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+ "select");
}
continue;
}
@@ -544,10 +553,13 @@
if (s == -1)
{
GNUNET_GE_LOG_STRERROR (sh->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "accept");
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN
+ | GNUNET_GE_BULK, "accept");
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "Select %s failed to accept!\n", sh->description);
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK,
+ "Select %s failed to accept!\n",
+ sh->description);
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
continue; /* not good, but not fatal either */
break;
@@ -557,16 +569,19 @@
SHUTDOWN (s, SHUT_WR);
if (0 != CLOSE (s))
GNUNET_GE_LOG_STRERROR (sh->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "close");
+ GNUNET_GE_WARNING |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "close");
s = -1;
continue;
}
sh->socket_quota--;
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Select %p is accepting connection: %d\n", sh, s);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ "Select %p is accepting connection: %d\n", sh,
+ s);
#endif
sock = socket_create (sh->ectx, sh->load_monitor, s);
GNUNET_mutex_unlock (sh->lock);
@@ -575,8 +590,10 @@
GNUNET_mutex_lock (sh->lock);
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Select %p is accepting connection: %p\n", sh, sctx);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ "Select %p is accepting connection: %p\n", sh,
+ sctx);
#endif
if (sctx == NULL)
{
@@ -624,14 +641,16 @@
if ((error != 0) || (optlen != sizeof (pending)))
{
GNUNET_GE_LOG_STRERROR (sh->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "ioctl");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "ioctl");
pending = 65535; /* max */
}
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Select %p is preparing to receive %u bytes from UDP\n",
- sh, pending);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ "Select %p is preparing to receive %u bytes from
UDP\n",
+ sh, pending);
#endif
GNUNET_GE_ASSERT (sh->ectx, pending >= 0);
if (pending >= 65536)
@@ -687,9 +706,11 @@
{
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- "Select %p is passing %u bytes from UDP
to handler\n",
- sh, size);
+ GNUNET_GE_DEBUG |
+ GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ "Select %p is passing %u bytes
from UDP to handler\n",
+ sh, size);
#endif
sh->mh (sh->mh_cls, sh, NULL, sctx, hdr);
sh->ch (sh->ch_cls, sh, NULL, sctx);
@@ -698,9 +719,11 @@
{
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- "Error in select %p -- connection
refused\n",
- sh);
+ GNUNET_GE_DEBUG |
+ GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ "Error in select %p -- connection
refused\n",
+ sh);
#endif
}
}
@@ -709,10 +732,12 @@
#if DEBUG_SELECT
GNUNET_GE_BREAK (sh->ectx, size == pending);
GNUNET_GE_BREAK (sh->ectx,
- size >= sizeof (GNUNET_MessageHeader));
+ size >=
+ sizeof (GNUNET_MessageHeader));
GNUNET_GE_BREAK (sh->ectx,
- (size >= sizeof (GNUNET_MessageHeader))
- && (ntohs (hdr->size) == size));
+ (size >=
+ sizeof (GNUNET_MessageHeader))
+ && (ntohs (hdr->size) == size));
#endif
}
}
@@ -730,7 +755,8 @@
if (0 >= READ (sh->signal_pipe[0], &buf[0], MAXSIG_BUF))
{
GNUNET_GE_LOG_STRERROR (sh->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "read");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "read");
}
}
for (i = 0; i < sh->sessionCount; i++)
@@ -793,8 +819,8 @@
if (-1 == fcntl (handle, F_SETFL, flags))
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- "fcntl");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE, "fcntl");
return GNUNET_SYSERR;
}
#endif
@@ -834,7 +860,9 @@
if ((is_udp == GNUNET_NO) && (sock != -1) && (0 != LISTEN (sock, 5)))
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "listen");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "listen");
return NULL;
}
GNUNET_GE_ASSERT (ectx, description != NULL);
@@ -844,7 +872,9 @@
sh->description = description;
if (0 != PIPE (sh->signal_pipe))
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "pipe");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "pipe");
GNUNET_free (sh);
return NULL;
}
@@ -853,7 +883,9 @@
{
if ((0 != CLOSE (sh->signal_pipe[0])) ||
(0 != CLOSE (sh->signal_pipe[1])))
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
GNUNET_GE_ADMIN, "close");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_ADMIN, "close");
GNUNET_free (sh);
return NULL;
}
@@ -880,12 +912,15 @@
if (sh->thread == NULL)
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
GNUNET_GE_ADMIN, "pthread_create");
+ GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_ADMIN, "pthread_create");
if (sh->listen_sock != NULL)
GNUNET_socket_destroy (sh->listen_sock);
if ((0 != CLOSE (sh->signal_pipe[0])) ||
(0 != CLOSE (sh->signal_pipe[1])))
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
GNUNET_GE_ADMIN, "close");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_ADMIN, "close");
GNUNET_mutex_destroy (sh->lock);
GNUNET_free (sh);
return NULL;
@@ -904,7 +939,8 @@
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK, "Destroying
select %p\n", sh);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Destroying select %p\n", sh);
#endif
sh->shutdown = GNUNET_YES;
signalSelect (sh);
@@ -919,10 +955,12 @@
GNUNET_mutex_destroy (sh->lock);
if (0 != CLOSE (sh->signal_pipe[1]))
GNUNET_GE_LOG_STRERROR (sh->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "close");
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
+ | GNUNET_GE_BULK, "close");
if (0 != CLOSE (sh->signal_pipe[0]))
GNUNET_GE_LOG_STRERROR (sh->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "close");
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
+ | GNUNET_GE_BULK, "close");
if (sh->listen_sock != NULL)
GNUNET_socket_destroy (sh->listen_sock);
GNUNET_free (sh);
@@ -953,9 +991,9 @@
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Adding message of size %u to %p of select %p\n",
- ntohs (msg->size), sock, sh);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Adding message of size %u to %p of select %p\n",
+ ntohs (msg->size), sock, sh);
#endif
session = NULL;
len = ntohs (msg->size);
@@ -1007,7 +1045,8 @@
(newBufferSize > sh->memory_quota) && (force == GNUNET_NO))
newBufferSize = sh->memory_quota;
GNUNET_GE_ASSERT (NULL,
- newBufferSize >= len + session->wapos - session->wspos);
+ newBufferSize >=
+ len + session->wapos - session->wspos);
newBuffer = GNUNET_malloc (newBufferSize);
memcpy (newBuffer,
&session->wbuff[session->wspos],
@@ -1071,8 +1110,8 @@
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Adding connection %p to selector %p\n", sock, sh);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Adding connection %p to selector %p\n", sock, sh);
#endif
session = GNUNET_malloc (sizeof (Session));
memset (session, 0, sizeof (Session));
@@ -1113,8 +1152,8 @@
#if DEBUG_SELECT
GNUNET_GE_LOG (sh->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "Removing connection %p from selector %p\n", sock, sh);
+ GNUNET_GE_DEBUG | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "Removing connection %p from selector %p\n", sock, sh);
#endif
GNUNET_mutex_lock (sh->lock);
session = findSession (sh, sock);
Modified: GNUnet/src/util/network_client/tcpio.c
===================================================================
--- GNUnet/src/util/network_client/tcpio.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/util/network_client/tcpio.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -79,7 +79,8 @@
* @return 0 on error
*/
static unsigned short
-getGNUnetPort (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+getGNUnetPort (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *res;
char *pos;
@@ -87,13 +88,14 @@
res = NULL;
if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
- "NETWORK",
- "HOST",
- "localhost:2087", &res))
+ "NETWORK",
+ "HOST",
+ "localhost:2087", &res))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Could not find valid value for HOST in section NETWORK."));
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Could not find valid value for HOST in section
NETWORK."));
return 2087;
}
pos = strstr (res, ":");
@@ -106,10 +108,10 @@
if (1 != SSCANF (pos, "%u", &port))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- _
- ("Syntax error in configuration entry HOST in section NETWORK:
`%s'"),
- pos);
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Syntax error in configuration entry HOST in section
NETWORK: `%s'"),
+ pos);
GNUNET_free (res);
return 2087;
}
@@ -124,20 +126,22 @@
* @return the name of the host, NULL on error
*/
static char *
-getGNUnetdHost (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+getGNUnetdHost (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *res;
char *pos;
res = NULL;
if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
- "NETWORK",
- "HOST",
- "localhost:2087", &res))
+ "NETWORK",
+ "HOST",
+ "localhost:2087", &res))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Could not find valid value for HOST in section NETWORK."));
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("Could not find valid value for HOST in section
NETWORK."));
return NULL;
}
pos = strstr (res, ":");
@@ -276,7 +280,8 @@
if (osock == -1)
{
GNUNET_GE_LOG_STRERROR (sock->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "socket");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "socket");
GNUNET_free (host);
GNUNET_mutex_unlock (sock->destroylock);
return GNUNET_SYSERR;
@@ -286,16 +291,16 @@
memset (&soaddr, 0, sizeof (soaddr));
soaddr.sin_family = AF_INET;
GNUNET_GE_ASSERT (sock->ectx,
- sizeof (struct in_addr) == sizeof (GNUNET_IPv4Address));
+ sizeof (struct in_addr) == sizeof (GNUNET_IPv4Address));
memcpy (&soaddr.sin_addr, &ip, sizeof (struct in_addr));
soaddr.sin_port = htons (port);
ret = CONNECT (osock, (struct sockaddr *) &soaddr, sizeof (soaddr));
if ((ret != 0) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK))
{
GNUNET_GE_LOG (sock->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Cannot connect to %s:%u: %s\n"),
- host, port, STRERROR (errno));
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Cannot connect to %s:%u: %s\n"),
+ host, port, STRERROR (errno));
GNUNET_socket_destroy (sock->sock);
sock->sock = NULL;
GNUNET_free (host);
@@ -320,7 +325,8 @@
{
if (errno != EINTR)
GNUNET_GE_LOG_STRERROR (sock->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
"select");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "select");
GNUNET_socket_destroy (sock->sock);
sock->sock = NULL;
GNUNET_free (host);
@@ -330,8 +336,8 @@
if (FD_ISSET (osock, &eset))
{
GNUNET_GE_LOG (sock->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Error connecting to %s:%u\n"), host, port);
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Error connecting to %s:%u\n"), host, port);
GNUNET_socket_destroy (sock->sock);
sock->sock = NULL;
GNUNET_free (host);
@@ -341,9 +347,9 @@
if (!FD_ISSET (osock, &wset))
{
GNUNET_GE_LOG (sock->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
- _("Failed to connect to %s:%u in %ds\n"),
- host, port, WAIT_SECONDS);
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _("Failed to connect to %s:%u in %ds\n"),
+ host, port, WAIT_SECONDS);
GNUNET_socket_destroy (sock->sock);
sock->sock = NULL;
GNUNET_free (host);
@@ -455,8 +461,9 @@
}
#if DEBUG_TCPIO
GNUNET_GE_LOG (sock->ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "Successfully received %d bytes from TCP socket.\n", size);
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "Successfully received %d bytes from TCP socket.\n",
+ size);
#endif
*buffer = (GNUNET_MessageHeader *) buf;
(*buffer)->size = htons (size);
@@ -475,7 +482,8 @@
}
size =
ntohs (rem->header.size) - sizeof (GNUNET_MessageReturnErrorMessage);
- GNUNET_GE_LOG (sock->ectx, ntohl (rem->kind), "%.*s", (int) size,
&rem[1]);
+ GNUNET_GE_LOG (sock->ectx, ntohl (rem->kind), "%.*s", (int) size,
+ &rem[1]);
GNUNET_free (rem);
} /* while (1) */
GNUNET_mutex_unlock (sock->readlock);
@@ -504,8 +512,8 @@
(ntohs (rv->header.type) != GNUNET_CS_PROTO_RETURN_VALUE))
{
GNUNET_GE_LOG (sock->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- _("`%s' failed, reply invalid!\n"), __FUNCTION__);
+ GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ _("`%s' failed, reply invalid!\n"), __FUNCTION__);
GNUNET_free (rv);
return GNUNET_SYSERR;
}
Modified: GNUnet/src/util/network_client/tcpiotest.c
===================================================================
--- GNUnet/src/util/network_client/tcpiotest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/util/network_client/tcpiotest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -48,7 +48,9 @@
listenerFD = SOCKET (PF_INET, SOCK_STREAM, 0);
if (listenerFD < 0)
{
- GNUNET_GE_LOG_STRERROR (NULL, GNUNET_GE_BULK | GNUNET_GE_ERROR |
GNUNET_GE_USER, "socket");
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_BULK | GNUNET_GE_ERROR |
+ GNUNET_GE_USER, "socket");
return -1;
}
@@ -60,7 +62,9 @@
if (SETSOCKOPT (listenerFD, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0)
{
- GNUNET_GE_LOG_STRERROR (NULL, GNUNET_GE_BULK | GNUNET_GE_ERROR |
GNUNET_GE_USER, "setsockopt");
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_BULK | GNUNET_GE_ERROR |
+ GNUNET_GE_USER, "setsockopt");
CLOSE (listenerFD);
return -1;
}
@@ -69,7 +73,9 @@
if (BIND (listenerFD,
(struct sockaddr *) &serverAddr, sizeof (serverAddr)) < 0)
{
- GNUNET_GE_LOG_STRERROR (NULL, GNUNET_GE_BULK | GNUNET_GE_ERROR |
GNUNET_GE_USER, "bind");
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_BULK | GNUNET_GE_ERROR |
+ GNUNET_GE_USER, "bind");
CLOSE (listenerFD);
return -1;
}
@@ -77,7 +83,9 @@
/* start listening for new connections */
if (0 != LISTEN (listenerFD, 5))
{
- GNUNET_GE_LOG_STRERROR (NULL, GNUNET_GE_BULK | GNUNET_GE_ERROR |
GNUNET_GE_USER, "listen");
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_BULK | GNUNET_GE_ERROR |
+ GNUNET_GE_USER, "listen");
CLOSE (listenerFD);
return -1;
}
@@ -100,7 +108,9 @@
&lenOfIncomingAddr);
if (incomingFD < 0)
{
- GNUNET_GE_LOG_STRERROR (NULL, GNUNET_GE_BULK | GNUNET_GE_ERROR |
GNUNET_GE_USER, "accept");
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_BULK | GNUNET_GE_ERROR |
+ GNUNET_GE_USER, "accept");
continue;
}
}
Modified: GNUnet/src/util/os/console.c
===================================================================
--- GNUnet/src/util/os/console.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/console.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -41,10 +41,10 @@
char *pif;
if (0 != GNUNET_GC_get_configuration_value_filename (cfg,
- "GNUNETD",
- "PIDFILE",
-
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
- "/gnunetd/pid", &pif))
+ "GNUNETD",
+ "PIDFILE",
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
+ "/gnunetd/pid", &pif))
return NULL;
return pif;
}
@@ -68,7 +68,8 @@
pif = getPIDFile (cfg);
if (pif == NULL)
return GNUNET_OK; /* no PID file */
- GNUNET_GC_get_configuration_value_string (cfg, "GNUNETD", "USER", "", &user);
+ GNUNET_GC_get_configuration_value_string (cfg, "GNUNETD", "USER", "",
+ &user);
rdir = GNUNET_strdup (pif);
len = strlen (rdir);
while ((len > 0) && (rdir[len] != DIR_SEPARATOR))
@@ -85,8 +86,9 @@
if (0 != ACCESS (rdir, W_OK | X_OK))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER
| GNUNET_GE_BULK,
- "access", rdir);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "access",
+ rdir);
GNUNET_free (rdir);
GNUNET_free (user);
return GNUNET_SYSERR;
@@ -96,17 +98,20 @@
if (pidfd == NULL)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "fopen", pif);
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "fopen", pif);
GNUNET_free (pif);
GNUNET_free (user);
return GNUNET_SYSERR;
}
if (0 > FPRINTF (pidfd, "%u", pid))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "fprintf", pif);
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "fprintf", pif);
if (0 != fclose (pidfd))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "fclose", pif);
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "fclose", pif);
if (strlen (user))
GNUNET_file_change_owner (ectx, pif, user);
GNUNET_free (user);
@@ -115,7 +120,8 @@
}
int
-GNUNET_pid_file_delete (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg)
+GNUNET_pid_file_delete (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
char *pif = getPIDFile (cfg);
if (pif == NULL)
@@ -125,8 +131,8 @@
if (0 != UNLINK (pif))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "unlink", pif);
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "unlink", pif);
GNUNET_free (pif);
return GNUNET_SYSERR;
}
@@ -154,7 +160,8 @@
if (CHDIR ("/") < 0)
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "chdir");
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE, "chdir");
return GNUNET_SYSERR;
}
@@ -164,7 +171,8 @@
if (pid < 0)
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "fork");
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE, "fork");
return GNUNET_SYSERR;
}
if (pid)
@@ -173,7 +181,9 @@
char c;
if (0 != CLOSE (filedes[1]))
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "close");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "close");
ok = GNUNET_SYSERR;
while (0 < READ (filedes[0], &c, sizeof (char)))
{
@@ -192,13 +202,16 @@
}
}
if (0 != CLOSE (filedes[0]))
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "close");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "close");
nullfd = GNUNET_disk_file_open (ectx, "/dev/null", O_RDWR | O_APPEND);
if (nullfd < 0)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN
| GNUNET_GE_IMMEDIATE,
- "fork", "/dev/null");
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ "fork", "/dev/null");
return GNUNET_SYSERR;
}
/* child - close fds linking to invoking terminal, but
@@ -208,13 +221,15 @@
if (dup2 (nullfd, 0) < 0 || dup2 (nullfd, 1) < 0 || dup2 (nullfd, 2) < 0)
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "dup2");
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE, "dup2");
return GNUNET_SYSERR;
}
pid = setsid (); /* Detach from controlling terminal */
if (pid == -1)
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "setsid");
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
+ | GNUNET_GE_IMMEDIATE, "setsid");
#else
FreeConsole ();
#endif
@@ -233,6 +248,7 @@
WRITE (filedes[1], &c, sizeof (char)); /* signal success */
if (0 != CLOSE (filedes[1]))
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE, "close");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE, "close");
#endif
}
Modified: GNUnet/src/util/os/cpustatus.c
===================================================================
--- GNUnet/src/util/os/cpustatus.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/cpustatus.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -99,8 +99,8 @@
if (kret != KERN_SUCCESS)
{
GNUNET_GE_LOG (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "host_processor_info failed.");
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "host_processor_info failed.");
return GNUNET_SYSERR;
}
prev_cpu_load = GNUNET_malloc (cpu_count * sizeof (*prev_cpu_load));
@@ -150,8 +150,9 @@
if (NULL == fgets (line, 256, proc_stat))
{
GNUNET_GE_LOG_STRERROR_FILE (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "fgets", "/proc/stat");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "fgets", "/proc/stat");
fclose (proc_stat);
proc_stat = NULL; /* don't try again */
}
@@ -164,8 +165,9 @@
if (ret < 4)
{
GNUNET_GE_LOG_STRERROR_FILE (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "fgets-sscanf", "/proc/stat");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "fgets-sscanf", "/proc/stat");
fclose (proc_stat);
proc_stat = NULL; /* don't try again */
have_last_cpu = GNUNET_NO;
@@ -296,8 +298,8 @@
else
{
GNUNET_GE_LOG (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "host_processor_info failed.");
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "host_processor_info failed.");
return GNUNET_SYSERR;
}
}
@@ -322,8 +324,9 @@
if (kc == NULL)
{
GNUNET_GE_LOG_STRERROR (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "kstat_open");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "kstat_open");
goto ABORT_KSTAT;
}
@@ -349,8 +352,8 @@
}
if (0 != kstat_close (kc))
GNUNET_GE_LOG_STRERROR (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "kstat_close");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "kstat_close");
if ((idlecount == 0) && (totalcount == 0))
goto ABORT_KSTAT; /* no stats found => abort */
deltaidle = idlecount - last_idlecount;
@@ -392,8 +395,9 @@
{
warnOnce = 1;
GNUNET_GE_LOG_STRERROR (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "getloadavg");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "getloadavg");
}
return GNUNET_SYSERR;
}
@@ -457,8 +461,9 @@
{
once = 1;
GNUNET_GE_LOG (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- _("Cannot query the CPU usage (Windows NT).\n"));
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ _("Cannot query the CPU usage (Windows NT).\n"));
}
return GNUNET_SYSERR;
}
@@ -479,8 +484,9 @@
{
once = 1;
GNUNET_GE_LOG (NULL,
- GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_ERROR |
GNUNET_GE_BULK,
- _("Cannot query the CPU usage (Win 9x)\n"));
+ GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_ERROR | GNUNET_GE_BULK,
+ _("Cannot query the CPU usage (Win 9x)\n"));
}
}
@@ -530,7 +536,8 @@
* that lock has already been obtained.
*/
static void
-updateAgedLoad (struct GNUNET_GE_Context *ectx, struct GNUNET_GC_Configuration
*cfg)
+updateAgedLoad (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
static GNUNET_CronTime lastCall;
GNUNET_CronTime now;
@@ -588,7 +595,8 @@
* (100 is equivalent to full load)
*/
int
-GNUNET_cpu_get_load (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg)
+GNUNET_cpu_get_load (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
unsigned long long maxCPULoad;
int ret;
@@ -599,8 +607,8 @@
GNUNET_mutex_unlock (statusMutex);
if (ret == -1)
return -1;
- if (-1 == GNUNET_GC_get_configuration_value_number (cfg, "LOAD",
"MAXCPULOAD", 0, 10000, /* more than 1 CPU possible */
- 100, &maxCPULoad))
+ if (-1 == GNUNET_GC_get_configuration_value_number (cfg, "LOAD",
"MAXCPULOAD", 0, 10000, /* more than 1 CPU possible */
+ 100, &maxCPULoad))
return GNUNET_SYSERR;
return (100 * ret) / maxCPULoad;
}
@@ -612,7 +620,8 @@
* (100 is equivalent to full load)
*/
int
-GNUNET_disk_get_load (struct GNUNET_GE_Context *ectx, struct
GNUNET_GC_Configuration *cfg)
+GNUNET_disk_get_load (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg)
{
unsigned long long maxIOLoad;
int ret;
@@ -623,8 +632,8 @@
GNUNET_mutex_unlock (statusMutex);
if (ret == -1)
return -1;
- if (-1 == GNUNET_GC_get_configuration_value_number (cfg, "LOAD",
"MAXIOLOAD", 0, 10000, /* more than 1 CPU possible */
- 100, &maxIOLoad))
+ if (-1 == GNUNET_GC_get_configuration_value_number (cfg, "LOAD",
"MAXIOLOAD", 0, 10000, /* more than 1 CPU possible */
+ 100, &maxIOLoad))
return GNUNET_SYSERR;
return (100 * ret) / maxIOLoad;
}
@@ -641,8 +650,9 @@
proc_stat = fopen ("/proc/stat", "r");
if (NULL == proc_stat)
GNUNET_GE_LOG_STRERROR_FILE (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "fopen", "/proc/stat");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK, "fopen",
+ "/proc/stat");
#elif OSX
initMachCpuStats ();
#elif MINGW
Modified: GNUnet/src/util/os/daemon.c
===================================================================
--- GNUnet/src/util/os/daemon.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/daemon.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -37,7 +37,8 @@
* daemonized sucessfully, -1 on error
*/
static pid_t
-launchWithExec (struct GNUNET_GE_Context *ectx, const char *cfgFile, int
daemonize)
+launchWithExec (struct GNUNET_GE_Context *ectx, const char *cfgFile,
+ int daemonize)
{
pid_t pid;
@@ -97,7 +98,9 @@
#ifndef MINGW
nice (10); /* return value is not well-defined */
if (errno != 0)
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "nice");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "nice");
if (path != NULL)
i = execv (path, (char **) args);
@@ -112,8 +115,9 @@
GNUNET_free_non_null (path);
if (i == -1)
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "exec", path == NULL ? "gnunetd" : path);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "exec",
+ path == NULL ? "gnunetd" : path);
#ifndef MINGW
_exit (-1);
#endif
@@ -127,7 +131,9 @@
ret = waitpid (pid, &status, 0);
if (ret == -1)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_BULK, "waitpid");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "waitpid");
return GNUNET_SYSERR;
}
if ((WIFEXITED (status) && (0 != WEXITSTATUS (status))))
@@ -225,7 +231,9 @@
p = pid;
if (p != WAITPID (p, &status, 0))
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_BULK, "waitpid");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "waitpid");
return GNUNET_SYSERR;
}
if (WEXITSTATUS (status) == 0)
Modified: GNUnet/src/util/os/daemontest.c
===================================================================
--- GNUnet/src/util/os/daemontest.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/daemontest.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -37,9 +37,12 @@
struct GNUNET_GC_Configuration *cfg;
ectx = GNUNET_GE_create_context_stderr (GNUNET_NO,
- GNUNET_GE_WARNING | GNUNET_GE_ERROR |
GNUNET_GE_FATAL |
- GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_DEVELOPER |
- GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK);
+ GNUNET_GE_WARNING | GNUNET_GE_ERROR
+ | GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN |
+ GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK);
GNUNET_GE_setDefaultContext (ectx);
cfg = GNUNET_GC_create ();
GNUNET_GE_ASSERT (ectx, cfg != NULL);
Modified: GNUnet/src/util/os/dso.c
===================================================================
--- GNUnet/src/util/os/dso.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/dso.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -115,9 +115,10 @@
if (libhandle == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- _("`%s' failed for library `%s' with error: %s\n"),
- "lt_dlopenext", libname, lt_dlerror ());
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE,
+ _("`%s' failed for library `%s' with error: %s\n"),
+ "lt_dlopenext", libname, lt_dlerror ());
GNUNET_free (libname);
return NULL;
}
@@ -156,9 +157,10 @@
mptr = lt_dlsym (plug->handle, initName);
if ((mptr == NULL) && (logError))
GNUNET_GE_LOG (plug->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_IMMEDIATE,
- _("`%s' failed to resolve method '%s' with error: %s\n"),
- "lt_dlsym", &initName[1], lt_dlerror ());
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE,
+ _("`%s' failed to resolve method '%s' with error: %s\n"),
+ "lt_dlsym", &initName[1], lt_dlerror ());
GNUNET_free (initName);
return mptr;
}
Modified: GNUnet/src/util/os/installpath.c
===================================================================
--- GNUnet/src/util/os/installpath.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/installpath.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -60,8 +60,9 @@
if ((size == 0) || (size >= 1024))
{
GNUNET_GE_LOG_STRERROR_FILE (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
| GNUNET_GE_IMMEDIATE,
- "readlink", fn);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ "readlink", fn);
GNUNET_free (lnk);
return NULL;
}
Modified: GNUnet/src/util/os/osconfig.c
===================================================================
--- GNUnet/src/util/os/osconfig.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/osconfig.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -55,8 +55,9 @@
if (!f)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_BULK
| GNUNET_GE_WARNING,
- "popen", "ifconfig");
+ GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK | GNUNET_GE_WARNING,
+ "popen", "ifconfig");
return;
}
@@ -115,14 +116,15 @@
if (ret != 0)
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- "setrlimit");
+ GNUNET_GE_INFO | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ "setrlimit");
return GNUNET_SYSERR;
}
#else
GNUNET_GE_LOG (ectx,
- GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_ADMIN,
- _("Setting open descriptor limit not supported.\n"));
+ GNUNET_GE_INFO | GNUNET_GE_USER | GNUNET_GE_ADMIN,
+ _("Setting open descriptor limit not supported.\n"));
#endif
return GNUNET_OK;
}
@@ -301,8 +303,9 @@
if ((ACCESS ("/usr/sbin/update-rc.d", X_OK) != 0))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
| GNUNET_GE_IMMEDIATE,
- "access", "/usr/sbin/update-rc.d");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ "access", "/usr/sbin/update-rc.d");
return GNUNET_SYSERR;
}
@@ -313,8 +316,9 @@
if (ACCESS (application, X_OK) != 0)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
- "access", application);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ "access", application);
}
if (STAT ("/etc/init.d/gnunetd", &buf) == -1)
{
@@ -323,9 +327,10 @@
if (f == NULL)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN |
- GNUNET_GE_IMMEDIATE, "fopen",
- "/etc/init.d/gnunetd");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "fopen",
+ "/etc/init.d/gnunetd");
return 2;
}
@@ -366,9 +371,10 @@
S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN |
- GNUNET_GE_IMMEDIATE, "chmod",
- "/etc/init.d/gnunetd");
+ GNUNET_GE_WARNING | GNUNET_GE_USER
+ | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "chmod",
+ "/etc/init.d/gnunetd");
return GNUNET_SYSERR;
}
}
@@ -381,17 +387,21 @@
if (errno != 0)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN |
- GNUNET_GE_IMMEDIATE, "system",
- "/usr/sbin/update-rc.d");
+ GNUNET_GE_WARNING |
+ GNUNET_GE_USER |
+ GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE, "system",
+ "/usr/sbin/update-rc.d");
}
else
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN
| GNUNET_GE_IMMEDIATE,
- _("Command `%s' failed with error code %u\n"),
- "/usr/sbin/update-rc.d gnunetd defaults",
- WEXITSTATUS (ret));
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ _
+ ("Command `%s' failed with error code %u\n"),
+ "/usr/sbin/update-rc.d gnunetd defaults",
+ WEXITSTATUS (ret));
}
return GNUNET_SYSERR;
}
@@ -403,18 +413,18 @@
if ((UNLINK ("/etc/init.d/gnunetd") == -1) && (errno != ENOENT))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN |
- GNUNET_GE_IMMEDIATE, "unlink",
- "/etc/init.d/gnunetd");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ "unlink", "/etc/init.d/gnunetd");
return GNUNET_SYSERR;
}
errno = 0;
if (-1 != system ("/usr/sbin/update-rc.d gnunetd remove"))
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_ADMIN |
- GNUNET_GE_IMMEDIATE, "system",
- "/usr/sbin/update-rc.d");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ "system", "/usr/sbin/update-rc.d");
return GNUNET_SYSERR;
}
return GNUNET_YES;
Modified: GNUnet/src/util/os/priority.c
===================================================================
--- GNUnet/src/util/os/priority.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/priority.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -74,8 +74,8 @@
if (1 != sscanf (str, "%d", &prio))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_USER | GNUNET_GE_BULK | GNUNET_GE_ERROR,
- _("Invalid process priority `%s'\n"), str);
+ GNUNET_GE_USER | GNUNET_GE_BULK | GNUNET_GE_ERROR,
+ _("Invalid process priority `%s'\n"), str);
return GNUNET_SYSERR;
}
@@ -102,7 +102,9 @@
nice (prio);
if (errno != 0)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "nice");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "nice");
return GNUNET_SYSERR;
}
#endif
Modified: GNUnet/src/util/os/semaphore.c
===================================================================
--- GNUnet/src/util/os/semaphore.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/semaphore.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -127,8 +127,9 @@
if (errno != EINTR)
{
GNUNET_GE_LOG_STRERROR (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- "flock");
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_BULK,
+ "flock");
return;
}
}
@@ -141,7 +142,9 @@
int ret;
ret = LSEEK (fd, pos, mode);
if (ret == -1)
- GNUNET_GE_LOG_STRERROR (NULL, GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK, "lseek");
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN
+ | GNUNET_GE_BULK, "lseek");
return ret;
}
#endif
@@ -181,8 +184,9 @@
}
if (ret->internal == (void *) SEM_FAILED)
GNUNET_GE_DIE_STRERROR_FILE (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER | GNUNET_GE_IMMEDIATE,
- "sem_open", noslashBasename);
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER | GNUNET_GE_IMMEDIATE,
+ "sem_open", noslashBasename);
GNUNET_free (noslashBasename);
return ret;
#elif WINDOWS
@@ -215,11 +219,12 @@
if (!ret->internal)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- _("Can't create semaphore: %i"), dwErr);
+ GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK, _("Can't create semaphore: %i"), dwErr);
GNUNET_GE_DIE_STRERROR_FILE (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
- "OpenSemaphore", noslashBasename);
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER | GNUNET_GE_BULK,
+ "OpenSemaphore", noslashBasename);
}
GNUNET_free (noslashBasename);
return ret;
@@ -244,7 +249,8 @@
if (NULL == fp)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
"fopen", ebasename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "fopen", ebasename);
GNUNET_free (ret);
GNUNET_free (ebasename);
return NULL;
@@ -259,30 +265,42 @@
IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
if (ret->internal == -1)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "semget");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "semget");
if (semop (ret->internal, &op_lock[0], 2) < 0)
{
if (errno == EINVAL)
goto again;
else
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "semop");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "semop");
}
/* get process count */
if ((pcount = semctl (ret->internal, 1, GETVAL, 0)) < 0)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "semctl");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "semctl");
if (pcount == 0)
{
semctl_arg.val = initialValue;
if (semctl (ret->internal, 0, SETVAL, semctl_arg) < 0)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "semtcl");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "semtcl");
semctl_arg.val = PROCCOUNT;
if (semctl (ret->internal, 1, SETVAL, semctl_arg) < 0)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "semtcl");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "semtcl");
}
if (semop (ret->internal, &op_endcreate[0], 2) < 0)
- GNUNET_GE_DIE_STRERROR (ectx, GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "semop");
+ GNUNET_GE_DIE_STRERROR (ectx,
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "semop");
ret->filename = ebasename;
return ret;
#elif SOMEBSD
@@ -317,8 +335,8 @@
if (fd == -1)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- "open", ret->filename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "open", ret->filename);
GNUNET_mutex_destroy (&ret->internalLock);
GNUNET_free (ret->filename);
GNUNET_free (ret);
@@ -331,8 +349,8 @@
SEMA_LSEEK (fd, 0, SEEK_SET);
if (sizeof (int) != WRITE (fd, &cnt, sizeof (int)))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "write", basename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "write", basename);
}
SEMA_LSEEK (fd, sizeof (int), SEEK_SET);
if (sizeof (int) != READ (fd, &cnt, sizeof (int)))
@@ -342,7 +360,8 @@
SEMA_LSEEK (fd, sizeof (int), SEEK_SET);
if (sizeof (int) != WRITE (fd, &cnt, sizeof (int)))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
"write", basename);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "write", basename);
FLOCK (fd, LOCK_UN);
ret->fd = fd;
ret->initialValue = initialValue;
@@ -364,17 +383,22 @@
return;
#if SOLARIS || OSX || GNUNET_freeBSD5
if (0 != sem_post (sem->internal))
- GNUNET_GE_LOG_STRERROR (sem->ectx, GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "sem_post");
+ GNUNET_GE_LOG_STRERROR (sem->ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "sem_post");
#elif WINDOWS
if (!ReleaseSemaphore (sem->internal, 1, NULL))
- GNUNET_GE_LOG (sem->ectx, GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "ReleaseSemaphore signaled error: %i\n", GetLastError ());
+ GNUNET_GE_LOG (sem->ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
+ "ReleaseSemaphore signaled error: %i\n", GetLastError ());
#elif LINUX
{
struct sembuf sops = { 0, 1, SEM_UNDO };
if (0 != semop (sem->internal, &sops, 1))
- GNUNET_GE_LOG_STRERROR (sem->ectx, GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "semop");
+ GNUNET_GE_LOG_STRERROR (sem->ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "semop");
}
#elif SOMEBSD
{
@@ -386,8 +410,8 @@
if (sizeof (int) != READ (sem->fd, &cnt, sizeof (int)))
{
GNUNET_GE_LOG_STRERROR_FILE (sem->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "read", sem->filename);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "read", sem->filename);
FLOCK (sem->fd, LOCK_UN);
GNUNET_mutex_unlock (&sem->internalLock);
return;
@@ -396,8 +420,8 @@
SEMA_LSEEK (sem->fd, 0, SEEK_SET);
if (sizeof (int) != WRITE (sem->fd, &cnt, sizeof (int)))
GNUNET_GE_LOG_STRERROR_FILE (sem->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "write", sem->filename);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "write", sem->filename);
FLOCK (sem->fd, LOCK_UN);
GNUNET_mutex_unlock (&sem->internalLock);
}
@@ -416,13 +440,15 @@
if ((errno == EINTR) || (errno == EAGAIN))
continue;
GNUNET_GE_DIE_STRERROR (sem->ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
"sem_wait");
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "sem_wait");
}
return GNUNET_OK;
#elif WINDOWS
if (WaitForSingleObject (sem->internal, INFINITE) == WAIT_FAILED)
GNUNET_GE_LOG_STRERROR (sem->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_BULK,
"WaitForSingleObject");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "WaitForSingleObject");
return GNUNET_OK;
#elif LINUX
{
@@ -433,7 +459,8 @@
if ((errno == EINTR) || (errno == EAGAIN))
continue;
GNUNET_GE_DIE_STRERROR (sem->ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE, "semop");
+ GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_IMMEDIATE, "semop");
}
return GNUNET_OK;
}
@@ -450,8 +477,9 @@
if (sizeof (int) != READ (sem->fd, &cnt, sizeof (int)))
{
GNUNET_GE_LOG_STRERROR_FILE (sem->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "read", sem->filename);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "read",
+ sem->filename);
FLOCK (sem->fd, LOCK_UN);
GNUNET_mutex_unlock (&sem->internalLock);
return GNUNET_SYSERR;
@@ -469,8 +497,8 @@
SEMA_LSEEK (sem->fd, 0, SEEK_SET);
if (sizeof (int) != WRITE (sem->fd, &cnt, sizeof (int)))
GNUNET_GE_LOG_STRERROR_FILE (sem->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "write", sem->filename);
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "write", sem->filename);
FLOCK (sem->fd, LOCK_UN);
GNUNET_mutex_unlock (&sem->internalLock);
}
@@ -487,20 +515,26 @@
return;
#if SOLARIS || OSX || GNUNET_freeBSD5
if (0 != sem_close (sem->internal))
- GNUNET_GE_LOG_STRERROR (sem->ectx, GNUNET_GE_USER | GNUNET_GE_WARNING |
GNUNET_GE_BULK, "sem_close");
+ GNUNET_GE_LOG_STRERROR (sem->ectx,
+ GNUNET_GE_USER | GNUNET_GE_WARNING |
+ GNUNET_GE_BULK, "sem_close");
#elif WINDOWS
if (!CloseHandle (sem->internal))
GNUNET_GE_LOG (sem->ectx,
- GNUNET_GE_USER | GNUNET_GE_WARNING | GNUNET_GE_BULK,
- "CloseHandle signaled error: %i\n", GetLastError ());
+ GNUNET_GE_USER | GNUNET_GE_WARNING | GNUNET_GE_BULK,
+ "CloseHandle signaled error: %i\n", GetLastError ());
#elif LINUX
{
int pcount;
if (semop (sem->internal, &op_close[0], 3) < 0)
- GNUNET_GE_LOG_STRERROR (sem->ectx, GNUNET_GE_USER | GNUNET_GE_WARNING |
GNUNET_GE_BULK, "semop");
+ GNUNET_GE_LOG_STRERROR (sem->ectx,
+ GNUNET_GE_USER | GNUNET_GE_WARNING |
+ GNUNET_GE_BULK, "semop");
if ((pcount = semctl (sem->internal, 1, GETVAL, 0)) < 0)
- GNUNET_GE_LOG_STRERROR (sem->ectx, GNUNET_GE_USER | GNUNET_GE_WARNING |
GNUNET_GE_BULK, "semctl");
+ GNUNET_GE_LOG_STRERROR (sem->ectx,
+ GNUNET_GE_USER | GNUNET_GE_WARNING |
+ GNUNET_GE_BULK, "semctl");
if (pcount > PROCCOUNT)
{
GNUNET_GE_BREAK (sem->ectx, 0);
@@ -509,14 +543,16 @@
{
if (0 != semctl (sem->internal, 0, IPC_RMID, 0))
GNUNET_GE_LOG_STRERROR (sem->ectx,
- GNUNET_GE_USER | GNUNET_GE_WARNING |
GNUNET_GE_BULK, "semctl");
+ GNUNET_GE_USER | GNUNET_GE_WARNING |
+ GNUNET_GE_BULK, "semctl");
UNLINK (sem->filename);
}
else
{
if (semop (sem->internal, &op_unlock[0], 1) < 0)
GNUNET_GE_LOG_STRERROR (sem->ectx,
- GNUNET_GE_USER | GNUNET_GE_WARNING |
GNUNET_GE_BULK, "semop");
+ GNUNET_GE_USER | GNUNET_GE_WARNING |
+ GNUNET_GE_BULK, "semop");
}
GNUNET_free (sem->filename);
}
@@ -533,12 +569,15 @@
SEMA_LSEEK (sem->fd, sizeof (int), SEEK_SET);
if (sizeof (int) != WRITE (sem->fd, &cnt, sizeof (int)))
GNUNET_GE_LOG_STRERROR (sem->ectx,
- GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "write");
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "write");
if (ntohl (cnt) == 0)
UNLINK (sem->filename);
}
else
- GNUNET_GE_LOG_STRERROR (sem->ectx, GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "read");
+ GNUNET_GE_LOG_STRERROR (sem->ectx,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "read");
FLOCK (sem->fd, LOCK_UN);
GNUNET_disk_file_close (sem->ectx, sem->filename, sem->fd);
GNUNET_free (sem->filename);
Modified: GNUnet/src/util/os/semaphoretest.c
===================================================================
--- GNUnet/src/util/os/semaphoretest.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/semaphoretest.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -129,12 +129,12 @@
else
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
- "waiting for other process to exit.\n");
+ GNUNET_GE_DEBUG | GNUNET_GE_REQUEST | GNUNET_GE_USER,
+ "waiting for other process to exit.\n");
if (-1 == waitpid (me, &j, 0))
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
- "waitpid failed: %s\n", STRERROR (errno));
+ GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
+ "waitpid failed: %s\n", STRERROR (errno));
if ((!WIFEXITED (j)) || WEXITSTATUS (j) == 1)
ret = 1; /* error in child */
}
@@ -147,9 +147,12 @@
int ret = 0;
ectx = GNUNET_GE_create_context_stderr (GNUNET_NO,
- GNUNET_GE_WARNING | GNUNET_GE_ERROR |
GNUNET_GE_FATAL |
- GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_DEVELOPER |
- GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK);
+ GNUNET_GE_WARNING | GNUNET_GE_ERROR
+ | GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN |
+ GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK);
GNUNET_GE_setDefaultContext (ectx);
GNUNET_os_init (ectx);
ret += testIPCSemaphore ();
Modified: GNUnet/src/util/os/statuscalls.c
===================================================================
--- GNUnet/src/util/os/statuscalls.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/statuscalls.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -191,10 +191,11 @@
&rxnew, &txnew))
{
GNUNET_GE_LOG (monitor->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- _
- ("Failed to parse interface data from `%s'.\n"),
- PROC_NET_DEV);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK,
+ _
+ ("Failed to parse interface data from
`%s'.\n"),
+ PROC_NET_DEV);
continue;
}
ifc->last_in = rxnew;
@@ -243,7 +244,8 @@
else
{
GNUNET_GE_LOG_STRERROR (monitor->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "sysctl");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "sysctl");
break;
}
}
@@ -264,7 +266,8 @@
else
{
GNUNET_GE_LOG_STRERROR (monitor->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
"sysctl");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "sysctl");
}
#elif MINGW
NetworkStats *ifc;
@@ -310,8 +313,8 @@
if ((command = popen ("netstat -e", "rt")) == NULL)
{
GNUNET_GE_LOG_STRERROR_FILE (monitor->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
GNUNET_GE_BULK,
- "popen", "netstat -e");
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "popen", "netstat -e");
return;
}
ifc = &monitor->ifcs[0];
@@ -333,9 +336,11 @@
else
{
GNUNET_GE_LOG (monitor->ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_BULK,
- _("Failed to parse interface data from `%s'.\n"),
- PROC_NET_DEV);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK,
+ _
+ ("Failed to parse interface data from
`%s'.\n"),
+ PROC_NET_DEV);
}
}
iLine++;
@@ -353,7 +358,8 @@
static int
resetStatusCalls (void *cls,
struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_GE_Context *ectx, const char *sect, const char
*op)
+ struct GNUNET_GE_Context *ectx, const char *sect,
+ const char *op)
{
struct GNUNET_LoadMonitor *monitor = cls;
char *interfaces;
@@ -364,32 +370,32 @@
if (0 != strcmp (sect, "LOAD"))
return 0; /* fast path */
basic = GNUNET_GC_get_configuration_value_yesno (cfg,
- "LOAD", "BASICLIMITING",
- GNUNET_YES);
+ "LOAD", "BASICLIMITING",
+ GNUNET_YES);
if (basic == GNUNET_SYSERR)
return GNUNET_SYSERR;
if (-1 == GNUNET_GC_get_configuration_value_string (cfg,
- "LOAD",
- "INTERFACES",
- "eth0", &interfaces))
+ "LOAD",
+ "INTERFACES",
+ "eth0", &interfaces))
return GNUNET_SYSERR;
if (interfaces == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- _
- ("No network interfaces defined in configuration section `%s'
under `%s'!\n"),
- "LOAD", "INTERFACES");
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("No network interfaces defined in configuration section
`%s' under `%s'!\n"),
+ "LOAD", "INTERFACES");
return GNUNET_SYSERR;
}
if (strlen (interfaces) == 0)
{
GNUNET_free (interfaces);
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
- _
- ("No network interfaces defined in configuration section `%s'
under `%s'!\n"),
- "LOAD", "INTERFACES");
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_BULK,
+ _
+ ("No network interfaces defined in configuration section
`%s' under `%s'!\n"),
+ "LOAD", "INTERFACES");
return GNUNET_SYSERR;
}
GNUNET_mutex_lock (monitor->statusMutex);
@@ -426,17 +432,15 @@
GNUNET_free (interfaces);
monitor->useBasicMethod = basic;
GNUNET_GC_get_configuration_value_number (cfg,
- "LOAD",
- "MAXNETDOWNBPSTOTAL",
- 0,
- (unsigned long long) -1,
- 50000, &monitor->download_info.max);
- GNUNET_GC_get_configuration_value_number (cfg,
- "LOAD",
- "MAXNETUPBPSTOTAL",
- 0,
- (unsigned long long) -1,
- 50000, &monitor->upload_info.max);
+ "LOAD",
+ "MAXNETDOWNBPSTOTAL",
+ 0,
+ (unsigned long long) -1,
+ 50000,
+ &monitor->download_info.max);
+ GNUNET_GC_get_configuration_value_number (cfg, "LOAD", "MAXNETUPBPSTOTAL",
+ 0, (unsigned long long) -1, 50000,
+ &monitor->upload_info.max);
monitor->last_ifc_update = GNUNET_get_time ();
updateInterfaceTraffic (monitor);
GNUNET_mutex_unlock (monitor->statusMutex);
@@ -572,11 +576,13 @@
monitor->proc_net_dev = fopen (PROC_NET_DEV, "r");
if (NULL == monitor->proc_net_dev)
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_ADMIN | GNUNET_GE_USER |
GNUNET_GE_BULK,
- "fopen", PROC_NET_DEV);
+ GNUNET_GE_ERROR | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK, "fopen",
+ PROC_NET_DEV);
#endif
monitor->statusMutex = GNUNET_mutex_create (GNUNET_NO);
- if (-1 == GNUNET_GC_attach_change_listener (cfg, &resetStatusCalls, monitor))
+ if (-1 ==
+ GNUNET_GC_attach_change_listener (cfg, &resetStatusCalls, monitor))
{
GNUNET_network_monitor_destroy (monitor);
return NULL;
Modified: GNUnet/src/util/os/statuscallstest.c
===================================================================
--- GNUnet/src/util/os/statuscallstest.c 2007-11-25 12:06:33 UTC (rev
5760)
+++ GNUnet/src/util/os/statuscallstest.c 2007-11-25 12:07:29 UTC (rev
5761)
@@ -37,9 +37,12 @@
struct GNUNET_GC_Configuration *cfg;
ectx = GNUNET_GE_create_context_stderr (GNUNET_NO,
- GNUNET_GE_WARNING | GNUNET_GE_ERROR |
GNUNET_GE_FATAL |
- GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_DEVELOPER |
- GNUNET_GE_IMMEDIATE | GNUNET_GE_BULK);
+ GNUNET_GE_WARNING | GNUNET_GE_ERROR
+ | GNUNET_GE_FATAL | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN |
+ GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE |
+ GNUNET_GE_BULK);
GNUNET_GE_setDefaultContext (ectx);
cfg = GNUNET_GC_create ();
GNUNET_GE_ASSERT (ectx, cfg != NULL);
Modified: GNUnet/src/util/os/user.c
===================================================================
--- GNUnet/src/util/os/user.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/os/user.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -131,9 +131,10 @@
if (pws == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- _("Cannot obtain information about user `%s': %s\n"),
- user, errno == 0 ? _("No such user") : STRERROR (errno));
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE,
+ _("Cannot obtain information about user `%s': %s\n"),
+ user, errno == 0 ? _("No such user") : STRERROR (errno));
return GNUNET_SYSERR;
}
if ((0 != setgid (pws->pw_gid)) || (0 != setegid (pws->pw_gid)) ||
@@ -146,9 +147,10 @@
(0 != setreuid (pws->pw_uid, pws->pw_uid)))
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- _("Cannot change user/group to `%s': %s\n"),
- user, STRERROR (errno));
+ GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE,
+ _("Cannot change user/group to `%s': %s\n"), user,
+ STRERROR (errno));
return GNUNET_SYSERR;
}
}
@@ -174,15 +176,17 @@
{
if (NULL != ectx)
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- _("Cannot obtain information about user `%s': %s\n"),
- user, STRERROR (errno));
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_IMMEDIATE,
+ _("Cannot obtain information about user `%s': %s\n"),
+ user, STRERROR (errno));
return GNUNET_SYSERR;
}
if ((0 != chown (filename, pws->pw_uid, pws->pw_gid)) && (NULL != ectx))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_ADMIN |
GNUNET_GE_IMMEDIATE,
- "chown", filename);
+ GNUNET_GE_ERROR | GNUNET_GE_USER |
+ GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ "chown", filename);
#endif
return GNUNET_OK;
}
Modified: GNUnet/src/util/string/string.c
===================================================================
--- GNUnet/src/util/string/string.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/string/string.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -142,8 +142,9 @@
if (cd == (iconv_t) - 1)
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_WARNING |
GNUNET_GE_BULK,
- "iconv_open");
+ GNUNET_GE_USER | GNUNET_GE_ADMIN |
+ GNUNET_GE_WARNING | GNUNET_GE_BULK,
+ "iconv_open");
ret = GNUNET_malloc (len + 1);
memcpy (ret, input, len);
ret[len] = '\0';
@@ -155,7 +156,9 @@
finSize = tmpSize;
if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == (size_t) - 1)
{
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_USER | GNUNET_GE_WARNING |
GNUNET_GE_BULK, "iconv");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_USER | GNUNET_GE_WARNING |
+ GNUNET_GE_BULK, "iconv");
iconv_close (cd);
GNUNET_free (tmp);
ret = GNUNET_malloc (len + 1);
@@ -168,7 +171,9 @@
ret[tmpSize - finSize] = '\0';
GNUNET_free (tmp);
if (0 != iconv_close (cd))
- GNUNET_GE_LOG_STRERROR (ectx, GNUNET_GE_ADMIN | GNUNET_GE_WARNING |
GNUNET_GE_REQUEST, "iconv_close");
+ GNUNET_GE_LOG_STRERROR (ectx,
+ GNUNET_GE_ADMIN | GNUNET_GE_WARNING |
+ GNUNET_GE_REQUEST, "iconv_close");
return ret;
#else
ret = GNUNET_malloc (len + 1);
@@ -215,9 +220,10 @@
if (fm == NULL)
{
GNUNET_GE_LOG (ectx,
- GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_WARNING |
GNUNET_GE_IMMEDIATE,
- _
- ("Failed to expand `$HOME': environment variable `HOME' not
set"));
+ GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_WARNING
+ | GNUNET_GE_IMMEDIATE,
+ _
+ ("Failed to expand `$HOME': environment variable
`HOME' not set"));
return NULL;
}
fm = GNUNET_strdup (fm);
@@ -254,7 +260,8 @@
if (fm == NULL)
{
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_USER | GNUNET_GE_WARNING |
GNUNET_GE_IMMEDIATE, "getcwd");
+ GNUNET_GE_USER | GNUNET_GE_WARNING |
+ GNUNET_GE_IMMEDIATE, "getcwd");
buffer = getenv ("PWD"); /* alternative */
if (buffer != NULL)
fm = GNUNET_strdup (buffer);
@@ -274,8 +281,8 @@
{
SetErrnoFromWinError (lRet);
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_USER | GNUNET_GE_WARNING |
GNUNET_GE_IMMEDIATE,
- "plibc_conv_to_win_path");
+ GNUNET_GE_USER | GNUNET_GE_WARNING |
+ GNUNET_GE_IMMEDIATE, "plibc_conv_to_win_path");
return NULL;
}
/* is the path relative? */
@@ -287,8 +294,8 @@
{
SetErrnoFromWinError (ERROR_BUFFER_OVERFLOW);
GNUNET_GE_LOG_STRERROR (ectx,
- GNUNET_GE_USER | GNUNET_GE_WARNING |
GNUNET_GE_IMMEDIATE,
- "GetCurrentDirectory");
+ GNUNET_GE_USER | GNUNET_GE_WARNING |
+ GNUNET_GE_IMMEDIATE, "GetCurrentDirectory");
return NULL;
}
buffer = GNUNET_malloc (MAX_PATH + 1);
Modified: GNUnet/src/util/string/xmalloc.c
===================================================================
--- GNUnet/src/util/string/xmalloc.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/string/xmalloc.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -51,8 +51,8 @@
/* As a security precaution, we generally do not allow very large
allocations using the default 'GNUNET_malloc' macro */
GNUNET_GE_ASSERT_FLF (NULL,
- size <= GNUNET_MAX_GNUNET_malloc_CHECKED, filename,
- linenumber, function);
+ size <= GNUNET_MAX_GNUNET_malloc_CHECKED, filename,
+ linenumber, function);
return GNUNET_xmalloc_unchecked_ (size, filename, linenumber, function);
}
@@ -67,8 +67,9 @@
result = malloc (size);
if (result == NULL)
GNUNET_GE_DIE_STRERROR_FLF (NULL,
- GNUNET_GE_IMMEDIATE | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER | GNUNET_GE_FATAL,
- "malloc", filename, linenumber, function);
+ GNUNET_GE_IMMEDIATE | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER | GNUNET_GE_FATAL,
+ "malloc", filename, linenumber, function);
memset (result, 0, size); /* client code should not rely on this,
though... */
return result;
}
@@ -94,8 +95,9 @@
if (!ptr)
GNUNET_GE_DIE_STRERROR_FLF (NULL,
- GNUNET_GE_IMMEDIATE | GNUNET_GE_USER |
GNUNET_GE_DEVELOPER | GNUNET_GE_FATAL,
- "realloc", filename, linenumber, function);
+ GNUNET_GE_IMMEDIATE | GNUNET_GE_USER |
+ GNUNET_GE_DEVELOPER | GNUNET_GE_FATAL,
+ "realloc", filename, linenumber, function);
return ptr;
}
@@ -160,8 +162,8 @@
size_t size;
GNUNET_GE_ASSERT_FLF (NULL,
- INT_MAX / elementSize > newCount,
- filename, linenumber, function);
+ INT_MAX / elementSize > newCount,
+ filename, linenumber, function);
size = newCount * elementSize;
if (size == 0)
{
Modified: GNUnet/src/util/threads/mutex.c
===================================================================
--- GNUnet/src/util/threads/mutex.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/threads/mutex.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -85,28 +85,28 @@
{
#if LINUX
GNUNET_GE_ASSERT (NULL,
- 0 == pthread_mutexattr_setkind_np
- (&attr, PTHREAD_MUTEX_RECURSIVE_NP));
+ 0 == pthread_mutexattr_setkind_np
+ (&attr, PTHREAD_MUTEX_RECURSIVE_NP));
#elif SOMEBSD || GNUNET_freeBSD || GNUNET_freeBSD5
GNUNET_GE_ASSERT (NULL,
- 0 == pthread_mutexattr_setkind_np
- (&attr, PTHREAD_MUTEX_RECURSIVE));
+ 0 == pthread_mutexattr_setkind_np
+ (&attr, PTHREAD_MUTEX_RECURSIVE));
#elif SOLARIS || OSX || WINDOWS
GNUNET_GE_ASSERT (NULL,
- 0 == pthread_mutexattr_settype
- (&attr, PTHREAD_MUTEX_RECURSIVE));
+ 0 == pthread_mutexattr_settype
+ (&attr, PTHREAD_MUTEX_RECURSIVE));
#endif
}
else
{
#if LINUX
GNUNET_GE_ASSERT (NULL,
- 0 == pthread_mutexattr_setkind_np
- (&attr, PTHREAD_MUTEX_ERRORCHECK_NP));
+ 0 == pthread_mutexattr_setkind_np
+ (&attr, PTHREAD_MUTEX_ERRORCHECK_NP));
#else
GNUNET_GE_ASSERT (NULL,
- 0 == pthread_mutexattr_settype
- (&attr, PTHREAD_MUTEX_ERRORCHECK));
+ 0 == pthread_mutexattr_settype
+ (&attr, PTHREAD_MUTEX_ERRORCHECK));
#endif
}
mut = GNUNET_malloc (sizeof (Mutex));
@@ -141,20 +141,24 @@
if ((end - start > GNUNET_REALTIME_LIMIT) && (GNUNET_REALTIME_LIMIT != 0))
{
GNUNET_GE_LOG (NULL,
- GNUNET_GE_DEVELOPER | GNUNET_GE_WARNING | GNUNET_GE_IMMEDIATE,
- _("Real-time delay violation (%llu ms) at %s:%u\n"),
- end - start, file, line);
+ GNUNET_GE_DEVELOPER | GNUNET_GE_WARNING |
+ GNUNET_GE_IMMEDIATE,
+ _("Real-time delay violation (%llu ms) at %s:%u\n"),
+ end - start, file, line);
}
if (ret != 0)
{
if (ret == EINVAL)
GNUNET_GE_LOG (NULL,
- GNUNET_GE_FATAL | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- _("Invalid argument for `%s'.\n"), "pthread_mutex_lock");
+ GNUNET_GE_FATAL | GNUNET_GE_DEVELOPER | GNUNET_GE_USER
+ | GNUNET_GE_IMMEDIATE,
+ _("Invalid argument for `%s'.\n"),
+ "pthread_mutex_lock");
if (ret == EDEADLK)
GNUNET_GE_LOG (NULL,
- GNUNET_GE_FATAL | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- _("Deadlock due to `%s'.\n"), "pthread_mutex_lock");
+ GNUNET_GE_FATAL | GNUNET_GE_DEVELOPER | GNUNET_GE_USER
+ | GNUNET_GE_IMMEDIATE, _("Deadlock due to `%s'.\n"),
+ "pthread_mutex_lock");
GNUNET_GE_ASSERT (NULL, 0);
}
if (mutex->locked_depth++ == 0)
@@ -178,10 +182,11 @@
if ((now - mutex->locked_time > GNUNET_REALTIME_LIMIT) &&
(GNUNET_REALTIME_LIMIT != 0))
GNUNET_GE_LOG (NULL,
- GNUNET_GE_DEVELOPER | GNUNET_GE_WARNING | GNUNET_GE_IMMEDIATE,
- _("Lock aquired for too long (%llu ms) at %s:%u\n"),
- now - mutex->locked_time,
- mutex->locked_file, mutex->locked_line);
+ GNUNET_GE_DEVELOPER | GNUNET_GE_WARNING |
+ GNUNET_GE_IMMEDIATE,
+ _("Lock aquired for too long (%llu ms) at %s:%u\n"),
+ now - mutex->locked_time, mutex->locked_file,
+ mutex->locked_line);
mutex->locked_file = NULL;
mutex->locked_line = 0;
mutex->locked_time = 0;
@@ -191,12 +196,16 @@
{
if (ret == EINVAL)
GNUNET_GE_LOG (NULL,
- GNUNET_GE_FATAL | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- _("Invalid argument for `%s'.\n"), "pthread_mutex_lock");
+ GNUNET_GE_FATAL | GNUNET_GE_DEVELOPER | GNUNET_GE_USER
+ | GNUNET_GE_IMMEDIATE,
+ _("Invalid argument for `%s'.\n"),
+ "pthread_mutex_lock");
if (ret == EPERM)
GNUNET_GE_LOG (NULL,
- GNUNET_GE_FATAL | GNUNET_GE_DEVELOPER | GNUNET_GE_USER |
GNUNET_GE_IMMEDIATE,
- _("Permission denied for `%s'.\n"), "pthread_mutex_unlock");
+ GNUNET_GE_FATAL | GNUNET_GE_DEVELOPER | GNUNET_GE_USER
+ | GNUNET_GE_IMMEDIATE,
+ _("Permission denied for `%s'.\n"),
+ "pthread_mutex_unlock");
GNUNET_GE_ASSERT (NULL, 0);
}
}
Modified: GNUnet/src/util/threads/pthread.c
===================================================================
--- GNUnet/src/util/threads/pthread.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/threads/pthread.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -152,9 +152,10 @@
if ((end - start > GNUNET_REALTIME_LIMIT) && (GNUNET_REALTIME_LIMIT != 0))
{
GNUNET_GE_LOG (NULL,
- GNUNET_GE_DEVELOPER | GNUNET_GE_WARNING | GNUNET_GE_IMMEDIATE,
- _("Real-time delay violation (%llu ms) at %s:%u\n"),
- end - start, file, line);
+ GNUNET_GE_DEVELOPER | GNUNET_GE_WARNING |
+ GNUNET_GE_IMMEDIATE,
+ _("Real-time delay violation (%llu ms) at %s:%u\n"),
+ end - start, file, line);
}
GNUNET_free (handle);
switch (k)
@@ -163,25 +164,29 @@
return;
case ESRCH:
GNUNET_GE_LOG (NULL,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_IMMEDIATE,
- _("`%s' failed with error code %s: %s\n"),
- "pthread_join", "ESRCH", STRERROR (errno));
+ GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE,
+ _("`%s' failed with error code %s: %s\n"),
+ "pthread_join", "ESRCH", STRERROR (errno));
break;
case EINVAL:
GNUNET_GE_LOG (NULL,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_IMMEDIATE,
- _("`%s' failed with error code %s: %s\n"),
- "pthread_join", "EINVAL", STRERROR (errno));
+ GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE,
+ _("`%s' failed with error code %s: %s\n"),
+ "pthread_join", "EINVAL", STRERROR (errno));
case EDEADLK:
GNUNET_GE_LOG (NULL,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_IMMEDIATE,
- _("`%s' failed with error code %s: %s\n"),
- "pthread_join", "EDEADLK", STRERROR (errno));
+ GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE,
+ _("`%s' failed with error code %s: %s\n"),
+ "pthread_join", "EDEADLK", STRERROR (errno));
default:
GNUNET_GE_LOG (NULL,
- GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_IMMEDIATE,
- _("`%s' failed with error code %d: %s\n"),
- "pthread_join", k, STRERROR (errno));
+ GNUNET_GE_FATAL | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_IMMEDIATE,
+ _("`%s' failed with error code %d: %s\n"),
+ "pthread_join", k, STRERROR (errno));
}
GNUNET_GE_ASSERT (NULL, 0);
}
@@ -226,7 +231,9 @@
rem.tv_sec = 0;
rem.tv_nsec = 0;
if ((0 != nanosleep (&req, &rem)) && (errno != EINTR))
- GNUNET_GE_LOG_STRERROR (NULL, GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "nanosleep");
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "nanosleep");
#elif WINDOWS
SleepEx (delay, TRUE);
@@ -237,7 +244,9 @@
= (delay - timeout.tv_sec * CRON_UNIT_TO_SECONDS) * MICROSEC_TO_CRON_UNIT;
ret = SELECT (0, NULL, NULL, NULL, &timeout);
if ((ret == -1) && (errno != EINTR))
- GNUNET_GE_LOG_STRERROR (NULL, GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "select");
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_WARNING | GNUNET_GE_USER |
+ GNUNET_GE_BULK, "select");
#endif
}
@@ -262,18 +271,20 @@
break; /* ok */
case EINVAL:
GNUNET_GE_LOG (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- _("`%s' failed with error code %s: %s\n"),
- "pthread_kill", "EINVAL", STRERROR (ret));
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ _("`%s' failed with error code %s: %s\n"),
+ "pthread_kill", "EINVAL", STRERROR (ret));
break;
case ESRCH:
/* ignore, thread might have already exited by chance */
break;
default:
GNUNET_GE_LOG (NULL,
- GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
GNUNET_GE_BULK,
- _("`%s' failed with error code %d: %s\n"),
- "pthread_kill", ret, STRERROR (ret));
+ GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_DEVELOPER |
+ GNUNET_GE_BULK,
+ _("`%s' failed with error code %d: %s\n"),
+ "pthread_kill", ret, STRERROR (ret));
break;
}
}
@@ -296,7 +307,9 @@
sig.sa_flags = SA_NODEFER;
sig.sa_handler = &sigalrmHandler;
if (0 != sigaction (SIGALRM, &sig, &old))
- GNUNET_GE_LOG_STRERROR (NULL, GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "sigaction");
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "sigaction");
#else
InitWinEnv (NULL);
#endif
@@ -306,7 +319,9 @@
{
#ifndef MINGW
if (0 != sigaction (SIGALRM, &old, &sig))
- GNUNET_GE_LOG_STRERROR (NULL, GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
GNUNET_GE_BULK, "sigaction");
+ GNUNET_GE_LOG_STRERROR (NULL,
+ GNUNET_GE_WARNING | GNUNET_GE_ADMIN |
+ GNUNET_GE_BULK, "sigaction");
#else
ShutdownWinEnv ();
#endif
Modified: GNUnet/src/util/threads/semaphore.c
===================================================================
--- GNUnet/src/util/threads/semaphore.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/threads/semaphore.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -102,12 +102,12 @@
pthread_mutexattr_init (&attr);
#if LINUX
GNUNET_GE_ASSERT (NULL,
- 0 == pthread_mutexattr_setkind_np
- (&attr, PTHREAD_MUTEX_ERRORCHECK_NP));
+ 0 == pthread_mutexattr_setkind_np
+ (&attr, PTHREAD_MUTEX_ERRORCHECK_NP));
#else
GNUNET_GE_ASSERT (NULL,
- 0 == pthread_mutexattr_settype
- (&attr, PTHREAD_MUTEX_ERRORCHECK));
+ 0 == pthread_mutexattr_settype
+ (&attr, PTHREAD_MUTEX_ERRORCHECK));
#endif
s = GNUNET_malloc (sizeof (Semaphore));
s->v = value;
@@ -163,9 +163,10 @@
(end - start > GNUNET_REALTIME_LIMIT) && (GNUNET_REALTIME_LIMIT != 0))
{
GNUNET_GE_LOG (NULL,
- GNUNET_GE_DEVELOPER | GNUNET_GE_WARNING | GNUNET_GE_IMMEDIATE,
- _("Real-time delay violation (%llu ms) at %s:%u\n"),
- end - start, file, line);
+ GNUNET_GE_DEVELOPER | GNUNET_GE_WARNING |
+ GNUNET_GE_IMMEDIATE,
+ _("Real-time delay violation (%llu ms) at %s:%u\n"),
+ end - start, file, line);
}
return ret;
}
Modified: GNUnet/src/util/win/winproc.c
===================================================================
--- GNUnet/src/util/win/winproc.c 2007-11-25 12:06:33 UTC (rev 5760)
+++ GNUnet/src/util/win/winproc.c 2007-11-25 12:07:29 UTC (rev 5761)
@@ -77,9 +77,10 @@
fprintf (stderr, "%s", msg);
else
GNUNET_GE_LOG (pEctx,
- ((err ==
- INT_MAX) ? GNUNET_GE_DEBUG : GNUNET_GE_FATAL) | GNUNET_GE_USER |
GNUNET_GE_ADMIN |
- GNUNET_GE_IMMEDIATE, "%s", msg);
+ ((err ==
+ INT_MAX) ? GNUNET_GE_DEBUG : GNUNET_GE_FATAL) |
+ GNUNET_GE_USER | GNUNET_GE_ADMIN | GNUNET_GE_IMMEDIATE,
+ "%s", msg);
}
/**
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r5761 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/chat applications/datastore applications/dht/module applications/dht/tools applications/dstore applications/fragmentation applications/fs applications/fs/collection applications/fs/ecrs applications/fs/fsui applications/fs/lib applications/fs/module applications/fs/namespace applications/fs/tools applications/fs/uritrack applications/gap applications/getoption applications/identity applications/kvstore_sqlite applications/pingpong applications/rpc applications/session applications/sqstore_mysql applications/sqstore_sqlite applications/state applications/stats applications/tbench applications/template applications/testbed applications/testing applications/topology_default applications/topology_f2f applications/tracekit applications/traffic applications/transport applications/vpn include server setup setup/gtk setup/lib setup/ncurses setup/text transports transports/upnp util/boot util/config util/config_impl util/containers util/cron util/crypto util/disk util/error util/getopt util/loggers util/network util/network_client util/os util/string util/threads util/win,
gnunet <=