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

diff --git a/src/net_packet.c b/src/net_packet.c
index 5171a4f4..bffe4a7f 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.1 2002/02/18 16:25:16 guus Exp $
+    $Id: net_packet.c,v 1.1.2.7 2002/03/01 14:09:31 guus Exp $
 */
 
 #include "config.h"
@@ -185,10 +185,13 @@ void send_udppacket(node_t *n, vpn_packet_t *inpkt)
   vpn_packet_t *pkt[] = {&pkt1, &pkt2, &pkt1, &pkt2};
   int nextpkt = 0;
   vpn_packet_t *outpkt;
+  int origlen;
   int outlen, outpad;
   long int complen = MTU + 12;
   EVP_CIPHER_CTX ctx;
   vpn_packet_t *copy;
+  static int priority = 0;
+  int origpriority;
 cp
   if(!n->status.validkey)
     {
@@ -210,6 +213,9 @@ cp
       return;
     }
 
+  origlen = inpkt->len;
+  origpriority = inpkt->priority;
+
   /* Compress the packet */
 
   if(n->compression)
@@ -255,12 +261,23 @@ cp
 
   /* Send the packet */
 
-  if((sendto(udp_socket, (char *)&inpkt->seqno, inpkt->len, 0, &(n->address.sa), sizeof(sockaddr_t))) < 0)
+  if(priorityinheritance && origpriority != priority)
+    {
+      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 */
+	syslog(LOG_ERR, _("System call `%s' failed: %s"), "setsockopt", strerror(errno));
+    }
+
+  if((sendto(udp_socket[0], (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));
       return;
     }
+  
+  inpkt->len = origlen;
 cp
 }
 
@@ -344,7 +361,7 @@ cp
 cp
 }
 
-void handle_incoming_vpn_data(void)
+void handle_incoming_vpn_data(int sock)
 {
   vpn_packet_t pkt;
   int x, l = sizeof(x);
@@ -353,11 +370,12 @@ void handle_incoming_vpn_data(void)
   socklen_t fromlen = sizeof(from);
   node_t *n;
 cp
-  if(getsockopt(udp_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
+  if(getsockopt(sock, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
     {
       syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%s"),
-             __FILE__, __LINE__, udp_socket, strerror(errno));
-      return;
+             __FILE__, __LINE__, sock, strerror(errno));
+      cp_trace();
+      exit(1);
     }
   if(x)
     {
@@ -365,7 +383,7 @@ cp
       return;
     }
 
-  if((pkt.len = recvfrom(udp_socket, (char *)&pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen)) <= 0)
+  if((pkt.len = recvfrom(sock, (char *)&pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen)) <= 0)
     {
       syslog(LOG_ERR, _("Receiving packet failed: %s"), strerror(errno));
       return;
@@ -381,10 +399,9 @@ cp
       return;
     }
 
-/*
   if(n->connection)
-    n->connection->last_ping_time = time(NULL);
-*/
+    n->connection->last_ping_time = now;
+
   receive_udppacket(n, &pkt);
 cp
 }