-fixing #2084

diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index a2b6d9c8aeced8e740b779670da72df4838dae6d..b4edcad91fd0ad733c836b6b0795d5ff5f865105 100644 (file)
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -970,9 +970,14 @@ setup_state_record (struct TunnelState *state)
   /* generate fresh, unique address */
   do
   {
-    setup_fresh_address (state->serv->address.af,
-                        state->serv->address.proto,
-                        &state->ri.local_address);
+    if (NULL == state->serv)
+      setup_fresh_address (state->ri.remote_address.af,
+                          state->ri.remote_address.proto,
+                          &state->ri.local_address);
+    else
+      setup_fresh_address (state->serv->address.af,
+                          state->serv->address.proto,
+                          &state->ri.local_address);
   } while (NULL != get_redirect_state (state->ri.remote_address.af,
                                       state->ri.remote_address.proto,
                                       &state->ri.remote_address.address,