diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-13 15:18:35 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-13 15:18:35 +0000 |
commit | 2742cca3d2180b4f615c40609fccf10a806f05c8 (patch) | |
tree | 7a59d0d43951cec4f0edd903f02ead3dbe037a2f /src/util/test_os_network.c | |
parent | 832d12049add37805697104b9f8eaae420eef406 (diff) | |
download | gnunet-2742cca3d2180b4f615c40609fccf10a806f05c8.tar.gz gnunet-2742cca3d2180b4f615c40609fccf10a806f05c8.zip |
-cleaning up VERBOSE and check nonsense in util tests
Diffstat (limited to 'src/util/test_os_network.c')
-rw-r--r-- | src/util/test_os_network.c | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/src/util/test_os_network.c b/src/util/test_os_network.c index 4486e6a99..2cdd75040 100644 --- a/src/util/test_os_network.c +++ b/src/util/test_os_network.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "gnunet_configuration_lib.h" | 26 | #include "gnunet_configuration_lib.h" |
27 | #include "gnunet_os_lib.h" | 27 | #include "gnunet_os_lib.h" |
28 | 28 | ||
29 | #define VERBOSE 1 | ||
30 | 29 | ||
31 | /** | 30 | /** |
32 | * Check if the address we got is IPv4 or IPv6 loopback (which should | 31 | * Check if the address we got is IPv4 or IPv6 loopback (which should |
@@ -40,20 +39,20 @@ proc (void *cls, const char *name, int isDefault, const struct sockaddr *addr, | |||
40 | { | 39 | { |
41 | int *ok = cls; | 40 | int *ok = cls; |
42 | char buf[INET6_ADDRSTRLEN]; | 41 | char buf[INET6_ADDRSTRLEN]; |
42 | const char * protocol; | ||
43 | 43 | ||
44 | if (NULL == addr) | 44 | if (NULL == addr) |
45 | return GNUNET_OK; | 45 | return GNUNET_OK; |
46 | #if VERBOSE | ||
47 | const char * protocol; | ||
48 | if (addrlen == sizeof (struct sockaddr_in)) | 46 | if (addrlen == sizeof (struct sockaddr_in)) |
49 | protocol = "IPv4"; | 47 | protocol = "IPv4"; |
50 | else | 48 | else |
51 | protocol = "IPv6"; | 49 | protocol = "IPv6"; |
52 | printf ("%s Address `%s'\n", protocol, GNUNET_a2s ((const struct sockaddr *) addr,addrlen) ); | 50 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
53 | printf (" Netmask `%s'\n", GNUNET_a2s ((const struct sockaddr *) netmask, addrlen) ); | 51 | "%s Address `%s'\n", protocol, GNUNET_a2s ((const struct sockaddr *) addr,addrlen) ); |
54 | printf (" Broadcast `%s'\n", GNUNET_a2s ((const struct sockaddr *) broadcast_addr,addrlen) ); | 52 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
55 | #endif | 53 | "Netmask `%s'\n", GNUNET_a2s ((const struct sockaddr *) netmask, addrlen) ); |
56 | 54 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | |
55 | "`%s'\n", GNUNET_a2s ((const struct sockaddr *) broadcast_addr,addrlen) ); | ||
57 | inet_ntop (addr->sa_family, | 56 | inet_ntop (addr->sa_family, |
58 | (addr->sa_family == | 57 | (addr->sa_family == |
59 | AF_INET) ? (void *) &((struct sockaddr_in *) addr)->sin_addr | 58 | AF_INET) ? (void *) &((struct sockaddr_in *) addr)->sin_addr |
@@ -64,23 +63,16 @@ proc (void *cls, const char *name, int isDefault, const struct sockaddr *addr, | |||
64 | return GNUNET_OK; | 63 | return GNUNET_OK; |
65 | } | 64 | } |
66 | 65 | ||
67 | static int | 66 | |
68 | testifcs () | 67 | int |
68 | main (int argc, char *argv[]) | ||
69 | { | 69 | { |
70 | int ret; | 70 | int ret; |
71 | 71 | ||
72 | GNUNET_log_setup ("test-os-network", "WARNING", NULL); | ||
72 | ret = 1; | 73 | ret = 1; |
73 | GNUNET_OS_network_interfaces_list (&proc, &ret); | 74 | GNUNET_OS_network_interfaces_list (&proc, &ret); |
74 | return ret; | 75 | return ret; |
75 | } | 76 | } |
76 | 77 | ||
77 | int | 78 | /* end of test_os_network.c */ |
78 | main (int argc, char *argv[]) | ||
79 | { | ||
80 | int errCnt = 0; | ||
81 | |||
82 | GNUNET_log_setup ("test-os-network", "WARNING", NULL); | ||
83 | if (0 != testifcs ()) | ||
84 | errCnt++; | ||
85 | return errCnt; | ||
86 | } | ||