Skip to contentSkip to conversation

compilation error + kernel panic sip-conntrack-nat

PATCH In review Ralf Schlatterbeck 2 participants 4 messages Mar 27, 2006 – Mar 29, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 compilation error + kernel panic sip-conntrack-nat

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.

Note: The FAQ-Entry about SIP
http://www.netfilter.org/documentation/FAQ/netfilter-faq-1.html#ss1.8
should be updated to point to sip-conntrack-nat, see
http://www.iptel.org/sipalg/
The conntrack module would surely get more testing if it is mentioned in the FAQ :-)

net/ipv4/netfilter/ip_conntrack_sip.c renamed from net/ipv4/netfilter/ip_conntrack_sip.c.before-rsc +3 -1
@@ -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);
 	

Ralf

Signature · 1 line
Ralf Schlatterbeck
#1 lore raw
Quoted 5 lines · 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.

I actually have a version with some more fixes I wanted to submit (since quite some time), but I haven't gotten around to fixing the last remaining issue, so I've applied your patch for now. Thanks.

Quoted 6 lines

Note: The FAQ-Entry about SIP
http://www.netfilter.org/documentation/FAQ/netfilter-faq-1.html#ss1.8
should be updated to point to sip-conntrack-nat, see
http://www.iptel.org/sipalg/
The conntrack module would surely get more testing if it is mentioned in the FAQ :-)

Feel free to send a patch :)

#2 lore raw
Quoted 9 lines · Patrick McHardy
Quoted 6 lines · Ralf Schlatterbeck

Note: The FAQ-Entry about SIP
http://www.netfilter.org/documentation/FAQ/netfilter-faq-1.html#ss1.8
should be updated to point to sip-conntrack-nat, see
http://www.iptel.org/sipalg/
The conntrack module would surely get more testing if it is mentioned in the FAQ :-)

Feel free to send a patch :)

Can you tell me where I should look for the sources? Is this directly maintained in HTML? For the other documents I suppose the SGML version is the original -- but for the FAQ there isn't an SGML document.

Ralf

Signature · 1 line
Ralf Schlatterbeck
#3 lore raw
Quoted 11 lines · Ralf Schlatterbeck
Quoted 9 lines · Patrick McHardy
Quoted 6 lines · Ralf Schlatterbeck

Note: The FAQ-Entry about SIP
http://www.netfilter.org/documentation/FAQ/netfilter-faq-1.html#ss1.8
should be updated to point to sip-conntrack-nat, see
http://www.iptel.org/sipalg/
The conntrack module would surely get more testing if it is mentioned in the FAQ :-)

Quoted 6 lines
Quoted 1 line

Feel free to send a patch :)

Can you tell me where I should look for the sources? Is this directly maintained in HTML? For the other documents I suppose the SGML version is the original -- but for the FAQ there isn't an SGML document.

I only I knew .. The FAQ stuff is under output/ in the SVN repository, so I suppose there must be an input somewhere :)