head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.26
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.24
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.22
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.20
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.18
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.16
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.14
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.12
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.10
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.8
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.6
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.4
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.2
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.1.0.6
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.4
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.2
	pkgsrc-2006Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.05.22.12.17.56;	author spz;	state dead;
branches;
next	1.1;

1.1
date	2006.07.07.12.30.56;	author spz;	state Exp;
branches;
next	;


desc
@@


1.2
log
@new version, new patches: upstream adopted a bunch of ours, but gcc found
new things to bitch about
@
text
@$NetBSD: patch-cm,v 1.1 2006/07/07 12:30:56 spz Exp $

--- src/rpsl/rpsl/prefix.cc.orig	2004-07-30 12:58:14.000000000 +0200
+++ src/rpsl/rpsl/prefix.cc
@@@@ -1216,10 +1216,13 @@@@ void MPPrefixRanges::except(MPPrefixRang
    assign(result.begin(), result.end());
 }
 
+// contains methods rewritten by spz according to hint from Hagen Boehm
 bool MPPrefixRanges::contains(IPAddr ip) const {
    MPPrefixRanges::const_iterator p;
    for (p = begin(); p != end(); ++p) {
-     if (p->ipv4 && (p->ipv4->get_ipaddr() == ip.get_ipaddr())) 
+     if (p->ipv4
+		&& p->ipv4->get_ipaddr() == ip.get_ipaddr()
+		&& p->ipv4->get_length() == ip.get_length() )
        return true;
    }
    return false;
@@@@ -1228,7 +1231,9 @@@@ bool MPPrefixRanges::contains(IPAddr ip)
 bool MPPrefixRanges::contains(IPv6Addr ip) const {
    MPPrefixRanges::const_iterator p;
    for (p = begin(); p != end(); ++p) {
-     if (p->ipv6 && (*(p->ipv6->get_ipaddr()) == *(ip.get_ipaddr())) )
+     if (p->ipv6
+		&& p->ipv6->get_ipaddr() == ip.get_ipaddr()
+		&& p->ipv6->get_length() == ip.get_length() )
        return true;
    }
    return false;
@@@@ -1237,9 +1242,17 @@@@ bool MPPrefixRanges::contains(IPv6Addr i
 bool MPPrefixRanges::contains(MPPrefix ip) const {
    MPPrefixRanges::const_iterator p;
    for (p = begin(); p != end(); ++p) {
-     if (p->ipv6 && ip.ipv6 && (*(p->ipv6->get_ipaddr()) == ip.get_ipaddr()) )
+     if (p->ipv6 && ip.ipv6
+		&& p->ipv6->get_ipaddr() == ip.ipv6->get_ipaddr()
+		&& p->ipv6->get_length() == ip.ipv6->get_length()
+		&& p->ipv6->get_m() == ip.ipv6->get_m()
+		&& p->ipv6->get_n() == ip.ipv6->get_n() )
        return true;
-     if (p->ipv4 && ip.ipv4 && (p->ipv4->get_ipaddr() == ip.ipv4->get_ipaddr()))
+     if (p->ipv4 && ip.ipv4
+		&& p->ipv4->get_ipaddr() == ip.ipv4->get_ipaddr()
+		&& p->ipv4->get_length() == ip.ipv4->get_length()
+		&& p->ipv4->get_m() == ip.ipv4->get_m()
+		&& p->ipv4->get_n() == ip.ipv4->get_n() )
        return true;
    }
    return false;
@


1.1
log
@add a fix for a list content checking problem Hagen Boehm identified
add a typo correction in a comment
@
text
@d1 1
a1 1
$NetBSD$
@