Changeset 3512 in MondoRescue for branches

Timestamp:

Feb 17, 2016, 1:37:44 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix #785 by returning conf values when NFS server not on the same LAN as the client

File:

• branches/3.2/MondoRescue/bin/mr-net-get-config (modified) (3 diffs)

branches/3.2/MondoRescue/bin/mr-net-get-config

@@ -131 +131 @@
 my ($scheme, $account, $host, $port, $path) = pb_get_uri($url);
 
-# If hot is a name transform into an IP
+# If host is a name transform into an IP
 my $hostip = inet_ntoa(scalar gethostbyname($host || 'localhost'));
+
+my $found = 0;
 
 # We need to loop on all if to see which one is on the same LAN as the server
@@ -138 +140 @@
     # Skip fake interfaces
     next if (not defined $if->address);
-    my $netfs_ipaddr = $if->address;
-    my $netfs_netmask = $if->netmask;
-    my $netfs_broadcast = $if->broadcast;
-    my $netfs_hwaddr = $if->hwaddr;
     pb_log(2, "interface = $if\n");
     pb_log(2, "--\n");
-    pb_log(2, "addr =      $netfs_ipaddr\n",
-        "broadcast = $netfs_broadcast\n",
-        "netmask =   $netfs_netmask\n",
+    pb_log(2, "addr =      $if->address\n",
+        "broadcast = $if->broadcast\n",
+        "netmask =   $if->netmask\n",
         "dstaddr =   ",$if->dstaddr,"\n",
-        "hwaddr =    $netfs_hwaddr\n",
+        "hwaddr =    $if->hwaddr\n",
         "mtu =       ",$if->mtu,"\n",
         "metric =    ",$if->metric,"\n",
@@ -162 +160 @@
     pb_log(2, "--\n");
     if (ipv4_in_network($if->address, $if->netmask, $hostip)) {
-        pb_log(1, "Netfs server $host is in network $netfs_ipaddr/$netfs_netmask\n");
+        pb_log(1, "Netfs server $host is in network $if->address/$if->netmask\n");
+        $found = 1;
         # So generate conf file
-        print $fd "netfs-dev $if\n";
-        print $fd "netfs-proto $scheme\n";
-        print $fd "netfs-client-ipaddr $netfs_ipaddr\n";
-        print $fd "netfs-client-netmask $netfs_netmask\n";
-        print $fd "netfs-client-broadcast $netfs_broadcast\n";
-        print $fd "netfs-client-hwaddr $netfs_hwaddr\n";
-        print $fd "netfs-server-mount $ARGV[0]\n";
-        print $fd "netfs-server-user $account\n";
-        print $fd "netfs-server-ipaddr $hostip\n";
-        open(ROUTE, "/proc/net/route") || die "Unable to read /proc/net/route: $!";
-        while (<ROUTE>) {
-            my ($iface,$dest,$gw,$foo) = split(/\s+/,$_);
-            # Keep only default route
-            next if ($dest !~ /^00000000$/);
-            $gw =~ s/([A-z0-9]{2})([A-z0-9]{2})([A-z0-9]{2})([A-z0-9]{2})/hex($4).".".hex($3).".".hex($2).".".hex($1)/eg;
-            print $fd "netfs-client-defgw $gw\n";
-        }
-        close(ROUTE);
+        my ($iface,$gw) = mr_net_get_def_gw();
+        mr_net_print_conf($fd, $if, $scheme, $if->address, $if->netmask, $if->broadcast, $if->hwaddr, $ARGV[0], $account, $hostip, $gw);
         last if ($pbdebug > 1);
     }
 }
+if ($found == 0) {
+    # Not found yet, so use the default GW to reach the server
+    my ($iface,$gw) = mr_net_get_def_gw();
+    my $if = IO::Interface::Simple->new($iface);
+    mr_net_print_conf($fd, $if, $scheme, $if->address, $if->netmask, $if->broadcast, $if->hwaddr, $ARGV[0], $account, $hostip, $gw);
+    }
+
 close($fd);
+
+sub mr_net_get_def_gw {
+
+my ($iface,$dest,$gw,$foo);
+
+open(ROUTE, "/proc/net/route") || die "Unable to read /proc/net/route: $!";
+while (<ROUTE>) {
+    ($iface,$dest,$gw,$foo) = split(/\s+/,$_);
+    # Keep only default route
+    next if ($dest !~ /^00000000$/);
+    $gw =~ s/([A-z0-9]{2})([A-z0-9]{2})([A-z0-9]{2})([A-z0-9]{2})/hex($4).".".hex($3).".".hex($2).".".hex($1)/eg;
+    last;
+}
+close(ROUTE);
+return($iface,$gw);
+}
+
+sub mr_net_print_conf {
+
+my ($fd, $iface, $scheme, $netfs_ipaddr, $netfs_netmask, $netfs_broadcast, $netfs_hwaddr, $netfs_server_mount, $account, $hostip, $gw) = @_;
+
+print $fd "netfs-dev $iface\n";
+print $fd "netfs-proto $scheme\n";
+print $fd "netfs-client-ipaddr $netfs_ipaddr\n";
+print $fd "netfs-client-netmask $netfs_netmask\n";
+print $fd "netfs-client-broadcast $netfs_broadcast\n";
+print $fd "netfs-client-hwaddr $netfs_hwaddr\n";
+print $fd "netfs-server-mount $ARGV[0]\n";
+print $fd "netfs-server-user $account\n";
+print $fd "netfs-server-ipaddr $hostip\n";
+print $fd "netfs-client-defgw $gw\n";
+}