Changeset 352 for trunk

Timestamp:

Sep 14, 2018, 8:54:44 AM (6 years ago)

Author:

g7moreau

Message:

• COntrol if IP in sector range

File:

• trunk/ddt/ddt (modified) (7 diffs)

trunk/ddt/ddt

@@ -21 +21 @@
 use strict;
 #use warnings;
-use version; our $VERSION = version->declare('0.11.4');
+use version; our $VERSION = version->declare('0.11.5');
 
 use Getopt::Long qw(GetOptions);
@@ -67 +67 @@
    'remove-tag'         => \&cmd_remove_tag,
    'search-mac'         => \&cmd_search_mac,
+   'sector-add-ip'      => \&cmd_sector_add_ip,
    'show'               => \&cmd_show_host,
    'show-sector'        => \&cmd_show_sector,
@@ -467 +468 @@
    $comment = normalize_comment($comment);
    control_exist_hostname($computer_db, $sector, $hostname) or die "Error: host already exist in sector $sector: $hostname\n";
-   control_syntax_mac_address($mac)                   or exit;
-   control_exist_mac($computer_db, $mac)              or die "Error: physical MAC address already exists: $mac\n";
-   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_syntax_comment($comment)                   or exit;
+   control_syntax_mac_address($mac)                         or exit;
+   control_exist_mac($computer_db, $mac)                    or die "Error: physical MAC address already exists: $mac\n";
+   control_syntax_ip($ip)                                   or exit;
+   control_exist_ip($computer_db, $ip)                      or die "Error: IP $ip address already exist in sector $sector\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;
    my $timestamp = time;
    push @{$computer_db->{$sector}}, { $mac => {
@@ -500 +502 @@
    $mac = normalize_mac_address($mac);
    $comment = normalize_comment($comment);
-   control_exist_sector($computer_db, $sector)  or exit;
+   control_exist_sector($computer_db, $sector)              or exit;
    control_exist_hostname($computer_db, $sector, $hostname) or die "Error: host already exist in sector $sector: $hostname\n";
-   control_syntax_mac_address($mac)                   or exit;
-   control_exist_mac($computer_db, $mac)              or die "Error: physical MAC address already exists: $mac\n";
-   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;
+   control_syntax_mac_address($mac)                         or exit;
+   control_exist_mac($computer_db, $mac)                    or die "Error: physical MAC address already exists: $mac\n";
+   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;
 
    push @{$computer_db->{$sector}}, { $mac => {
@@ -688 +690 @@
    my $timestamp = time;
 
-   control_exist_sector($computer_db, $sector)           or exit;
+   control_exist_sector($computer_db, $sector)              or exit;
    control_exist_hostname($computer_db, $sector, $hostname) or die "Error: host already exist in sector $sector: $hostname\n";
-   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_syntax_comment($comment)                            or exit;
+   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;
 
    my $mac = join ':', 'FF', 'FF', map({sprintf("%02X", $_)} split(/\./, $ip));
@@ -792 +795 @@
       die "Error: unkown host: $hostname, in sector: $sector\n";
       }
-   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_syntax_ip($ip)                          or exit;
+   control_exist_ip($computer_db, $ip)             or die "Error: IP $ip address already exist in sector $sector\n";
+   control_ip_in_range($computer_db, $sector, $ip) or die "Error: IP $ip is not in sector $sector IP range.\n";
 
    my @sectordb = @{$computer_db->{$sector}};
@@ -1602 +1606 @@
 
    GetOptions(
-      'sector|s|d=s'      => \$sector,
+      'sector|s|d=s'       => \$sector,
       'dns-extension|e=s'  => \$dns_extension,
       'comment|c=s'        => \$comment,