diff options
-rw-r--r-- | src/include/gnunet_nat_lib.h | 2 | ||||
-rw-r--r-- | src/nat/test_nat_mini.c | 10 | ||||
-rw-r--r-- | src/nat/test_nat_test.c | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/include/gnunet_nat_lib.h b/src/include/gnunet_nat_lib.h index 40a5135bd..f81fe485a 100644 --- a/src/include/gnunet_nat_lib.h +++ b/src/include/gnunet_nat_lib.h | |||
@@ -77,7 +77,7 @@ enum GNUNET_NAT_FailureCode { | |||
77 | /** | 77 | /** |
78 | * Just the default | 78 | * Just the default |
79 | */ | 79 | */ |
80 | GNUNET_NAT_ERROR_SUCCESS = 0, | 80 | GNUNET_NAT_ERROR_SUCCESS = GNUNET_OK, |
81 | 81 | ||
82 | /** | 82 | /** |
83 | * `upnpc` command not found | 83 | * `upnpc` command not found |
diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c index 6fe4fd5b9..e9dab8351 100644 --- a/src/nat/test_nat_mini.c +++ b/src/nat/test_nat_mini.c | |||
@@ -45,15 +45,21 @@ static void | |||
45 | addr_callback (void *cls, int add_remove, | 45 | addr_callback (void *cls, int add_remove, |
46 | const struct sockaddr *addr, | 46 | const struct sockaddr *addr, |
47 | socklen_t addrlen, | 47 | socklen_t addrlen, |
48 | const char *emsg) | 48 | enum GNUNET_NAT_FailureCode ret) |
49 | { | 49 | { |
50 | fprintf (stderr, | 50 | if (GNUNET_NAT_ERROR_SUCCESS == ret) |
51 | { | ||
52 | fprintf (stderr, | ||
51 | "Address changed: %s `%s' (%u bytes)\n", | 53 | "Address changed: %s `%s' (%u bytes)\n", |
52 | add_remove == GNUNET_YES | 54 | add_remove == GNUNET_YES |
53 | ? "added" : "removed", | 55 | ? "added" : "removed", |
54 | GNUNET_a2s (addr, | 56 | GNUNET_a2s (addr, |
55 | addrlen), | 57 | addrlen), |
56 | (unsigned int) addrlen); | 58 | (unsigned int) addrlen); |
59 | } | ||
60 | else | ||
61 | ; | ||
62 | //TODO: proper error handling! | ||
57 | } | 63 | } |
58 | 64 | ||
59 | 65 | ||
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index f66773a65..39bd6612e 100644 --- a/src/nat/test_nat_test.c +++ b/src/nat/test_nat_test.c | |||
@@ -50,10 +50,9 @@ end_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
50 | 50 | ||
51 | static void | 51 | static void |
52 | report_success (void *cls, | 52 | report_success (void *cls, |
53 | int success, | 53 | enum GNUNET_NAT_FailureCode aret) |
54 | const char *emsg) | ||
55 | { | 54 | { |
56 | GNUNET_assert (GNUNET_OK == success); | 55 | GNUNET_assert (GNUNET_NAT_ERROR_SUCCESS == aret); |
57 | ret = 0; | 56 | ret = 0; |
58 | GNUNET_SCHEDULER_cancel (end); | 57 | GNUNET_SCHEDULER_cancel (end); |
59 | end = GNUNET_SCHEDULER_add_now (&end_test, NULL); | 58 | end = GNUNET_SCHEDULER_add_now (&end_test, NULL); |