Changeset 7441 in genesis

Timestamp:

Jan 28, 2010, 4:05:44 PM (15 years ago)

Author:

rick

Message:

Make the ifconfig 8.0 compatible

Location:

tools/iris-8.0

Files:

• genesis.conf (modified) (2 diffs)
• wleiden.pl (modified) (2 diffs)

tools/iris-8.0/genesis.conf

@@ -37 +37 @@
 
 chomp($hostname);
-$cgi_dir="http://$hostname/freebsd/iris";
+$cgi_dir="http://$hostname/freebsd/iris-8.0";
 $source="$cgi_dir/g_list.pl";
 
@@ -43 +43 @@
 $home=getcwd . "/../../";
 $ndir="$home/nodes";
-$toolfile="$home/freebsd/iris/wleiden.pl";
+$toolfile="$home/freebsd/iris-8.0/wleiden.pl";
 
 

tools/iris-8.0/wleiden.pl

@@ -233 +233 @@
   };
   
-  $output .= "ifconfig_lo0_alias0=\"inet 172.31.255.1/32\"\n";
+  $iplist = "172.31.255.1/32";
   if( $masterNotUsed ) {
-    $output .= "ifconfig_lo0_alias1=\"inet $master_ip/32\"\n\n";
-  }
-  else {
-    $output .= "#ifconfig_lo0_alias1=\"inet $master_ip/32\"\n\n";
-  };
-
+    $iplist .= "$master_ip/32";
+  }
+  $output .= "ipv4_addrs_lo0=\"127.0.0.1/8 $iplist\"\n";
+
+  $WLAN_NR = 0;
   foreach my $interface (sort keys %config) {
     (my $if, my $number) = split(/:/, $interface);
-      if( defined $number ) {
-        $output .= "ifconfig_$if\_alias$number=\"inet $IP{$interface}\"\n";
-      }
-      else {
-        $output .= "ifconfig_$if=\"inet $IP{$interface}";
-        $output .= " $CARD_OPTION{$interface}";
+      if( not defined $number ) {
+        # No special syntax for aliases anymore
+        $IFNAME = $if;
         if( $TYPE{$if} =~ /wireless/i ) {
-          $output .= " ssid $ESSID{$interface}";
+          $IFNAME = "wlan$WLAN_NR";
+          $WLAN_NR++;
+          $output .= "wlans_$if=\"$IFNAME\"\n";
+          $output .= "create_args_$IFNAME=\"";
+
+          if( $MODE{$if} =~/master/i ) {
+            $output .= "wlanmode ap";
+            $output .= " channel $CHANNEL{$interface}";
+          } else {
+            $output .= " wlanmode sta"
+          }
+
           if ( $SUBTYPE{$if} =~ /802.11a/i ) {
             $output .= " mode 11a";
@@ -260 +267 @@
           }
 
-          if( $MODE{$if}=~/master/i ) {
-            $output .= " channel $CHANNEL{$interface}";
-            $output .= " mediaopt hostap";
-          }
-          else {
-            $output .= "";
-          };
+          $output .= " ssid $ESSID{$interface} regdomain ETSI country NL up\"\n";
+        }
+
+        @iplist = ();
+        foreach my $interface (sort keys %config) {
+          (my $if_t, my $number) = split(/:/, $interface);
+            if ( $if_t eq $if ) {
+                push(@iplist,$IP{$interface});
+            };
         };
-        $output .= "\"\n";
+        $output .= "ipv4_addrs_$IFNAME=\"" . join(' ',@iplist) . "\"\n";
+        $output .= "\n";
       };
   };