Cleanup some code that is not needed anymore

2 files changed, 4 insertions, 31 deletions

diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc
index 33ffaf6..e310fd7 100644
--- a/etc/inc/gwlb.inc
+++ b/etc/inc/gwlb.inc
@@ -165,9 +165,7 @@ EOD;
 		} else if (is_ipaddrv6($gateway['gateway'])) {
 			/* link locals really need a different src ip */
 			if(is_linklocal($gateway['gateway'])) {
-				$linklocal = explode("%", find_interface_ipv6_ll($gateway['interface'], true));
-				$gwifip = $linklocal[0];
-				$ifscope = "%". $linklocal[1];
+				$gwifip = find_interface_ipv6_ll($gateway['interface'], true);
 			} else {
 				$gwifip = find_interface_ipv6($gateway['interface'], true);
 			}
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index a9279a6..55731a8 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -4361,7 +4361,6 @@ function find_interface_ipv6($interface, $flush = false) {
 	/* Setup IP cache */
 	if (!isset($interface_ipv6_arr_cache[$interface]) or $flush) {
 		$ifinfo = pfSense_get_interface_addresses($interface);
-		exec("/sbin/ifconfig {$interface} inet6", $output);
 		$interface_ipv6_arr_cache[$interface] = $ifinfo['ipaddr6'];
 		$interface_snv6_arr_cache[$interface] = $ifinfo['subnetbits6'];
 	}
@@ -4422,34 +4421,10 @@ function find_interface_subnetv6($interface, $flush = false) {
 	if (does_interface_exist($interface) == false)
 		return;
 
-	$foundv6 = false;
 	if (!isset($interface_snv6_arr_cache[$interface]) or $flush) {
-		$ifinfo = array();
-		// FIXME: Add IPv6 support to the pfSense module
-		unset($output);
-		exec("/sbin/ifconfig {$interface} inet6", $output);
-		foreach($output as $line) {
-			$line = trim($line);
-			if(preg_match("/inet6/", $line)) {
-				$parts = explode(" ", $line);
-				if(!is_linklocal($parts[1])) {
-					$ifinfo['ipaddrv6'] = $parts[1];
-					if($parts[2] == "-->") {
-						$parts[5] = "126";
-						$ifinfo['subnetbitsv6'] = $parts[5];
-					} else {
-						$ifinfo['subnetbitsv6'] = $parts[3];
-					}
-					$foundv6 = true;
-					break;
-				}
-			}
-		}
-		if ($foundv6 === true) {
-			$interface_ipv6_arr_cache[$interface] = $ifinfo['ipaddrv6'];
-			$interface_snv6_arr_cache[$interface] = $ifinfo['subnetbitsv6'];
-		} else
-			unset($interface_ipv6_arr_cache[$interface], $interface_snv6_arr_cache[$interface]);
+		$ifinfo = pfSense_get_interface_addresses($interface);
+		$interface_ipv6_arr_cache[$interface] = $ifinfo['ipaddr6'];
+		$interface_snv6_arr_cache[$interface] = $ifinfo['subnetbits6'];
 	}
 
 	return $interface_snv6_arr_cache[$interface];