Changeset 350

Timestamp:

Sep 13, 2018, 5:49:24 PM (6 years ago)

Author:

g7moreau

Message:

• First support for ip range in sector

Location:

trunk/ddt

Files:

• ddt (modified) (5 diffs)
• make-package-debian (modified) (1 diff)

trunk/ddt/ddt

@@ -4 +4 @@
 # License GNU GPL version 2 or later and Perl equivalent
 #
-# apt-get install perl-base perl-modules libyaml-syck-perl libnet-netmask-perl libreadonly-perl libfile-touch-perl libtext-table-perl
+# apt-get install perl-base perl-modules libyaml-syck-perl libnet-netmask-perl libreadonly-perl libfile-touch-perl libtext-table-perl libnetaddr-ip-perl
 
 package DDT::RE;
@@ -21 +21 @@
 use strict;
 #use warnings;
-use version; our $VERSION = version->declare('0.11.3');
+use version; our $VERSION = version->declare('0.11.4');
 
 use Getopt::Long qw(GetOptions);
@@ -31 +31 @@
 use Socket;
 use Text::Table;
+use NetAddr::IP;
 
 my $command = shift @ARGV || 'help';
@@ -261 +262 @@
    }
 
+#-------------------------------------------------------------------------------
+
+sub control_ip_in_range {
+   my ($computer_db, $sector, $ip) = @_;
+
+   return 1 if not exists $computer_db->{'dset'}{$sector}{'ip'}; # No IP range defined for this sector
+
+   my $ip_addr = NetAddr::IP->new($ip);
+
+   LOOP_ON_IP_RANGE:
+   for my $ip_range_current (@{$computer_db->{'dset'}{$sector}{'ip'}}) {
+      my $range = NetAddr::IP->new($ip_range_current);
+      return 1 if $range->contains($ip_addr);
+      }
+
+   return 0;
+   }
+
 #-------------------------------------------------------------------------------------
 #Nom: control_syntaxe_mac
@@ -487 +506 @@
    control_syntax_ip($ip)                             or exit;
    control_exist_ip($computer_db, $ip)                or die "Error: IP address already exist in sector $sector: $ip.\n";
+   control_ip_in_range($computer_db, $sector, $ip)    or die "Error: IP $ip is not in sector $sector IP range.\n";
    control_syntax_comment($comment)                   or exit;
 

trunk/ddt/make-package-debian

@@ -43 +43 @@
 Tag: implemented-in::perl, interface::commandline, role::program
 Priority: optional
-Depends: perl, perl-base, perl-modules, libyaml-syck-perl, libnet-netmask-perl, libreadonly-perl, libfile-touch-perl, libtext-table-perl
+Depends: perl, perl-base, perl-modules, libyaml-syck-perl, libnet-netmask-perl, libreadonly-perl, libfile-touch-perl, libtext-table-perl, libnetaddr-ip-perl
 Suggests: libyaml-shell-perl | yamllint, perl-doc, isc-dhcp-server, bind9
 Architecture: all