From: Guus Sliepen Date: Mon, 22 Dec 2014 14:18:17 +0000 (+0100) Subject: Remember ToS/Diffserv priority for each socket individually. X-Git-Tag: release-1.0.25~5 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=042a6c1;hp=c72e237caa22525ab36a8286758e47544db3d496;p=tinc Remember ToS/Diffserv priority for each socket individually. --- diff --git a/src/net.h b/src/net.h index 2b50c5a2..0982020f 100644 --- a/src/net.h +++ b/src/net.h @@ -87,6 +87,7 @@ typedef struct listen_socket_t { int tcp; int udp; sockaddr_t sa; + int priority; } listen_socket_t; #include "conf.h" diff --git a/src/net_packet.c b/src/net_packet.c index dbf65463..e67857cc 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -415,9 +415,6 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) { vpn_packet_t *outpkt; int origlen; int outlen, outpad; -#if (defined(SOL_IP) && defined(IP_TOS)) || (defined(IPPROTO_IPV6) && defined(IPV6_TCLASS)) - static int priority = 0; -#endif int origpriority; if(!n->status.reachable) { @@ -549,23 +546,27 @@ static void send_udppacket(node_t *n, vpn_packet_t *origpkt) { sock = n->sock; } + if(priorityinheritance && origpriority != listen_socket[n->sock].priority) { + listen_socket[n->sock].priority = origpriority; + switch(listen_socket[n->sock].sa.sa.sa_family) { #if defined(SOL_IP) && defined(IP_TOS) - if(priorityinheritance && origpriority != priority && listen_socket[n->sock].sa.sa.sa_family == AF_INET) { - priority = origpriority; - ifdebug(TRAFFIC) logger(LOG_DEBUG, "Setting IPv4 outgoing packet priority to %d", priority); - if(setsockopt(listen_socket[n->sock].udp, SOL_IP, IP_TOS, &priority, sizeof(priority))) /* SO_PRIORITY doesn't seem to work */ - logger(LOG_ERR, "System call `%s' failed: %s", "setsockopt", strerror(errno)); - } + case AF_INET: + ifdebug(TRAFFIC) logger(LOG_DEBUG, "Setting IPv4 outgoing packet priority to %d", origpriority); + if(setsockopt(listen_socket[n->sock].udp, SOL_IP, IP_TOS, &origpriority, sizeof(origpriority))) /* SO_PRIORITY doesn't seem to work */ + logger(LOG_ERR, "System call `%s' failed: %s", "setsockopt", strerror(errno)); + break; #endif - #if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS) - if(priorityinheritance && origpriority != priority && listen_socket[n->sock].sa.sa.sa_family == AF_INET6) { - priority = origpriority; - ifdebug(TRAFFIC) logger(LOG_DEBUG, "Setting IPv6 outgoing packet priority to %d", priority); - if(setsockopt(listen_socket[n->sock].udp, IPPROTO_IPV6, IPV6_TCLASS, &priority, sizeof(priority))) /* SO_PRIORITY doesn't seem to work */ - logger(LOG_ERR, "System call `%s' failed: %s", "setsockopt", strerror(errno)); - } + case AF_INET6: + ifdebug(TRAFFIC) logger(LOG_DEBUG, "Setting IPv6 outgoing packet priority to %d", origpriority); + if(setsockopt(listen_socket[n->sock].udp, IPPROTO_IPV6, IPV6_TCLASS, &origpriority, sizeof(origpriority))) + logger(LOG_ERR, "System call `%s' failed: %s", "setsockopt", strerror(errno)); + break; #endif + default: + break; + } + } if(sendto(listen_socket[sock].udp, (char *) &inpkt->seqno, inpkt->len, 0, sa, sl) < 0 && !sockwouldblock(sockerrno)) { if(sockmsgsize(sockerrno)) {