[GNUnet-SVN] r33324 - in gnunet/src: include nat

[gnunet]

Author: cfuchs
Date: 2014-05-19 14:58:06 +0200 (Mon, 19 May 2014)
New Revision: 33324

Modified:
   gnunet/src/include/gnunet_nat_lib.h
   gnunet/src/nat/test_nat_mini.c
   gnunet/src/nat/test_nat_test.c
Log:
- adapted nat-tests for API changes
- set NAT success return code to be GNUNET_OK

Modified: gnunet/src/include/gnunet_nat_lib.h
===================================================================
--- gnunet/src/include/gnunet_nat_lib.h 2014-05-19 12:07:59 UTC (rev 33323)
+++ gnunet/src/include/gnunet_nat_lib.h 2014-05-19 12:58:06 UTC (rev 33324)
@@ -77,7 +77,7 @@
   /**
    * Just the default
    */
-  GNUNET_NAT_ERROR_SUCCESS = 0,
+  GNUNET_NAT_ERROR_SUCCESS = GNUNET_OK,
   
   /**
    * `upnpc` command not found

Modified: gnunet/src/nat/test_nat_mini.c
===================================================================
--- gnunet/src/nat/test_nat_mini.c      2014-05-19 12:07:59 UTC (rev 33323)
+++ gnunet/src/nat/test_nat_mini.c      2014-05-19 12:58:06 UTC (rev 33324)
@@ -45,15 +45,21 @@
 addr_callback (void *cls, int add_remove,
                const struct sockaddr *addr,
                socklen_t addrlen,
-               const char *emsg)
+               enum GNUNET_NAT_FailureCode ret)
 {
-  fprintf (stderr,
+  if (GNUNET_NAT_ERROR_SUCCESS == ret)
+  {
+    fprintf (stderr,
            "Address changed: %s `%s' (%u bytes)\n",
            add_remove == GNUNET_YES
            ? "added" : "removed",
            GNUNET_a2s (addr,
                        addrlen),
            (unsigned int) addrlen);
+  }
+  else
+    ;
+    //TODO: proper error handling!
 }
 
 

Modified: gnunet/src/nat/test_nat_test.c
===================================================================
--- gnunet/src/nat/test_nat_test.c      2014-05-19 12:07:59 UTC (rev 33323)
+++ gnunet/src/nat/test_nat_test.c      2014-05-19 12:58:06 UTC (rev 33324)
@@ -50,10 +50,9 @@
 
 static void
 report_success (void *cls,
-                int success,
-                const char *emsg)
+                enum GNUNET_NAT_FailureCode aret)
 {
-  GNUNET_assert (GNUNET_OK == success);
+  GNUNET_assert (GNUNET_NAT_ERROR_SUCCESS == aret);
   ret = 0;
   GNUNET_SCHEDULER_cancel (end);
   end = GNUNET_SCHEDULER_add_now (&end_test, NULL);