From 96dc4026054df77affedfe50380a661dcdba732a Mon Sep 17 00:00:00 2001 From: Tar Committer Date: Thu, 7 Jul 2005 01:14:43 +0000 Subject: Imported from rancid-2.3.2a2.tar.gz. --- bin/rivrancid.in | 79 ++++++++++++++++++++++++++------------------------------ 1 file changed, 37 insertions(+), 42 deletions(-) (limited to 'bin/rivrancid.in') diff --git a/bin/rivrancid.in b/bin/rivrancid.in index 8b9ae03..6d5f869 100644 --- a/bin/rivrancid.in +++ b/bin/rivrancid.in @@ -1,6 +1,6 @@ #! @PERLV_PATH@ ## -## $Id: rivrancid.in,v 1.9 2004/01/11 03:49:13 heas Exp $ +## $Id: rivrancid.in,v 1.14 2005/06/15 20:54:41 heas Exp $ ## ## Copyright (C) 1997-2004 by Terrapin Communications, Inc. ## All rights reserved. @@ -21,9 +21,9 @@ # # Amazingly hacked version of Hank's rancid - this one tries to # deal with Cabletron, Riverstone and Enterasys routers/switches -# +# # 10/23/2002 -- Initial changes for Riverstone/Cabletron support -# Jim Meehan -- jmeehan@vpizza.org +# Jim Meehan -- jmeehan@vpizza.org # # RANCID - Really Awesome New Cisco confIg Differ # @@ -37,15 +37,16 @@ $file = $opt_f; $host = $ARGV[0]; $clean_run = 0; $found_end = 0; -$timeo = 90; # flogin timeout in seconds +$timeo = 90; # rivlogin 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; } @@ -67,10 +68,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)) { @@ -80,10 +81,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)) { @@ -93,22 +94,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) { @@ -122,7 +123,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) { @@ -135,7 +136,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); @@ -179,7 +180,7 @@ sub ShowUptime { tr/\015//d; last if(/^$prompt/); next if /^\s*$/; - next if /System up/; + next if /System up/; ProcessHistory("UPTIME","","","!UPTIME: $_"); } ProcessHistory("","","","!\n"); @@ -197,13 +198,13 @@ sub ShowActive { s/^\s*(\d+\D: )*//; # Riverstone/Cabletron doesn't have an "end" line, so - # we need to set $clean_run here + # we need to set $clean_run here if (/^$prompt/) { - $clean_run = 1; - last; - } + $clean_run = 1; + last; + } - next if (/Running system configuration/); + next if (/Running system configuration/); # filter out any RCS/CVS tags to avoid confusing local CVS storage s/\$(Revision|Id):/ $1:/; @@ -227,22 +228,16 @@ sub ShowActive { sub DoNothing {print STDOUT;} # Main -%commands=( - 'system show uptime' => "ShowUptime", - 'system show version' => "ShowVersion", - 'system show hardware' => "ShowHardware", - 'system show active-config' => "ShowActive" -); - -# keys() doesnt return things in the order entered and the order of the -# cmds is important. pita - -@commands=( - "system show uptime", - "system show version", - "system show hardware", - "system show active-config" +@commandtable = ( + {'system show uptime' => 'ShowUptime'}, + {'system show version' => 'ShowVersion'}, + {'system show hardware' => 'ShowHardware'}, + {'system show active-config' => 'ShowActive'} ); +# 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); @@ -269,7 +264,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 { -- cgit