From 0b80b17757c3d66c1f8a4463dcb8022fff2ebe02 Mon Sep 17 00:00:00 2001 From: ShadowFlare Date: Fri, 5 Feb 2010 18:54:19 -0700 Subject: [PATCH] Fix the output of guess_interface_from_ip for bridges. --- etc/inc/interfaces.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 7de3e55..1993955 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -2442,12 +2442,12 @@ function guess_interface_from_ip($ipaddress) { return false; } /* create a route table we can search */ - exec("netstat -rn", $output, $ret); + exec("netstat -rnW", $output, $ret); foreach($output as $line) { if(preg_match("/^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\/[0-9]+[ ]+link[#]/", $line)) { $fields = preg_split("/[ ]+/", $line); if(ip_in_subnet($ipaddress, $fields[0])) { - return $fields[5]; + return $fields[6]; } } } -- 1.6.2.2.1669.g7eaf8