X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_packet.c;h=7216fb5fef3f9f733ce3452942e7c13178492600;hp=bffe4a7f63c3bec3b967ea17131485513418c0cd;hb=2de5e0eef911b9ff723d562ef9c62d833f3cdc45;hpb=14979f835df4214a7c2510852f7ffedc9e08c2c0

diff --git a/src/net_packet.c b/src/net_packet.c
index bffe4a7f..7216fb5f 100644
--- a/src/net_packet.c
+++ b/src/net_packet.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_packet.c,v 1.1.2.7 2002/03/01 14:09:31 guus Exp $
+    $Id: net_packet.c,v 1.1.2.12 2002/03/25 15:51:58 guus Exp $
 */
 
 #include "config.h"
@@ -103,7 +103,8 @@ cp
       HMAC(myself->digest, myself->key, myself->keylength, (char *)&inpkt->seqno, inpkt->len, hmac, NULL);
       if(memcmp(hmac, (char *)&inpkt->seqno + inpkt->len, myself->maclength))
         {
-          syslog(LOG_DEBUG, _("Got unauthenticated packet from %s (%s)"), n->name, n->hostname);
+          if(debug_lvl >= DEBUG_TRAFFIC)
+            syslog(LOG_DEBUG, _("Got unauthenticated packet from %s (%s)"), n->name, n->hostname);
           return;
         }
     }
@@ -129,7 +130,8 @@ cp
 
   if(inpkt->seqno <= n->received_seqno)
   {
-    syslog(LOG_DEBUG, _("Got late or replayed packet from %s (%s), seqno %d"), n->name, n->hostname, inpkt->seqno);
+    if(debug_lvl >= DEBUG_TRAFFIC)
+      syslog(LOG_DEBUG, _("Got late or replayed packet from %s (%s), seqno %d"), n->name, n->hostname, inpkt->seqno);
     return;
   }
   
@@ -192,7 +194,10 @@ void send_udppacket(node_t *n, vpn_packet_t *inpkt)
   vpn_packet_t *copy;
   static int priority = 0;
   int origpriority;
+  int sock;
 cp
+  /* Make sure we have a valid key */
+
   if(!n->status.validkey)
     {
       if(debug_lvl >= DEBUG_TRAFFIC)
@@ -210,6 +215,8 @@ cp
       if(!n->status.waitingforkey)
         send_req_key(n->nexthop->connection, myself, n);
 
+      n->status.waitingforkey = 1;
+
       return;
     }
 
@@ -259,18 +266,29 @@ cp
       inpkt->len += n->maclength;
     }
 
+  /* Determine which socket we have to use */
+
+  for(sock = 0; sock < listen_sockets; sock++)
+    if(n->address.sa.sa_family == listen_socket[sock].sa.sa.sa_family)
+      break;
+
+  if(sock >= listen_sockets)
+    sock = 0;  /* If none is available, just use the first and hope for the best. */
+  
   /* Send the packet */
 
-  if(priorityinheritance && origpriority != priority)
+#if defined(SOL_IP) && defined(IP_TOS)
+  if(priorityinheritance && origpriority != priority && listen_socket[sock].sa.sa.sa_family == AF_INET)
     {
       priority = origpriority;
       if(debug_lvl >= DEBUG_TRAFFIC)
         syslog(LOG_DEBUG, _("Setting outgoing packet priority to %d"), priority);
-      if(setsockopt(udp_socket[0], SOL_IP, IP_TOS, &priority, sizeof(priority))) /* SO_PRIORITY doesn't seem to work */
+      if(setsockopt(sock, SOL_IP, IP_TOS, &priority, sizeof(priority))) /* SO_PRIORITY doesn't seem to work */
 	syslog(LOG_ERR, _("System call `%s' failed: %s"), "setsockopt", strerror(errno));
     }
+#endif
 
-  if((sendto(udp_socket[0], (char *)&inpkt->seqno, inpkt->len, 0, &(n->address.sa), SALEN(n->address.sa))) < 0)
+  if((sendto(listen_socket[sock].udp, (char *)&inpkt->seqno, inpkt->len, 0, &(n->address.sa), SALEN(n->address.sa))) < 0)
     {
       syslog(LOG_ERR, _("Error sending packet to %s (%s): %s"),
              n->name, n->hostname, strerror(errno));
@@ -389,6 +407,8 @@ cp
       return;
     }
 
+  sockaddrunmap(&from);  /* Some braindead IPv6 implementations do stupid things. */
+
   n = lookup_node_udp(&from);
 
   if(!n)