Skip to contentSkip to conversation

netfilter fix for 2.6.30-rc

PATCH New Pablo Neira Ayuso 2 participants 3 messages May 9, 2009 – May 25, 2009

Subsystems (2)
lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/1 netfilter fix for 2.6.30-rc

Hi Patrick!

The following is a fix for DCCP support, we are not currently including the protocol state in the event messages.

---

Pablo Neira Ayuso (1):
netfilter: conntrack: add missing DCCP protocol changes in event cache

 net/netfilter/nf_conntrack_proto_dccp.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
author maintainer
#1 lore raw

PATCH 1/1 netfilter: conntrack: add missing DCCP protocol changes in event cache

This patch adds the missing protocol state-change event reporting for DCCP.

$ sudo conntrack -E
    [NEW] dccp     33 240 src=192.168.0.2 dst=192.168.1.2 sport=57040 dport=5001 [UNREPLIED] src=192.168.1.2 dst=192.168.1.100 sport=5001 dport=57040

With this patch:

$ sudo conntrack -E
    [NEW] dccp     33 240 REQUEST src=192.168.0.2 dst=192.168.1.2 sport=57040 dport=5001 [UNREPLIED] src=192.168.1.2 dst=192.168.1.100 sport=5001 dport=57040

---

 net/netfilter/nf_conntrack_proto_dccp.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
net/netfilter/nf_conntrack_proto_dccp.c +4 -0
index 8e757dd..aee0d6b 100644
@@ -22,6 +22,7 @@
 #include <linux/netfilter/nfnetlink_conntrack.h>
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_l4proto.h>
+#include <net/netfilter/nf_conntrack_ecache.h>
 #include <net/netfilter/nf_log.h>
 
 static DEFINE_RWLOCK(dccp_lock);
@@ -553,6 +554,9 @@ static int dccp_packet(struct nf_conn *ct, const struct sk_buff *skb,
 	ct->proto.dccp.state = new_state;
 	write_unlock_bh(&dccp_lock);
 
+	if (new_state != old_state)
+		nf_conntrack_event_cache(IPCT_PROTOINFO, ct);
+
 	dn = dccp_pernet(net);
 	nf_ct_refresh_acct(ct, ctinfo, skb, dn->dccp_timeout[new_state]);
 
#2 lore raw

Re: [PATCH] netfilter: conntrack: add missing DCCP protocol changes in event cache

Quoted 11 lines · Pablo Neira Ayuso

This patch adds the missing protocol state-change event reporting for DCCP.

$ sudo conntrack -E
    [NEW] dccp     33 240 src=192.168.0.2 dst=192.168.1.2 sport=57040 dport=5001 [UNREPLIED] src=192.168.1.2 dst=192.168.1.100 sport=5001 dport=57040

With this patch:

$ sudo conntrack -E
    [NEW] dccp     33 240 REQUEST src=192.168.0.2 dst=192.168.1.2 sport=57040 dport=5001 [UNREPLIED] src=192.168.1.2 dst=192.168.1.100 sport=5001 dport=57040

Applied, thanks Pablo.