Changeset 2969 in MondoRescue for branches/3.0/mindi/mr-net-find

Timestamp:

Mar 17, 2012, 4:10:22 AM (13 years ago)

Author:

Bruno Cornec

Message:

r4571@cabanilles: bruno | 2012-03-15 16:26:08 +0100

• Working mr-net-find for both ip and ifconfig

File:

• branches/3.0/mindi/mr-net-find (modified) (4 diffs)

branches/3.0/mindi/mr-net-find

@@ -116 +116 @@
 
 my $curdev = "";
-open(IP,"ip addr |") || die "Unable to read IP config\n";
-while(<IP>) {
-    # Remove duplicate spaces
-    $_ =~ s/\s+/ /g;
-    pb_log(2,"Line: $_\n");
-    # Check for a new interface
-    my $tmp;
-    if (/^[0-9]+:/) {
-        my $dev;
-        my $rank;
-        ($rank,$dev,$tmp) = split(/:/);
-        pb_log(3,"$rank,$dev,$tmp");
-        $dev =~ s/\s*//;
-        $if->{$dev}->{'if'} = $dev;
-        $curdev = $dev;
-    }
-    ($tmp,$tmp,$if->{$curdev}->{'mac'},$tmp) = split(/ /) if (/^ link/);
-    ($tmp,$tmp,$if->{$curdev}->{'cidr'},$tmp) = split(/ /) if (/^ inet/);
-}
-close(IP);
+# TODO: Check whther the ip command is available ! 
+# If not consider using ifconfig for compatibility or non Linux availability
+my $ipcmd = pb_check_req("ip",1);
+if (defined $ipcmd) {
+    open(IP,"$ipcmd addr |") || die "Unable to read IP config with $ipcmd addr\n";
+    while (<IP>) {
+        # Remove duplicate spaces
+        my $line = $_;
+        $line =~ s/\s+/ /g;
+        pb_log(2,"Line: $line\n");
+        # Check for a new interface
+        my $tmp;
+        if ($line =~ /^[0-9]+:/) {
+            my $dev;
+            my $rank;
+            ($rank,$dev,$tmp) = split(/:/,$line);
+            pb_log(3,"$rank,$dev,$tmp\n");
+            $dev =~ s/\s*//;
+            $if->{$dev}->{'if'} = $dev;
+            $curdev = $dev;
+        }
+        ($tmp,$tmp,$if->{$curdev}->{'mac'},$tmp) = split(/ /,$line) if (/^\s*link/);
+        ($tmp,$tmp,$if->{$curdev}->{'cidr'},$tmp) = split(/ /,$line) if (/^\s*inet/);
+    }
+    close(IP);
+} else { 
+    my $ipcmd = pb_check_req("ifconfig",1);
+    if (defined $ipcmd) {
+        open(IP,"$ipcmd -a |") || die "Unable to read IP config with $ipcmd -a\n";
+        while (<IP>) {
+            # Remove duplicate spaces
+            my $line = $_;
+            $line =~ s/\s+/ /g;
+            pb_log(2,"Line: $line\n");
+            # Check for a new interface
+            my $tmp;
+            my $tmp2;
+            if ($line =~ /^[^ ]+ /) {
+                my $dev;
+                ($dev,$tmp) = split(/ /,$line,2);
+                pb_log(3,"DEV: $dev,$tmp\n");
+                $dev =~ s/\s*//;
+                $if->{$dev}->{'if'} = $dev;
+                $curdev = $dev;
+                ($tmp2,$tmp2,$tmp2,$if->{$curdev}->{'mac'}) = split(/ /,$tmp);
+            }
+            if (/^\s*inet/) {
+                ($tmp,$if->{$curdev}->{'ip'},$if->{$curdev}->{'nm'},$tmp) = split(/:/,$line);
+                $if->{$curdev}->{'ip'} =~ s/ .*$// if (defined $if->{$curdev}->{'ip'});
+                $if->{$curdev}->{'nm'} =~ s/ .*$// if (defined $if->{$curdev}->{'nm'});
+                pb_log(3,"IP: $if->{$curdev}->{'ip'},$if->{$curdev}->{'nm'}\n");
+                $if->{$curdev}->{'cidr'} = $if->{$curdev}->{'ip'}."/".mr_net_cvt_mask_bits($if->{$curdev}->{'nm'}) if ((defined $if->{$curdev}->{'ip'}) && (defined $if->{$curdev}->{'nm'}));
+                }
+        }
+        close(IP);
+    } else {
+        die "Neither ip nor ifconfig are available to get IP configuration.\nPlease report upstream how to deal with your platform.\n";
+    }
+}
 
 # Ideas Taken from http://nixcraft.com/shell-scripting/11398-simple-ipcalc-perl-script.html
 foreach my $dev (keys %if) {
     next if (not defined $if->{$dev}->{'cidr'});
-    ($if->{$dev}->{'ip'},my $cidr) = split(/\//,$if->{$dev}->{'cidr'});
-
-    $if->{$dev}->{'nm'} = mr_net_cvt_bits_mask($cidr);
+    ($if->{$dev}->{'ip'},my $cidr) = split(/\//,$if->{$dev}->{'cidr'}) if (not defined $if->{$dev}->{'ip'});
+
+    $if->{$dev}->{'nm'} = mr_net_cvt_bits_mask($cidr) if (not defined $if->{$dev}->{'nm'});;
 
     ($if->{$dev}->{'net'},$if->{$dev}->{'bcast'}) = mr_net_nbcast_from_in($if->{$dev}->{'ip'},$if->{$dev}->{'nm'});
@@ -162 +201 @@
 
 if ($bits <= 8 ) {
-    $a = bits_to_dec($bits);
+    $a = mr_net_bits_to_dec($bits);
 } else {
     $a = 255;
     if ($bits <= 16 ) {
-        $b = bits_to_dec($bits-8);
+        $b = mr_net_bits_to_dec($bits-8);
     } else {
         $b=255;
         if ($bits <= 24 ) {
-            $c = bits_to_dec($bits-16);
+            $c = mr_net_bits_to_dec($bits-16);
         } else {
             $c=255;
             if ($bits <= 32 ) {
-                $d = bits_to_dec($bits-24);
+                $d = mr_net_bits_to_dec($bits-24);
             } else {
                 die "invalid bit count\n";
@@ -183 +222 @@
 return ($a.".".$b.".".$c.".".$d);
 }
-   
-sub bits_to_dec {
+
+sub mr_net_cvt_mask_bits {
+
+my ($mask) = @_;
+my ($a,$b,$c,$d) = split(/\./,$mask);
+my $bits =0;
+
+$bits= mr_net_dec_to_bits($a) + mr_net_dec_to_bits($b) + mr_net_dec_to_bits($c) + mr_net_dec_to_bits($d);
+return ($bits);
+}
+  
+sub mr_net_bits_to_dec {
 my ($bits) = @_;
    
@@ -198 +247 @@
 }
 
+sub mr_net_dec_to_bits {
+my ($dec) = @_;
+   
+if ($dec == 0 ) { return 0; }
+if ($dec == 128 ) { return 1; }
+if ($dec == 192 ) { return 2; }
+if ($dec == 224 ) { return 3; }
+if ($dec == 240 ) { return 4; }
+if ($dec == 248 ) { return 5; }
+if ($dec == 252 ) { return 6; }
+if ($dec == 254 ) { return 7; }
+if ($dec == 255 ) { return 8; }
+}
+
 # Get Net and Broadcast from IP and Netmask
 sub mr_net_nbcast_from_in  {