If "PriorityInheritance = yes" is specified in tinc.conf, the value of the

TOS field of the tunneled packets will be passed on to the UDP packets tinc
sends out.

diff --git a/src/net.h b/src/net.h
index e42f07e5eeabcc49dab291b117955e64cbcf1e89..0dc81817b4ed6d4c6f94ca4dec8f3f360cd4db5c 100644 (file)
--- a/src/net.h
+++ b/src/net.h
@@ -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.h,v 1.9.4.43 2002/02/26 23:26:41 guus Exp $
+    $Id: net.h,v 1.9.4.44 2002/03/01 12:26:56 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -74,6 +74,7 @@ typedef union {
 
 typedef struct vpn_packet_t {
   length_t len;                        /* the actual number of bytes in the `data' field */
+  int priority;                 /* priority or TOS */
   unsigned int seqno;          /* 32 bits sequence number (network byte order of course) */
   unsigned char data[MAXSIZE];
 } vpn_packet_t;

diff --git a/src/net_packet.c b/src/net_packet.c
index 725789de721b0461829fed5342f5a70fdc1d5c67..81d759a6f7951d1d25f25a2d6151cfa33a3c01fb 100644 (file)
--- 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.5 2002/02/26 23:26:41 guus Exp $
+    $Id: net_packet.c,v 1.1.2.6 2002/03/01 12:26:56 guus Exp $
 */
 
 #include "config.h"
@@ -190,6 +190,8 @@ void send_udppacket(node_t *n, vpn_packet_t *inpkt)
   long int complen = MTU + 12;
   EVP_CIPHER_CTX ctx;
   vpn_packet_t *copy;
+  static int priority = 0;
+  int origpriority;
 cp
   if(!n->status.validkey)
     {
@@ -212,6 +214,7 @@ cp
     }
 
   origlen = inpkt->len;
+  origpriority = inpkt->priority;
 
   /* Compress the packet */
 
@@ -258,6 +261,15 @@ cp
 
   /* Send the packet */
 
+  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"),
@@ -362,7 +374,8 @@ cp
     {
       syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%s"),
              __FILE__, __LINE__, sock, strerror(errno));
-      return;
+      cp_trace();
+      exit(1);
     }
   if(x)
     {

diff --git a/src/route.c b/src/route.c
index e9451c8c18acdcfec4947816bff1e39e1ac3e30b..a6790c958bf84fdf0b9c931cf81249e7ae33b8d9 100644 (file)
--- a/src/route.c
+++ b/src/route.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: route.c,v 1.1.2.24 2002/02/20 16:04:59 guus Exp $
+    $Id: route.c,v 1.1.2.25 2002/03/01 12:26:56 guus Exp $
 */
 
 #include "config.h"
@@ -51,6 +51,7 @@
 #include "system.h"
 
 int routing_mode = RMODE_ROUTER;
+int priorityinheritance = 0;
 subnet_t mymac;
 
 void learn_mac(mac_t *address)
@@ -107,6 +108,9 @@ node_t *route_ipv4(vpn_packet_t *packet)
 {
   subnet_t *subnet;
 cp
+  if(priorityinheritance)
+    packet->priority = packet->data[15];
+
   subnet = lookup_subnet_ipv4((ipv4_t *)&packet->data[30]);
 cp
   if(!subnet)

diff --git a/src/route.h b/src/route.h
index 70aab89a8a8df3dada996ec72b78ccb4c9c8b3b3..1f9e7a5a7bae2ead49ea9e8f6279217ff1f55479 100644 (file)
--- a/src/route.h
+++ b/src/route.h
@@ -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: route.h,v 1.1.2.5 2002/02/10 21:57:54 guus Exp $
+    $Id: route.h,v 1.1.2.6 2002/03/01 12:26:56 guus Exp $
 */
 
 #ifndef __TINC_ROUTE_H__
@@ -31,6 +31,7 @@ enum
 };
 
 extern int routing_mode;
+extern int priorityinheritance;
 
 extern void route_incoming(node_t *, vpn_packet_t *);
 extern void route_outgoing(vpn_packet_t *);