From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 19 Jan 2012 17:49:19 +0000 (+0000)
Subject: -fixing #2084
X-Git-Tag: initial-import-from-subversion-38251~15214
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7f1311dcfcaaa944c10aadf8618d47b15bb1a450;p=oweals%2Fgnunet.git

-fixing #2084
---

diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index a2b6d9c8a..b4edcad91 100644
--- 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,