[PATCH 1/2] Specify nf_queue max length from userspace

[Eric Leblond <eric@inl.fr>]

[-- Attachment #1.1: Type: text/plain, Size: 90 bytes --]

Attach patch is against current git kernel tree.

-- 
Eric Leblond <eric@inl.fr>
INL

[-- Attachment #1.2: specify-queue-max-length-from-userspace.txt --]
[-- Type: text/plain, Size: 1535 bytes --]

Signed-off-by: Eric Leblond <eric@inl.fr>


---

 include/linux/netfilter/nfnetlink_queue.h |    2 ++
 net/netfilter/nfnetlink_queue.c           |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)

1fb988dc51e2465500df50ff4e085f80acb7b6a3
diff --git a/include/linux/netfilter/nfnetlink_queue.h b/include/linux/netfilter/nfnetlink_queue.h
index 9e77437..ce32c54 100644
--- a/include/linux/netfilter/nfnetlink_queue.h
+++ b/include/linux/netfilter/nfnetlink_queue.h
@@ -67,6 +67,7 @@ struct nfqnl_msg_config_cmd {
 } __attribute__ ((packed));
 
 enum nfqnl_config_mode {
+	NFQNL_COPY_UNSPEC,
 	NFQNL_COPY_NONE,
 	NFQNL_COPY_META,
 	NFQNL_COPY_PACKET,
@@ -75,6 +76,7 @@ enum nfqnl_config_mode {
 struct nfqnl_msg_config_params {
 	u_int32_t	copy_range;
 	u_int8_t	copy_mode;	/* enum nfqnl_config_mode */
+	u_int32_t   queue_maxlen;
 } __attribute__ ((packed));
 
 
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 86a4ac3..6032ad5 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -935,8 +935,13 @@ nfqnl_recv_config(struct sock *ctnl, str
 			goto out_put;
 		}
 		params = NFA_DATA(nfqa[NFQA_CFG_PARAMS-1]);
-		nfqnl_set_mode(queue, params->copy_mode,
+		if (params->copy_mode != NFQNL_COPY_UNSPEC){
+			nfqnl_set_mode(queue, params->copy_mode,
 				ntohl(params->copy_range));
+		}
+		if (params->queue_maxlen) {
+			queue->queue_maxlen=ntohl(params->queue_maxlen);
+		}
 	}
 
 out_put:
-- 
1.3.3


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]