diff options
Diffstat (limited to 'bin/tntrancid.in')
| -rw-r--r-- | bin/tntrancid.in | 78 |
1 files changed, 36 insertions, 42 deletions
diff --git a/bin/tntrancid.in b/bin/tntrancid.in index 88520fd..ac3bbee 100644 --- a/bin/tntrancid.in +++ b/bin/tntrancid.in @@ -1,6 +1,6 @@ #! @PERLV_PATH@ ## -## $Id: tntrancid.in,v 1.8 2004/01/11 03:49:13 heas Exp $ +## $Id: tntrancid.in,v 1.14 2005/06/15 20:54:41 heas Exp $ ## ## Copyright (C) 1997-2004 by Terrapin Communications, Inc. ## All rights reserved. @@ -34,19 +34,19 @@ $file = $opt_f; $host = $ARGV[0]; $clean_run = 0; $found_end = 0; -$timeo = 90; # tntlogin timeout in seconds +$timeo = 90; # tntlogin timeout in seconds $prompt = "admin> "; -$always_y = "y"; # cause its a pain. +$always_y = "y"; # cause its a pain. -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"; - print eval "$always_y \%history"; undef %history; } if (($new_hist_tag) && ($new_command) && ($command_string)) { @@ -67,10 +67,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 +80,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,10 +93,10 @@ 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) { @@ -106,9 +106,9 @@ sub valsort{ @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 +122,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,45 +135,40 @@ 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); } - # This routine processes a "save con" sub SaveConf { print STDERR " In SaveConf: $_" if ($debug); - my($comment) = 1; # strip extra comments, esp to preserve chassis type while (<INPUT>) { tr/\015//d; last if(/^$prompt/); -# next if(/^\s*$/); - -### s/^\s*$/;/; - -# Leave software revision, but strip out saved date, -# which causes rancid to think it changes each poll + # Leave software revision, but strip out saved date, + # which causes rancid to think it changes each poll if (/^; saved from /) { - ProcessHistory("","","","$_"); - next; + ProcessHistory("","","","$_"); + next; } /^; saved / && next; # catch anything that wasnt match above. ProcessHistory("","","","$_"); + # end of config -# if (/^# End of configuration file/i) { if (/; profiles saved$/) { printf STDERR " End SaveConf: $_" if ($debug); $found_end = 1; print STDOUT "$found_end = found_end within test\n"; - return(1); + return(1); } - $found_end = 1; + # XXX what is the purpose of this? + $found_end = 1; #### print STDOUT "$found_end = found_end at test\n"; } $found_end = 1; @@ -189,17 +184,16 @@ print STDOUT "$found_end = found_end at end test\n"; sub DoNothing {print STDOUT;} # Main -%commands=( - 'save con' => "SaveConf" -); -# keys() doesnt return things in the order entered and the order of the -# cmds is important (show version first and write term last). pita -@commands=( - "save con" +@commandtable = ( + {'save con' => 'SaveConf'} ); +# 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); + $tnt_cmds=join(";",@commands); $cmds_regexp=join("|",@commands); -$tnt_cmds="save con"; open(OUTPUT,">$host.new") || die "Can't open $host.new for writing: $!\n"; select(OUTPUT); @@ -223,7 +217,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 { @@ -234,8 +228,8 @@ ProcessHistory("","","","#RANCID-CONTENT-TYPE: tnt\n#\n"); ProcessHistory("COMMENTS","keysort","X0",";\n"); TOP: while(<INPUT>) { tr/\015//d; - - if (/^Error:/) { + + if (/^Error:/) { print STDOUT ("$host tntlogin error: $_"); print STDERR ("$host tntlogin error: $_") if ($debug); $clean_run=0; |