X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Ftest_transport_api.c;h=eb64b0f398130a8846a6b17d644ba607843ef6c2;hb=aa390e34b0b9e793e1c9f82a606ad0c10fcc84ca;hp=853ce9aa5c5b14c89c3334f772f108b2f1ae7a62;hpb=33cbde487152c775a38628ae7b12e8f5e8040a52;p=oweals%2Fgnunet.git diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index 853ce9aa5..eb64b0f39 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c @@ -46,7 +46,7 @@ /** * How long until we give up on transmitting the message? */ -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300) +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120) /** * How long until we give up on transmitting the message? @@ -55,39 +55,29 @@ #define MTYPE 12345 -static struct PeerContext p1; +static char *test_source; -static struct PeerContext p2; +static char *test_plugin; -static int ok; - -static int is_tcp; - -static int is_tcp_nat; - -static int is_udp; - -static int is_unix; +static char *test_name; -static int is_udp_nat; +static int ok; -static int is_http; +static GNUNET_SCHEDULER_TaskIdentifier die_task; -static int is_https; +static GNUNET_SCHEDULER_TaskIdentifier send_task; -static int is_multi_protocol; +struct PeerContext *p1; -static int is_wlan; +struct PeerContext *p2; -static GNUNET_SCHEDULER_TaskIdentifier die_task; +static GNUNET_TRANSPORT_TESTING_ConnectRequest cc; -static GNUNET_SCHEDULER_TaskIdentifier tct; +struct GNUNET_TRANSPORT_TransmitHandle *th; -static char * key_file_p1; -static char * cert_file_p1; +char *cfg_file_p1; -static char * key_file_p2; -static char * cert_file_p2; +char *cfg_file_p2; #if VERBOSE #define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) @@ -99,65 +89,73 @@ static char * cert_file_p2; static void end () { - GNUNET_assert (ok == 6); - GNUNET_SCHEDULER_cancel (die_task); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Disconnecting from transports!\n"); - GNUNET_TRANSPORT_disconnect (p1.th); - GNUNET_TRANSPORT_disconnect (p2.th); - die_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transports disconnected, returning success!\n"); - ok = 0; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); + + if (send_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (send_task); + + if (die_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (die_task); + + if (th != NULL) + GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); + th = NULL; + + GNUNET_TRANSPORT_TESTING_stop_peer (p1); + GNUNET_TRANSPORT_TESTING_stop_peer (p2); } static void -stop_arm (struct PeerContext *p) +end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { -#if START_ARM - if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - GNUNET_OS_process_wait (p->arm_proc); - GNUNET_OS_process_close (p->arm_proc); - p->arm_proc = NULL; -#endif - GNUNET_CONFIGURATION_destroy (p->cfg); -} + die_task = GNUNET_SCHEDULER_NO_TASK; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); -static void -end_badly () -{ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n"); - GNUNET_break (0); - GNUNET_TRANSPORT_disconnect (p1.th); - GNUNET_TRANSPORT_disconnect (p2.th); - if (GNUNET_SCHEDULER_NO_TASK != tct) - { - GNUNET_SCHEDULER_cancel (tct); - tct = GNUNET_SCHEDULER_NO_TASK; - } - ok = 1; + if (send_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (send_task); + + if (cc != NULL) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Fail! Could not connect peers\n")); + GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc); + } + + if (th != NULL) + GNUNET_TRANSPORT_notify_transmit_ready_cancel (th); + th = NULL; + + if (p1 != NULL) + GNUNET_TRANSPORT_TESTING_stop_peer (p1); + if (p2 != NULL) + GNUNET_TRANSPORT_TESTING_stop_peer (p2); + + ok = GNUNET_SYSERR; } static void -notify_receive (void *cls, - const struct GNUNET_PeerIdentity *peer, +notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_MessageHeader *message, const struct GNUNET_TRANSPORT_ATS_Information *ats, uint32_t ats_count) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received message of type %d from peer %s!\n", - ntohs(message->type), - GNUNET_i2s (peer)); - GNUNET_assert (ok == 5); - OKPP; - GNUNET_assert (MTYPE == ntohs (message->type)); - GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == - ntohs (message->size)); - end (); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received message of type %d from peer %s!\n", + ntohs (message->type), GNUNET_i2s (peer)); + + if ((MTYPE == ntohs (message->type)) && + (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size))) + { + ok = 0; + end (); + } + else + { + GNUNET_break (0); + ok = 1; + end (); + } } @@ -167,13 +165,24 @@ notify_ready (void *cls, size_t size, void *buf) struct PeerContext *p = cls; struct GNUNET_MessageHeader *hdr; + th = NULL; + + if (buf == NULL) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Timeout occurred while waiting for transmit_ready\n"); + if (GNUNET_SCHEDULER_NO_TASK != die_task) + GNUNET_SCHEDULER_cancel (die_task); + die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); + ok = 42; + return 0; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transmitting message with %u bytes to peer %s\n", - sizeof (struct GNUNET_MessageHeader), - GNUNET_i2s (&p->id)); + "Transmitting message with %u bytes to peer %s\n", + sizeof (struct GNUNET_MessageHeader), GNUNET_i2s (&p->id)); GNUNET_assert (size >= 256); - GNUNET_assert (ok == 4); - OKPP; + if (buf != NULL) { hdr = buf; @@ -185,263 +194,77 @@ notify_ready (void *cls, size_t size, void *buf) static void -exchange_hello_last (void *cls, - const struct GNUNET_MessageHeader *message) +notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_TRANSPORT_ATS_Information *ats, + uint32_t ats_count) { - struct PeerContext *me = cls; - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Exchanging HELLO of size %d with peer (%s)!\n", - (int) GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message), - GNUNET_i2s (&me->id)); - GNUNET_assert (message != NULL); - GNUNET_assert (GNUNET_OK == - GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) - message, &me->id)); - GNUNET_TRANSPORT_offer_hello (p1.th, message, NULL, NULL); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' connected to us (%p)!\n", + GNUNET_i2s (peer), cls); } - static void -exchange_hello (void *cls, - const struct GNUNET_MessageHeader *message) +notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) { - struct PeerContext *me = cls; - - GNUNET_assert (message != NULL); - GNUNET_assert (GNUNET_OK == - GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) - message, &me->id)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Exchanging HELLO of size %d from peer %s!\n", - (int) GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message), - GNUNET_i2s (&me->id)); - GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' disconnected (%p)!\n", + GNUNET_i2s (peer), cls); } - - static void -notify_connect (void *cls, - const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_TRANSPORT_ATS_Information *ats, - uint32_t ats_count) +sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer `%4s' connected to us (%p)!\n", - GNUNET_i2s (peer), - cls); - if (cls == &p1) - { - GNUNET_assert (ok >= 2); - OKPP; - OKPP; - GNUNET_SCHEDULER_cancel (die_task); - GNUNET_SCHEDULER_cancel (tct); - tct = GNUNET_SCHEDULER_NO_TASK; - GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, &p2); - GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, &p1); - die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT_TRANSMIT, - &end_badly, NULL); - GNUNET_TRANSPORT_notify_transmit_ready (p1.th, - &p2.id, - 256, 0, TIMEOUT, ¬ify_ready, - &p1); - } -} + send_task = GNUNET_SCHEDULER_NO_TASK; + if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) + return; -static void -notify_disconnect (void *cls, - const struct GNUNET_PeerIdentity *peer) -{ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer `%4s' disconnected (%p)!\n", - GNUNET_i2s (peer), cls); + th = GNUNET_TRANSPORT_notify_transmit_ready (p1->th, &p2->id, 256, 0, + TIMEOUT_TRANSMIT, ¬ify_ready, + &p1); } - static void -setup_peer (struct PeerContext *p, - const char *cfgname) +testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls) { - p->cfg = GNUNET_CONFIGURATION_create (); - - GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); - if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME")) - GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME", &p->servicehome); - GNUNET_DISK_directory_remove (p->servicehome); - -#if START_ARM - p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", - "gnunet-service-arm", -#if VERBOSE_ARM - "-L", "DEBUG", -#endif - "-c", cfgname, NULL); -#endif + cc = NULL; + char *p1_c = strdup (GNUNET_i2s (&p1->id)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %s <-> %s\n", p1_c, + GNUNET_i2s (&p2->id)); + GNUNET_free (p1_c); - if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME")) - GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME", &p->servicehome); - - if (is_https) - { - struct stat sbuf; - if (p==&p1) - { - if (GNUNET_CONFIGURATION_have_value (p->cfg, - "transport-https", "KEY_FILE")) - GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p1); - if (key_file_p1==NULL) - GNUNET_asprintf(&key_file_p1,"https.key"); - if (0 == stat (key_file_p1, &sbuf )) - { - if (0 == remove(key_file_p1)) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Successfully removed existing private key file `%s'\n",key_file_p1); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to remove private key file `%s'\n",key_file_p1); - } - if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE")) - GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p1); - if (cert_file_p1==NULL) - GNUNET_asprintf(&cert_file_p1,"https.cert"); - if (0 == stat (cert_file_p1, &sbuf )) - { - if (0 == remove(cert_file_p1)) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Successfully removed existing certificate file `%s'\n", - cert_file_p1); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to remove existing certificate file `%s'\n", - cert_file_p1); - } - } - else if (p==&p2) - { - if (GNUNET_CONFIGURATION_have_value (p->cfg, - "transport-https", "KEY_FILE")) - GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "KEY_FILE", &key_file_p2); - if (key_file_p2==NULL) - GNUNET_asprintf(&key_file_p2,"https.key"); - if (0 == stat (key_file_p2, &sbuf )) - { - if (0 == remove(key_file_p2)) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Successfully removed existing private key file `%s'\n", - key_file_p2); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to remove private key file `%s'\n", - key_file_p2); - } - if (GNUNET_CONFIGURATION_have_value (p->cfg,"transport-https", "CERT_FILE")) - GNUNET_CONFIGURATION_get_value_string (p->cfg, "transport-https", "CERT_FILE", &cert_file_p2); - if (cert_file_p2==NULL) - GNUNET_asprintf(&cert_file_p2,"https.cert"); - if (0 == stat (cert_file_p2, &sbuf )) - { - if (0 == remove(cert_file_p2)) - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Successfully removed existing certificate file `%s'\n",cert_file_p2); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to remove existing certificate file `%s'\n",cert_file_p2); - } - } - } - - p->th = GNUNET_TRANSPORT_connect (p->cfg, - NULL, p, - ¬ify_receive, - ¬ify_connect, ¬ify_disconnect); - GNUNET_assert (p->th != NULL); + // FIXME: THIS IS REQUIRED! SEEMS TO BE A BUG! + send_task = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &sendtask, NULL); } - static void -try_connect (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +run (void *cls, char *const *args, const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Asking peers to connect...\n"); - GNUNET_TRANSPORT_try_connect (p2.th, - &p1.id); - GNUNET_TRANSPORT_try_connect (p1.th, - &p2.id); - tct = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, - &try_connect, - NULL); -} + die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); + p1 = GNUNET_TRANSPORT_TESTING_start_peer (cfg_file_p1, ¬ify_receive, + ¬ify_connect, ¬ify_disconnect, + NULL); + p2 = GNUNET_TRANSPORT_TESTING_start_peer (cfg_file_p2, ¬ify_receive, + ¬ify_connect, ¬ify_disconnect, + NULL); -static void -run (void *cls, - char *const *args, - const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) -{ - GNUNET_assert (ok == 1); - OKPP; - die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, - &end_badly, NULL); - - if (is_udp) - { - setup_peer (&p1, "test_transport_api_udp_peer1.conf"); - setup_peer (&p2, "test_transport_api_udp_peer2.conf"); - } - if (is_unix) - { - setup_peer (&p1, "test_transport_api_unix_peer1.conf"); - setup_peer (&p2, "test_transport_api_unix_peer2.conf"); - } - if (is_multi_protocol) - { - setup_peer (&p1, "test_transport_api_multi_peer1.conf"); - setup_peer (&p2, "test_transport_api_multi_peer2.conf"); - } - else if (is_tcp) - { - setup_peer (&p1, "test_transport_api_tcp_peer1.conf"); - setup_peer (&p2, "test_transport_api_tcp_peer2.conf"); - } - else if (is_tcp_nat) - { - setup_peer (&p1, "test_transport_api_tcp_nat_peer1.conf"); - setup_peer (&p2, "test_transport_api_tcp_nat_peer2.conf"); - } - else if (is_udp_nat) - { - setup_peer (&p1, "test_transport_api_udp_nat_peer1.conf"); - setup_peer (&p2, "test_transport_api_udp_nat_peer2.conf"); - } - else if (is_http) - { - setup_peer (&p1, "test_transport_api_http_peer1.conf"); - setup_peer (&p2, "test_transport_api_http_peer2.conf"); - } - else if (is_https) - { - setup_peer (&p1, "test_transport_api_https_peer1.conf"); - setup_peer (&p2, "test_transport_api_https_peer2.conf"); - } - else if (is_wlan) - { - setup_peer (&p1, "test_transport_api_wlan_peer1.conf"); - setup_peer (&p2, "test_transport_api_wlan_peer2.conf"); - } - GNUNET_assert(p1.th != NULL); - GNUNET_assert(p2.th != NULL); + if ((p1 == NULL) || (p2 == NULL)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n"); + if (die_task != GNUNET_SCHEDULER_NO_TASK) + GNUNET_SCHEDULER_cancel (die_task); + die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); + return; + } - GNUNET_TRANSPORT_get_hello (p1.th, &exchange_hello, &p1); - GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2); - tct = GNUNET_SCHEDULER_add_now (&try_connect, NULL); + cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, + NULL); } + static int check () { @@ -458,193 +281,29 @@ check () }; #if WRITECONFIG - setTransportOptions("test_transport_api_data.conf"); + setTransportOptions ("test_transport_api_data.conf"); #endif - ok = 1; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, - argv, "test-transport-api", "nohelp", - options, &run, &ok); - stop_arm (&p1); - stop_arm (&p2); + send_task = GNUNET_SCHEDULER_NO_TASK; - if (is_https) - { - struct stat sbuf; - if (0 == stat (cert_file_p1, &sbuf )) - { - if (0 == remove(cert_file_p1)) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Successfully removed existing certificate file `%s'\n",cert_file_p1); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to remove certfile `%s'\n",cert_file_p1); - } - - if (0 == stat (key_file_p1, &sbuf )) - { - if (0 == remove(key_file_p1)) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Successfully removed private key file `%s'\n",key_file_p1); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to private key file `%s'\n",key_file_p1); - } - - if (0 == stat (cert_file_p2, &sbuf )) - { - if (0 == remove(cert_file_p2)) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Successfully removed existing certificate file `%s'\n",cert_file_p2); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to remove certfile `%s'\n",cert_file_p2); - } - - if (0 == stat (key_file_p2, &sbuf )) - { - if (0 == remove(key_file_p2)) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Successfully removed private key file `%s'\n",key_file_p2); - else - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Failed to private key file `%s'\n",key_file_p2); - } - GNUNET_free(key_file_p1); - GNUNET_free(key_file_p2); - GNUNET_free(cert_file_p1); - GNUNET_free(cert_file_p2); - } + ok = 1; + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name, + "nohelp", options, &run, &ok); - if ((p1.servicehome != NULL) && (p2.servicehome != NULL)) - { - GNUNET_DISK_directory_remove (p1.servicehome); - GNUNET_DISK_directory_remove (p2.servicehome); - GNUNET_free(p1.servicehome); - GNUNET_free(p2.servicehome); - } return ok; } -/** - * Return the actual path to a file found in the current - * PATH environment variable. - * - * @param binary the name of the file to find - */ -static char * -get_path_from_PATH (char *binary) -{ - char *path; - char *pos; - char *end; - char *buf; - const char *p; - - p = getenv ("PATH"); - if (p == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("PATH environment variable is unset.\n")); - return NULL; - } - path = GNUNET_strdup (p); /* because we write on it */ - buf = GNUNET_malloc (strlen (path) + 20); - pos = path; - - while (NULL != (end = strchr (pos, PATH_SEPARATOR))) - { - *end = '\0'; - sprintf (buf, "%s/%s", pos, binary); - if (GNUNET_DISK_file_test (buf) == GNUNET_YES) - { - GNUNET_free (path); - return buf; - } - pos = end + 1; - } - sprintf (buf, "%s/%s", pos, binary); - if (GNUNET_DISK_file_test (buf) == GNUNET_YES) - { - GNUNET_free (path); - return buf; - } - GNUNET_free (buf); - GNUNET_free (path); - return NULL; -} - -/** - * Check whether the suid bit is set on a file. - * Attempts to find the file using the current - * PATH environment variable as a search path. - * - * @param binary the name of the file to check - * - * @return GNUNET_YES if the binary is found and - * can be run properly, GNUNET_NO otherwise - */ -static int -check_gnunet_nat_binary(char *binary) -{ - struct stat statbuf; - char *p; -#ifdef MINGW - SOCKET rawsock; -#endif - -#ifdef MINGW - char *binaryexe; - GNUNET_asprintf (&binaryexe, "%s.exe", binary); - p = get_path_from_PATH (binaryexe); - free (binaryexe); -#else - p = get_path_from_PATH (binary); -#endif - if (p == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Could not find binary `%s' in PATH!\n"), - binary); - return GNUNET_NO; - } - if (0 != STAT (p, &statbuf)) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("stat (%s) failed: %s\n"), - p, - STRERROR (errno)); - GNUNET_free (p); - return GNUNET_SYSERR; - } - GNUNET_free (p); -#ifndef MINGW - if ( (0 != (statbuf.st_mode & S_ISUID)) && - (statbuf.st_uid == 0) ) - return GNUNET_YES; - return GNUNET_NO; -#else - rawsock = socket (AF_INET, SOCK_RAW, IPPROTO_ICMP); - if (INVALID_SOCKET == rawsock) - { - DWORD err = GetLastError (); - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "socket (AF_INET, SOCK_RAW, IPPROTO_ICMP) have failed! GLE = %d\n", err); - return GNUNET_NO; /* not running as administrator */ - } - closesocket (rawsock); - return GNUNET_YES; -#endif -} - int main (int argc, char *argv[]) { int ret; -#ifdef MINGW - return GNUNET_SYSERR; -#endif + int nat_res; - GNUNET_log_setup ("test-transport-api", + GNUNET_TRANSPORT_TESTING_get_test_source_name (__FILE__, &test_source); + GNUNET_TRANSPORT_TESTING_get_test_plugin_name (argv[0], test_source, + &test_plugin); + GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name); + + GNUNET_log_setup (test_name, #if VERBOSE "DEBUG", #else @@ -652,60 +311,37 @@ main (int argc, char *argv[]) #endif NULL); - if (strstr(argv[0], "tcp_nat") != NULL) - { - is_tcp_nat = GNUNET_YES; - if (GNUNET_YES != check_gnunet_nat_binary("gnunet-nat-server")) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "`%s' not properly installed, cannot run NAT test!\n", - "gnunet-nat-server"); - return 0; - } - } - else if (strstr(argv[0], "tcp") != NULL) - { - is_tcp = GNUNET_YES; - } - else if (strstr(argv[0], "udp_nat") != NULL) - { - is_udp_nat = GNUNET_YES; - if (GNUNET_YES != check_gnunet_nat_binary("gnunet-nat-server")) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "`%s' not properly installed, cannot run NAT test!\n", - "gnunet-nat-server"); - return 0; - } GNUNET_free(p1.servicehome); - GNUNET_free(p2.servicehome); - } - else if (strstr(argv[0], "udp") != NULL) - { - is_udp = GNUNET_YES; - } - else if (strstr(argv[0], "unix") != NULL) - { - is_unix = GNUNET_YES; - } - else if (strstr(argv[0], "https") != NULL) - { - is_https = GNUNET_YES; - } - else if (strstr(argv[0], "http") != NULL) - { - is_http = GNUNET_YES; - } - else if (strstr(argv[0], "wlan") != NULL) + if ((strcmp (test_plugin, "tcp_nat") == 0) || + (strcmp (test_plugin, "udp_nat") == 0)) + { + nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server"); + if (GNUNET_NO == nat_res) { - is_wlan = GNUNET_YES; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", + "gnunet-nat-server", "SUID not set"); + return 0; } - else if (strstr(argv[0], "multi") != NULL) + if (GNUNET_SYSERR == nat_res) { - is_multi_protocol = GNUNET_YES; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' %s \n", + "gnunet-nat-server", "file not found"); + return 0; } + } + + GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1); + GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p2, 2); ret = check (); + GNUNET_free (cfg_file_p1); + GNUNET_free (cfg_file_p2); + + GNUNET_free (test_source); + GNUNET_free (test_plugin); + GNUNET_free (test_name); + + return ret; }