Changeset 113 for trunk/klask

Timestamp:

Sep 12, 2012, 3:22:25 PM (12 years ago)

Author:

g7moreau

Message:

• Rename 'network' variable to 'vlan-name'
• Use global @ARGV array (bug in parameter otherwise...

File:

• trunk/klask (modified) (7 diffs)

trunk/klask

@@ -424 +424 @@
 
 sub get_current_interface {
-   my $network = shift;
-
-   return $KLASK_CFG->{network}{$network}{interface};
+   my $vlan_name = shift;
+
+   return $KLASK_CFG->{network}{$vlan_name}{interface};
    }
 
@@ -432 +432 @@
 # liste l'ensemble des adresses ip d'un réseau
 sub get_list_ip {
-   my @network = @_;
+   my @vlan_name = @_;
 
    my $cidrlist = Net::CIDR::Lite->new;
 
-   for my $net (@network) {
+   for my $net (@vlan_name) {
       my @line  = @{$KLASK_CFG->{network}{$net}{'ip-subnet'}};
       for my $cmd (@line) {
@@ -460 +460 @@
 # liste l'ensemble des routeurs du réseau
 sub get_list_main_router {
-   my @network = @_;
+   my @vlan_name = @_;
 
    my @res = ();
 
-   for my $net (@network) {
+   for my $net (@vlan_name) {
       push @res, $KLASK_CFG->{network}{$net}{'main-router'};
       }
@@ -918 +918 @@
 
 sub cmd_exportdb {
-   my @ARGV = @_;
+   @ARGV = @_;
 
    my $format = 'txt';
@@ -1210 +1210 @@
 
 sub cmd_ip_free {
-   my @ARGV = @_; # VLAN name with option
+   @ARGV = @_; # VLAN name with option
 
    my $days_to_dead = 365 * 2;
@@ -1414 +1414 @@
 
 sub cmd_updatesw {
-   my @ARGV = @_;
+   @ARGV = @_;
 
    my $verbose;
@@ -1614 +1614 @@
 
 sub cmd_exportsw {
-   my @ARGV = @_;
+   @ARGV = @_;
 
    test_switchdb_environnement();