Changeset 4103 in genesis

Timestamp:

Mar 17, 2005, 8:31:19 PM (21 years ago)

Author:

rick

Message:

Preserve $tproxy value

File:

• tools/configcleaner.pl (modified) (5 diffs)

tools/configcleaner.pl

@@ -10 +10 @@
 #maak een mooi systeem met hash aanroepen om snel gegevens te verwerken
 sub parse_config {
-        foreach my $id (sort keys %config) {
-                my $rawData = $config{$id};
-                $rawData =~ s/#.*\n/\n/g;                  #wegslopen comments
-                $rawData =~ s/\s*[\r,\n]+\s*/:::/g;        #spaties+enter+spaties vervangen door :::
-                $rawData =~ s/^::://;                      #::: aan het begin weghalen
-                $rawData =~ s/:::$//;                      #::: aan het eind weghalen
-                my @configArray = split( /:::/, $rawData); #array er van maken
-                foreach $line (@configArray) {
-                        (my $name, my $value) = split( /\=/, $line);
-                        $$name{$id} = $value;
-                }
-        }
+  foreach my $id (sort keys %config) {
+    my $rawData = $config{$id};
+    $rawData =~ s/#.*\n/\n/g;                  #wegslopen comments
+    $rawData =~ s/\s*[\r,\n]+\s*/:::/g;        #spaties+enter+spaties vervangen door :::
+    $rawData =~ s/^::://;                      #::: aan het begin weghalen
+    $rawData =~ s/:::$//;                      #::: aan het eind weghalen
+    my @configArray = split( /:::/, $rawData); #array er van maken
+    foreach $line (@configArray) {
+      (my $name, my $value) = split( /\=/, $line);
+      $$name{$id} = $value;
+    }
+  }
 }
 
 
 sub genericConfig {
-        my $configfile = $_[0];
-        open( CONF, "> $configfile");
-        print CONF <<EOP;
+  my $configfile = $_[0];
+  open( CONF, "> $configfile");
+  print CONF <<EOP;
 #
 # Config cleaned up bij configcleaner
@@ -45 +45 @@
 \$OS='$OS';
 
+\$tproxy='$tproxy';
 EOP
-        
-        if(! $static_dhcp[0] eq "" ) {
-                for( my $ctr=0; $ctr < scalar(@static_dhcp); $ctr++ ) {
-                        print CONF "\$dhcp_static[$ctr]='$static_dhcp[$ctr]';" . "\n";
-                }
-        }
+  
+  if(! $static_dhcp[0] eq "" ) {
+    for( my $ctr=0; $ctr < scalar(@static_dhcp); $ctr++ ) {
+      print CONF "\$dhcp_static[$ctr]='$static_dhcp[$ctr]';" . "\n";
+    }
+  }
 
-        foreach my $key (sort keys %config) {
-                my $keyTerminator = $key;
-                $keyTerminator =~ tr/a-z/A-Z/;
-                $keyTerminator =~ s/://;
-                print CONF <<EOP;
+  foreach my $key (sort keys %config) {
+    my $keyTerminator = $key;
+    $keyTerminator =~ tr/a-z/A-Z/;
+    $keyTerminator =~ s/://;
+    print CONF <<EOP;
 
 \$config{'$key'}=sprintf <<$keyTerminator;
@@ -64 +65 @@
 EOP
 
-                if( lc($TYPE{$key}) eq "wireless" ) {
-                        print CONF <<EOP;
+    if( lc($TYPE{$key}) eq "wireless" ) {
+      print CONF <<EOP;
   MODE=$MODE{$key}
   ESSID=$ESSID{$key}
   CHANNEL=$CHANNEL{$key}
 EOP
-                }
+    }
 
-                print CONF <<EOP;
+    print CONF <<EOP;
   SPEED=$SPEED{$key}
 
@@ -82 +83 @@
 EOP
 
-                if( lc($TYPE{$key}) eq "wireless" ) {
-                        print CONF <<EOP;
+    if( lc($TYPE{$key}) eq "wireless" ) {
+      print CONF <<EOP;
 
   POLAR=$POLAR{$key}
@@ -92 +93 @@
   HEIGHT=$HEIGTH{$key}
 EOP
-                }
-                print CONF "$keyTerminator" . "\n";
-        }
-        print CONF "\n" . "# End of Config File" . "\n";
-        close ( CONF );
+    }
+    print CONF "$keyTerminator" . "\n";
+  }
+  print CONF "\n" . "# End of Config File" . "\n";
+  close ( CONF );
 }
 
 
 foreach my $file (@ARGV) {
-        if($debug) {
-                $file_output = "test.conf";
-        }
-        else
-                {$file_output = $file;
-        }
-        print "Working on $file...\n";
-        @$_ = [] foreach qw(static_dhcp);
-        $static_dhcp[0]="";
-        $$_ = "" foreach qw(location master_ip gw_open nodetype nodename
+  if($debug) {
+    $file_output = "test.conf";
+  }
+  else
+    {$file_output = $file;
+  }
+  print "Working on $file...\n";
+  @$_ = [] foreach qw(static_dhcp);
+  $static_dhcp[0]="";
+  $$_ = "" foreach qw(location master_ip gw_open nodetype nodename
                       OS status X Y N E OS DISK AGGREGATE);
-        %$_ = () foreach qw(config TYPE IP DESC SDESC SPEED DHCP DHCP_STATIC
+  %$_ = () foreach qw(config TYPE IP DESC SDESC SPEED DHCP DHCP_STATIC
                             OSPF_BROADCAST OSPF_NEIGHBORS MODE ESSID CHANNEL
                             POLAR ANTENNA GAIN DIRECTION BEAMWIDTH CABLE
                             HEIGHT ROUTE);
-        do($file) || die("Cann't open file");
-        print "\t Parsing config...";
-        parse_config;
-        print "DONE\n";
-        print "\t Applying generic rules ...";
-        genericConfig($file_output);
-        print "DONE\n";
+  do($file) || die("Cann't open file");
+  print "\t Parsing config...";
+  parse_config;
+  print "DONE\n";
+  print "\t Applying generic rules ...";
+  genericConfig($file_output);
+  print "DONE\n";
 }