On Thursday 25 September 2008 01:58, Daniel Cheng wrote:
> On Thu, Sep 25, 2008 at 12:33 AM,  <[EMAIL PROTECTED]> wrote:
> > Author: toad
> > Date: 2008-09-24 16:33:13 +0000 (Wed, 24 Sep 2008)
> > New Revision: 22799
> >
> > Modified:
> >   trunk/freenet/src/freenet/node/NodeIPDetector.java
> > Log:
> > Don't allow detected IPs to include hostnames with no IPs, *only* override 
addresses.
> >
> >
> > Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
> > ===================================================================
> > --- trunk/freenet/src/freenet/node/NodeIPDetector.java  2008-09-24 
16:21:34 UTC (rev 22798)
> > +++ trunk/freenet/src/freenet/node/NodeIPDetector.java  2008-09-24 
16:33:13 UTC (rev 22799)
> > @@ -134,8 +134,9 @@
> >                        ArrayList filtered = new 
ArrayList(lastIPAddress.length);
> >                        for(int i=0;i<lastIPAddress.length;i++) {
> >                                if(lastIPAddress[i] == null) continue;
> > -                               if(lastIPAddress[i].hasHostnameNoIP())
> > +                               if(lastIPAddress[i] == overrideIPAddress 
&& lastIPAddress[i].hasHostnameNoIP())
> 
> use .equals() ?

No, here we want same-object equality.
> 
> >                                        filtered.add(lastIPAddress[i]);
> > +                               else 
if(lastIPAddress[i].hasHostnameNoIP()) continue;
> >                                else 
if(IPUtil.isValidAddress(lastIPAddress[i].getAddress(), false))
> >                                        filtered.add(lastIPAddress[i]);
> >                        }

Attachment: pgpc1NV68Ws24.pgp
Description: PGP signature

_______________________________________________
Devl mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl

Reply via email to