Changeset 318 for trunk/ddt

Timestamp:

Jul 19, 2018, 11:40:43 PM (7 years ago)

Author:

g7moreau

Message:

• Begin rework on gen dns file

File:

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

trunk/ddt/ddt

@@ -21 +21 @@
 use strict;
 #use warnings;
-use version; our $VERSION = version->declare('0.9.8');
+use version; our $VERSION = version->declare('0.10.0');
 
 use Getopt::Long qw(GetOptions);
@@ -2486 +2486 @@
 
 sub cmd_generate_dns_file {
-   my $buffer;
+   my $buffer_fwd;
    my $buffer_rev;
    my $pool_domain;
@@ -2500 +2500 @@
 
       if ($domainset_current eq 'pool') {
-         #next;
-         for my $value (@{$computer_db->{$domainset_current}}) {
-            for my $pool_name (keys %{$value}) {
-               $pool_domain = $value->{$pool_name}->{'domain'}."\n";
-               #print $value->{$pool_name}->{'file'};
+         LOOP_ON_COMPUTER:
+         for my $computer (@{$computer_db->{$domainset_current}}) {
+            for my $pool_name (keys %{$computer}) {
+               $pool_domain = $computer->{$pool_name}->{'domain'}."\n";
+               #print $computer->{$pool_name}->{'file'};
                chomp $pool_domain;
                open FILE_FORWARD_DNS, '>>', "$FOLDER_GEN_DNS/db.$pool_domain.fwd";
                open FILE_REVERSE_DNS, '>>', "$FOLDER_GEN_DNS/db.$pool_domain.rev";
-               my @T_pool_ip = @{$value->{$pool_name}->{'ip'}};
+               my @T_pool_ip = @{$computer->{$pool_name}->{'ip'}};
                for my $pool_ip (@T_pool_ip) {
                   my @T_split = split(/\./ , $pool_ip);
-                  $buffer     = sprintf "%-24s IN  A  %-15s ;\n", "$pool_name$T_split[3]", $pool_ip;
+                  $buffer_fwd = sprintf "%-24s IN  A  %-15s ;\n", "$pool_name$T_split[3]", $pool_ip;
                   $buffer_rev = "$T_split[3]   IN PTR   $pool_name$T_split[3].$pool_domain.\n";
-                  print FILE_FORWARD_DNS $buffer;
+                  print FILE_FORWARD_DNS $buffer_fwd;
                   print FILE_REVERSE_DNS $buffer_rev;
                   }
@@ -2524 +2524 @@
       else {
          #--- Création du fichier non-reverse ---#
-         open ( FILE_FORWARD_DNS, ">> $FOLDER_GEN_DNS/db.$domainset_current.fwd");
-         open ( FILE_REVERSE_DNS, ">> $FOLDER_GEN_DNS/db.$domainset_current.rev");
+         open FILE_FORWARD_DNS, ">> $FOLDER_GEN_DNS/db.$domainset_current.fwd";
+         open FILE_REVERSE_DNS, ">> $FOLDER_GEN_DNS/db.$domainset_current.rev";
+
          my @domainsetdb = @{$computer_db->{$domainset_current}};
-         for my $value (@domainsetdb) {
-            for my $id (keys %{$value}) {
-               #host pcdavoust {  deny-unknown-clients;
-               #hardware ethernet 0:6:5b:b8:13:d1;
-               #fixed-address 194.254.66.72;
-               #}
-               my $hostname = $value->{$id}->{'hostname'};
-               my $ip       = $value->{$id}->{'ip'};
-               my $comment  = $value->{$id}->{'comment'};
-               my $address_type = $value->{$id}->{'address_type'};
-               my $enabled      = $value->{$id}->{'enabled'};
-
-               my $dns_domain = $domainset_current;
-               if (exists $computer_db->{'dset'}{$domainset_current}) {
-                  $dns_domain = $computer_db->{'dset'}{$domainset_current}{'dns_extension'};
+
+         LOOP_ON_COMPUTER:
+         for my $computer (@domainsetdb) {
+            my ($mac_address, $attribute) = %{$computer};
+
+            #host pcdavoust {  deny-unknown-clients;
+            #hardware ethernet 0:6:5b:b8:13:d1;
+            #fixed-address 194.254.66.72;
+            #}
+
+            my $hostname     = $attribute->{'hostname'};
+            my $ip           = $attribute->{'ip'};
+            my $comment      = $attribute->{'comment'};
+            my $address_type = $attribute->{'address_type'};
+            my $enabled      = $attribute->{'enabled'};
+
+            next LOOP_ON_COMPUTER if not (($address_type eq 'dhcp') or ($address_type eq 'static'));
+
+            my $dns_domain = $domainset_current;
+            if (exists $computer_db->{'dset'}{$domainset_current}) {
+               $dns_domain = $computer_db->{'dset'}{$domainset_current}{'dns_extension'};
+               }
+
+            my @ip_split = split /\./, $ip;
+            if ($enabled eq 'yes') {
+               if (exists $attribute->{'dns_extension'}
+                     and "$attribute->{'dns_extension'}" != "$dns_domain") {
+                  print "A FAIRE\n";
                   }
-               my @T_split = split(/\./ , $ip);
-               if  (($address_type eq 'dhcp') or ($address_type eq 'static')) {
-                  if ($enabled eq 'yes') {
-                     $buffer = sprintf "%-24s IN A %-15s ; %s\n", $hostname, $ip, $comment;
-                     if (exists $value->{$id}->{'dns_extension'}
-                           and "$value->{$id}->{'dns_extension'}" != "$dns_domain") {
-                        print "A FAIRE\n";
-                        }
-                     $buffer_rev = $T_split[3]."     IN PTR   $hostname.$dns_domain.\n";
-                     }
-
-                  else {
-                     $buffer = sprintf "%-24s IN A %-15s ; %s\n", $hostname, $ip, $comment;
-                     $buffer_rev = ";".$T_split[3]."    IN PTR   $hostname.$dns_domain.\n";
-                     }
-                  print FILE_REVERSE_DNS $buffer_rev;
-                  print FILE_FORWARD_DNS $buffer;
-                  }
+               $buffer_fwd = sprintf "%-24s  IN A   %-15s ; %s\n", $hostname, $ip, $comment;
+               $buffer_rev = sprintf "%3i    IN PTR %-15s\n", $ip_split[3], "$hostname.$dns_domain.";
                }
-            #$cpt=$cpt+1;
+
+            else {
+               $buffer_fwd = sprintf ";%-24s IN A   %-15s ; %s\n", $hostname, $ip, $comment;
+               $buffer_rev = sprintf ";%3i   IN PTR %-15s\n", $ip_split[3], "$hostname.$dns_domain.";
+               }
+            print FILE_REVERSE_DNS $buffer_rev;
+            print FILE_FORWARD_DNS $buffer_fwd;
             }
          print "- DNS: db.$domainset_current.fwd db.$domainset_current.rev [CREATE].\n";