Changeset 78

Timestamp:

Mar 24, 2011, 6:33:19 PM (14 years ago)

Author:

g7moreau

Message:

• Last change. Limit arpwatch cache two 1.1 hour
• Some format thing

File:

• trunk/klask (modified) (8 diffs)

trunk/klask

@@ -84 +84 @@
    J9449A => { model => 'HP1810-8G',  match => 'HP ProCurve 1810G - 8 GE'        },
    J4093A => { model => 'HP2424M',    match => 'HP J4093A ProCurve Switch 2424M' },
+   J9279A => { model => 'HP2510G-24', match => 'ProCurve J9279A Switch 2510G-24' },
    J9280A => { model => 'HP2510G-48', match => 'ProCurve J9280A Switch 2510G-48' },
    J4813A => { model => 'HP2524',     match => 'HP J4813A ProCurve Switch 2524'  },
@@ -216 +217 @@
    my $nowtimestamp = time;
 
-   if ( $type eq 'fast' and ( not defined $timestamp or $timestamp < ( $nowtimestamp - 3 * 3600 ) ) ) {
+   if ( $type eq 'fast' and ( not defined $timestamp or $timestamp < ( $nowtimestamp - 1.1 * 3600 ) ) ) {
       $ret{mac_address} = 'unknow';
       return %ret;
@@ -956 +957 @@
    my $computerdb = YAML::Syck::LoadFile("$KLASK_DB_FILE");
 
-   printf "%-25s %-4s            %-40s %-15s %-18s %-16s %s\n", qw(Switch Port Hostname-FQ IPv4-Address MAC-Address Date VLAN);
-   print "-------------------------------------------------------------------------------------------------------------------------------------------\n";
+   printf "%-26s %-4s            %-40s %-15s %-18s %-16s %s\n", qw(Switch Port Hostname-FQ IPv4-Address MAC-Address Date VLAN);
+   print "--------------------------------------------------------------------------------------------------------------------------------------------\n";
 
    LOOP_ON_IP_ADDRESS:
@@ -975 +976 @@
       my $date = sprintf '%04i-%02i-%02i %02i:%02i', $year, $mon, $mday, $hour, $min;
 
-      printf "%-26s  %2s  <-------  %-40s %-15s %-18s %-16s %s\n",
+      printf "%-27s  %2s  <-------  %-40s %-15s %-18s %-16s %s\n",
          $computerdb->{$ip}{switch_hostname} || $computerdb->{$ip}{switch_description},
          $computerdb->{$ip}{switch_port},
@@ -1569 +1570 @@
    for my $sw (sort keys %db_switch_output_port) {
       if (exists $db_switch_parent{$sw}) {
-         printf "%-25s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port}, $db_switch_parent{$sw}->{switch};
+         printf "%-27s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port}, $db_switch_parent{$sw}->{switch};
          }
       else {
-         printf "%-25s  %2s  +-->  router\n", $sw, $db_switch_output_port{$sw};
+         printf "%-27s  %2s  +-->  router\n", $sw, $db_switch_output_port{$sw};
          }
       }
@@ -1583 +1584 @@
       for my $sw (keys %{$db_switch_connected_on_port{$swport}}) {
          if (exists $db_switch_output_port{$sw}) {
-            printf "%-25s  %2s  <--+  %2s  %-25s\n", $sw_connect, $port_connect, $db_switch_output_port{$sw}, $sw;
+            printf "%-27s  %2s  <--+  %2s  %-25s\n", $sw_connect, $port_connect, $db_switch_output_port{$sw}, $sw;
             }
          else {
-            printf "%-25s  %2s  <--+      %-25s\n", $sw_connect, $port_connect, $sw;
+            printf "%-27s  %2s  <--+      %-25s\n", $sw_connect, $port_connect, $sw;
             }
          }
@@ -1637 +1638 @@
    for my $sw (sort keys %db_switch_output_port) {
       if (exists $db_switch_parent{$sw}) {
-         printf "%-25s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port}, $db_switch_parent{$sw}->{switch};
+         printf "%-27s  %2s  +-->  %2s  %-25s\n", $sw, $db_switch_output_port{$sw}, $db_switch_parent{$sw}->{port}, $db_switch_parent{$sw}->{switch};
          }
       else {
-         printf "%-25s  %2s  +-->  router\n", $sw, $db_switch_output_port{$sw};
+         printf "%-27s  %2s  +-->  router\n", $sw, $db_switch_output_port{$sw};
          }
       }
@@ -1651 +1652 @@
       for my $sw (keys %{$db_switch_connected_on_port{$swport}}) {
          if (exists $db_switch_output_port{$sw}) {
-            printf "%-25s  %2s  <--+  %2s  %-25s\n", $sw_connect, $port_connect, $db_switch_output_port{$sw}, $sw;
+            printf "%-27s  %2s  <--+  %2s  %-25s\n", $sw_connect, $port_connect, $db_switch_output_port{$sw}, $sw;
             }
          else {
-            printf "%-25s  %2s  <--+      %-25s\n", $sw_connect, $port_connect, $sw;
+            printf "%-27s  %2s  <--+      %-25s\n", $sw_connect, $port_connect, $sw;
             }
          }