From: Mark Andrews <marka@isc.org>
Date: Thu, 11 Apr 2013 23:32:41 +0000 (+1000)
Subject: handle both cmsg types IP_TOS and IP_RECVTOS being used to return IP_TOS
X-Git-Tag: v9.10.0a1~417
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=8ce8052bb8024b12bc3a50830eaf45d863b0a050;p=thirdparty%2Fbind9.git

handle both cmsg types IP_TOS and IP_RECVTOS being used to return IP_TOS
---

diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 2eebf0acb5e..668fbcd1baf 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1339,7 +1339,11 @@ process_cmsg(isc__socket_t *sock, struct msghdr *msg, isc_socketevent_t *dev) {
 
 #ifdef IP_TOS
 		if (cmsgp->cmsg_level == IPPROTO_IP
-		    && cmsgp->cmsg_type == IP_TOS) {
+		    && (cmsgp->cmsg_type == IP_TOS
+#ifdef IP_RECVTOS
+		        || cmsgp->cmsg_type == IP_RECVTOS
+#endif
+			)) {
 			dev->dscp = (int) *(uint8_t *)CMSG_DATA(cmsgp);
 			dev->dscp >>= 2;
 			dev->attributes |= ISC_SOCKEVENTATTR_DSCP;