diff options
Diffstat (limited to 'bin/fnrancid.in')
| -rw-r--r-- | bin/fnrancid.in | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/bin/fnrancid.in b/bin/fnrancid.in index 815227b..6965f7b 100644 --- a/bin/fnrancid.in +++ b/bin/fnrancid.in @@ -1,6 +1,6 @@ #! @PERLV_PATH@ ## -## $Id: fnrancid.in,v 1.3 2004/01/11 03:49:13 heas Exp $ +## $Id: fnrancid.in,v 1.8 2005/06/15 20:54:40 heas Exp $ ## ## Copyright (C) 1997-2004 by Terrapin Communications, Inc. ## All rights reserved. @@ -20,7 +20,7 @@ ## # # A library built on Stephen Gill's Netscreen stuff to accomodate -# the Fortinet product line. [d_pfleger@juniper.net] +# the Fortinet product line. [d_pfleger@juniper.net] # # RANCID - Really Awesome New Cisco confIg Differ # @@ -34,15 +34,16 @@ $debug = $opt_d; $file = $opt_f; $host = $ARGV[0]; $found_end = 0; -$timeo = 90; # nlogin timeout in seconds +$timeo = 90; # nlogin timeout in seconds -my(%filter_pwds); # password filtering mode +my(@commandtable, %commands, @commands);# command lists +my(%filter_pwds); # password filtering mode # This routine is used to print out the router configuration sub ProcessHistory { - my($new_hist_tag,$new_command,$command_string,@string)=(@_); - if((($new_hist_tag ne $hist_tag) || ($new_command ne $command)) - && defined %history) { + my($new_hist_tag,$new_command,$command_string,@string) = (@_); + if ((($new_hist_tag ne $hist_tag) || ($new_command ne $command)) + && defined %history) { print eval "$command \%history"; undef %history; } @@ -64,10 +65,10 @@ sub ProcessHistory { sub numerically { $a <=> $b; } -# This is a sort routing that will sort numerically on the +# This is a sort routine that will sort numerically on the # keys of a hash as if it were a normal array. sub keynsort { - local(%lines)=@_; + local(%lines) = @_; local($i) = 0; local(@sorted_lines); foreach $key (sort numerically keys(%lines)) { @@ -77,10 +78,10 @@ sub keynsort { @sorted_lines; } -# This is a sort routing that will sort on the +# This is a sort routine that will sort on the # keys of a hash as if it were a normal array. sub keysort { - local(%lines)=@_; + local(%lines) = @_; local($i) = 0; local(@sorted_lines); foreach $key (sort keys(%lines)) { @@ -90,22 +91,22 @@ sub keysort { @sorted_lines; } -# This is a sort routing that will sort on the +# This is a sort routine that will sort on the # values of a hash as if it were a normal array. sub valsort{ - local(%lines)=@_; + local(%lines) = @_; local($i) = 0; local(@sorted_lines); foreach $key (sort values %lines) { - $sorted_lines[$i] = $key; - $i++; + $sorted_lines[$i] = $key; + $i++; } @sorted_lines; } -# This is a numerical sort routing (ascending). +# This is a numerical sort routine (ascending). sub numsort { - local(%lines)=@_; + local(%lines) = @_; local($i) = 0; local(@sorted_lines); foreach $num (sort {$a <=> $b} keys %lines) { @@ -119,7 +120,7 @@ sub numsort { # ip address when the ip address is anywhere in # the strings. sub ipsort { - local(%lines)=@_; + local(%lines) = @_; local($i) = 0; local(@sorted_lines); foreach $addr (sort sortbyipaddr keys %lines) { @@ -132,7 +133,7 @@ sub ipsort { # These two routines will sort based upon IP addresses sub ipaddrval { my(@a) = ($_[0] =~ m#^(\d+)\.(\d+)\.(\d+)\.(\d+)$#); - $a[3]+256*($a[2]+256*($a[1]+256*$a[0])); + $a[3] + 256 * ($a[2] + 256 * ($a[1] +256 * $a[0])); } sub sortbyipaddr { &ipaddrval($a) <=> &ipaddrval($b); @@ -146,7 +147,7 @@ sub GetSystem { tr/\015//d; next if /^\s*$/; last if(/$prompt/); - ProcessHistory("","","","$_"); + ProcessHistory("","","","$_"); #print STDOUT "$_"; } print STDOUT "Vendor: $vendor"; @@ -170,9 +171,9 @@ sub GetConf { next if /^\s*$/; last if(/$prompt/); if (/(^set.*)('Enc .*')(.*)/) { - ProcessHistory("ENC","","","!$1 'Enc **encoding removed**' $3\n"); - next; - } + ProcessHistory("ENC","","","!$1 'Enc **encoding removed**' $3\n"); + next; + } ProcessHistory("","","","$_"); #print STDOUT "$_"; } @@ -184,16 +185,15 @@ sub GetConf { sub DoNothing {print STDOUT;} # Main -%commands=( - 'get system status' => "GetSystem", - 'get conf' => "GetConf" -); -# keys() doesnt return things in the order entered and the order of the -# cmds is important. pita -@commands=( - "get system status", - "get conf" +@commandtable = ( + {'get system status' => 'GetSystem'}, + {'get conf' => 'GetConf'} ); +# Use an array to preserve the order of the commands and a hash for mapping +# commands to the subroutine and track commands that have been completed. +@commands = map(keys(%$_), @commandtable); +%commands = map(%$_, @commandtable); + $cisco_cmds=join(";",@commands); $cmds_regexp=join("|",@commands); @@ -218,7 +218,7 @@ if ($file) { # determine password filtering mode if ($ENV{"FILTER_PWDS"} =~ /no/i) { - $filter_pwds = 0; + $filter_pwds = 0; } elsif ($ENV{"FILTER_PWDS"} =~ /all/i) { $filter_pwds = 2; } else { |