improve/fix handling of NAT server logic for ICMP-based autonomous NAT traversal

1 files changed, 8 insertions, 4 deletions

diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index 4d0ed5723..a145dc800 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -338,15 +338,11 @@ address_cb (void *cls,
  * reversal.
  *
  * @param cls closure, NULL
- * @param local_addr address where we received the request
- * @param local_addrlen actual length of the @a local_addr
  * @param remote_addr public IP address of the other peer
  * @param remote_addrlen actual length of the @a remote_addr
  */
 static void
 reversal_cb (void *cls,
-             const struct sockaddr *local_addr,
-             socklen_t local_addrlen,
              const struct sockaddr *remote_addr,
              socklen_t remote_addrlen)
 {
@@ -580,6 +576,14 @@ run (void *cls,
                               (listen_reversal) ? &reversal_cb : NULL,
                               NULL);
   }
+  else if (listen_reversal)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                "Use of `-W` only effective in combination with `-i`\n");    
+    global_ret = 1;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
 
   if (NULL != remote_addr)
   {