[PATCH] ip_nat_sip: fix compiler warning

[PATCH] ip_nat_sip: fix compiler warning

[Torsten Luettgert]

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

Hi,

here's a trivial patch for ip_nat_sip which fixes the following
compiler warning:

net/ipv4/netfilter/ip_nat_sip.c:97: warning: ISO C90 forbids mixed
declarations and code

Regards,
Torsten

[-- Attachment #2: ip_nat_sip.patch --]
[-- Type: text/x-patch, Size: 694 bytes --]

Index: linux-2.6.13/net/ipv4/netfilter/ip_nat_sip.c
===================================================================
--- linux-2.6.13/net/ipv4/netfilter/ip_nat_sip.c	(revision 6622)
+++ linux-2.6.13/net/ipv4/netfilter/ip_nat_sip.c	(working copy)
@@ -61,6 +61,7 @@
 	unsigned int bufflen, dataoff;
 	uint32_t ip;
 	uint16_t port;
+   const char *aux;
 	
 	dataoff = (*pskb)->nh.iph->ihl*4 + sizeof(struct udphdr);
 	
@@ -93,7 +94,7 @@
 		}
 		
 		/* This search should ignore case, but later.. */
-		const char *aux = ct_sip_search("CSeq:", *dptr, sizeof("CSeq:") - 1, 
+		aux = ct_sip_search("CSeq:", *dptr, sizeof("CSeq:") - 1, 
 								(*pskb)->len - dataoff);
 		if (!aux)
 			return 0;

Re: [PATCH] ip_nat_sip: fix compiler warning

[Patrick McHardy]

Torsten Luettgert wrote:
> Hi,
> 
> here's a trivial patch for ip_nat_sip which fixes the following
> compiler warning:
> 
> net/ipv4/netfilter/ip_nat_sip.c:97: warning: ISO C90 forbids mixed
> declarations and code


Thanks, but the SIP helper in patch-o-matic is quite out of date.
I have a version with that warning (and some other things) already
fixed queued for upstream submission. After that I'll most likely
remove it from pom.

Re: [PATCH] ip_nat_sip: fix compiler warning

[Torsten Luettgert]

On So, 2006-05-28 at 16:29 +0200, Patrick McHardy wrote:
> Torsten Luettgert wrote:
> > 
> Thanks, but the SIP helper in patch-o-matic is quite out of date.
> I have a version with that warning (and some other things) already
> fixed queued for upstream submission. After that I'll most likely
> remove it from pom.

Ok, I'll just switch if off in my 2.6.16 kernels.

BTW: What about the new protoff argument to match functions, and
the change from struct ipt_ip * to void * in the checkentry
functions (e.g. in the set match).

Are those already fixed and going upstream, too, or would it be
worthwile to submit patches for old matches and targets?

Regards,
Torsten

Re: [PATCH] ip_nat_sip: fix compiler warning

[Patrick McHardy]

Torsten Luettgert wrote:
> BTW: What about the new protoff argument to match functions, and
> the change from struct ipt_ip * to void * in the checkentry
> functions (e.g. in the set match).
> 
> Are those already fixed and going upstream, too, or would it be
> worthwile to submit patches for old matches and targets?

I guess anything still in pom is worth fixing. There are
a couple of patchlets that have found new maintainers but
don't have an external repository yet, those will be
removed once those repositories are set up. Until then
I have no problems applying fixes to them.