Remember sockaddrs of listening sockets, use appropriate one when sending

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index f8a8b99..f4c9e53 100644 (file)
--- 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.
 
     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.8 2002/03/01 14:09:31 guus Exp $
+    $Id: net_setup.c,v 1.1.2.11 2002/03/18 22:47:20 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -327,6 +327,10 @@ cp
     routing_mode = RMODE_ROUTER;
 
   get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
     routing_mode = RMODE_ROUTER;
 
   get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);

+#if !defined(SOL_IP) || !defined(IP_TOS)
+  if(priorityinheritance)
+    syslog(LOG_WARNING, _("PriorityInheritance not supported on this platform"));
+#endif

 
   if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
     macexpire= 600;
 
   if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
     macexpire= 600;


@@ -482,10 +486,10 @@ cp
 
   for(aip = ai; aip; aip = aip->ai_next)
     {
 
   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;
 
         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)
         continue;
 
       if(debug_lvl >= DEBUG_CONNECTIONS)


@@ -495,6 +499,7 @@ cp
          free(hostname);
        }
 
          free(hostname);
        }
 

+      listen_socket[listen_sockets].sa.sa = *aip->ai_addr;

       listen_sockets++;
     }
 
       listen_sockets++;
     }
 


@@ -563,7 +568,7 @@ cp
       next = node->next;
       c = (connection_t *)node->data;
       if(c->outgoing)
       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);
     }
 
       terminate_connection(c, 0);
     }
 


@@ -572,8 +577,8 @@ cp
 
   for(i = 0; i < listen_sockets; i++)
     {
 
   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();
     }
 
   exit_events();