X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=f4c9e534900ac1c6059d7223fa6fbcc54a9f1569;hp=77e7a7c9eb52a2d6cf0fc0571848b872f738b626;hb=305505f5ec4bb738f175cd897fa409f08d2971a3;hpb=0c16add71c6432c882c6d8f538a4b2db0026ec24;ds=sidebyside

diff --git a/src/net_setup.c b/src/net_setup.c
index 77e7a7c9..f4c9e534 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_setup.c,v 1.1.2.9 2002/03/01 15:14:29 guus Exp $
+    $Id: net_setup.c,v 1.1.2.11 2002/03/18 22:47:20 guus Exp $
 */
 
 #include "config.h"
@@ -486,10 +486,10 @@ cp
 
   for(aip = ai; aip; aip = aip->ai_next)
     {
-      if((tcp_socket[listen_sockets] = setup_listen_socket((sockaddr_t *)aip->ai_addr)) < 0)
+      if((listen_socket[listen_sockets].tcp = setup_listen_socket((sockaddr_t *)aip->ai_addr)) < 0)
         continue;
 
-      if((udp_socket[listen_sockets] = setup_vpn_in_socket((sockaddr_t *)aip->ai_addr)) < 0)
+      if((listen_socket[listen_sockets].udp = setup_vpn_in_socket((sockaddr_t *)aip->ai_addr)) < 0)
         continue;
 
       if(debug_lvl >= DEBUG_CONNECTIONS)
@@ -499,6 +499,7 @@ cp
 	  free(hostname);
 	}
 
+      listen_socket[listen_sockets].sa.sa = *aip->ai_addr;
       listen_sockets++;
     }
 
@@ -567,7 +568,7 @@ cp
       next = node->next;
       c = (connection_t *)node->data;
       if(c->outgoing)
-        free(c->outgoing->name), free(c->outgoing);
+        free(c->outgoing->name), free(c->outgoing), c->outgoing = NULL;
       terminate_connection(c, 0);
     }
 
@@ -576,8 +577,8 @@ cp
 
   for(i = 0; i < listen_sockets; i++)
     {
-      close(udp_socket[i]);
-      close(tcp_socket[i]);
+      close(listen_socket[i].tcp);
+      close(listen_socket[i].udp);
     }
 
   exit_events();