* Make the carp ip fix for ipsec more general so other services that use the same methodology work.

	- Basically get_interface_ip() now knows how to handle carp(4).
* Move interface related function from pfsense-utils.inc to interfaces.inc that is their place.
	- More will come after the schedules fixes.

1 files changed, 1 insertions, 278 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 883b8ad..ea0b2b8 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1205,41 +1205,6 @@ function find_number_of_created_carp_interfaces($flush = false) {
 	return $carp_interface_count_cache;
 }
 
-/****f* pfsense-utils/link_interface_to_bridge
- * NAME
- *   link_interface_to_bridge - Finds out a bridge group for an interface
- * INPUTS
- *   $ip
- * RESULT
- *   bridge[0-99]
- ******/
-function link_interface_to_bridge($int) {
-	global $config;
-	
-	if (is_array($config['bridges']['bridged']))
-		foreach ($config['bridges']['bridged'] as $bridge) 
-			if(stristr($bridge['members'], "{$int}")) 
-				return "{$bridge['bridgeif']}";
-}
-
-function link_interface_to_gre($interface) {
-        global $config;
-
-        if (is_array($config['gres']['gre']))
-                foreach ($config['gres']['gre'] as $gre)
-                        if($gre['if'] == $interface)
-                                return "{$gre['greif']}";
-}
-
-function link_interface_to_gif($interface) {
-        global $config;
-
-        if (is_array($config['gifs']['gif']))
-                foreach ($config['gifs']['gif'] as $gif)
-                        if($gif['if'] == $interface)
-                                return "{$gif['gifif']}";
-}
-
 function link_carp_interface_to_parent($interface) {
 	global $config;
 	if($interface == "") return;
@@ -1406,66 +1371,6 @@ function convert_ip_to_network_format($ip, $subnet) {
 }
 
 /*
- * find_interface_ip($interface): return the interface ip (first found)
- */
-function find_interface_ip($interface, $flush = false) {
-	global $interface_ip_arr_cache;
-	
-	$interface = str_replace("\n", "", $interface);
-	if(does_interface_exist($interface) == false) 
-		return;
-
-	/* Setup IP cache */
-	if (!isset($interface_ip_arr_cache[$interface]) or $flush) {
-		$interface_ip_arr_cache[$interface] = exec_command("/sbin/ifconfig {$interface} | /usr/bin/grep -w \"inet\" | /usr/bin/cut -d\" \" -f 2| /usr/bin/head -1");
-		$interface_ip_arr_cache[$interface] = str_replace("\n", "", $interface_ip_arr_cache[$interface]);
-	}
-
-	return $interface_ip_arr_cache[$interface];
-}
-
-function find_interface_subnet($interface, $flush = false) 
-{
-	global $interface_sn_arr_cache;
-	
-	$interface = str_replace("\n", "", $interface);
-	if (does_interface_exist($interface) == false)
-		return;
-
-	if (!isset($interface_sn_arr_cache[$interface]) or $flush) {
-		$interface_sn_arr_cache[$interface] = exec_command("/sbin/ifconfig {$interface} | /usr/bin/grep -w \"inet\" | /usr/bin/cut -d\" \" -f 4 | /usr/bin/head -1");
-		$interface_sn_arr_cache[$interface] = strlen(str_replace("0", "", base_convert(str_replace("\n", "", $interface_sn_arr_cache[$interface]),16, 2)));
-	}
-
-	return $interface_sn_arr_cache[$interface];
-}
-
-function guess_interface_from_ip($ipaddress) {
-	$ret = exec_command("/usr/bin/netstat -rn | /usr/bin/awk '/^{$ipaddress}/ {print \$6}'");
-	if(empty($ret)) {
-		return false;
-	}
-	return $ret;
-}
-
-/*
- * find_ip_interface($ip): return the interface where an ip is defined
- */
-function find_ip_interface($ip) {
-
-	/* if list */
-        $ifdescrs = get_configured_interface_list();
-
-	foreach ($ifdescrs as $ifdescr => $ifname) {
-		$int = convert_friendly_interface_to_real_interface_name($ifname);
-		$ifconfig = exec_command("/sbin/ifconfig {$int}");
-		if(stristr($ifconfig,$ip) <> false)
-			return $int;
-	}
-	return false;
-}
-
-/*
  *  filter_translate_type_to_real_interface($interface): 
  *		returns the real hardware interface name for a friendly interface.  ie: wan
  */
@@ -1711,188 +1616,6 @@ function execute_command_return_output($command) {
 }
 
 /*
- * convert_friendly_interface_to_real_interface_name($interface): convert WAN to FXP0
- */
-function convert_friendly_interface_to_real_interface_name($interface) {
-	global $config;
-
-	$wanif = NULL;
-	switch ($interface) {
-		case "l2tp":
-                	$wanif = "l2tp";
-                	break;
-		case "pptp":
-			$wanif = "pptp";
-			break;
-		case "pppoe":
-			$wanif = "pppoe";
-			break;
-		case "openvpn":
-			$wanif = "openvpn";
-			break;
-		case "enc0":
-			$wanif = "enc0";
-			break;
-		/* XXX: dial in support?!
-		case "ppp":
-			$wanif = "ppp";
-			break;
-		*/
-		default:
-			$iflist = get_configured_interface_with_descr(false,true);
-
-		foreach ($iflist as $if => $ifdesc) {
-			if ($interface == $if || $interface == $ifdesc) {
-
-			$cfg = $config['interfaces'][$if];
-
-			if (empty($cfg['ipaddr'])) {
-                                $wanif = $cfg['if'];
-                                break;
-                        }
-
-			switch ($cfg['ipaddr']) {
-			case "carpdev-dhcp":
-				$viparr = &$config['virtualip']['vip'];
-				$counter = 0;
-				if(is_array($viparr))
-				foreach ($viparr as $vip) {
-					if ($vip['mode'] == "carpdev-dhcp") {
-						if($vip['interface'] == $if) {
-							$wanif =  "carp{$counter}";
-							break;
-						}
-						$counter++;
-					} else if ($vip['mode'] = "carp") 
-						$counter++;
-				}
-				break;
-			case "pppoe": 
-				if ($if == "wan")
-					$wanif = "pppoe0";
-				else
-					$wanif = "pppoe" . substr($if,3);
-				break;
-			case "pptp": 
-				if ($if == "wan")
-					$wanif = "pptp0";
-				else
-					$wanif = "pptp" . substr($if, 3);
-				break;
-			default:
-				if (isset($cfg['ispointtopoint']) && $cfg['pointtopoint'])
-					$wanif = "ppp0"; // XXX: PPP needs to convert to mpd
-				else	
-					$wanif = $cfg['if'];
-				break;
-			}
-			break;
-
-			break;
-			}
-		}
-		break;
-	}
-
-    return $wanif;
-}
-
-/*
- * convert_real_interface_to_friendly_interface_name($interface): convert fxp0 -> wan, etc.
- */
-function convert_real_interface_to_friendly_interface_name($interface = "wan") {
-	global $config;
-	
-	if (stristr($interface, "pppoe")) {
-		$index = substr($interface, 5);
-		if (intval($index) > 0)
-			return "opt{$index}";
-		else
-			return "wan";
-	} else if (stristr($interface, "pptp")) {
-		$index = substr($interface, 4);
-                if (intval($index) > 0)
-                        return "opt{$index}";
-                else
-                        return "wan";	
-	} else if (stristr($interface, "carp")) {
-		$index = substr($interface, 4);
-		$counter = 0;
-		foreach ($config['virtualip']['vip'] as $vip) {
-			if ($vip['mode'] == "carpdev-dhcp" || $vip['mode'] == "carp")  {
-				if (intval($index) == $counter)
-					return $vip['interface'];
-				$counter++;
-			}
-		}
-	}
-		
-	/* if list */
-        $ifdescrs = get_configured_interface_list(false, true);
-
-	foreach ($ifdescrs as $if => $ifname) {
-		if($config['interfaces'][$if]['if'] == $interface)
-			return $ifname;
-
-		/* XXX: ermal - The 3 lines below are totally bogus code. */
-		$int = filter_translate_type_to_real_interface($if);
-		if($ifname == $interface) 
-			return $ifname;
-
-		if($int == $interface) 
-			return $ifname;
-	}
-	return NULL;
-}
-
-/* attempt to resolve interface to friendly descr */
-function convert_friendly_interface_to_friendly_descr($interface) {
-        global $config;
-
-        switch ($interface) {
-		case "l2tp":
-				$ifdesc = "L2TP";
-				break;
-        	case "pptp":
-				$ifdesc = "pptp";
-				break;
-       		case "pppoe":
-				$ifdesc = "pppoe";
-				break;
-        	case "openvpn":
-				$ifdesc = "OpenVPN";
-				break;
-        	case "enc0":
-			case "ipsec":
-				$ifdesc = "IPsec";
-				break;
-        default:
-        	/* if list */
-        	$ifdescrs = get_configured_interface_with_descr(false, true);
-        	foreach ($ifdescrs as $if => $ifname) {
-				if ($if == $interface || $ifname == $interface)
-					return $ifname;
-        	}
-		break;
-	}
-
-        return $ifdesc;
-}
-
-function convert_real_interface_to_friendly_descr($interface) {
-        global $config;
-
-	$ifdesc = convert_real_interface_to_friendly_interface_name("{$interface}");
-
-	if ($ifdesc) {
-		$iflist = get_configured_interface_with_descr();
-		return $iflist[$ifdesc];
-	}
-	
-        return $interface;
-}
-
-/*
  * update_progress_bar($percent): updates the javascript driven progress bar.
  */
 function update_progress_bar($percent) {
@@ -3479,4 +3202,4 @@ function compare_hostname_to_dnscache($hostname) {
 	}
 }
 
-?>
\ No newline at end of file
+?>