From: Nathan S. Evans Date: Thu, 11 Mar 2010 12:45:52 +0000 (+0000) Subject: dv config files and fixes X-Git-Tag: initial-import-from-subversion-38251~22514 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9c923d1ef6752f40535124439fed299ee4150795;p=oweals%2Fgnunet.git dv config files and fixes --- diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am index 755f89d59..9b5761f32 100644 --- a/src/dv/Makefile.am +++ b/src/dv/Makefile.am @@ -47,20 +47,20 @@ libgnunet_plugin_transport_dv_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) -#check_PROGRAMS = \ -# test_statistics_api - +check_PROGRAMS = \ + test_transport_api_dv + TESTS = $(check_PROGRAMS) $(check_SCRIPTS) -#test_statistics_api_SOURCES = \ -# test_statistics_api.c -#test_statistics_api_LDADD = \ -# $(top_builddir)/src/statistics/libgnunetstatistics.la \ -# $(top_builddir)/src/util/libgnunetutil.la +test_transport_api_dv_SOURCES = \ + test_transport_api_dv.c +test_transport_api_dv_LDADD = \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/util/libgnunetutil.la -#EXTRA_DIST = \ -# test_statistics_api_data.conf +EXTRA_DIST = \ + test_transport_api_dv_peer1.conf \ + test_transport_api_dv_peer2.conf \ + test_transport_api_dv_peer3.conf -#check_SCRIPTS = \ -# test_gnunet_statistics.sh diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 92f5c96aa..3c483746e 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c @@ -41,13 +41,33 @@ /** * DV Service Context stuff goes here... */ + +/** + * Handle to the core service api. + */ static struct GNUNET_CORE_Handle *coreAPI; +/** + * The identity of our peer. + */ static struct GNUNET_PeerIdentity *my_identity; +/** + * The configuration for this service. + */ const struct GNUNET_CONFIGURATION_Handle *cfg; -struct GNUNET_SCHEDULER_Handle *sched; +/** + * The scheduler for this service. + */ +static struct GNUNET_SCHEDULER_Handle *sched; + +/** + * The client, should be the DV plugin connected to us. Hopefully + * this client will never change, although if the plugin dies + * and returns for some reason it may happen. + */ +static struct GNUNET_SERVER_Client * client_handle; GNUNET_SCHEDULER_TaskIdentifier cleanup_task; @@ -61,17 +81,20 @@ GNUNET_SCHEDULER_TaskIdentifier cleanup_task; * @param client identification of the client * @param message the actual message */ -void handle_dv_data_message (void *cls, - struct GNUNET_SERVER_Client * - client, +static void handle_dv_data_message (void *cls, + struct GNUNET_PeerIdentity * + peer, const struct GNUNET_MessageHeader * - message) + message, + struct GNUNET_TIME_Relative latency, + uint32_t distance) { #if DEBUG_DV GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s: Receives %s message!\n", "dv", "DV DATA"); #endif + } /** @@ -85,16 +108,17 @@ void handle_dv_data_message (void *cls, * @param client identification of the client * @param message the actual message */ -void handle_dv_gossip_message (void *cls, - struct GNUNET_SERVER_Client * - client, - const struct GNUNET_MessageHeader * - message) +static void handle_dv_gossip_message (void *cls, + struct GNUNET_PeerIdentity * peer, + const struct GNUNET_MessageHeader * message, + struct GNUNET_TIME_Relative latency, + uint32_t distance) { #if DEBUG_DV GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s: Receives %s message!\n", "dv", "DV GOSSIP"); #endif + } @@ -114,6 +138,21 @@ void send_dv_message (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s: Receives %s message!\n", "dv", "SEND"); #endif + if (client_handle == NULL) + { + client_handle = client; +#if DEBUG_DV + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%s: Setting initial client handle!\n", "dv"); +#endif + } + else if (client_handle != client) + { + client_handle = client; + /* What should we do in this case, assert fail or just log the warning? */ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "%s: Setting client handle (was a different client!)!\n", "dv"); + } } /** @@ -126,10 +165,10 @@ void send_dv_message (void *cls, * transport) and then our server should be getting messages * from the dv_plugin, right? */ -static struct GNUNET_SERVER_MessageHandler core_handlers[] = { - {&handle_dv_data_message, NULL, GNUNET_MESSAGE_TYPE_DV_DATA, 0}, - {&handle_dv_gossip_message, NULL, GNUNET_MESSAGE_TYPE_DV_GOSSIP, 0}, - {NULL, NULL, 0, 0} +static struct GNUNET_CORE_MessageHandler core_handlers[] = { + {&handle_dv_data_message, GNUNET_MESSAGE_TYPE_DV_DATA, 0}, + {&handle_dv_gossip_message, GNUNET_MESSAGE_TYPE_DV_GOSSIP, 0}, + {NULL, 0, 0} }; static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = { @@ -165,10 +204,11 @@ void core_init (void *cls, { GNUNET_SCHEDULER_cancel(sched, cleanup_task); GNUNET_SCHEDULER_add_now(sched, &shutdown_task, NULL); + return; } #if DEBUG_DV GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s: Core initialized, I am peer: %s\n", "dv", GNUNET_i2s(my_identity)); + "%s: Core connection initialized, I am peer: %s\n", "dv", GNUNET_i2s(my_identity)); #endif coreAPI = server; } @@ -202,13 +242,11 @@ void handle_core_connect (void *cls, * @param distance reported distance (DV) to 'other' */ void handle_core_disconnect (void *cls, - const struct GNUNET_PeerIdentity * peer, - struct GNUNET_TIME_Relative latency, - uint32_t distance) + const struct GNUNET_PeerIdentity * peer) { #if DEBUG_DV GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%s: Receives core disconnect message!\n", "dv"); + "%s: Receives core peer disconnect message!\n", "dv"); #endif } @@ -228,6 +266,8 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *c) { struct GNUNET_TIME_Relative timeout; + + timeout = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5); sched = scheduler; cfg = c; GNUNET_SERVER_add_handlers (server, plugin_handlers); @@ -241,9 +281,9 @@ run (void *cls, &handle_core_connect, &handle_core_disconnect, NULL, + GNUNET_NO, NULL, - NULL, - NULL, + GNUNET_NO, core_handlers); if (coreAPI == NULL) diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c index aa25c97e6..2c9881d30 100644 --- a/src/dv/plugin_transport_dv.c +++ b/src/dv/plugin_transport_dv.c @@ -146,12 +146,12 @@ struct Plugin /** * Our server. */ - struct GNUNET_SERVER_Handle *server; + //struct GNUNET_SERVER_Handle *server; /* * Handle to the running service. */ - struct GNUNET_SERVICE_Context *service; + //struct GNUNET_SERVICE_Context *service; /** * Copy of the handler array where the closures are @@ -268,7 +268,7 @@ dv_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *target) { // struct Plugin *plugin = cls; - // FIXME + // TODO: Add message type to send to dv service to "disconnect" a peer } @@ -288,13 +288,13 @@ dv_plugin_disconnect (void *cls, */ static void dv_plugin_address_pretty_printer (void *cls, - const char *type, - const void *addr, - size_t addrlen, - int numeric, - struct GNUNET_TIME_Relative timeout, - GNUNET_TRANSPORT_AddressStringCallback - asc, void *asc_cls) + const char *type, + const void *addr, + size_t addrlen, + int numeric, + struct GNUNET_TIME_Relative timeout, + GNUNET_TRANSPORT_AddressStringCallback + asc, void *asc_cls) { asc (asc_cls, NULL); } @@ -323,7 +323,7 @@ dv_plugin_address_suggested (void *cls, /* check if the address is plausible; if so, add it to our list! */ - return GNUNET_OK; + return GNUNET_NO; } @@ -331,14 +331,17 @@ dv_plugin_address_suggested (void *cls, * Entry point for the plugin. */ void * -gnunet_plugin_transport_dv_init (void *cls) +libgnunet_plugin_transport_dv_init (void *cls) { struct GNUNET_TRANSPORT_PluginEnvironment *env = cls; struct GNUNET_TRANSPORT_PluginFunctions *api; struct Plugin *plugin; - unsigned long long port; struct GNUNET_SERVICE_Context *service; + /** + * Do we not even need a service for this thing? That's peculiar. + */ + /* service = GNUNET_SERVICE_start ("transport-dv", env->sched, env->cfg); if (service == NULL) { @@ -349,7 +352,13 @@ gnunet_plugin_transport_dv_init (void *cls) "dv"); return NULL; } - + */ + /** + * I don't think we need a port, the only way we get stuff is being directly + * called by service transport or by responses from the dv-service via our + * client handle + */ + /* if ((GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-dv", @@ -364,15 +373,22 @@ gnunet_plugin_transport_dv_init (void *cls) GNUNET_SERVICE_stop (service); return NULL; } + */ plugin = GNUNET_malloc (sizeof (struct Plugin)); plugin->env = env; plugin->statistics = NULL; - plugin->service = service; - plugin->server = GNUNET_SERVICE_get_server (service); + //plugin->service = service; + //plugin->server = GNUNET_SERVICE_get_server (service); plugin->dv_handle = GNUNET_DV_connect(env->sched, env->cfg, &handle_dv_message_received, plugin); + if (plugin->dv_handle == NULL) + { + GNUNET_free(plugin); + return NULL; + } + api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions)); api->cls = plugin; api->send = &dv_plugin_send; @@ -387,7 +403,7 @@ gnunet_plugin_transport_dv_init (void *cls) * Exit point from the plugin. */ void * -gnunet_plugin_transport_dv_done (void *cls) +libgnunet_plugin_transport_dv_done (void *cls) { struct GNUNET_TRANSPORT_PluginFunctions *api = cls; struct Plugin *plugin = api->cls; diff --git a/src/dv/test_transport_api_data.conf b/src/dv/test_transport_api_data.conf new file mode 100644 index 000000000..0a5c8f02e --- /dev/null +++ b/src/dv/test_transport_api_data.conf @@ -0,0 +1,133 @@ +[PATHS] +SERVICEHOME = /tmp/test-transport-api/ +DEFAULTCONFIG = test_transport_api_data.conf + +[transport-udp] +PORT = 2094 + +[fs] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-fs +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2094 +INDEXDB = $SERVICEHOME/idxinfo.lst + +[datastore-sqlite] +FILENAME = $SERVICEHOME/datastore/sqlite.db + +[datastore] +DATABASE = sqlite +BLOOMFILTER = $SERVICEHOME/fs/bloomfilter +QUOTA = 100000000 +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-datastore +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2093 + +[hostlist] +HTTP-PROXY = +SERVERS = http://gnunet.org:8080/ +OPTIONS = -b +BINARY = gnunet-daemon-hostlist +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +HTTPPORT = 8080 + +[topology] +BINARY = gnunet-daemon-topology +CONFIG = $DEFAULTCONFIG +FRIENDS = $SERVICEHOME/friends +TARGET-CONNECTION-COUNT = 16 +AUTOCONNECT = YES +FRIENDS-ONLY = NO +MINIMUM-FRIENDS = 0 + +[core] +TOTAL_QUOTA_OUT = 3932160 +TOTAL_QUOTA_IN = 3932160 +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-core +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2092 + +[transport] +plugins = udp +DEBUG = NO +PREFIX = +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +NEIGHBOUR_LIMIT = 50 +BINARY = gnunet-service-transport +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2091 + +[peerinfo] +TRUST = $SERVICEHOME/data/credit/ +HOSTS = $SERVICEHOME/data/hosts/ +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-peerinfo +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2090 + +[resolver] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-resolver +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2089 + +[statistics] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-statistics +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2088 + +[arm] +DEFAULTSERVICES = resolver transport core +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-arm +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2087 + +[transport-tcp] +ALLOW_SHUTDOWN = NO +TIMEOUT = 300000 +PORT = 2094 + +[TESTING] +WEAKRANDOM = NO + +[gnunetd] +HOSTKEY = $SERVICEHOME/.hostkey + diff --git a/src/dv/test_transport_api_dv_peer1.conf b/src/dv/test_transport_api_dv_peer1.conf new file mode 100644 index 000000000..25dc1fa34 --- /dev/null +++ b/src/dv/test_transport_api_dv_peer1.conf @@ -0,0 +1,144 @@ +[fs] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-fs +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2094 +INDEXDB = $SERVICEHOME/idxinfo.lst + +[datastore-sqlite] +FILENAME = $SERVICEHOME/datastore/sqlite.db + +[datastore] +DATABASE = sqlite +BLOOMFILTER = $SERVICEHOME/fs/bloomfilter +QUOTA = 100000000 +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-datastore +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2093 + +[hostlist] +HTTP-PROXY = +SERVERS = http://gnunet.org:8080/ +OPTIONS = -b +BINARY = gnunet-daemon-hostlist +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +HTTPPORT = 8080 + +[topology] +BINARY = gnunet-daemon-topology +CONFIG = $DEFAULTCONFIG +FRIENDS = $SERVICEHOME/friends +TARGET-CONNECTION-COUNT = 16 +AUTOCONNECT = YES +FRIENDS-ONLY = NO +MINIMUM-FRIENDS = 0 + +[transport] +PLUGINS = tcp dv +DEBUG = YES +#PREFIX = xterm -T transport2 -e gdb --command=cmd --args +#PREFIX = valgrind --leak-check=full +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +NEIGHBOUR_LIMIT = 50 +BINARY = gnunet-service-transport +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 12365 + +[peerinfo] +TRUST = $SERVICEHOME/data/credit/ +HOSTS = $SERVICEHOME/data/hosts/ +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-peerinfo +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 12369 + +[resolver] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-resolver +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 12364 + +[statistics] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-statistics +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 12367 + +[dv] +DEBUG = YES +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-dv +#BINARY = /root/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv +#PREFIX = xterm -T dvservice -e gdb --args +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 12370 + +[core] +TOTAL_QUOTA_OUT = 3932160 +TOTAL_QUOTA_IN = 3932160 +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-core +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 12092 + +[arm] +DEFAULTSERVICES = core dv +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-arm +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 12366 + +[transport-tcp] +ALLOW_SHUTDOWN = NO +TIMEOUT = 300000 +PORT = 12368 + +[TESTING] +WEAKRANDOM = YES + +[gnunetd] +HOSTKEY = $SERVICEHOME/.hostkey + +[PATHS] +DEFAULTCONFIG = test_transport_api_dv_peer1.conf +SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ + diff --git a/src/dv/test_transport_api_dv_peer2.conf b/src/dv/test_transport_api_dv_peer2.conf new file mode 100644 index 000000000..03670607f --- /dev/null +++ b/src/dv/test_transport_api_dv_peer2.conf @@ -0,0 +1,142 @@ +[fs] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-fs +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2094 +INDEXDB = $SERVICEHOME/idxinfo.lst + +[datastore-sqlite] +FILENAME = $SERVICEHOME/datastore/sqlite.db + +[core] +TOTAL_QUOTA_OUT = 3932160 +TOTAL_QUOTA_IN = 3932160 +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-core +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 22092 + +[datastore] +DATABASE = sqlite +BLOOMFILTER = $SERVICEHOME/fs/bloomfilter +QUOTA = 100000000 +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-datastore +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2093 + +[hostlist] +HTTP-PROXY = +SERVERS = http://gnunet.org:8080/ +OPTIONS = -b +BINARY = gnunet-daemon-hostlist +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +HTTPPORT = 8080 + +[topology] +BINARY = gnunet-daemon-topology +CONFIG = $DEFAULTCONFIG +FRIENDS = $SERVICEHOME/friends +TARGET-CONNECTION-COUNT = 16 +AUTOCONNECT = YES +FRIENDS-ONLY = NO +MINIMUM-FRIENDS = 0 + +[transport] +PLUGINS = tcp dv +DEBUG = YES +# PREFIX = +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +NEIGHBOUR_LIMIT = 50 +BINARY = gnunet-service-transport +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 22365 +#PREFIX = xterm -T transport1 -e gdb --command=cmd --args +#PREFIX = valgrind --leak-check=full + +[peerinfo] +TRUST = $SERVICEHOME/data/credit/ +HOSTS = $SERVICEHOME/data/hosts/ +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-peerinfo +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 22369 + +[resolver] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-resolver +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 22364 + +[statistics] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-statistics +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 22367 + +[dv] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-dv +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 22370 + +[arm] +DEFAULTSERVICES = core dv +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-arm +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 22366 + +[transport-tcp] +ALLOW_SHUTDOWN = NO +TIMEOUT = 300000 +PORT = 22368 + +[TESTING] +WEAKRANDOM = YES + +[gnunetd] +HOSTKEY = $SERVICEHOME/.hostkey + +[PATHS] +DEFAULTCONFIG = test_transport_api_dv_peer2.conf +SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ + diff --git a/src/dv/test_transport_api_dv_peer3.conf b/src/dv/test_transport_api_dv_peer3.conf new file mode 100644 index 000000000..eff16f039 --- /dev/null +++ b/src/dv/test_transport_api_dv_peer3.conf @@ -0,0 +1,142 @@ +[fs] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-fs +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2094 +INDEXDB = $SERVICEHOME/idxinfo.lst + +[datastore-sqlite] +FILENAME = $SERVICEHOME/datastore/sqlite.db + +[datastore] +DATABASE = sqlite +BLOOMFILTER = $SERVICEHOME/fs/bloomfilter +QUOTA = 100000000 +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-datastore +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 2093 + +[hostlist] +HTTP-PROXY = +SERVERS = http://gnunet.org:8080/ +OPTIONS = -b +BINARY = gnunet-daemon-hostlist +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +HTTPPORT = 8080 + +[topology] +BINARY = gnunet-daemon-topology +CONFIG = $DEFAULTCONFIG +FRIENDS = $SERVICEHOME/friends +TARGET-CONNECTION-COUNT = 16 +AUTOCONNECT = YES +FRIENDS-ONLY = NO +MINIMUM-FRIENDS = 0 + +[transport] +PLUGINS = tcp dv +#DEBUG = YES +# PREFIX = +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +NEIGHBOUR_LIMIT = 50 +BINARY = gnunet-service-transport +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 32365 +#PREFIX = xterm -T transport1 -e gdb --command=cmd --args +#PREFIX = valgrind --leak-check=full + +[peerinfo] +TRUST = $SERVICEHOME/data/credit/ +HOSTS = $SERVICEHOME/data/hosts/ +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-peerinfo +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 32369 + +[resolver] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-resolver +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 32364 + +[core] +TOTAL_QUOTA_OUT = 3932160 +TOTAL_QUOTA_IN = 3932160 +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-core +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 32092 + +[statistics] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-statistics +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 32367 + +[dv] +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-dv +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 32370 + +[arm] +DEFAULTSERVICES = core dv +ALLOW_SHUTDOWN = YES +ACCEPT_FROM6 = ::1; +ACCEPT_FROM = 127.0.0.1; +BINARY = gnunet-service-arm +CONFIG = $DEFAULTCONFIG +HOME = $SERVICEHOME +HOSTNAME = localhost +PORT = 32366 + +[transport-tcp] +ALLOW_SHUTDOWN = NO +TIMEOUT = 300000 +PORT = 32368 + +[TESTING] +WEAKRANDOM = YES + +[gnunetd] +HOSTKEY = $SERVICEHOME/.hostkey + +[PATHS] +DEFAULTCONFIG = test_transport_api_dv_peer3.conf +SERVICEHOME = /tmp/test-gnunetd-transport-peer-3/ +