netfilter: nfnetlink_log: send complete hardware header

regit · davem330 · commit 72961ecf84d6 · 2008-07-21T10:11:00.000-07:00
This patch adds some fields to NFLOG to be able to send the complete
hardware header with all necessary informations.
It sends to userspace:
 * the type of hardware link
 * the lenght of hardware header
 * the hardware header

Signed-off-by: Eric Leblond &lt;eric@inl.fr&gt;
Signed-off-by: Patrick McHardy &lt;kaber@trash.net&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/linux/netfilter/nfnetlink_log.h b/include/linux/netfilter/nfnetlink_log.h
@@ -48,6 +48,9 @@ enum nfulnl_attr_type {
 	NFULA_SEQ,			/* instance-local sequence number */
 	NFULA_SEQ_GLOBAL,		/* global sequence number */
 	NFULA_GID,			/* group id of socket */
+	NFULA_HWTYPE,			/* hardware type */
+	NFULA_HWHEADER,			/* hardware header */
+	NFULA_HWLEN,			/* hardware header length */
 
 	__NFULA_MAX
 };
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
@@ -453,6 +453,14 @@ __build_packet_message(struct nfulnl_instance *inst,
 		}
 	}
 
+	if (indev && skb_mac_header_was_set(skb)) {
+		NLA_PUT_BE16(inst->skb, NFULA_HWTYPE, htons(skb->dev->type));
+		NLA_PUT_BE16(inst->skb, NFULA_HWLEN,
+			     htons(skb->dev->hard_header_len));
+		NLA_PUT(inst->skb, NFULA_HWHEADER, skb->dev->hard_header_len,
+			skb_mac_header(skb));
+	}
+
 	if (skb->tstamp.tv64) {
 		struct nfulnl_msg_packet_timestamp ts;
 		struct timeval tv = ktime_to_timeval(skb->tstamp);

Original file line number	Diff line number	Diff line change
`@@ -453,6 +453,14 @@ __build_packet_message(struct nfulnl_instance *inst,`
`453`	`453`	`}`
`454`	`454`	`}`
`455`	`455`
	`456`	`+ if (indev && skb_mac_header_was_set(skb)) {`
	`457`	`+ NLA_PUT_BE16(inst->skb, NFULA_HWTYPE, htons(skb->dev->type));`
	`458`	`+ NLA_PUT_BE16(inst->skb, NFULA_HWLEN,`
	`459`	`+ htons(skb->dev->hard_header_len));`
	`460`	`+ NLA_PUT(inst->skb, NFULA_HWHEADER, skb->dev->hard_header_len,`
	`461`	`+ skb_mac_header(skb));`
	`462`	`+ }`
	`463`	`+`
`456`	`464`	`if (skb->tstamp.tv64) {`
`457`	`465`	`struct nfulnl_msg_packet_timestamp ts;`
`458`	`466`	`struct timeval tv = ktime_to_timeval(skb->tstamp);`