From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262261AbTHTW3T (ORCPT ); Wed, 20 Aug 2003 18:29:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262278AbTHTW3T (ORCPT ); Wed, 20 Aug 2003 18:29:19 -0400 Received: from willy.net1.nerim.net ([62.212.114.60]:6412 "EHLO www.home.local") by vger.kernel.org with ESMTP id S262261AbTHTW3K (ORCPT ); Wed, 20 Aug 2003 18:29:10 -0400 Date: Thu, 21 Aug 2003 00:27:10 +0200 From: Willy Tarreau To: "David S. Miller" Cc: linux-kernel@vger.kernel.org, netdev@oss.sgi.com Subject: Re: [RFC][2.4 PATCH] source address selection for ARP requests Message-ID: <20030820222710.GC734@alpha.home.local> References: <1061320363.3744.14.camel@athena.fprintf.net> <20030820100044.3127d612.davem@redhat.com> <3F43B389.5060602@candelatech.com> <20030820104831.6235f3b9.davem@redhat.com> <20030820213443.GA23939@alpha.home.local> <20030820144711.13ea5f38.davem@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030820144711.13ea5f38.davem@redhat.com> User-Agent: Mutt/1.4i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 20, 2003 at 02:47:11PM -0700, David S. Miller wrote: > On Wed, 20 Aug 2003 23:34:43 +0200 > Willy Tarreau wrote: > > > + if (in_dev == NULL) > > + return; > > A NULL in_dev is what you'll see if no addresses are > assigned to the interface, therefore you must treat > this case similarly. OK, that's fine. It is what I wanted to test with in_dev->ifa_list==NULL. I don't know if I must keep the test or not (anyway, it doesn't hurt, this isn't a fast path). Better this way ? Cheers, Willy -------- patch 1 : diff -urN linux-2.4.22-rc2/net/ipv4/arp.c linux-2.4.22-rc2-arp/net/ipv4/arp.c --- linux-2.4.22-rc2/net/ipv4/arp.c Fri Aug 1 23:06:29 2003 +++ linux-2.4.22-rc2-arp/net/ipv4/arp.c Thu Aug 21 00:20:19 2003 @@ -320,13 +320,20 @@ u32 saddr; u8 *dst_ha = NULL; struct net_device *dev = neigh->dev; + struct in_device *in_dev = in_dev_get(dev); u32 target = *(u32*)neigh->primary_key; int probes = atomic_read(&neigh->probes); - if (skb && inet_addr_type(skb->nh.iph->saddr) == RTN_LOCAL) + if (in_dev == NULL || in_dev->ifa_list == NULL || + (skb && inet_addr_type(skb->nh.iph->saddr) == RTN_LOCAL && + (IN_DEV_SHARED_MEDIA(in_dev) || + inet_addr_onlink(in_dev, skb->nh.iph->saddr, 0)))) saddr = skb->nh.iph->saddr; else saddr = inet_select_addr(dev, target, RT_SCOPE_LINK); + + if (in_dev == NULL) + in_dev_put(in_dev); if ((probes -= neigh->parms->ucast_probes) < 0) { if (!(neigh->nud_state&NUD_VALID)) --------- patch 2 : diff -urN linux-2.4.22-rc2/net/ipv4/arp.c linux-2.4.22-rc2-arp2/net/ipv4/arp.c --- linux-2.4.22-rc2/net/ipv4/arp.c Fri Aug 1 23:06:29 2003 +++ linux-2.4.22-rc2-arp2/net/ipv4/arp.c Thu Aug 21 00:24:25 2003 @@ -320,13 +320,19 @@ u32 saddr; u8 *dst_ha = NULL; struct net_device *dev = neigh->dev; + struct in_device *in_dev = in_dev_get(dev); u32 target = *(u32*)neigh->primary_key; int probes = atomic_read(&neigh->probes); - if (skb && inet_addr_type(skb->nh.iph->saddr) == RTN_LOCAL) - saddr = skb->nh.iph->saddr; + if (skb && inet_addr_type(skb->nh.iph->saddr) == RTN_LOCAL && + (in_dev == NULL || IN_DEV_SHARED_MEDIA(in_dev) || + (saddr = inet_select_addr(dev, target, RT_SCOPE_LINK)) == 0)) + saddr = skb->nh.iph->saddr; else saddr = inet_select_addr(dev, target, RT_SCOPE_LINK); + + if (in_dev == NULL) + in_dev_put(in_dev); if ((probes -= neigh->parms->ucast_probes) < 0) { if (!(neigh->nud_state&NUD_VALID))