Re: Patch?: linux-2.5.45/net/ipv4/netfilter dst.pmtu compilation fixes

Re: Patch?: linux-2.5.45/net/ipv4/netfilter dst.pmtu compilation fixes

[Loic Jaquemet]

also see
http://marc.theaimsgroup.com/?l=linux-kernel&m=103614599321384&w=1

linux-2.5.45 appears to have replaced dst_entry.pmtu with
dst_entry.metrics[RTAX_PMTU] and created a helper function
dst_pmtu(struct dst_entry*), presumably to simplify future changes
like this one.   Now the
files compile.  That is as much as I have tested.

 I am not currently familiar with this code, so I could easily
have misunderstood something in this patch.


--- linux-2.5.45.orig/net/ipv4/netfilter/ipt_TCPMSS.c   2002-10-31
01:42:56.000000000 +0100
+++ linux-2.5.45/net/ipv4/netfilter/ipt_TCPMSS.c        2002-11-01
15:18:12.000000000 +0100
@@ -85,14 +85,14 @@
                        return NF_DROP; /* or IPT_CONTINUE ?? */
                }

-               if((*pskb)->dst->pmtu <= (sizeof(struct iphdr) +
sizeof(struct tcphdr))) {
+               if( dst_pmtu( (*pskb)->dst ) <= (sizeof(struct iphdr) +
sizeof(struct tcphdr))) {
                        if (net_ratelimit())
                                printk(KERN_ERR
-                                       "ipt_tcpmss_target: unknown or
invalid path-MTU (%d)\n", (*pskb)->dst->pmtu);
+                                       "ipt_tcpmss_target: unknown or
invalid path-MTU (%d)\n", dst_pmtu( (*pskb)->dst ) );
                        return NF_DROP; /* or IPT_CONTINUE ?? */
                }

-               newmss = (*pskb)->dst->pmtu - sizeof(struct iphdr) -
sizeof(struct tcphdr);
+               newmss = dst_pmtu( (*pskb)->dst ) - sizeof(struct iphdr)
- sizeof(struct tcphdr);
        } else
                newmss = tcpmssinfo->mss;



--
+----------------------------------------------+
|Jaquemet Loic                                 |
|Intern in WesternGeco, Schlumberger in Gatwick|
|Phone: 44-(0)1293-55-6876                     |
|Eleve ingenieur en informatique FIIFO, ORSAY  |
+----------------------------------------------+
http://sourceforge.net/projects/ffss/
#wirelessfr @ irc.freenode.net

Re: Patch?: linux-2.5.45/net/ipv4/netfilter dst.pmtu compilation fixes

[Harald Welte]

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

On Fri, Nov 01, 2002 at 02:34:40PM +0000, Loic Jaquemet wrote:
> 
> also see
> http://marc.theaimsgroup.com/?l=linux-kernel&m=103614599321384&w=1
> 
> linux-2.5.45 appears to have replaced dst_entry.pmtu with
> dst_entry.metrics[RTAX_PMTU] and created a helper function
> dst_pmtu(struct dst_entry*), presumably to simplify future changes
> like this one.   Now the
> files compile.  That is as much as I have tested.
> 
>  I am not currently familiar with this code, so I could easily
> have misunderstood something in this patch.

I will forward your patch for kernel inclusion.
-- 
Live long and prosper
- Harald Welte / laforge@gnumonks.org               http://www.gnumonks.org/
============================================================================
"If this were a dictatorship, it'd be a heck of a lot easier, just so long
 as I'm the dictator."  --  George W. Bush Dec 18, 2000

[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]