Changeset 262

Timestamp:

Sep 14, 2017, 10:15:05 PM (7 years ago)

Author:

g7moreau

Message:

• nicer code
• add network name (vlan_name) in switch db

File:

• trunk/klask (modified) (23 diffs)

trunk/klask

@@ -391 +391 @@
          }
 
-      $sw->{description} = $result->{$OID_NUMBER{'sysName'}} || $sw->{'hostname'};
+      $sw->{'description'} = $result->{$OID_NUMBER{'sysName'}} || $sw->{'hostname'};
       $sw->{model} = get_switch_model($result->{$OID_NUMBER{'sysDescription'}});
       if ($verb_description) {
@@ -412 +412 @@
 
       # Ligne à virer car on récupère maintenant le modèle du switch
-      #my ($desc, $type) = split m/ : /xms, $sw->{description}, 2;
-      printf "%-26s 0--------->>>> %-25s %s\n", $sw->{'hostname'}, $sw->{description}, $sw->{model} if $verbose;
+      #my ($desc, $type) = split m/ : /xms, $sw->{'description'}, 2;
+      printf "%-26s 0--------->>>> %-25s %s\n", $sw->{'hostname'}, $sw->{'description'}, $sw->{model} if $verbose;
       }
 
@@ -546 +546 @@
 
       $ret{'switch_hostname'}    = $sw->{'hostname'};
-      $ret{'switch_description'} = $sw->{description};
+      $ret{'switch_description'} = $sw->{'description'};
       $ret{'switch_port'}        = $swport_num;
       $ret{'switch_port_hr'}     = $swport_hr; # human readable
@@ -596 +596 @@
          $ret->{$sw->{'hostname'}} = {};
          $ret->{$sw->{'hostname'}}{'hostname'}    = $sw->{'hostname'};
-         $ret->{$sw->{'hostname'}}{description} = $sw->{description};
-         $ret->{$sw->{'hostname'}}{port}        = $swport_num;
+         $ret->{$sw->{'hostname'}}{'description'} = $sw->{'description'};
+         $ret->{$sw->{'hostname'}}{'port'}        = $swport_num;
          $ret->{$sw->{'hostname'}}{'port_hr'}     = $swport_hr;
          }
@@ -609 +609 @@
 sub get_list_network {
 
-   return keys %{$KLASK_CFG->{network}};
+   return keys %{$KLASK_CFG->{'network'}};
    }
 
@@ -616 +616 @@
    my $vlan_name = shift;
 
-   return $KLASK_CFG->{network}{$vlan_name}{'interface'};
+   return $KLASK_CFG->{'network'}{$vlan_name}{'interface'};
    }
 
@@ -623 +623 @@
    my $vlan_name = shift;
 
-   return 0 if not exists $KLASK_CFG->{network}{$vlan_name};
-   return $KLASK_CFG->{network}{$vlan_name}{'vlan-id'};
+   return 0 if not exists $KLASK_CFG->{'network'}{$vlan_name};
+   return $KLASK_CFG->{'network'}{$vlan_name}{'vlan-id'};
    }
 
@@ -631 +631 @@
    my $vlan_name = shift;
 
-   return $KLASK_CFG->{network}{$vlan_name}{'scan-mode'} || $DEFAULT{'scan-mode'} || 'active';
+   return $KLASK_CFG->{'network'}{$vlan_name}{'scan-mode'} || $DEFAULT{'scan-mode'} || 'active';
    }
 
@@ -638 +638 @@
    my $interface = shift;
 
