pf-tools/pf-tools: 2 new changesets

[parmelan-guest at users.alioth.debian.org]

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/efd3292987ed
changeset: 1387:efd3292987ed
user:      melkor <melkor at sitadelle.com>
date:      Mon Dec 15 15:42:06 2014 +0100
description:
can enable ipv6 feature without perl error

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/5ec9718235d3
changeset: 1388:5ec9718235d3
user:      melkor <melkor at sitadelle.com>
date:      Mon Dec 15 15:45:31 2014 +0100
description:
bugfix

diffstat:

 lib/PFTools/Conf/Host.pm    |  2 ++
 lib/PFTools/Conf/Network.pm |  3 +++
 lib/PFTools/Net.pm          |  2 ++
 lib/PFTools/Utils.pm        |  1 +
 4 files changed, 8 insertions(+), 0 deletions(-)

diffs (55 lines):

diff -r 4f108abe7e6a -r 5ec9718235d3 lib/PFTools/Conf/Host.pm
--- a/lib/PFTools/Conf/Host.pm	Mon Dec 15 15:17:18 2014 +0100
+++ b/lib/PFTools/Conf/Host.pm	Mon Dec 15 15:45:31 2014 +0100
@@ -228,6 +228,7 @@
 
                 foreach my $ip_type ( 'ipv4', 'ipv6' ) {
                     next if not $pf_config->{'features'}->{$ip_type};
+                    next if not $new_iface_ref->{$ip_type};
 
                     my $ip_type_suffix = get_suffix_from_ip_type($ip_type);
                     my $addr_key       = qq{BY_ADDR$ip_type_suffix};
@@ -873,6 +874,7 @@
         next if not $pf_config->{'features'}->{$ip_type};
 
         my $subnet_ref = get_subnet_from_vlan( $ip_type, $vlan_ref );
+        next if !$subnet_ref;
 
         eval {
             $result->{$ip_type} = __get_host_real_ip(
diff -r 4f108abe7e6a -r 5ec9718235d3 lib/PFTools/Conf/Network.pm
--- a/lib/PFTools/Conf/Network.pm	Mon Dec 15 15:17:18 2014 +0100
+++ b/lib/PFTools/Conf/Network.pm	Mon Dec 15 15:45:31 2014 +0100
@@ -255,6 +255,9 @@
 
         my $suffix      = get_suffix_from_ip_type($ip_type);
         my $subnet_ref  = get_subnet_from_vlan( $ip_type, $section_ref );
+
+        next if !$subnet_ref;
+
         my $zone_key    = qq{ZONE$suffix};
         my $dhcp_key    = qq{DHCP$suffix};
         my $netaddr_key = qq{BY_ADDR$suffix};
diff -r 4f108abe7e6a -r 5ec9718235d3 lib/PFTools/Net.pm
--- a/lib/PFTools/Net.pm	Mon Dec 15 15:17:18 2014 +0100
+++ b/lib/PFTools/Net.pm	Mon Dec 15 15:45:31 2014 +0100
@@ -74,6 +74,8 @@
     }
 
     my $suffix  = get_suffix_from_ip_type($type);
+    return if !$net_hash->{"network$suffix"};
+
     my $net_def = $net_hash->{"network$suffix"};
 
     my $subnet_ref;
diff -r 4f108abe7e6a -r 5ec9718235d3 lib/PFTools/Utils.pm
--- a/lib/PFTools/Utils.pm	Mon Dec 15 15:17:18 2014 +0100
+++ b/lib/PFTools/Utils.pm	Mon Dec 15 15:45:31 2014 +0100
@@ -1486,6 +1486,7 @@
 
     foreach my $ip_type ( 'ipv4', 'ipv6' ) {
         next if not $pf_config->{'features'}->{$ip_type};
+        next if not $if_part->{$ip_type};
 
         my $ip = NetAddr::IP->new( $if_part->{$ip_type} );
         push @iface_lines,