Hello community, here is the log from the commit of package perl-Net-Netmask for openSUSE:Factory checked in at Thu Mar 24 17:39:18 CET 2011.
-------- --- perl-Net-Netmask/perl-Net-Netmask.changes 2010-12-01 14:51:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Net-Netmask/perl-Net-Netmask.changes 2011-03-24 14:37:28.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 24 13:25:11 UTC 2011 - [email protected] + +- update to 1.9016 +Fix bug rt#46996: warnings issued for bad input. +Fix bug rt#43348: use POSIX::floor() instead of int() +Rewrite netmask.t to use Test::More + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Net-Netmask-1.9015.tar.bz2 New: ---- Net-Netmask-1.9016.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Net-Netmask.spec ++++++ --- /var/tmp/diff_new_pack.xqvhKY/_old 2011-03-24 17:38:53.000000000 +0100 +++ /var/tmp/diff_new_pack.xqvhKY/_new 2011-03-24 17:38:53.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-Net-Netmask (Version 1.9015) +# spec file for package perl-Net-Netmask # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,8 @@ Name: perl-Net-Netmask -Version: 1.9015 -Release: 113 +Version: 1.9016 +Release: 1 Provides: perl_nm Obsoletes: perl_nm AutoReqProv: on @@ -49,6 +49,8 @@ %build perl Makefile.PL make %{?_smp_mflags} + +%check make test %install ++++++ Net-Netmask-1.9015.tar.bz2 -> Net-Netmask-1.9016.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/CHANGELOG new/Net-Netmask-1.9016/CHANGELOG --- old/Net-Netmask-1.9015/CHANGELOG 2006-11-30 23:06:09.000000000 +0100 +++ new/Net-Netmask-1.9016/CHANGELOG 2011-02-01 14:58:01.000000000 +0100 @@ -1,3 +1,10 @@ + += 2011/03/22 1.9016 + +Fix bug #46996: warnings issued for bad input. +Fix bug #43348: use POSIX::floor() instead of int() +Rewrite netmask.t to use Test::More + = 2006/11/30 1.9015 Fix bug # 22662 reported by grjones at gmail: cidrs2inverse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/META.yml new/Net-Netmask-1.9016/META.yml --- old/Net-Netmask-1.9015/META.yml 2006-11-30 23:06:29.000000000 +0100 +++ new/Net-Netmask-1.9016/META.yml 2011-02-01 15:00:22.000000000 +0100 @@ -1,10 +1,21 @@ -# http://module-build.sourceforge.net/META-spec.html -#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# -name: Net-Netmask -version: 1.9015 -version_from: Netmask.pm -installdirs: site -requires: - -distribution_type: module -generated_by: ExtUtils::MakeMaker version 6.21 +--- #YAML:1.0 +name: Net-Netmask +version: 1.9016 +abstract: Understand and manipulate IP netmaks +author: + - David Muir Sharnoff <[email protected]> +license: unknown +distribution_type: module +configure_requires: + ExtUtils::MakeMaker: 0 +build_requires: + ExtUtils::MakeMaker: 0 +requires: {} +no_index: + directory: + - t + - inc +generated_by: ExtUtils::MakeMaker version 6.56 +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/Makefile.PL new/Net-Netmask-1.9016/Makefile.PL --- old/Net-Netmask-1.9015/Makefile.PL 1999-06-16 08:17:01.000000000 +0200 +++ new/Net-Netmask-1.9016/Makefile.PL 2008-04-01 01:00:30.000000000 +0200 @@ -8,7 +8,7 @@ 'VERSION_FROM' => 'Netmask.pm', ($] >= 5.005 ? ('ABSTRACT' => 'Understand and manipulate IP netmaks', - 'AUTHOR' => 'David Muir Sharnoff <[email protected]>') : ()), + 'AUTHOR' => 'David Muir Sharnoff <[email protected]>') : ()), 'dist' => {COMPRESS=>'gzip', SUFFIX=>'gz'} ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/Netmask.pm new/Net-Netmask-1.9016/Netmask.pm --- old/Net-Netmask-1.9015/Netmask.pm 2006-11-30 23:03:06.000000000 +0100 +++ new/Net-Netmask-1.9016/Netmask.pm 2011-02-01 14:53:06.000000000 +0100 @@ -1,9 +1,9 @@ -# Copyright (C) 1998-2006, David Muir Sharnoff <[email protected]> +# Copyright (C) 1998-2006, David Muir Sharnoff <[email protected]> package Net::Netmask; use vars qw($VERSION); -$VERSION = 1.9015; +$VERSION = 1.9016; require Exporter; @ISA = qw(Exporter); @@ -28,6 +28,7 @@ use strict; use warnings; use Carp; +use POSIX qw(floor); use overload '""' => \&desc, '<=>' => \&cmp_net_netmask_block, @@ -220,7 +221,7 @@ { my ($this) = @_; my $ibase = $this->{'IBASE'}; - my $blocks = int($this->size()/256); + my $blocks = floor($this->size()/256); return (join('.',unpack('xC3', pack('V', $ibase))).".in-addr.arpa", $ibase%256, $ibase%256+$this->size()-1) if $blocks == 0; my @ary; @@ -297,6 +298,7 @@ $t = $remembered unless $t; my $ip = quad2int($ipquad); + return unless defined $ip; my %done; for (my $b = 32; $b >= 0; $b--) { @@ -462,7 +464,7 @@ my @result; while ($end >= $start) { my $maxsize = imaxblock($start, 32); - my $maxdiff = 32 - int(log($end - $start + 1)/log(2)); + my $maxdiff = 32 - floor(log($end - $start + 1)/log(2)); $maxsize = $maxdiff if $maxsize < $maxdiff; push (@result, bless { 'IBASE' => $start, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/Netmask.pod new/Net-Netmask-1.9016/Netmask.pod --- old/Net-Netmask-1.9015/Netmask.pod 2006-10-14 05:18:36.000000000 +0200 +++ new/Net-Netmask-1.9016/Netmask.pod 2011-02-01 14:25:58.000000000 +0100 @@ -436,12 +436,10 @@ =head1 LICENSE -Copyright (C) 1998-2006 David Muir Sharnoff. License hereby -granted for anyone to use, modify or redistribute this module at -their own risk. Please feed useful changes back to <[email protected]>. +Copyright (C) 1998-2006 David Muir Sharnoff. + +Copyright (C) 2011 Google, Inc. + +This module may be used, modified and redistributed on the same +terms as Perl itself. -If you found this module useful, please thank me (the author) by -giving me a chance to bid to provide your next high-speed Internet -link. I run multiple ISPs and can generally save you money and -provide a top-notch service for your T1s, T3s, OC3s, etc. Please -send your request to <[email protected]>. Thank you. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/README new/Net-Netmask-1.9016/README --- old/Net-Netmask-1.9015/README 2006-10-14 05:20:31.000000000 +0200 +++ new/Net-Netmask-1.9016/README 2011-02-01 14:30:31.000000000 +0100 @@ -382,13 +382,10 @@ Overlapping blocks will be collapsed. LICENSE - Copyright (C) 1998-2006 David Muir Sharnoff. License hereby granted for - anyone to use, modify or redistribute this module at their own risk. - Please feed useful changes back to <[email protected]>. + Copyright (C) 1998-2006 David Muir Sharnoff. - If you found this module useful, please thank me (the author) by giving - me a chance to bid to provide your next high-speed Internet link. I run - multiple ISPs and can generally save you money and provide a top-notch - service for your T1s, T3s, OC3s, etc. Please send your request to - <[email protected]>. Thank you. + Copyright (C) 2011 Google, Inc. + + This module may be used, modified and redistributed on the same terms as + Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-Netmask-1.9015/t/netmasks.t new/Net-Netmask-1.9016/t/netmasks.t --- old/Net-Netmask-1.9015/t/netmasks.t 2006-11-30 23:05:03.000000000 +0100 +++ new/Net-Netmask-1.9016/t/netmasks.t 2011-02-01 14:53:27.000000000 +0100 @@ -1,11 +1,10 @@ #!/usr/bin/perl -I. -w -print "1..282\n"; - use Net::Netmask; use Net::Netmask qw(sameblock cmpblocks); use Carp; use Carp qw(verbose); +use Test::More tests => 295; # addr mask base newmask bits mb my @rtests = qw( @@ -20,11 +19,13 @@ 10/8 u 10.0.0.0 255.0.0.0 8 7 209.157.64/19 u 209.157.64.0 255.255.224.0 19 18 209.157.64.0-209.157.95.255 u 209.157.64.0 255.255.224.0 19 18 + 216.140.48.16/32 u 216.140.48.16 255.255.255.255 32 28 209.157/17 u 209.157.0.0 255.255.128.0 17 16 default u 0.0.0.0 0.0.0.0 0 0 ); push(@rtests, '209.157.68.22#0.0.31.255', 'u', '209.157.64.0', '255.255.224.0', '19', '18'); + my @store = qw( 209.157.64.0/19 default @@ -54,129 +55,122 @@ ); my $debug = 0; -my $test = 1; my $x; my ($addr, $mask, $base, $newmask, $bits, $max); while (($addr, $mask, $base, $newmask, $bits, $max) = splice(@rtests, 0, 6)) { + + print "# $addr $mask $base $newmask $bits $max\n"; + $mask = undef if $mask eq 'u'; $x = new Net::Netmask ($addr, $mask); - printf STDERR "test $test, %s %s: %s %s %d %d\n", - $addr, $mask, $x->base(), $x->mask(), - $x->bits(), $x->maxblock() if $debug; - - print $x->base() eq $base ? "ok $test\n" : "not ok $test\n"; $test++; - print $x->mask() eq $newmask ? "ok $test\n" : "not ok $test\n"; $test++; - print $x->maxblock() == $max ? "ok $test\n" : "not ok $test\n"; $test++; - print $x->bits() == $bits ? "ok $test\n" : "not ok $test\n"; $test++; + is($x->base(), $base, "base of $addr"); + is($x->mask(), $newmask, "mask of $addr"); + is($x->maxblock(), $max, "maxblock of $addr"); + is($x->bits(), $bits, "bits of $addr"); } my @y; $x = new Net::Netmask ('209.157.64.0/19'); -print $x->size() == 8192 ? "ok $test\n" : "not ok $test\n"; $test++; - -print $x->hostmask() eq '0.0.31.255' ? "ok $test\n" : "not ok $test\n"; $test++; +is($x->size(), 8192, "size of 209.157.64.0/19"); +is($x->hostmask(), '0.0.31.255', "hostmask of 209.157.64.0/19"); @y = $x->inaddr(); -print STDERR "REVERSE: @y\n" if $debug; -print $y[0] eq '64.157.209.in-addr.arpa' - ? "ok $test\n" : "not ok $test\n"; $test++; -print $y[31*3] eq '95.157.209.in-addr.arpa' - ? "ok $test\n" : "not ok $test\n"; $test++; -print defined($y[32*3]) ? "not ok $test\n" : "ok $test\n"; $test++; +print "# REVERSE: @y\n"; +is ($y[0], '64.157.209.in-addr.arpa'); +is ($y[31*3], '95.157.209.in-addr.arpa'); +ok(! defined($y[32*3])); $x = new Net::Netmask ('140.174.82.4/32'); -print $x->size() == 1 ? "ok $test\n" : "not ok $test\n"; $test++; +is($x->size(), 1, "size of 140.174.82.4/32"); # perl bug: cannot just print this. -my $p = ($x->inaddr())[0] eq '82.174.140.in-addr.arpa' - ? "ok $test\n" - : "not ok $test\n"; -print $p; -printf STDERR "REVERSE$test %s\n", $x->inaddr() if $debug; -$test++; +is(($x->inaddr())[0], '82.174.140.in-addr.arpa'); $x = new Net::Netmask ('140.174.82.64/27'); -print (($x->inaddr())[1] == 64 ? "ok $test\n" : "not ok $test\n"); $test++; -print (($x->inaddr())[2] == 95 ? "ok $test\n" : "not ok $test\n"); $test++; -@y = $x->inaddr(); -print STDERR "Y$test @y\n" if $debug; +is(($x->inaddr())[1], 64); +is(($x->inaddr())[2], 95); $x = new Net::Netmask ('default'); -print $x->size() == 4294967296 ? "ok $test\n" : "not ok $test\n"; $test++; +ok($x->size() == 4294967296); $x = new Net::Netmask ('209.157.64.0/27'); @y = $x->enumerate(); -print $y[0] eq '209.157.64.0' ? "ok $test\n" : "not ok $test\n"; $test++; -print $y[31] eq '209.157.64.31' ? "ok $test\n" : "not ok $test\n"; $test++; -print defined($y[32]) ? "not ok $test\n" : "ok $test\n"; $test++; +is($y[0], '209.157.64.0'); +is($y[31], '209.157.64.31'); +ok(! defined($y[32])); $x = new Net::Netmask ('10.2.0.16/19'); @y = $x->enumerate(); -print $y[0] eq '10.2.0.0' ? "ok $test\n" : "not ok $test\n"; $test++; -print $y[8191] eq '10.2.31.255' ? "ok $test\n" : "not ok $test\n"; $test++; -print defined($y[8192]) ? "not ok $test\n" : "ok $test\n"; $test++; +is($y[0], '10.2.0.0'); +is($y[8191], '10.2.31.255'); +ok(! defined($y[8192])); my $table = {}; my $table9 = {}; -for my $b (@store) { - $x = new Net::Netmask ($b); - $x->storeNetblock(); +{ + for my $b (@store) { + $x = new Net::Netmask ($b); + $x->storeNetblock(); + } } -for my $b (@store2) { - $x = new Net::Netmask ($b); - $x->storeNetblock($table); - $x->storeNetblock($table9); +{ + for my $b (@store2) { + $x = new Net::Netmask ($b); + $x->storeNetblock($table); + $x->storeNetblock($table9); + } } my $result; while (($addr, $result) = splice(@lookup, 0, 2)) { my $nb = findNetblock($addr); - printf STDERR "lookup(%s): %s, wanting %s.\n", - $addr, $nb->desc(), $result if $debug; - print $nb->desc() eq $result ? "ok $test\n" : "not ok $test\n"; $test++; + printf "# lookup(%s): %s, wanting %s.\n", $addr, $nb->desc(), $result; + is($nb->desc(), $result, "$addr / $result"); } while (($addr, $result) = splice(@lookup2, 0, 2)) { my $nb = findNetblock($addr, $table); - printf STDERR "lookup(%s): %s, wanting %s.\n", - $addr, $nb->desc(), $result if $debug; - print $nb->desc() eq $result ? "ok $test\n" : "not ok $test\n"; $test++; + printf "# lookup(%s): %s, wanting %s.\n", + $addr, $nb->desc(), $result; + is($nb->desc(), $result, "$addr / $result"); } $newmask = Net::Netmask->new("192.168.1.0/24"); -print (($newmask->broadcast() eq "192.168.1.255") ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->next() eq "192.168.2.0") ? "ok $test\n" : "not ok $test\n"); $test++; -print ($newmask->match("192.168.0.255") ? "not ok $test\n" : "ok $test\n"); $test++; -print ($newmask->match("192.168.2.0") ? "not ok $test\n" : "ok $test\n"); $test++; -print ($newmask->match("10.168.2.0") ? "not ok $test\n" : "ok $test\n"); $test++; -print ($newmask->match("209.168.2.0") ? "not ok $test\n" : "ok $test\n"); $test++; -print ($newmask->match("192.168.1.0") ? "ok $test\n" : "not ok $test\n"); $test++; -print ($newmask->match("192.168.1.255") ? "ok $test\n" : "not ok $test\n"); $test++; -print ($newmask->match("192.168.1.63") ? "ok $test\n" : "not ok $test\n"); $test++; - -print (($newmask->nth(1) eq '192.168.1.1') ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->nth(-1) eq '192.168.1.255') ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->nth(-2) eq '192.168.1.254') ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->nth(0) eq '192.168.1.0') ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->match('192.168.1.1') == 1) ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->match('192.168.1.100') == 100) ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->match('192.168.1.255') == 255) ? "ok $test\n" : "not ok $test\n"); $test++; - -print (($newmask->match('192.168.2.1') == 0) ? "ok $test\n" : "not ok $test\n"); $test++; -print (!($newmask->match('192.168.2.1')) ? "ok $test\n" : "not ok $test\n"); $test++; -print (((0+$newmask->match('192.168.1.0')) == 0) ? "ok $test\n" : "not ok $test\n"); $test++; -print (($newmask->match('192.168.1.0')) ? "ok $test\n" : "not ok $test\n"); $test++; +is($newmask->broadcast(), "192.168.1.255"); +is($newmask->next(), "192.168.2.0"); +ok($newmask->match("192.168.1.0")); +ok($newmask->match("192.168.1.255")); +ok($newmask->match("192.168.1.63")); + +ok(! $newmask->match("192.168.0.255")); +ok(! $newmask->match("192.168.2.0")); +ok(! $newmask->match("10.168.2.0")); +ok(! $newmask->match("209.168.2.0")); + +is($newmask->nth(1),'192.168.1.1'); +is($newmask->nth(-1),'192.168.1.255'); +is($newmask->nth(-2),'192.168.1.254'); +is($newmask->nth(0),'192.168.1.0'); + +ok($newmask->match('192.168.1.1') == 1); +ok($newmask->match('192.168.1.100') == 100); +ok($newmask->match('192.168.1.255') == 255); + +ok(($newmask->match('192.168.2.1') == 0)); +ok(!($newmask->match('192.168.2.1'))); +ok(((0+$newmask->match('192.168.1.0')) == 0)); +ok(($newmask->match('192.168.1.0'))); my $bks; $block = new Net::Netmask '209.157.64.1/32'; $block->storeNetblock($bks); -print findNetblock('209.157.64.1',$bks) ? "ok $test\n" : "not ok $test\n"; $test++; +ok(findNetblock('209.157.64.1',$bks)); my @store3 = qw( @@ -231,40 +225,37 @@ my ($table, $value, $result) = @_; my $found = findNetblock($value, $table); if ($result) { -#printf "value = $value eresult = $result found = @{[$found->desc]}\n"; - print (($found->desc eq $result) ? "ok $test\n" : "not ok $test\n"); + is($found->desc, $result, "value='$value' found=@{[$found->desc]}"); } else { - print ($found ? "not ok $test\n" : "ok $test\n"); + ok(! $found, $value); } - $test++; } sub fdel { my ($value, $result, $table) = @_; my $found = findNetblock($value, $table); #print "search for $value, found and deleting @{[ $found->desc ]} eq $result\n"; - print (($found->desc eq $result) ? "ok $test\n" : "not ok $test\n"); + is($found->desc, $result, "$value / $result"); $found->deleteNetblock($table); - $test++; } my (@c) = range2cidrlist("66.33.85.239", "66.33.85.240"); my $dl = dlist(@c); -print ($dl eq '66.33.85.239/32 66.33.85.240/32' ? "ok $test\n" : "not ok $test\n"); $test++; +ok($dl eq '66.33.85.239/32 66.33.85.240/32'); (@c) = range2cidrlist('216.240.32.128', '216.240.36.127'); $dl = dlist(@c); -print ($dl eq '216.240.32.128/25 216.240.33.0/24 216.240.34.0/23 216.240.36.0/25' ? "ok $test\n" : "not ok $test\n"); $test++; +ok($dl eq '216.240.32.128/25 216.240.33.0/24 216.240.34.0/23 216.240.36.0/25'); my @d; @d = (@c[0,1,3]); my (@e) = cidrs2contiglists(@d); -print (@e == 2 ? "ok $test\n" : "not ok $test\n"); $test++; +ok(@e == 2); -print (dlist(@{$e[0]}) eq '216.240.32.128/25 216.240.33.0/24' ? "ok $test\n" : "not ok $test\n"); $test++; -print (dlist(@{$e[1]}) eq '216.240.36.0/25' ? "ok $test\n" : "not ok $test\n"); $test++; +is(dlist(@{$e[0]}), '216.240.32.128/25 216.240.33.0/24'); +is(dlist(@{$e[1]}), '216.240.36.0/25'); sub dlist { @@ -308,59 +299,53 @@ my (@blist) = map { new Net::Netmask $_ } @iplist; my (@clist) = sort @blist; my (@sorted2) = map { $_->base() } @clist; - -if ($] < 5.006_001) { - print "ok $test # skip Overload not supported at $[\n"; $test++; -} else { - print ("@sorted1" eq "@sorted2" ? "ok $test\n" : "not ok $test\n"); $test++; -} - my (@dlist) = sort @blist; my (@sorted3) = map { $_->base() } @dlist; -if ($] < 5.006_001) { - print "ok $test # skip Overload not supported at $[\n"; $test++; -} else { - print "# AT TEST $test\n"; - print ("@sorted1" eq "@sorted3" ? "ok $test\n" : "not ok $test\n"); $test++; +SKIP: { + skip 2 if $] < 5.006_001; + is("@sorted1", "@sorted2"); + is("@sorted1", "@sorted3"); } my $q144 = new Net::Netmask '216.240.32.0/25'; for my $i (qw(216.240.32.0/24 216.240.32.0/26 216.240.33.0/25)) { my $q144p = new Net::Netmask $i; - print ($q144 eq $q144p ? "not ok $test\n" : "ok $test\n"); $test++; - print ($q144 == $q144p ? "not ok $test\n" : "ok $test\n"); $test++; - print (sameblock($q144, $i) ? "not ok $test\n" : "ok $test\n"); $test++; - print (cmpblocks($q144, $i) ? "ok $test\n" : "not ok $test\n"); $test++; - print ($q144->sameblock($i) ? "not ok $test\n" : "ok $test\n"); $test++; - print ($q144->cmpblocks($i) ? "ok $test\n" : "not ok $test\n"); $test++; + + print "# working on $i\n"; + ok (! ($q144 eq $q144p)); + ok (! ($q144 == $q144p)); + ok (! (sameblock($q144, $i))); + ok (! ($q144->sameblock($i))); + ok (cmpblocks($q144, $i)); + ok ($q144->cmpblocks($i)); } my $q144pp = new Net::Netmask '216.240.32.0/25'; -print ($q144 == $q144pp ? "ok $test\n" : "not ok $test\n"); $test++; -print ($q144 eq $q144pp ? "ok $test\n" : "not ok $test\n"); $test++; -print (sameblock($q144, '216.240.32.0/25') ? "ok $test\n" : "not ok $test\n"); $test++; -print (cmpblocks($q144, '216.240.32.0/25') ? "not ok $test\n" : "ok $test\n"); $test++; -print ($q144->sameblock('216.240.32.0/25') ? "ok $test\n" : "not ok $test\n"); $test++; -print ($q144->cmpblocks('216.240.32.0/25') ? "not ok $test\n" : "ok $test\n"); $test++; +ok (($q144 == $q144pp)); +ok (($q144 eq $q144pp)); +ok (($q144->desc eq "$q144")); +ok ($q144->sameblock('216.240.32.0/25')); +ok (sameblock($q144, '216.240.32.0/25')); + +ok (! (cmpblocks($q144, '216.240.32.0/25'))); +ok (! ($q144->cmpblocks('216.240.32.0/25'))); + -print ($q144->desc eq "$q144" ? "ok $test\n" : "not ok $test\n"); $test++; my $dnts = join(' ',dumpNetworkTable($table9)); -print ($dnts eq '0.0.0.0/0 209.157.64.0/19 209.157.80.0/24 209.157.81.16/28' ? "ok $test\n" : "not ok $test\n"); $test++; +is($dnts, '0.0.0.0/0 209.157.64.0/19 209.157.80.0/24 209.157.81.16/28'); sub lookouter { my ($table, $value, $result) = @_; my $found = findOuterNetblock($value, $table); if ($result) { -#printf "value = $value eresult = $result found = @{[$found->desc]}\n"; - print (($found->desc eq $result) ? "ok $test\n" : "not ok $test\n"); + is($found->desc, $result, "value = $value, result = $result"); } else { - print ($found ? "not ok $test\n" : "ok $test\n"); + ok(! $found, "value = $value"); } - $test++; } # 216.240.32.0/19 @@ -405,12 +390,10 @@ my $block = new2 Net::Netmask $value; my $found = findOuterNetblock($block, $table); if ($result) { -#printf "value = $value eresult = $result found = @{[$found->desc]}\n"; - print (($found->desc eq $result) ? "ok $test\n" : "not ok $test\n"); + is($found->desc, $result, "value = $value"); } else { - print ($found ? "not ok $test\n" : "ok $test\n"); + ok(! $found); } - $test++; } lookouterO($table7, "216.240.40.5/30", "216.240.32.0/19"); @@ -449,10 +432,10 @@ my $b = new Net::Netmask shift; print "# ctest($a, $b)\n"; - print ($a->contains($a) ? "ok $test\n" : "not ok $test\n"); $test++; - print ($b->contains($b) ? "ok $test\n" : "not ok $test\n"); $test++; - print ($a->contains($b) ? "ok $test\n" : "not ok $test\n"); $test++; - print (($a->sameblock($b) || ! $b->contains($a)) ? "ok $test\n" : "not ok $test\n"); $test++; + ok($a->contains($a)); + ok($b->contains($b)); + ok($a->contains($b)); + ok(($a->sameblock($b) || ! $b->contains($a))); } sub ctestno @@ -461,8 +444,8 @@ my $b = new Net::Netmask shift; print "# ctestno($a, $b)\n"; - print ($a->contains($b) ? "not ok $test\n" : "ok $test\n"); $test++; - print ($b->contains($a) ? "not ok $test\n" : "ok $test\n"); $test++; + ok (! $a->contains($b)); + ok (! $b->contains($a)); } ctest("10.20.30.0/24", "10.20.30.0/25"); @@ -486,23 +469,23 @@ (@c) = cidrs2cidrs(multinew(qw(216.240.32.0/25 216.240.32.128/25 216.240.33.0/25 216.240.34.0/24))); $dl = dlist(@c); -print ($dl eq '216.240.32.0/24 216.240.33.0/25 216.240.34.0/24' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq '216.240.32.0/24 216.240.33.0/25 216.240.34.0/24'); (@c) = cidrs2cidrs(multinew(qw(216.240.32.0/32 216.240.32.1/32 216.240.32.2/32 216.240.32.3/32 216.240.32.4/32))); $dl = dlist(@c); -print ($dl eq '216.240.32.0/30 216.240.32.4/32' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq '216.240.32.0/30 216.240.32.4/32'); (@c) = cidrs2cidrs(multinew(qw(216.240.32.64/28 216.240.32.0/25 216.240.32.128/25 216.240.33.0/25 216.240.34.0/24))); $dl = dlist(@c); -print ($dl eq '216.240.32.0/24 216.240.33.0/25 216.240.34.0/24' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq '216.240.32.0/24 216.240.33.0/25 216.240.34.0/24'); my $block = new Net::Netmask ('172.2.4.0', '255.255.255.0'); $table = {}; $block->storeNetblock($table); @b = findAllNetblock('172.2.4.1', $table); -print $#b == 0 ? "ok $test\n" : "not ok $test\n"; $test++; +ok( $#b == 0 ); $block->tag('a', 'b'); $block->tag('b', 'c'); @@ -511,34 +494,29 @@ $block->tag('d', 'x'); $block->tag('d'); -print $block->tag('a') eq 'b' ? "ok $test\n" : "not ok $test\n"; $test++; -print $block->tag('b') eq 'c' ? "ok $test\n" : "not ok $test\n"; $test++; -print(!defined($block->tag('c')) ? "ok $test\n" : "not ok $test\n"); $test++; -print $block->tag('d') eq 'x' ? "ok $test\n" : "not ok $test\n"; $test++; -print $block->tag('a') eq 'b' ? "ok $test\n" : "not ok $test\n"; $test++; +ok( $block->tag('a') eq 'b'); +ok( $block->tag('b') eq 'c'); +ok( !defined($block->tag('c'))); +ok( $block->tag('d') eq 'x'); +ok( $block->tag('a') eq 'b'); (@c) = cidrs2inverse('216.240.32.0/22', (multinew(qw(216.240.32.64/28 216.240.32.0/25 216.240.32.128/25 216.240.33.0/25 216.240.34.0/24)))); $dl = dlist(@c); -print ($dl eq '216.240.33.128/25 216.240.35.0/24' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq '216.240.33.128/25 216.240.35.0/24'); (@c) = cidrs2inverse('216.240.32.0/22', (multinew(qw(215.0.0.0/16 216.240.32.64/28 216.240.32.0/25 216.240.32.128/25 216.240.33.0/25 216.240.34.0/24 216.240.45.0/24)))); $dl = dlist(@c); -print ($dl eq '216.240.33.128/25 216.240.35.0/24' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq '216.240.33.128/25 216.240.35.0/24'); (@c) = cidrs2inverse('216.240.32.0/22', (multinew(qw(216.240.0.0/16 215.0.0.0/16 216.240.32.64/28 216.240.32.0/25 216.240.32.128/25 216.240.33.0/25 216.240.34.0/24 216.240.45.0/24)))); $dl = dlist(@c); -print ($dl eq '' ? "ok $test\n" : "not ok $test\n"); $test++; +ok ($dl eq ''); my $table77 = {}; my $block77 = new2 Net::Netmask("10.1.2.0/24", $table77); $block77->storeNetblock(); -if(defined(findNetblock("10.2.1.0", $table77))) { - print "not ok $test\n"; -} else { - print "ok $test\n"; -} -$test++; +ok(! defined(findNetblock("10.2.1.0", $table77))); { @@ -552,12 +530,7 @@ while (@t) { my $arg = shift(@t); my $result = shift(@t); - if ($b->nextblock($arg)."" eq $result) { - print "ok $test\n"; - } else { - print "not ok $test\n"; - } - $test++; + is($b->nextblock($arg)."", $result, "$result"); } } @@ -567,70 +540,61 @@ my $obj2 = new2 Net::Netmask ('1.0.0.4/32'); my @leftover = cidrs2inverse($obj1, $obj2); # print "leftover = @leftover\n"; - if (@leftover == 1 && "$leftover[0]" eq "1.0.0.5/32") { - print "ok $test\n"; - } else { - print "not ok $test\n"; - } - $test++; + ok(@leftover == 1); + ok("$leftover[0]" eq "1.0.0.5/32"); } { my $obj1 = new2 Net::Netmask ('1.0.0.4/32'); my $obj2 = new2 Net::Netmask ('1.0.0.0/8'); my @leftover = cidrs2inverse($obj1, $obj2); - if (@leftover) { - print "not ok $test # leftover = @leftover\n"; - } else { - print "ok $test\n"; - } - $test++; + ok(! @leftover, "@leftover"); } { my $obj1 = new2 Net::Netmask ('1.0.0.4/32'); my $obj2 = new2 Net::Netmask ('1.0.0.4/32'); my @leftover = cidrs2inverse($obj1, $obj2); - if (@leftover) { - print "not ok $test # leftover2 = @leftover\n"; - } else { - print "ok $test\n"; - } - $test++; + ok(! @leftover, "@leftover"); } { my $obj1 = new2 Net::Netmask ('1.0.0.4/32'); my $obj2 = new2 Net::Netmask ('1.0.0.6/32'); my @leftover = cidrs2inverse($obj1, $obj2); - if (@leftover == 1 && "$leftover[0]" eq '1.0.0.4/32') { - print "ok $test\n"; - } else { - print "not ok $test # leftover3 = @leftover\n"; - } - $test++; + ok(@leftover == 1); + ok("$leftover[0]" eq '1.0.0.4/32'); } { my $obj1 = new2 Net::Netmask ('1.0.0.4/31'); my $obj2 = new2 Net::Netmask ('1.0.0.5/32'); my @leftover = cidrs2inverse($obj1, $obj2); - if (@leftover == 1 && "$leftover[0]" eq '1.0.0.4/32') { - print "ok $test\n"; - } else { - print "not ok $test # leftover3 = @leftover\n"; - } - $test++; + ok(@leftover == 1); + ok("$leftover[0]" eq '1.0.0.4/32'); } { my $obj1 = new2 Net::Netmask ('1.0.0.4/31'); my $obj2 = new2 Net::Netmask ('1.0.0.4/32'); my @leftover = cidrs2inverse($obj1, $obj2); - if (@leftover == 1 && "$leftover[0]" eq '1.0.0.5/32') { - print "ok $test\n"; - } else { - print "not ok $test # leftover3 = @leftover\n"; - } - $test++; + ok(@leftover == 1); + ok("$leftover[0]" eq '1.0.0.5/32'); +} + +{ + my $obj1 = new2 Net::Netmask ('217.173.192.0/21'); + my $obj2 = new2 Net::Netmask ('217.173.200.0/21'); + is("$obj1", '217.173.192.0/21'); + is("$obj2", '217.173.200.0/21'); + ok(! $obj1->contains($obj2)); + ok(! $obj2->contains($obj1)); } + +{ + my $warnings = ''; + local($SIG{__WARN__}) = sub { $warnings = $_[0] }; + my $block = findNetblock("127.0.0.", { 1 => []}); + is($warnings, ''); +} + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
