[netfilter-cvslog] r6562 -
trunk/patch-o-matic-ng/patchlets/sip-conntrack-nat/linux-2.6.13/net/ipv4/netfilter
kaber at netfilter.org
kaber at netfilter.org
Wed Mar 29 10:55:05 CEST 2006
Author: kaber at netfilter.org
Date: 2006-03-29 10:55:01 +0200 (Wed, 29 Mar 2006)
New Revision: 6562
Modified:
trunk/patch-o-matic-ng/patchlets/sip-conntrack-nat/linux-2.6.13/net/ipv4/netfilter/ip_conntrack_sip.c
Log:
[PATCH]: compilation error + kernel panic sip-conntrack-nat (Ralf Schlatterbeck)
The following patch fixes a compilation problem for 2.6.16 (two missing
includes) and a kernel panic on the first sip packets (reproduced with
2.6.15.4 and 2.6.16, tested only with 2.6.16). The kernel-panic fix is
from the mailinglist-archive but obviously didn't yet make it into
the official tree yet.
Modified: trunk/patch-o-matic-ng/patchlets/sip-conntrack-nat/linux-2.6.13/net/ipv4/netfilter/ip_conntrack_sip.c
===================================================================
--- trunk/patch-o-matic-ng/patchlets/sip-conntrack-nat/linux-2.6.13/net/ipv4/netfilter/ip_conntrack_sip.c 2006-03-29 08:50:53 UTC (rev 6561)
+++ trunk/patch-o-matic-ng/patchlets/sip-conntrack-nat/linux-2.6.13/net/ipv4/netfilter/ip_conntrack_sip.c 2006-03-29 08:55:01 UTC (rev 6562)
@@ -13,6 +13,8 @@
#include <linux/netfilter.h>
#include <linux/ip.h>
#include <linux/ctype.h>
+#include <linux/in.h>
+#include <linux/udp.h>
#include <net/checksum.h>
#include <net/udp.h>
@@ -296,7 +298,7 @@
return NF_ACCEPT;
}
- ip_ct_refresh_acct(ct, ctinfo, NULL, sip_timeout * HZ);
+ ip_ct_refresh(ct, *pskb, sip_timeout * HZ);
spin_lock_bh(&sipbf_lock);
More information about the netfilter-cvslog
mailing list