aboutsummaryrefslogtreecommitdiff
path: root/src/nat
diff options
context:
space:
mode:
authorChristian Fuchs <christian.fuchs@cfuchs.net>2014-05-19 12:58:06 +0000
committerChristian Fuchs <christian.fuchs@cfuchs.net>2014-05-19 12:58:06 +0000
commit8f4f3b2de0a5288fd6b68219f7ec0e2073f5017e (patch)
tree4f14c40492eaec96fbcc4dcc248ef7b5cee53547 /src/nat
parent59b3b928d1f86e6fe5b0e5d6f89625d911b2766f (diff)
downloadgnunet-8f4f3b2de0a5288fd6b68219f7ec0e2073f5017e.tar.gz
gnunet-8f4f3b2de0a5288fd6b68219f7ec0e2073f5017e.zip
- adapted nat-tests for API changes
- set NAT success return code to be GNUNET_OK
Diffstat (limited to 'src/nat')
-rw-r--r--src/nat/test_nat_mini.c10
-rw-r--r--src/nat/test_nat_test.c5
2 files changed, 10 insertions, 5 deletions
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
45addr_callback (void *cls, int add_remove, 45addr_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
51static void 51static void
52report_success (void *cls, 52report_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);