Improve 'source-interface-id' option.

On software router, an IPv4 and IPv6 addresses need to be specified.
Not specifying one of them or both will result in the router trying
to use the best address to contact the destination.

This fix the bug where software routers could not ping or traceroute
IPv6 destination with only a IPv4 source address (obviously).

1 files changed, 31 insertions, 0 deletions

diff --git a/routers/router.php b/routers/router.php
index c878342..d68c2f4 100644
--- a/routers/router.php
+++ b/routers/router.php
@@ -77,6 +77,37 @@ abstract class Router {
     return $displayable;
   }
 
+  protected function has_source_interface_id() {
+    return isset($this->config['source-interface-id']);
+  }
+
+  protected function get_source_interface_id($ip_version = null) {
+    // No source interface ID specified
+    if (!$this->has_source_interface_id()) {
+      return null;
+    }
+
+    $source_interface_id = $this->config['source-interface-id'];
+
+    // Generic interface ID (interface name)
+    if (!is_array($source_interface_id)) {
+      return $source_interface_id;
+    }
+
+    // Composed interface ID (IPv4 and IPv6 address)
+    if (($ip_version == null) || ($ip_version == 'ipv4')) {
+      return $source_interface_id['ipv4'];
+    } else if ($ip_version == 'ipv6') {
+      return $source_interface_id['ipv6'];
+    }
+
+    return null;
+  }
+
+  protected abstract function build_ping($destination);
+
+  protected abstract function build_traceroute($destination);
+
   protected abstract function build_commands($command, $parameters);
 
   public function send_command($command, $parameters) {