commit 481d2440038ddfbb25f3a4ba439d7354fbd0eea3
author James Hulka <james.hulka@gmail.com> Tue Jan 20 21:37:08 2015 +0100
committer Jiri Kastner <jkastner@redhat.com> Sun May 17 17:39:00 2015 +0200
tree 36c1173c3ffc525e696b1a22c657e66547aae9b6
parent 7c9ad5f2a4fb7c08d4aa89e2228c65fa010da9bb

inet_diag.c: allow usage of old request type

Signed-off-by: James Hulka <james.hulka@gmail.com>
Signed-off-by: Jiri Kastner <jkastner@redhat.com>

python-inet_diag/inet_diag.c

diff --git a/python-inet_diag/inet_diag.c b/python-inet_diag/inet_diag.c
index db907e1..7a209e0 100644
--- a/python-inet_diag/inet_diag.c
+++ b/python-inet_diag/inet_diag.c
@@ -941,7 +941,7 @@
         user_ent_hash_build();
     }
 
-	self->socket = socket(AF_NETLINK, SOCK_RAW, NETLINK_INET_DIAG);
+        self->socket = socket(AF_NETLINK, SOCK_RAW, NETLINK_INET_DIAG);
 	if (self->socket < 0)
 		goto out_err;
 
@@ -949,23 +949,45 @@
 		.nl_family = AF_NETLINK,
 	};
 
-	struct {
-		struct nlmsghdr nlh;
+    // allow usage of old request type with TCPDIAG_GETSOCK and DCCPDIAG_GETSOCK constants
+    int req_v2 = 1;
+    if ( socktype == TCPDIAG_GETSOCK || socktype == DCCPDIAG_GETSOCK ) {
+        req_v2 = 0;
+    }
+
+    struct {
+	struct nlmsghdr nlh;
         struct inet_diag_req_v2 r;
-	} req = {
-		.nlh = {
-			.nlmsg_len   = sizeof(req),
+    } req2 = {
+	.nlh = {
+	    .nlmsg_len   = sizeof(req2),
             .nlmsg_type  = SOCK_DIAG_BY_FAMILY,
-			.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST,
-			.nlmsg_seq   = 123456,
-		},
-		.r = {
-            .sdiag_family    = AF_INET,
-            .sdiag_protocol  = socktype,
-			.idiag_states = states,
-			.idiag_ext    = extensions,
-		},
-	};
+	    .nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST,
+	    .nlmsg_seq   = 123456,
+	},
+	.r = {
+            .sdiag_family   = AF_INET,
+            .sdiag_protocol = socktype,
+	    .idiag_states   = states,
+	    .idiag_ext      = extensions,
+	},
+    };
+    struct {
+        struct nlmsghdr nlh;
+        struct inet_diag_req r;
+    } req = {
+        .nlh = {
+            .nlmsg_len   = sizeof(req),
+            .nlmsg_type  = socktype,
+	    .nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST,
+	    .nlmsg_seq   = 123456,
+	},
+	.r = {
+            .idiag_family = AF_INET,
+	    .idiag_states = states,
+	    .idiag_ext    = extensions,
+	},
+    };
 
     // filter preparation
     struct diag_filter *filter;
@@ -1106,9 +1128,9 @@
 
     struct iovec iov[3];
     iov[0] = (struct iovec){
-			.iov_base = &req,
-			.iov_len  = sizeof(req),
-	};
+        .iov_base = ( req_v2 == 1 ) ? &req2 : &req,
+        .iov_len  = ( req_v2 == 1 ) ? sizeof(req2) : sizeof(req),
+    };
 
     // append the filter    
     struct rtattr rta; 
@@ -1122,7 +1144,11 @@
         iov[1] = (struct iovec){ &rta, sizeof(rta) };
         iov[2] = (struct iovec){ self->bytecode, filter_len };
 
-        req.nlh.nlmsg_len += RTA_LENGTH(filter_len);
+	if ( req_v2 == 1 ) {
+            req2.nlh.nlmsg_len += RTA_LENGTH(filter_len);
+	} else {
+            req.nlh.nlmsg_len += RTA_LENGTH(filter_len);
+	}
     } else {
         self->bytecode = NULL;
     }