* [PATCH] netfilter fix for 2.6.30-rc
@ 2009-05-09 18:45 Pablo Neira Ayuso
2009-05-09 18:46 ` [PATCH] netfilter: conntrack: add missing DCCP protocol changes in event cache Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2009-05-09 18:45 UTC (permalink / raw)
To: netfilter-devel; +Cc: kaber
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(-)
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] netfilter: conntrack: add missing DCCP protocol changes in event cache
2009-05-09 18:45 [PATCH] netfilter fix for 2.6.30-rc Pablo Neira Ayuso
@ 2009-05-09 18:46 ` Pablo Neira Ayuso
2009-05-25 15:30 ` Patrick McHardy
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2009-05-09 18:46 UTC (permalink / raw)
To: netfilter-devel; +Cc: kaber
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
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_conntrack_proto_dccp.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
index 8e757dd..aee0d6b 100644
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
@@ -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]);
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-05-25 15:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-09 18:45 [PATCH] netfilter fix for 2.6.30-rc Pablo Neira Ayuso
2009-05-09 18:46 ` [PATCH] netfilter: conntrack: add missing DCCP protocol changes in event cache Pablo Neira Ayuso
2009-05-25 15:30 ` Patrick McHardy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).