system: add system_host_route(), later we also want system_default_ro…

…ute()
14CORE · May 31, 2017 · 611d972 · 611d972
1 parent 2a2bca9
commit 611d972
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
@@ -985,15 +985,7 @@ function interface_gif_configure(&$gif, $gifkey = "")
         file_put_contents("/tmp/{$gifif}_routerv6", $gif['tunnel-remote-addr']);
     }
 
-    if (is_ipaddrv4($realifgw)) {
-        mwexec("/sbin/route delete -host " . escapeshellarg($gif['remote-addr']));
-        mwexec("/sbin/route add -host " . escapeshellarg($gif['remote-addr']) . " {$realifgw}");
-    }
-    if (is_ipaddrv6($realifgw)) {
-        mwexec("/sbin/route delete -host -inet6 " . escapeshellarg($gif['remote-addr']));
-        mwexec("/sbin/route add -host -inet6 " . escapeshellarg($gif['remote-addr']) . " {$realifgw}");
-    }
-
+    system_host_route($gif['remote-addr'], $realifgw);
     interfaces_bring_up($gifif);
 
     return $gifif;

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
@@ -425,6 +425,20 @@ function system_hostname_configure($verbose = false)
     }
 }
 
+function system_host_route($host, $gateway)
+{
+    if (is_ipaddrv4($realifgw)) {
+        $family = 'inet';
+    } elseif (is_ipaddrv6($realifgw)) {
+        $family = 'inet6';
+    } else {
+        return;
+    }
+
+    mwexecf('/sbin/route delete -host -%s %s', array($family, $host), true);
+    mwexecf('/sbin/route add -host -%s %s %s', array($family, $host, $gateway));
+}
+
 function system_routing_configure($interface = '', $verbose = false)
 {
     global $config;