-   for my $vlan_name (keys %{$KLASK_CFG->{network}}) {
-      next if $KLASK_CFG->{network}{$vlan_name}{'interface'} ne $interface;
+   for my $vlan_name (keys %{$KLASK_CFG->{'network'}}) {
+      next if $KLASK_CFG->{'network'}{$vlan_name}{'interface'} ne $interface;
       return $vlan_name;
       }
@@ -652 +652 @@
 
    for my $net (@vlan_name) {
-      my @line  = @{$KLASK_CFG->{network}{$net}{'ip-subnet'}};
+      my @line  = @{$KLASK_CFG->{'network'}{$net}{'ip-subnet'}};
       for my $cmd (@line) {
          for my $method (keys %{$cmd}) {
@@ -681 +681 @@
 
    for my $net (@vlan_name) {
-      push @res, $KLASK_CFG->{network}{$net}{'main-router'};
+      push @res, $KLASK_CFG->{'network'}{$net}{'main-router'};
       }
 
@@ -1136 +1136 @@
          my $vlan_name = get_current_vlan_name_for_interface($resol_arp{'interface'});
          my $vlan_id   = get_current_vlan_id($vlan_name);
-         my %where = find_switch_port($resol_arp{'mac_address'}, $switch_proposal,$vlan_id);
+         my %where = find_switch_port($resol_arp{'mac_address'}, $switch_proposal, $vlan_id);
 
          #192.168.24.156:
@@ -1397 +1397 @@
 
       my $vlan = '';
-      $vlan = $computerdb->{$ip}{network}.'('.get_current_vlan_id($computerdb->{$ip}{network}).')' if $computerdb->{$ip}{network};
+      $vlan = $computerdb->{$ip}{'network'}.'('.get_current_vlan_id($computerdb->{$ip}{'network'}).')' if $computerdb->{$ip}{'network'};
 
       my $arrow ='<-----------';
@@ -1496 +1496 @@
 
       my $vlan = '';
-      $vlan = $computerdb->{$ip}{network}.' ('.get_current_vlan_id($computerdb->{$ip}{network}).')' if $computerdb->{$ip}{network};
+      $vlan = $computerdb->{$ip}{'network'}.' ('.get_current_vlan_id($computerdb->{$ip}{'network'}).')' if $computerdb->{$ip}{'network'};
 
       my $parent_port_hr = format_aggregator4html($computerdb->{$ip}{'switch_port_hr'});
@@ -1684 +1684 @@
          ip          => $ip,
          timestamp   => $ip_timestamp,
-         vlan        => $computerdb->{$ip}{network},
+         vlan        => $computerdb->{$ip}{'network'},
          hostname_fq => $ip_hostname_fq,
          mac_address => $ip_mac,
@@ -1699 +1699 @@
             ip          => $ip,
             timestamp   => $ip_timestamp,
-            vlan        => $computerdb->{$ip}{network},
+            vlan        => $computerdb->{$ip}{'network'},
             hostname_fq => $ip_hostname_fq,
             mac_address => $ip_mac,
@@ -1737 +1737 @@
       my $src_date = sprintf '%04i-%02i-%02i/%02i:%02i', $year, $mon, $mday, $hour, $min;
 
-      my $vlan_id = get_current_vlan_id($computerdb->{$src_ip}{network});
+      my $vlan_id = get_current_vlan_id($computerdb->{$src_ip}{'network'});
 
       printf "%s / %-10s +-> %-10s(%i)  %s %s %s %s\n",
-         $swpt, $switchportdb{$swpt}->{'vlan'}, $computerdb->{$src_ip}{network}, $vlan_id,
+         $swpt, $switchportdb{$swpt}->{'vlan'}, $computerdb->{$src_ip}{'network'}, $vlan_id,
          $date,
          $src_date,
@@ -2459 +2459 @@
       my $vlan_name = get_current_vlan_name_for_interface($resol_arp{'interface'});
       my $vlan_id   = get_current_vlan_id($vlan_name);
-      $where{$resol_arp{'ipv4_address'}} = find_all_switch_port($resol_arp{'mac_address'},$vlan_id); # retrouve les emplacements des routeurs
+      $where{$resol_arp{'ipv4_address'}} = find_all_switch_port($resol_arp{'mac_address'}, $vlan_id); # retrouve les emplacements des routeurs
       }
 
@@ -2472 +2472 @@
          my $switch = $where{$ip_router}->{$switch_detected};
 
-         next ALL_SWITCH_CONNECTED if $switch->{port} eq '0';
+         next ALL_SWITCH_CONNECTED if $switch->{'port'} eq '0';
 
          $db_switch_output_port{$switch->{'hostname'}} = $switch->{'port_hr'};
@@ -2512 +2512 @@
       my $vlan_name = get_current_vlan_name_for_interface($resol_arp{'interface'});
       my $vlan_id   = get_current_vlan_id($vlan_name);
-      $where{$resol_arp{'ipv4_address'}} = find_all_switch_port($resol_arp{'mac_address'},$vlan_id); # find port on all switch
+      $where{$resol_arp{'ipv4_address'}} = find_all_switch_port($resol_arp{'mac_address'}, $vlan_id); # find port on all switch
 
       if ($verbose) {
@@ -2527 +2527 @@
       $SWITCH_DB{$one_switch}->{'mac_address'}  = $resol_arp{'mac_address'};
       $SWITCH_DB{$one_switch}->{'timestamp'}    = $timestamp;
+      $SWITCH_DB{$one_switch}->{'network'}      = $vlan_name;
       }
 
@@ -2544 +2545 @@
          print "VERBOSE_6: $db_switch_ip_hostnamefq{$ip} -> $switch->{'hostname'} : $switch->{'port_hr'}\n" if $verbose;
 
-         next if $switch->{port}     eq '0';
+         next if $switch->{'port'}     eq '0';
          next if $switch->{'port_hr'}  eq $db_switch_output_port{$switch->{'hostname'}};
          next if $switch->{'hostname'} eq $db_switch_ip_hostnamefq{$ip}; # $computerdb->{$ip}{'hostname'};
@@ -2801 +2802 @@
    for my $sw (sort keys %db_switch_output_port) {
       if (exists $db_switch_parent{$sw}) {
-#         printf "   \"%s:%s\" -> \"%s:%s\"\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{'switch'}, $db_switch_parent{$sw}->{port};
+#         printf "   \"%s:%s\" -> \"%s:%s\"\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{'switch'}, $db_switch_parent{$sw}->{'port'};
          }
       else {