/etc/inc/pfsense-utils.inc - Annotate - pfSense - pfSense bugtracker

| Branch: | Tag: | Revision:

root/etc/inc/pfsense-utils.inc @ 9befcca7

-c51
+<?php
-becf
+/****h* pfSense/pfsense-utils
  * NAME
  *   pfsense-utils.inc - Utilities specific to pfSense
  * DESCRIPTION
  *   This include contains various pfSense specific functions.
  * HISTORY
  *   $Id$
  ******
+ *
-            69487053
+ * Copyright (C) 2004-2007 Scott Ullrich (sullrich@gmail.com)
-becf
+ * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  * this list of conditions and the following disclaimer.
+ *
  * 2. Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
  * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
  * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
+ *
  */
-            0397013a
+/****f* pfsense-utils/have_natonetooneruleint_access
  * NAME
  *   have_natonetooneruleint_access
  * INPUTS
  *	 none
  * RESULT
  *   returns true if user has access to edit a specific firewall nat one to one interface
  ******/
 function have_natonetooneruleint_access($if) {
 	$security_url = "firewall_nat_1to1_edit.php?if=". strtolower($if);
-ee90ed
+	if(isAllowedPage($security_url, $allowed))
-            0397013a
+		return true;
 	return false;
+}
 /****f* pfsense-utils/have_natpfruleint_access
  * NAME
  *   have_natpfruleint_access
  * INPUTS
  *	 none
  * RESULT
  *   returns true if user has access to edit a specific firewall nat port forward interface
  ******/
 function have_natpfruleint_access($if) {
 	$security_url = "firewall_nat_edit.php?if=". strtolower($if);
-ee90ed
+	if(isAllowedPage($security_url, $allowed))
-            0397013a
+		return true;
 	return false;
+}
-            b6742927
+/****f* pfsense-utils/have_ruleint_access
  * NAME
  *   have_ruleint_access
  * INPUTS
  *	 none
  * RESULT
  *   returns true if user has access to edit a specific firewall interface
  ******/
 function have_ruleint_access($if) {
 	$security_url = "firewall_rules.php?if=". strtolower($if);
-ee90ed
+	if(isAllowedPage($security_url))
 		return true;
-            b6742927
+	return false;
+}
-            10387862
+/****f* pfsense-utils/does_url_exist
  * NAME
  *   does_url_exist
  * INPUTS
  *	 none
  * RESULT
  *   returns true if a url is available
  ******/
 function does_url_exist($url) {
-c13b
+	$fd = fopen("$url","r");
-            10387862
+	if($fd) {
-cc6345e
+		fclose($fd);
-            10387862
+   		return true;
 	} else {
         return false;
+	}
+}
-bd75
+/****f* pfsense-utils/is_private_ip
  * NAME
  *   is_private_ip
  * INPUTS
  *	 none
  * RESULT
  *   returns true if an ip address is in a private range
  ******/
 function is_private_ip($iptocheck) {
         $isprivate = false;
         $ip_private_list=array(
                "10.0.0.0/8",
                "172.16.0.0/12",
                "192.168.0.0/16",
                "99.0.0.0/8"
         );
         foreach($ip_private_list as $private) {
                 if(ip_in_subnet($iptocheck,$private)==true)
                         $isprivate = true;
+        }
         return $isprivate;
+}
-cb370b9
+/****f* pfsense-utils/get_tmp_file
  * NAME
  *   get_tmp_file
  * INPUTS
  *	 none
  * RESULT
  *   returns a temporary filename
  ******/
-becf
+function get_tmp_file() {
 	return "/tmp/tmp-" . time();
+}
 /****f* pfsense-utils/find_number_of_needed_carp_interfaces
  * NAME
  *   find_number_of_needed_carp_interfaces
  * INPUTS
  *   null
  * RESULT
  *   the number of needed carp interfacs
  ******/
 function find_number_of_needed_carp_interfaces() {
 	global $config, $g;
 	$carp_counter=0;
 	if(!$config['virtualip'])
 		return 0;
 	if(!$config['virtualip']['vip'])
 		return 0;
 	foreach($config['virtualip']['vip'] as $vip) {
 		if($vip['mode'] == "carp")
 			$carp_counter++;
+	}
 	return $carp_counter;
+}
 /****f* pfsense-utils/reset_carp
  * NAME
  *   reset_carp - resets carp after primary interface changes
  * INPUTS
  *   null
  * RESULT
  *   null
  ******/
 function reset_carp() {
 	$carp_counter=find_number_of_created_carp_interfaces();
 	$needed_carp_interfaces = find_number_of_needed_carp_interfaces();
 	mwexec("/sbin/sysctl net.inet.carp.allow=0");
 	for($x=0; $x<$carp_counter; $x++) {
 		mwexec("/sbin/ifconfig carp{$x} down");
-            cf79d727
+		usleep(1000);
-becf
+		mwexec("/sbin/ifconfig carp{$x} delete");
 		if($needed_carp_interfaces < $carp_counter) {
 			$needed_carp_interfaces--;
-cb54
+			//log_error("Destroying carp interface.");
 			//mwexec("/sbin/ifconfig carp{$x} destroy");
-becf
+            Scott Ullrich
+	}
 	find_number_of_created_carp_interfaces(true);
 	sleep(1);
 	mwexec("/sbin/sysctl net.inet.carp.allow=1");
 	interfaces_carp_configure();
+}
 /****f* pfsense-utils/get_dns_servers
  * NAME
  *   get_dns_servres - get system dns servers
  * INPUTS
  *   $dns_servers - an array of the dns servers
  * RESULT
  *   null
  ******/
 function get_dns_servers() {
 	$dns_servers = array();
 	$dns = `cat /etc/resolv.conf`;
 	$dns_s = split("\n", $dns);
 	foreach($dns_s as $dns) {
 		$matches = "";
 		if (preg_match("/nameserver (.*)/", $dns, $matches))
 			$dns_servers[] = $matches[1];
+	}
 	$dns_server_master = array();
 	$lastseen = "";
 	foreach($dns_servers as $t) {
 		if($t <> $lastseen)
 			if($t <> "")
 				$dns_server_master[] = $t;
 		$lastseen = $t;
+	}
 	return $dns_server_master;
+}
 /****f* pfsense-utils/enable_hardware_offloading
  * NAME
  *   enable_hardware_offloading - Enable a NIC's supported hardware features.
  * INPUTS
  *   $interface	- string containing the physical interface to work on.
  * RESULT
  *   null
  * NOTES
  *   This function only supports the fxp driver's loadable microcode.
  ******/
 function enable_hardware_offloading($interface) {
 	global $g, $config;
 	if(stristr($interface,"lnc"))
-            d2eb5def
+		return;
-d98f634
+            Scott Ullrich
-becf
+	/* translate wan, lan, opt -> real interface if needed */
-b0fb8
+	$int = interface_translate_type_to_real($interface);
-            a7c6604c
+	if($int <> "") $interface = $int;
-becf
+	$int_family = preg_split("/[0-9]+/", $int);
-            a7c6604c
+	$options = strtolower(`/sbin/ifconfig -m {$interface} | grep capabilities`);
-becf
+	$supported_ints = array('fxp');
-            a7c6604c
+	if (in_array($int_family, $supported_ints)) {
         	if(isset($config['system']['do_not_use_nic_microcode']))
                         continue;
-becf
+		mwexec("/sbin/ifconfig {$interface} link0");
-            a7c6604c
+            Chris Buechler
-becf
+            Scott Ullrich
-            a7c6604c
+	/* skip vlans for checksumming and polling */
 	if(stristr($interface, "vlan"))
-becf
+		return;
-            a7c6604c
+	if($config['system']['disablechecksumoffloading']) {
                 if(stristr($options, "txcsum") == true)
                         mwexec("/sbin/ifconfig {$interface} -txcsum 2>/dev/null");
                 if(stristr($options, "rxcsum") == true)
                         mwexec("/sbin/ifconfig {$interface} -rxcsum 2>/dev/null");
 	} else {
                	if(stristr($options, "txcsum") == true)
                         mwexec("/sbin/ifconfig {$interface} txcsum 2>/dev/null");
         	if(stristr($options, "rxcsum") == true)
                         mwexec("/sbin/ifconfig {$interface} rxcsum 2>/dev/null");
+        }
-d98f634
+            Scott Ullrich
 	/* if the NIC supports polling *AND* it is enabled in the GUI */
-            f7eb54e4
+	if(interface_supports_polling($interface)) {
-d98f634
+		$polling = isset($config['system']['polling']);
 		if($polling) {
 			mwexec("sysctl kern.polling.enable=1");
-            a7c6604c
+                        mwexec("/sbin/ifconfig {$interface} polling 2>/dev/null");
-d98f634
+		} else {
 			mwexec("sysctl kern.polling.enable=0");
+		}
-becf
+            Scott Ullrich
 	return;
+}
-            f7eb54e4
+/****f* pfsense-utils/interface_supports_polling
  * NAME
  *   checks to see if an interface supports polling according to man polling
  * INPUTS
+ *
  * RESULT
  *   true or false
  * NOTES
+ *
  ******/
 function interface_supports_polling($iface) {
 	$pattern = '/([a-z].*)[0-9]/';
 	preg_match($pattern, $iface, $iface2);
 	$interface=$iface2[1];
 	$supported_ints = array("bge",
 		"dc",
 		"em",
 		"fwe",
 		"fwip",
 		"fxp",
 		"ixgb",
 		"nfe",
-c17018
+		"vge",
-            f7eb54e4
+		"re",
 		"rl",
 		"sf",
-c17018
+		"sis",
-            f7eb54e4
+		"ste",
-c17018
+		"stge",
 		"vge",
-            f7eb54e4
+		"vr",
 		"xl");
 	if(in_array($interface, $supported_ints))
 		return true;
 	return false;
+}
-becf
+/****f* pfsense-utils/is_alias_inuse
  * NAME
  *   checks to see if an alias is currently in use by a rule
  * INPUTS
+ *
  * RESULT
  *   true or false
  * NOTES
+ *
  ******/
 function is_alias_inuse($alias) {
 	global $g, $config;
 	if($alias == "") return false;
 	/* loop through firewall rules looking for alias in use */
-e2e6b
+	if(is_array($config['filter']['rule']))
-becf
+		foreach($config['filter']['rule'] as $rule) {
-eee841
+			if($rule['source']['address'])
-becf
+				if($rule['source']['address'] == $alias)
-c8c496e
+					return true;
-eee841
+			if($rule['destination']['address'])
-becf
+				if($rule['destination']['address'] == $alias)
-c8c496e
+					return true;
+		}
-becf
+	/* loop through nat rules looking for alias in use */
 	if(is_array($config['nat']['rule']))
 		foreach($config['nat']['rule'] as $rule) {
 			if($rule['target'] == $alias)
 				return true;
 			if($rule['external-address'] == $alias)
 				return true;
+		}
 	return false;
+}
-b02
+/****f* pfsense-utils/is_schedule_inuse
  * NAME
  *   checks to see if a schedule is currently in use by a rule
  * INPUTS
+ *
  * RESULT
  *   true or false
  * NOTES
+ *
  ******/
 function is_schedule_inuse($schedule) {
 	global $g, $config;
 	if($schedule == "") return false;
 	/* loop through firewall rules looking for schedule in use */
 	if(is_array($config['filter']['rule']))
 		foreach($config['filter']['rule'] as $rule) {
-ceb32
+			if($rule['sched'] == $schedule)
 				return true;
-b02
+            Scott Dale
 	return false;
+}
-becf
+/****f* pfsense-utils/setup_polling_defaults
  * NAME
  *   sets up sysctls for pollingS
  * INPUTS
+ *
  * RESULT
  *   null
  * NOTES
+ *
  ******/
 function setup_polling_defaults() {
 	global $g, $config;
 	if($config['system']['polling_each_burst'])
 		mwexec("sysctl kern.polling.each_burst={$config['system']['polling_each_burst']}");
 	if($config['system']['polling_burst_max'])
 		mwexec("sysctl kern.polling.burst_max={$config['system']['polling_burst_max']}");
 	if($config['system']['polling_user_frac'])
 		mwexec("sysctl kern.polling.user_frac={$config['system']['polling_user_frac']}");
+}
 /****f* pfsense-utils/setup_polling
  * NAME
  *   sets up polling
  * INPUTS
+ *
  * RESULT
  *   null
  * NOTES
+ *
  ******/
 function setup_polling() {
 	global $g, $config;
 	setup_polling_defaults();
-            eff8869e
+	$supported_ints = array('bge', 'dc', 'em', 'fwe', 'fwip', 'fxp', 'ixgb', 'ste', 'nge', 're', 'rl', 'sf', 'sis', 'ste', 'vge', 'vr', 'xl');
-becf
+            Scott Ullrich
-a4ce87d
+	/* if list */
-            eff8869e
+	$iflist = get_configured_interface_list();
-becf
+            Scott Ullrich
 	foreach ($iflist as $ifent => $ifname) {
 		$real_interface = convert_friendly_interface_to_real_interface_name($ifname);
-            eff8869e
+		$ifdevice = substr($real_interface, 0, -1);
 		if(!in_array($ifdevice, $supported_ints)) {
-            ccaf2def
+			continue;
-            eff8869e
+            Chris Buechler
-            ccaf2def
+		if(isset($config['system']['polling'])) {
-becf
+			mwexec("/sbin/ifconfig {$real_interface} polling");
 		} else {
 			mwexec("/sbin/ifconfig {$real_interface} -polling");
+		}
+	}
+}
 /****f* pfsense-utils/setup_microcode
  * NAME
  *   enumerates all interfaces and calls enable_hardware_offloading which
  *   enables a NIC's supported hardware features.
  * INPUTS
+ *
  * RESULT
  *   null
  * NOTES
  *   This function only supports the fxp driver's loadable microcode.
  ******/
 function setup_microcode() {
-a4ce87d
+	/* if list */
         $ifdescrs = get_configured_interface_list();
-            e8df4c2f
+            Scott Ullrich
-becf
+	foreach($ifdescrs as $if)
 		enable_hardware_offloading($if);
+}
 /****f* pfsense-utils/get_carp_status
  * NAME
  *   get_carp_status - Return whether CARP is enabled or disabled.
  * RESULT
  *   boolean	- true if CARP is enabled, false if otherwise.
  ******/
 function get_carp_status() {
     /* grab the current status of carp */
     $status = `/sbin/sysctl net.inet.carp.allow | cut -d" " -f2`;
     if(intval($status) == "0") return false;
     return true;
+}
 /****f* pfsense-utils/is_carp_defined
  * NAME
  *   is_carp_defined - Return whether CARP is detected in the kernel.
  * RESULT
  *   boolean	- true if CARP is detected, false otherwise.
  ******/
 function is_carp_defined() {
 	/* is carp compiled into the kernel and userland? */
 	$command = "/sbin/sysctl -a | grep carp";
 	$fd = popen($command . " 2>&1 ", "r");
 	if(!$fd) {
 		log_error("Warning, could not execute command {$command}");
 		return 0;
+	}
 	while(!feof($fd)) {
 		$tmp .= fread($fd,49);
+	}
 	fclose($fd);
 	if($tmp == "")
 		return false;
 	else
 		return true;
+}
 /****f* pfsense-utils/find_number_of_created_carp_interfaces
  * NAME
  *   find_number_of_created_carp_interfaces - Return the number of CARP interfaces.
  * RESULT
  *   $tmp	- Number of currently created CARP interfaces.
  ******/
 function find_number_of_created_carp_interfaces($flush = false) {
 	global $carp_interface_count_cache;
 	if (!isset($carp_interface_count_cache) or $flush) {
 		$command = "/sbin/ifconfig | /usr/bin/grep \"carp*:\" | /usr/bin/wc -l";
-b2d4769
+		$fd = popen($command . " 2>&1 ", "r");
 		if(!$fd) {
 			log_error("Warning, could not execute command {$command}");
 			return 0;
+		}
 		while(!feof($fd)) {
 			$tmp .= fread($fd,49);
+		}
 		fclose($fd);
-becf
+		$carp_interface_count_cache = intval($tmp);
+	}
 	return $carp_interface_count_cache;
+}
-cde41
+function link_carp_interface_to_parent($interface) {
 	global $config;
-            e88fbe50
+	if ($interface == "")
 		return;
-cde41
+            Scott Ullrich
-b51b3
+	$carp_ip = find_interface_ip($interface);
-            e88fbe50
+	if (!is_ipaddr($carp_ip))
 		return;
-b51b3
+            Seth Mos
-            e88fbe50
+	/* if list */
         $ifdescrs = get_configured_interface_list();
-cde41
+	foreach ($ifdescrs as $ifdescr => $ifname) {
-            e88fbe50
+		$interfaceip = get_interface_ip($ifname);
 		$subnet_bits = get_interface_subnet($ifname);
 		$subnet_ip = gen_subnet("{$interfaceip}", "{$subnet_bits}");
 		if(ip_in_subnet($carp_ip, "{$subnet_ip}/{$subnet_bits}"))
 			return $ifname;
-cde41
+            Scott Ullrich
-            e88fbe50
+            Ermal Lu?i
 	return "";
-cde41
+            Scott Ullrich
-becf
+/****f* pfsense-utils/link_ip_to_carp_interface
  * NAME
  *   link_ip_to_carp_interface - Find where a CARP interface links to.
  * INPUTS
  *   $ip
  * RESULT
  *   $carp_ints
  ******/
 function link_ip_to_carp_interface($ip) {
 	global $config;
-            e88fbe50
+	if (!is_ipaddr($ip))
 		return;
-becf
+            Scott Ullrich
 	$carp_ints = "";
 	$num_carp_ints = find_number_of_created_carp_interfaces();
-            e88fbe50
+	for ($x=0; $x<$num_carp_ints; $x++) {
 		$carp_int = "carp{$x}";
 		$carp_ip = find_interface_ip($carp_int);
 		$carp_subnet = find_virtual_ip_netmask($carp_ip);
 		$starting_ip = gen_subnet("{$carp_ip}", "{$carp_subnet}");
 		if (ip_in_subnet($ip, "{$starting_ip}/{$carp_subnet}"))
 			if(!stristr($carp_ints, $carp_int))
 				$carp_ints .= " " . $carp_int;
-becf
+            Scott Ullrich
-            e88fbe50
+            Ermal Lu?i
-becf
+	return $carp_ints;
+}
 /****f* pfsense-utils/find_virtual_ip_netmask
  * NAME
  *   find_virtual_ip_netmask - Finds a virtual ip's subnet mask'
  * INPUTS
  *   $ip - ip address to locate subnet mask of
  * RESULT
  *   String containing the command's result.
  * NOTES
  *   This function returns the command's stdout and stderr.
  ******/
 function find_virtual_ip_netmask($ip) {
         global $config;
         foreach($config['virtualip']['vip'] as $vip) {
                 if($ip == $vip['subnet'])
                         return $vip['subnet_bits'];
+        }
+}
 /*
  * convert_ip_to_network_format($ip, $subnet): converts an ip address to network form
-            52947718
+            Ermal Lu?i
-becf
+ */
 function convert_ip_to_network_format($ip, $subnet) {
 	$ipsplit = split('[.]', $ip);
 	$string = $ipsplit[0] . "." . $ipsplit[1] . "." . $ipsplit[2] . ".0/" . $subnet;
 	return $string;
+}
 /*
  * get_carp_interface_status($carpinterface): returns the status of a carp ip
  */
 function get_carp_interface_status($carpinterface) {
 	/* basically cache the contents of ifconfig statement
 	to speed up this routine */
 	global $carp_query;
 	if($carp_query == "")
 	$carp_query = split("\n", `/sbin/ifconfig | /usr/bin/grep carp`);
 	$found_interface = 0;
 	foreach($carp_query as $int) {
 		if($found_interface == 1) {
 			if(stristr($int, "MASTER")) return "MASTER";
 			if(stristr($int, "BACKUP")) return "BACKUP";
 			if(stristr($int, "INIT")) return "INIT";
-c8c496e
+			return false;
+		}
-becf
+		if(stristr($int, $carpinterface) == true)
 		$found_interface=1;
+	}
 	return;
+}
 /*
  * get_pfsync_interface_status($pfsyncinterface): returns the status of a pfsync
  */
 function get_pfsync_interface_status($pfsyncinterface) {
     $result = does_interface_exist($pfsyncinterface);
     if($result <> true) return;
     $status = exec_command("/sbin/ifconfig {$pfsyncinterface} | /usr/bin/grep \"pfsync:\" | /usr/bin/cut -d\" \" -f5");
     return $status;
+}
 /*
  * find_carp_interface($ip): return the carp interface where an ip is defined
  */
 function find_carp_interface($ip) {
 	global $find_carp_ifconfig;
 	if($find_carp_ifconfig == "") {
 		$find_carp_ifconfig = array();
 		$num_carp_ints = find_number_of_created_carp_interfaces();
 		for($x=0; $x<$num_carp_ints; $x++) {
 			$find_carp_ifconfig[$x] = exec_command("/sbin/ifconfig carp{$x}");
+		}
+	}
 	$carps = 0;
 	foreach($find_carp_ifconfig as $fci) {
-e9547cf
+		if(stristr($fci, $ip . " ") == true)
-becf
+			return "carp{$carps}";
 		$carps++;
+	}
+}
 /*
  * add_rule_to_anchor($anchor, $rule): adds the specified rule to an anchor
  */
 function add_rule_to_anchor($anchor, $rule, $label) {
 	mwexec("echo " . $rule . " | /sbin/pfctl -a " . $anchor . ":" . $label . " -f -");
+}
 /*
  * remove_text_from_file
  * remove $text from file $file
  */
 function remove_text_from_file($file, $text) {
 	global $fd_log;
 	if($fd_log)
 		fwrite($fd_log, "Adding needed text items:\n");
 	$filecontents = file_get_contents($file);
 	$textTMP = str_replace($text, "", $filecontents);
 	$text = $textTMP;
 	if($fd_log)
 		fwrite($fd_log, $text);
 	$fd = fopen($file, "w");
 	fwrite($fd, $text);
 	fclose($fd);
+}
 /*
  * add_text_to_file($file, $text): adds $text to $file.
  * replaces the text if it already exists.
  */
-a6f3ca0
+function add_text_to_file($file, $text, $replace = false) {
-becf
+	if(file_exists($file) and is_writable($file)) {
-a6f3ca0
+		$filecontents = file($file);
-becf
+		$fout = fopen($file, "w");
-a6f3ca0
+            Scott Ullrich
 		$filecontents = array_map('rtrim', $filecontents);
 		array_push($filecontents, $text);
 		if ($replace)
 			$filecontents = array_unique($filecontents);
 		$file_text = implode("\n", $filecontents);
-becf
+		fwrite($fout, $file_text);
 		fclose($fout);
 		return true;
 	} else {
 		return false;
-c8c496e
+            Scott Ullrich
-becf
+            Scott Ullrich
 /*
  *   after_sync_bump_adv_skew(): create skew values by 1S
  */
 function after_sync_bump_adv_skew() {
 	global $config, $g;
 	$processed_skew = 1;
 	$a_vip = &$config['virtualip']['vip'];
 	foreach ($a_vip as $vipent) {
 		if($vipent['advskew'] <> "") {
 			$processed_skew = 1;
 			$vipent['advskew'] = $vipent['advskew']+1;
+		}
+	}
 	if($processed_skew == 1)
 		write_config("After synch increase advertising skew");
+}
 /*
  * get_filename_from_url($url): converts a url to its filename.
  */
 function get_filename_from_url($url) {
 	return basename($url);
+}
 /*
  *   update_output_window: update bottom textarea dynamically.
  */
 function update_output_window($text) {
 	global $pkg_interface;
 	$log = ereg_replace("\n", "\\n", $text);
 	if($pkg_interface == "console") {
 		/* too chatty */
 	} else {
 		echo "\n<script language=\"JavaScript\">this.document.forms[0].output.value = \"" . $log . "\";</script>";
+	}
 	/* ensure that contents are written out */
 	ob_flush();
+}
 /*
  *   get_dir: return an array of $dir
  */
 function get_dir($dir) {
 	$dir_array = array();
 	$d = dir($dir);
 	while (false !== ($entry = $d->read())) {
 		array_push($dir_array, $entry);
+	}
 	$d->close();
 	return $dir_array;
+}
 /*
  *   update_output_window: update top textarea dynamically.
  */
 function update_status($status) {
 	global $pkg_interface;
 	if($pkg_interface == "console") {
 		echo $status . "\n";
 	} else {
-fbefa5b
+		echo "\n<script type=\"text/javascript\">this.document.forms[0].status.value=\"" . $status . "\";</script>";
-becf
+            Scott Ullrich
 	/* ensure that contents are written out */
 	ob_flush();
+}
 /*
  * update_progress_bar($percent): updates the javascript driven progress bar.
  */
 function update_progress_bar($percent) {
 	global $pkg_interface;
 	if($percent > 100) $percent = 1;
 	if($pkg_interface <> "console") {
 		echo "\n<script type=\"text/javascript\" language=\"javascript\">";
 		echo "\ndocument.progressbar.style.width='" . $percent . "%';";
 		echo "\n</script>";
 	} else {
 		echo " {$percent}%";
+	}
+}
 /****f* pfsense-utils/WakeOnLan
  * NAME
  *   WakeOnLan - Wake a machine up using the wake on lan format/protocol
  * RESULT
  *   true/false - true if the operation was successful
  ******/
 function WakeOnLan($addr, $mac)
+{
 	$addr_byte = explode(':', $mac);
 	$hw_addr = '';
 	for ($a=0; $a < 6; $a++)
 		$hw_addr .= chr(hexdec($addr_byte[$a]));
 	$msg = chr(255).chr(255).chr(255).chr(255).chr(255).chr(255);
 	for ($a = 1; $a <= 16; $a++)
 		$msg .= $hw_addr;
 	// send it to the broadcast address using UDP
 	$s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
 	if ($s == false) {
 		log_error("Error creating socket!");
 		log_error("Error code is '".socket_last_error($s)."' - " . socket_strerror(socket_last_error($s)));
 	} else {
 		// setting a broadcast option to socket:
 		$opt_ret =  socket_set_option($s, 1, 6, TRUE);
 		if($opt_ret < 0)
 			log_error("setsockopt() failed, error: " . strerror($opt_ret));
 		$e = socket_sendto($s, $msg, strlen($msg), 0, $addr, 2050);
 		socket_close($s);
 		log_error("Magic Packet sent ({$e}) to {$addr} MAC={$mac}");
 		return true;
-c8c496e
+            Scott Ullrich
-becf
+            Scott Ullrich
 	return false;
+}
 /*
  * gather_altq_queue_stats():  gather altq queue stats and return an array that
  *                             is queuename|qlength|measured_packets
  *                             NOTE: this command takes 5 seconds to run
  */
 function gather_altq_queue_stats($dont_return_root_queues) {
-            f2b8daad
+	exec("/sbin/pfctl -vvsq", $stats_array);
-becf
+	$queue_stats = array();
 	foreach ($stats_array as $stats_line) {
 		$match_array = "";
 		if (preg_match_all("/queue\s+(\w+)\s+/",$stats_line,$match_array))
 			$queue_name = $match_array[1][0];
 		if (preg_match_all("/measured:\s+.*packets\/s\,\s(.*)\s+\]/",$stats_line,$match_array))
 			$speed = $match_array[1][0];
 		if (preg_match_all("/borrows:\s+(.*)/",$stats_line,$match_array))
 			$borrows = $match_array[1][0];
 		if (preg_match_all("/suspends:\s+(.*)/",$stats_line,$match_array))
 			$suspends = $match_array[1][0];
 		if (preg_match_all("/dropped pkts:\s+(.*)/",$stats_line,$match_array))
 			$drops = $match_array[1][0];
 		if (preg_match_all("/measured:\s+(.*)packets/",$stats_line,$match_array)) {
 			$measured = $match_array[1][0];
 			if($dont_return_root_queues == true)
 				if(stristr($queue_name,"root_") == false)
 					array_push($queue_stats, "{$queue_name}|{$speed}|{$measured}|{$borrows}|{$suspends}|{$drops}");
+		}
+	}
 	return $queue_stats;
+}
 /*
  * reverse_strrchr($haystack, $needle):  Return everything in $haystack up to the *last* instance of $needle.
  *					 Useful for finding paths and stripping file extensions.
  */
 function reverse_strrchr($haystack, $needle) {
 	return strrpos($haystack, $needle) ? substr($haystack, 0, strrpos($haystack, $needle) +1 ) : false;
+}
 /*
  *  backup_config_section($section): returns as an xml file string of
  *                                   the configuration section
  */
 function backup_config_section($section) {
 	global $config;
 	$new_section = &$config[$section];
 	/* generate configuration XML */
 	$xmlconfig = dump_xml_config($new_section, $section);
 	$xmlconfig = str_replace("<?xml version=\"1.0\"?>", "", $xmlconfig);
 	return $xmlconfig;
+}
 /*
  *  backup_vip_config_section($section): returns as an xml file string of
  *                                   the configuration section
  */
 function backup_vip_config_section() {
 	global $config;
 	$new_section = &$config['virtualip'];
 	foreach($new_section['vip'] as $section) {
 		if($section['mode'] == "proxyarp") {
 			unset($section);
+		}
 		if($section['advskew'] <> "") {
 			$section_val = intval($section['advskew']);
 			$section_val=$section_val+100;
 			if($section_val > 255)
 				$section_val = 255;
 			$section['advskew'] = $section_val;
+		}
 		$temp['vip'][] = $section;
+   }
    return $temp;
+}
 /*
  *  restore_config_section($section, new_contents): restore a configuration section,
  *                                                  and write the configuration out
  *                                                  to disk/cf.
  */
 function restore_config_section($section, $new_contents) {
 	global $config, $g;
 	conf_mount_rw();
 	$fout = fopen("{$g['tmp_path']}/tmpxml","w");
 	fwrite($fout, $new_contents);
 	fclose($fout);
 	$section_xml = parse_xml_config($g['tmp_path'] . "/tmpxml", $section);
 	$config[$section] = &$section_xml;
 	unlink($g['tmp_path'] . "/tmpxml");
 	write_config("Restored {$section} of config file (maybe from CARP partner)");
 	conf_mount_ro();
 	return;
+}
 /*
  *  merge_config_section($section, new_contents):   restore a configuration section,
  *                                                  and write the configuration out
  *                                                  to disk/cf.  But preserve the prior
  * 													structure if needed
  */
 function merge_config_section($section, $new_contents) {
 	global $config;
 	conf_mount_rw();
 	$fname = get_tmp_filename();
 	$fout = fopen($fname, "w");
 	fwrite($fout, $new_contents);
 	fclose($fout);
 	$section_xml = parse_xml_config($fname, $section);
 	$config[$section] = $section_xml;
 	unlink($fname);
 	write_config("Restored {$section} of config file (maybe from CARP partner)");
 	conf_mount_ro();
 	return;
+}
 /*
  * http_post($server, $port, $url, $vars): does an http post to a web server
  *                                         posting the vars array.
  * written by nf@bigpond.net.au
  */
 function http_post($server, $port, $url, $vars) {
 	$user_agent = "Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)";
 	$urlencoded = "";
 	while (list($key,$value) = each($vars))
 		$urlencoded.= urlencode($key) . "=" . urlencode($value) . "&";
 	$urlencoded = substr($urlencoded,0,-1);
 	$content_length = strlen($urlencoded);
 	$headers = "POST $url HTTP/1.1
 Accept: */*
 Accept-Language: en-au
 Content-Type: application/x-www-form-urlencoded
 User-Agent: $user_agent
 Host: $server
 Connection: Keep-Alive
 Cache-Control: no-cache
 Content-Length: $content_length
 ";
 	$errno = "";
 	$errstr = "";
 	$fp = fsockopen($server, $port, $errno, $errstr);
 	if (!$fp) {
-c8c496e
+		return false;
+	}
-becf
+            Scott Ullrich
 	fputs($fp, $headers);
 	fputs($fp, $urlencoded);
 	$ret = "";
 	while (!feof($fp))
 		$ret.= fgets($fp, 1024);
 	fclose($fp);
 	return $ret;
+}
 /*
  *  php_check_syntax($code_tocheck, $errormessage): checks $code_to_check for errors
  */
 if (!function_exists('php_check_syntax')){
 	function php_check_syntax($code_to_check, &$errormessage){
 		return false;
 		$fout = fopen("/tmp/codetocheck.php","w");
 		$code = $_POST['content'];
 		$code = str_replace("<?php", "", $code);
 		$code = str_replace("?>", "", $code);
 		fwrite($fout, "<?php\n\n");
 		fwrite($fout, $code_to_check);
 		fwrite($fout, "\n\n?>\n");
-c8c496e
+		fclose($fout);
-becf
+		$command = "/usr/local/bin/php -l /tmp/codetocheck.php";
 		$output = exec_command($command);
 		if (stristr($output, "Errors parsing") == false) {
 			echo "false\n";
 			$errormessage = '';
 			return(false);
 		} else {
 			$errormessage = $output;
 			return(true);
-c8c496e
+            Scott Ullrich
+	}
-becf
+            Scott Ullrich
 /*
  *  php_check_filename_syntax($filename, $errormessage): checks the file $filename for errors
  */
 if (!function_exists('php_check_syntax')){
 	function php_check_syntax($code_to_check, &$errormessage){
 		return false;
 		$command = "/usr/local/bin/php -l " . $code_to_check;
 		$output = exec_command($command);
 		if (stristr($output, "Errors parsing") == false) {
 			echo "false\n";
 			$errormessage = '';
 			return(false);
 		} else {
 			$errormessage = $output;
 			return(true);
+		}
+	}
+}
 /*
  * rmdir_recursive($path,$follow_links=false)
  * Recursively remove a directory tree (rm -rf path)
  * This is for directories _only_
  */
 function rmdir_recursive($path,$follow_links=false) {
 	$to_do = glob($path);
 	if(!is_array($to_do)) $to_do = array($to_do);
 	foreach($to_do as $workingdir) { // Handle wildcards by foreaching.
 		if(file_exists($workingdir)) {
 			if(is_dir($workingdir)) {
 				$dir = opendir($workingdir);
 				while ($entry = readdir($dir)) {
 					if (is_file("$workingdir/$entry") || ((!$follow_links) && is_link("$workingdir/$entry")))
 						unlink("$workingdir/$entry");
 					elseif (is_dir("$workingdir/$entry") && $entry!='.' && $entry!='..')
 						rmdir_recursive("$workingdir/$entry");
-a031
+            Scott Ullrich
-becf
+				closedir($dir);
 				rmdir($workingdir);
 			} elseif (is_file($workingdir)) {
 				unlink($workingdir);
+			}
+               	}
+	}
 	return;
+}
 /*
  * call_pfsense_method(): Call a method exposed by the pfsense.com XMLRPC server.
  */
 function call_pfsense_method($method, $params, $timeout = 0) {
-            cfceefc6
+	global $g, $config;
-d0358b
+	$ip = gethostbyname($g['product_website']);
 	if($ip == $g['product_website'])
-becf
+		return false;
 	global $g, $config;
 	$xmlrpc_base_url = $g['xmlrpcbaseurl'];
 	$xmlrpc_path = $g['xmlrpcpath'];
 	$msg = new XML_RPC_Message($method, array(XML_RPC_Encode($params)));
 	$cli = new XML_RPC_Client($xmlrpc_path, $xmlrpc_base_url);
 	$resp = $cli->send($msg, $timeout);
 	if(!$resp) {
 		log_error("XMLRPC communication error: " . $cli->errstr);
 		return false;
 	} elseif($resp->faultCode()) {
 		log_error("XMLRPC request failed with error " . $resp->faultCode() . ": " . $resp->faultString());
 		return false;
 	} else {
 		return XML_RPC_Decode($resp->value());
+	}
+}
 /*
  * check_firmware_version(): Check whether the current firmware installed is the most recently released.
  */
 function check_firmware_version($tocheck = "all", $return_php = true) {
 	global $g, $config;
-d0358b
+	$ip = gethostbyname($g['product_website']);
 	if($ip == $g['product_website'])
-becf
+		return false;
 	$rawparams = array("firmware" => array("version" => trim(file_get_contents('/etc/version'))),
 		"kernel"   => array("version" => trim(file_get_contents('/etc/version_kernel'))),
 		"base"     => array("version" => trim(file_get_contents('/etc/version_base'))),
 		"platform" => trim(file_get_contents('/etc/platform'))
 		);
 	if($tocheck == "all") {
 		$params = $rawparams;
 	} else {
 		foreach($tocheck as $check) {
 			$params['check'] = $rawparams['check'];
 			$params['platform'] = $rawparams['platform'];
+		}
+	}
 	if($config['system']['firmware']['branch']) {
 		$params['branch'] = $config['system']['firmware']['branch'];
+	}
 	if(!$versions = call_pfsense_method('pfsense.get_firmware_version', $params)) {
 		return false;
 	} else {
 		$versions["current"] = $params;
+	}
 	return $versions;
+}
 function get_disk_info() {
 	$diskout = "";
 	exec("/bin/df -h | /usr/bin/grep -w '/' | /usr/bin/awk '{ print $2, $3, $4, $5 }'", $diskout);
 	return explode(' ', $diskout[0]);
 	// $size, $used, $avail, $cap
+}
 /****f* pfsense-utils/display_top_tabs
  * NAME
  *   display_top_tabs - display tabs with rounded edges
  * INPUTS
-adfb2df
+ *   $text      - array of tabs
-becf
+ * RESULT
  *   null
  ******/
-adfb2df
+function display_top_tabs(& $tab_array) {
 	global $HTTP_SERVER_VARS;
 	global $config;
-aae364d
+	global $g;
-adfb2df
+            Scott Ullrich
-ee90ed
+	/*  does the user have access to this tab?
 	 *  master user has access to everything.
 	 *  if the user does not have access, simply
 	 *  unset the tab item.
 	 */
 	$tab_temp = array ();
 	foreach ($tab_array as $ta)
 		if(isAllowedPage($ta[2]))
 			$tab_temp[] = $ta;
 	/*
 		// FIXME :	if the checks are not good enough
 		//			in isAllowedPage, it needs to be
 		//			fixed instead of kludging here
 		// TODO: humm what shall we do with pkg_edit.php and pkg.php?
 		if ((strpos($link, "pkg.php")) !== false || (strpos($link, "pkg_edit.php")) !== false) {
 			$pos_equal = strpos($link, "=");
 			$pos_xmlsuffix = strpos($link, ".xml");
 			// do we match an absolute url including ?xml= foo
 			if(!isAllowedPage($link, $allowed))
 				$link = substr($link, $pos_equal +1, ($pos_xmlsuffix - $pos_equal +3));
-adfb2df
+            Scott Ullrich
-ee90ed
+		// next check - what if the basename contains a query string?
 		if ((strpos($link, "?")) !== false) {
 			$pos_qmark = strpos($link, "?");
 			$link = substr($link, 0, $pos_qmark);
+		}
 		$authorized_text = print_r($allowed, true);
 		if(is_array($authorized))
 			if (in_array(basename($link), $authorized))
 	*/
 	unset ($tab_array);
 	$tab_array = & $tab_temp;
-adfb2df
+            Scott Ullrich
-            fe39586a
+	$tab_active_bg   = "#EEEEEE";
 	$tab_inactive_bg = "#777777";
 	$nifty_tabs_corners = "#FFF";
 	$font_color = "white";
 	/* if tabcontrols.php exist for a theme, allow it to be overriden */
 	$themename = $config['theme'];
 	$filename = "/usr/local/www/themes/{$themename}/tabcontrols.php";
-f36cda
+	if(file_exists($filename)) {
 		$eval_code = file_get_contents($filename);
 		eval($eval_code);
+	}
-a60a
+	$tabcharcount = 0;
 	foreach ($tab_array as $ta)
 		$tabcharcount = $tabcharcount + strlen($ta[0]);
-b67506
+	// If the character count of the tab names is > 670
-a60a
+	// then show a select item dropdown menubox.
-            d4e6c445
+	if($tabcharcount > 82) {
-a60a
+		echo "Currently viewing: ";
 		echo "<select name='TabSelect'>\n";
 		foreach ($tab_array as $ta) {
 			if($ta[1]=="true")
 				$selected = " SELECTED";
 			else
 				$selected = "";
 			echo "<option onClick=\"document.location='{$ta[2]}';\"{$selected}>{$ta['0']}</option>\n";
+		}
 		echo "</select>\n<p/>";
 	}  else {
 		echo "<table cellpadding='0' cellspacing='0'>\n";
 		echo " <tr>\n";
 		$tabscounter = 0;
 		foreach ($tab_array as $ta) {
 			if ($ta[1] == true) {
 				echo "  <td bgcolor='{$tab_active_bg}' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><div id='tabactive'></div></td>\n";
 			} else {
 				echo "  <td bgcolor='{$tab_inactive_bg}' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><div id='tabdeactive{$tabscounter}'></div></td>\n";
+			}
 			$tabscounter++;
+		}
 		echo "</tr>\n<tr>\n";
 		foreach ($tab_array as $ta) {
 			if ($ta[1] == true) {
 				echo "  <td height=\"15\" valign=\"middle\" bgcolor='{$tab_active_bg}' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><B>&nbsp;&nbsp;&nbsp;{$ta[0]}";
 				echo "&nbsp;&nbsp;&nbsp;";
 				echo "<font size='-12'>&nbsp;</font></B></td>\n";
 			} else {
 				echo "  <td height=\"15\" valign=\"middle\" bgcolor='{$tab_inactive_bg}' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"><B>&nbsp;&nbsp;&nbsp;<a href='{$ta[2]}'>";
 				echo "<font color='{$font_color}'>{$ta[0]}</font></a>&nbsp;&nbsp;&nbsp;";
 				echo "<font size='-12'>&nbsp;</font></B></td>\n";
+			}
-c8c496e
+            Scott Ullrich
-a60a
+		echo "</tr>\n<tr>\n";
 		foreach ($tab_array as $ta) {
 			if ($ta[1] == true) {
 				echo "  <td bgcolor='{$tab_active_bg}' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"></td>\n";
 			} else {
 				echo "  <td bgcolor='{$tab_inactive_bg}' onClick=\"document.location='{$ta[2]}'\" style=\"cursor: pointer;\"></td>\n";
+			}
 			$tabscounter++;
-becf
+            Scott Ullrich
-a60a
+		echo " </tr>\n";
 		echo "</table>\n";
 		echo "<script type=\"text/javascript\">";
 		echo "NiftyCheck();\n";
 		echo "Rounded(\"div#tabactive\",\"top\",\"{$nifty_tabs_corners}\",\"{$tab_active_bg}\",\"smooth\");\n";
 		for ($x = 0; $x < $tabscounter; $x++)
 			echo "Rounded(\"div#tabdeactive{$x}\",\"top\",\"{$nifty_tabs_corners}\",\"{$tab_inactive_bg}\",\"smooth\");\n";
 		echo "</script>";
-becf
+            Scott Ullrich
+}
 /****f* pfsense-utils/display_topbar
  * NAME
  *   display_topbar - top a table off with rounded edges
  * INPUTS
  *   $text	- (optional) Text to include in bar
  * RESULT
  *   null
  ******/
 function display_topbar($text = "", $bg_color="#990000", $replace_color="#FFFFFF", $rounding_style="smooth") {
 	echo "     <table width='100%' cellpadding='0' cellspacing='0'>\n";
 	echo "       <tr height='1'>\n";
 	echo "         <td width='100%' valign='top' color='{$bg_color}' bgcolor='{$bg_color}'>";
 	echo "		<div id='topbar'></div></td>\n";
 	echo "       </tr>\n";
 	echo "       <tr height='1'>\n";
 	if ($text != "")
 		echo "         <td height='1' class='listtopic'>{$text}</td>\n";
 	else
 		echo "         <td height='1' class='listtopic'></td>\n";
 	echo "       </tr>\n";
 	echo "     </table>";
 	echo "<script type=\"text/javascript\">";
 	echo "NiftyCheck();\n";
 	echo "Rounded(\"div#topbar\",\"top\",\"{$replace_color}\",\"{$bg_color}\",\"{$rounding_style}\");\n";
 	echo "</script>";
+}
 /****f* pfsense-utils/strncpy
  * NAME
  *   strncpy - copy strings
  * INPUTS
  *   &$dst, $src, $length
  * RESULT
  *   none
  ******/
 function strncpy(&$dst, $src, $length) {
 	if (strlen($src) > $length) {
 		$dst = substr($src, 0, $length);
 	} else {
 		$dst = $src;
+	}
+}
 /****f* pfsense-utils/reload_interfaces_sync
  * NAME
  *   reload_interfaces - reload all interfaces
  * INPUTS
  *   none
  * RESULT
  *   none
  ******/
 function reload_interfaces_sync() {
-            c0836064
+	global $config, $g;
-becf
+            Scott Ullrich
 	$shutdown_webgui_needed = false;
 	touch("{$g['tmp_path']}/reloading_all");
-            c0836064
+	if($g['debug'])
-becf
+		log_error("reload_interfaces_sync() is starting.");
 	if(file_exists("{$g['tmp_path']}/config.cache"))
 		unlink("{$g['tmp_path']}/config.cache");
 	/* parse config.xml again */
 	$config = parse_config(true);
 	$wan_if = $config['interfaces']['wan']['if'];
-            c0836064
+	if (isset($config['interfaces']['lan']))
                 $lan_if = $config['interfaces']['lan']['if'];
         else
                 $lan_if = "";
-becf
+            Scott Ullrich
-            c0836064
+	if($g['debug'])
-becf
+		log_error("Cleaning up Interfaces");
-a4ce87d
+	/* if list */
-ee1ec5
+        $iflist = get_configured_interface_list(true);
-becf
+            Scott Ullrich
 	foreach ($iflist as $ifent => $ifname) {
 		$ifname_real = convert_friendly_interface_to_real_interface_name($ifname);
-a4ce87d
+            Ermal Luçi
-becf
+		if(stristr($ifname, "lo0") == true)
 			continue;
 		/* do not process wan interface, its mandatory */
-ee1ec5
+                if(stristr($ifname, "$wan_if") == true)
                         continue;
                 /* do not process lan interface, its mandatory */
                 if(stristr($ifname, "$lan_if") == true)
                         continue;
-            c0836064
+		if($g['debug'])
-becf
+			log_error("Downing and deleting $ifname_real - $ifname");
 		mwexec("/sbin/ifconfig {$ifname_real} down");
 		mwexec("/sbin/ifconfig {$ifname_real} delete");
+	}
-ee1ec5
+	/* set up interfaces */
 	interfaces_configure();
-becf
+            Scott Ullrich
 	/* set up static routes */
-            c0836064
+	if($g['debug'])
-becf
+		log_error("Configuring system Routing");
 	system_routing_configure();
 	/* enable routing */
-            c0836064
+	if($g['debug'])
-becf
+		log_error("Enabling system routing");
 	system_routing_enable();
 	/* setup captive portal if needed */
-            c0836064
+	if($g['debug'])
-becf
+		log_error("Configuring Captive portal");
 	captiveportal_configure();
 	/* restart webConfigurator if needed */
 	if($shutdown_webgui_needed == true)
 		touch("/tmp/restart_webgui");
 	/* start devd back up */
 	mwexec("/bin/rm /tmp/reload*");
 	/* remove reloading_all trigger */
-            c0836064
+	if($g['debug'])
-becf
+		log_error("Removing {$g['tmp_path']}/reloading_all");
 	unlink_if_exists("{$g['tmp_path']}/reloading_all");
+}
 /****f* pfsense-utils/reload_all
  * NAME
  *   reload_all - triggers a reload of all settings
  *   * INPUTS
  *   none
  * RESULT
  *   none
  ******/
 function reload_all() {
 	touch("/tmp/reload_all");
+}
 /****f* pfsense-utils/reload_interfaces
  * NAME
  *   reload_interfaces - triggers a reload of all interfaces
  * INPUTS
  *   none
  * RESULT
  *   none
  ******/
 function reload_interfaces() {
 	touch("/tmp/reload_interfaces");
+}
 /****f* pfsense-utils/reload_all_sync
  * NAME
  *   reload_all - reload all settings
  *   * INPUTS
  *   none
  * RESULT
  *   none
  ******/
 function reload_all_sync() {
 	global $config, $g;
 	$g['booting'] = false;
 	touch("{$g['tmp_path']}/reloading_all");
 	$shutdown_webgui_needed = false;
 	if(file_exists("{$g['tmp_path']}/config.cache"))
 		unlink("{$g['tmp_path']}/config.cache");
 	/* parse config.xml again */
 	$config = parse_config(true);
 	/* set up our timezone */
 	system_timezone_configure();
 	/* set up our hostname */
 	system_hostname_configure();
 	/* make hosts file */
 	system_hosts_generate();
 	/* generate resolv.conf */
 	system_resolvconf_generate();
-            ae84328e
+	/* Set up our loopback interface */
 	interfaces_loopback_configure();
-becf
+	$wan_if = $config['interfaces']['wan']['if'];
-            c0836064
+	if (isset($config['interfaces']['lan']))
 		$lan_if = $config['interfaces']['lan']['if'];
 	else
 		$lan_if = "";
-becf
+            Scott Ullrich
-a4ce87d
+	/* if list */
 	$iflist = get_configured_interface_list();
-becf
+            Scott Ullrich
 	foreach ($iflist as $ifent => $ifname) {
 		$ifname_real = convert_friendly_interface_to_real_interface_name($ifname);
 		if(stristr($ifname, "lo0") == true)
 			continue;
 		/* do not process wan interface, its mandatory */
 		if($wan_if == $ifname_real)
 			continue;
 		/* do not process lan interface, its mandatory */
 		if($lan_if == $ifname_real)
 			continue;
 		mwexec("/sbin/ifconfig {$ifname_real} down");
 		mwexec("/sbin/ifconfig {$ifname_real} delete");
+	}
-ee1ec5
+	/* set up interfaces */
 	interfaces_configure();
-becf
+            Scott Ullrich
 	/* set up static routes */
 	system_routing_configure();
 	/* enable routing */
 	system_routing_enable();
 	/* ensure passwords are sync'd */
-fa7f2
+//	system_password_configure();
-becf
+            Scott Ullrich
 	/* start dnsmasq service */
 	services_dnsmasq_configure();
 	/* start dyndns service */
 	services_dyndns_configure();
 	/* start DHCP service */
 	services_dhcpd_configure();
 	/* configure cron service */
 	configure_cron();
 	/* start the NTP client */
 	system_ntp_configure();
 	/* start the captive portal */
 	captiveportal_configure();
         /* reload the filter */
 	filter_configure_sync();
 	/* sync pw database */
 	conf_mount_rw();
 	mwexec("/usr/sbin/pwd_mkdb -d /etc/ /etc/master.passwd");
 	conf_mount_ro();
 	/* restart sshd */
 	touch("/tmp/start_sshd");
 	/* restart webConfigurator if needed */
 	if($shutdown_webgui_needed == true)
 		touch("/tmp/restart_webgui");
 	mwexec("/bin/rm /tmp/reload*");
 	unlink_if_exists("{$g['tmp_path']}/reloading_all");
+}
 function auto_login($status) {
 	$gettytab = file_get_contents("/etc/gettytab");
 	$getty_split = split("\n", $gettytab);
 	conf_mount_rw();
 	$fd = fopen("/etc/gettytab", "w");
 	foreach($getty_split as $gs) {
 		if(stristr($gs, ":ht:np:sp#115200") ) {
 			if($status == true) {
 				fwrite($fd, "	:ht:np:sp#115200:al=root:\n");
 			} else {
 				fwrite($fd, "	:ht:np:sp#115200:\n");
-            ca8e4ed2
+            Scott Ullrich
-c8c496e
+		} else {
-becf
+			fwrite($fd, "{$gs}\n");
+		}
+	}
 	fclose($fd);
 	conf_mount_ro();
+}
 function setup_serial_port() {
 	global $g, $config;
 	conf_mount_rw();
 	/* serial console - write out /boot.config */
 	if(file_exists("/boot.config"))
 		$boot_config = file_get_contents("/boot.config");
 	else
 		$boot_config = "";
 	if($g['platform'] <> "cdrom") {
 		$boot_config_split = split("\n", $boot_config);
 		$fd = fopen("/boot.config","w");
 		if($fd) {
 			foreach($boot_config_split as $bcs) {
 				if(stristr($bcs, "-D")) {
 					/* DONT WRITE OUT, WE'LL DO IT LATER */
 				} else {
 					if($bcs <> "")
 						fwrite($fd, "{$bcs}\n");
+				}
-c8c496e
+            Scott Ullrich
-becf
+			if(isset($config['system']['enableserial'])) {
 				fwrite($fd, "-D");
-c8c496e
+            Scott Ullrich
-becf
+			fclose($fd);
-c8c496e
+            Scott Ullrich
-becf
+		/* serial console - write out /boot/loader.conf */
 		$boot_config = file_get_contents("/boot/loader.conf");
 		$boot_config_split = split("\n", $boot_config);
 		$fd = fopen("/boot/loader.conf","w");
 		if($fd) {
 			foreach($boot_config_split as $bcs) {
 				if(stristr($bcs, "console")) {
 					/* DONT WRITE OUT, WE'LL DO IT LATER */
 				} else {
 					if($bcs <> "")
 						fwrite($fd, "{$bcs}\n");
+				}
-c8c496e
+            Scott Ullrich
-becf
+			if(isset($config['system']['enableserial'])) {
 				fwrite($fd, "console=\"comconsole\"\n");
-            ca8e4ed2
+            Scott Ullrich
-becf
+			fclose($fd);
-c8c496e
+            Scott Ullrich
+	}
-becf
+	$ttys = file_get_contents("/etc/ttys");
 	$ttys_split = split("\n", $ttys);
 	$fd = fopen("/etc/ttys", "w");
 	foreach($ttys_split as $tty) {
 		if(stristr($tty, "ttyd0")) {
 			if(isset($config['system']['enableserial'])) {
 				fwrite($fd, "ttyd0	\"/usr/libexec/getty bootupcli\"	dialup	on	secure\n");
 			} else {
 				fwrite($fd, "ttyd0	\"/usr/libexec/getty bootupcli\"	dialup	off	secure\n");
-            ca8e4ed2
+            Scott Ullrich
-becf
+		} else {
 			fwrite($fd, $tty . "\n");
+		}
+	}
 	fclose($fd);
 	if(isset($config['system']['disableconsolemenu'])) {
 		auto_login(false);
 	} else {
 		auto_login(true);
+	}
 	conf_mount_ro();
 	return;
+}
 function print_value_list($list, $count = 10, $separator = ",") {
 	$list = implode($separator, array_slice($list, 0, $count));
 	if(count($list) < $count) {
 		$list .= ".";
 	} else {
 		$list .= "...";
+	}
 	return $list;
+}
-            bfe776f0
+/* DHCP enabled on any interfaces? */
 function is_dhcp_server_enabled()
+{
-            db9fabf3
+	global $config;
-            bfe776f0
+            Ermal Luçi
-becf
+	$dhcpdenable = false;
-            bfe776f0
+            Ermal Luçi
 	if (!is_array($config['dhcpd']))
 		return false;
-            db9fabf3
+	$Iflist = get_configured_interface_list();
-            bfe776f0
+	foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) {
-            db9fabf3
+		if (isset($dhcpifconf['enable']) && isset($Iflist[$dhcpif])) {
-becf
+			$dhcpdenable = true;
-            db9fabf3
+			break;
+		}
-becf
+            Scott Ullrich
-            bfe776f0
+            Ermal Luçi
-becf
+	return $dhcpdenable;
+}
-            fab7ff44
+/****f* pfsense-utils/isAjax
  * NAME
  *   isAjax - reports if the request is driven from prototype
  * INPUTS
  *   none
  * RESULT
  *   true/false
  ******/
 function isAjax() {
 	return isset ($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest';
+}
-            6189988d
+//returns interface information
 function get_interface_info($ifdescr) {
 	global $config, $linkinfo, $netstatrninfo;
 	$ifinfo = array();
-ee1ec5
+	/* if list */
 	$iflist = get_configured_interface_with_descr(false,true);
 	$found = false;
     	foreach ($iflist as $if => $ifname) {
     	if ($ifdescr == $if || $ifdescr == $ifname) {
 			$ifinfo['hwif'] = $config['interfaces'][$if]['if'];
-a5da13
+			$ifinfo['if'] = get_real_interface($if);
-ee1ec5
+			$found = true;
 			break;
+		}
+	}
 	if ($found == false)
 		return;
-            6189988d
+            Scott Dale
 	/* run netstat to determine link info */
 	unset($linkinfo);
-c79427
+	if ($ifinfo['if'] != $ifinfo['hwif'])
 		$chkif = $ifinfo['hwif'];
 	else
 		$chkif = $ifinfo['if'];
 	exec("/usr/bin/netstat -I {$chkif} -nWb -f link", $linkinfo);
-e1d16e
+            Ermal Lu?i
-            6189988d
+	$linkinfo = preg_split("/\s+/", $linkinfo[1]);
-c79427
+	if ("{$chkif}*" == $linkinfo[0])
-            6189988d
+		$ifinfo['status'] = "down";
-c79427
+	else if ($chkif == $linkinfo[0])
-            6189988d
+		$ifinfo['status'] = "up";
-c79427
+	else
-e1d16e
+		$ifinfo['status'] = "down";
-            6189988d
+            Scott Dale
-            fb707f4a
+	if (preg_match("/^enc|^tun|^ppp|^pptp|^ovpn/i", $ifinfo['if'])) {
 		$ifinfo['inpkts'] = $linkinfo[3];
-b0c
+		$ifinfo['outpkts'] = $linkinfo[6];
-            fb707f4a
+	} else {
-            6189988d
+		$ifinfo['macaddr'] = $linkinfo[3];
 		$ifinfo['inerrs'] = $linkinfo[5];
 		$ifinfo['outerrs'] = $linkinfo[8];
 		$ifinfo['collisions'] = $linkinfo[10];
+	}
-b0c
+	/* Use pfctl for non wrapping 64 bit counters */
-            b5a8483c
+	/* Pass */
-            ea1f7b42
+	exec("/sbin/pfctl -vvsI -i {$ifinfo['if']}", $pfctlstats);
-eaab5
+	$pf_in4_pass = preg_split("/ +/ ", $pfctlstats[3]);
 	$pf_out4_pass = preg_split("/ +/", $pfctlstats[5]);
 	$in4_pass = $pf_in4_pass[5];
 	$out4_pass = $pf_out4_pass[5];
 	$in4_pass_packets = $pf_in4_pass[3];
 	$out4_pass_packets = $pf_out4_pass[3];
 	$ifinfo['inbytespass'] = $in4_pass;
 	$ifinfo['outbytespass'] = $out4_pass;
 	$ifinfo['inpktspass'] = $in4_pass_packets;
 	$ifinfo['outpktspass'] = $out4_pass_packets;
-b0c
+            Scott Ullrich
-eaab5
+	/* Block */
 	$pf_in4_block = preg_split("/ +/", $pfctlstats[4]);
 	$pf_out4_block = preg_split("/ +/", $pfctlstats[6]);
 	$in4_block = $pf_in4_block[5];
 	$out4_block = $pf_out4_block[5];
 	$in4_block_packets = $pf_in4_block[3];
 	$out4_block_packets = $pf_out4_block[3];
 	$ifinfo['inbytesblock'] = $in4_block;
 	$ifinfo['outbytesblock'] = $out4_block;
 	$ifinfo['inpktsblock'] = $in4_block_packets;
 	$ifinfo['outpktsblock'] = $out4_block_packets;
 	$ifinfo['inbytes'] = $in4_pass + $in4_block;
 	$ifinfo['outbytes'] = $out4_pass + $out4_block;
 	$ifinfo['inpkts'] = $in4_pass_packets + $in4_block_packets;
 	$ifinfo['outpkts'] = $in4_pass_packets + $out4_block_packets;
-b0c
+            Scott Ullrich
-b3f
+	$ifconfiginfo = "";
-c79427
+	unset($ifconfiginfo, $link0);
-b3f
+	exec("/sbin/ifconfig " . $ifinfo['if'], $ifconfiginfo);
 	foreach ($ifconfiginfo as $ici) {
-            b9064a4d
+		if (preg_match("/inet (\S+)/", $ici, $matches)) {
-b3f
+			$ifinfo['ipaddr'] = $matches[1];
-            b9064a4d
+            Seth Mos
 		if (preg_match("/netmask (\S+)/", $ici, $matches)) {
 			if (preg_match("/^0x/", $matches[1])) {
-b3f
+				$ifinfo['subnet'] = long2ip(hexdec($matches[1]));
-            b9064a4d
+            Seth Mos
+		}
 		if (strpos($ici, 'LINK0') !== false) {
-c79427
+			$link0 = "down";
-            b9064a4d
+            Seth Mos
-b3f
+            Ermal Luçi
-ee1ec5
+	switch ($config['interfaces'][$if]['ipaddr']) {
-            6189988d
+	/* DHCP? -> see if dhclient is up */
-ee1ec5
+	case "dhcp":
-            f2a5b5e4
+		/* see if dhclient is up */
 		if (is_dhcp_running($ifinfo['if']) == true)
 			$ifinfo['dhcplink'] = "up";
 		else
 			$ifinfo['dhcplink'] = "down";
 		break;
-ee1ec5
+	case "carpdev-dhcp":
-c79427
+		/* see if dhclient is up */
 		if (is_dhcp_running($ifinfo['if']) == true)
 			$ifinfo['dhcplink'] = "up";
 		else
 			$ifinfo['dhcplink'] = "down";
-b3f
+            Ermal Luçi
-ee1ec5
+		break;
-            6189988d
+	/* PPPoE interface? -> get status from virtual interface */
-ee1ec5
+	case "pppoe":
-            6189988d
+		unset($linkinfo);
 		exec("/usr/bin/netstat -I " . $ifinfo['if'] . " -nWb -f link", $linkinfo);
 		$linkinfo = preg_split("/\s+/", $linkinfo[1]);
-c79427
+		if ("{$ifinfo['if']}*" == $linkinfo[0])
-            6189988d
+			$ifinfo['pppoelink'] = "down";
-c79427
+		else if ($ifinfo['if'] == $linkinfo[0] && !isset($link0))
-            6189988d
+			/* get PPPoE link status for dial on demand */
 			$ifinfo['pppoelink'] = "up";
-c79427
+		else
 			$ifinfo['pppoelink'] = "down";
-            6189988d
+            Scott Dale
-ee1ec5
+		break;
-            6189988d
+	/* PPTP interface? -> get status from virtual interface */
-ee1ec5
+	case "pptp":
-            6189988d
+		unset($linkinfo);
 		exec("/usr/bin/netstat -I " . $ifinfo['if'] . " -nWb -f link", $linkinfo);
 		$linkinfo = preg_split("/\s+/", $linkinfo[1]);
-c79427
+		if ("{$ifinfo['if']}*" == $linkinfo[0])
-            6189988d
+			$ifinfo['pptplink'] = "down";
-c79427
+		else if ($ifinfo['if'] == $linkinfo[0] && !isset($link0))
-            6189988d
+			/* get PPTP link status for dial on demand */
 			$ifinfo['pptplink'] = "up";
-c79427
+		else
 			$ifinfo['pptplink'] = "down";
-            6189988d
+            Scott Dale
-ee1ec5
+		break;
-b3f
+	default:
 		break;
-            6189988d
+            Scott Dale
 	if ($ifinfo['status'] == "up") {
 		/* try to determine media with ifconfig */
 		unset($ifconfiginfo);
 		exec("/sbin/ifconfig " . $ifinfo['hwif'], $ifconfiginfo);
 		$matches = "";
 		foreach ($ifconfiginfo as $ici) {
 			/* don't list media/speed for wireless cards, as it always
 			   displays 2 Mbps even though clients can connect at 11 Mbps */
 			if (preg_match("/media: .*? \((.*?)\)/", $ici, $matches)) {
 				$ifinfo['media'] = $matches[1];
 			} else if (preg_match("/media: Ethernet (.*)/", $ici, $matches)) {
 				$ifinfo['media'] = $matches[1];
 			} else if (preg_match("/media: IEEE 802.11 Wireless Ethernet (.*)/", $ici, $matches)) {
 				$ifinfo['media'] = $matches[1];
+			}
 			if (preg_match("/status: (.*)$/", $ici, $matches)) {
 				if ($matches[1] != "active")
 					$ifinfo['status'] = $matches[1];
+			}
 			if (preg_match("/channel (\S*)/", $ici, $matches)) {
 				$ifinfo['channel'] = $matches[1];
+			}
 			if (preg_match("/ssid (\".*?\"|\S*)/", $ici, $matches)) {
 				if ($matches[1][0] == '"')
 					$ifinfo['ssid'] = substr($matches[1], 1, -1);
 				else
 					$ifinfo['ssid'] = $matches[1];
+			}
+		}
-ee1ec5
+		/* lookup the gateway */
 		if (interface_has_gateway($if))
 			$ifinfo['gateway'] = get_interface_gateway($if);
-            6189988d
+            Scott Dale
 	$bridge = "";
-ec05d27
+	$bridge = link_interface_to_bridge($ifdescr);
-            6189988d
+	if($bridge) {
 		$bridge_text = `/sbin/ifconfig {$bridge}`;
 		if(stristr($bridge_text, "blocking") <> false) {
 			$ifinfo['bridge'] = "<b><font color='red'>blocking</font></b> - check for ethernet loops";
 			$ifinfo['bridgeint'] = $bridge;
 		} else if(stristr($bridge_text, "learning") <> false) {
 			$ifinfo['bridge'] = "learning";
 			$ifinfo['bridgeint'] = $bridge;
 		} else if(stristr($bridge_text, "forwarding") <> false) {
 			$ifinfo['bridge'] = "forwarding";
 			$ifinfo['bridgeint'] = $bridge;
+		}
+	}
 	return $ifinfo;
+}
 //returns cpu speed of processor. Good for determining capabilities of machine
 function get_cpu_speed() {
 	 return exec("sysctl hw.clockrate | awk '{ print $2 }'");
+}
-            fab7ff44
+            Bill Marquette
-            fe80446f
+/* check if the wan interface is up
  * Wait for a maximum of 10 seconds
  * If the interface is up before then continue
  */
 function is_wan_interface_up($interface) {
 	global $g;
 	global $config;
 	$i = 0;
 	while($i < 10) {
 		if(get_interface_gateway($interface)) {
 			return true;
 		} else {
 			sleep(1);
+		}
 		$i++;
+	}
 	return false;
+}
-            a5f94f14
+            Scott Ullrich
 function add_hostname_to_watch($hostname) {
-            c941ea1c
+	if(!is_dir("/var/db/dnscache")) {
 		mkdir("/var/db/dnscache");
+	}
-f31bf01
+	if((is_fqdn($hostname)) && (!is_ipaddr($hostname))) {
-e772e
+		$domrecords = array();
 		$domips = array();
 		exec("host -t A $hostname", $domrecords, $rethost);
 		if($rethost == 0) {
 			foreach($domrecords as $domr) {
 				$doml = explode(" ", $domr);
 				$domip = $doml[3];
 				/* fill array with domain ip addresses */
 				if(is_ipaddr($domip)) {
 					$domips[] = $domip;
+				}
+			}
+		}
 		sort($domips);
 		$contents = "";
 		if(! empty($domips)) {
-c059e
+			foreach($domips as $ip) {
 				$contents .= "$ip\n";
+			}
-e772e
+            Seth Mos
 		file_put_contents("/var/db/dnscache/$hostname", $contents);
-            a5f94f14
+            Scott Ullrich
+}
-cb6ca6
+function find_dns_aliases() {
 	global $config, $g;
-            aa0b6f36
+	foreach((array) $config['aliases']['alias'] as $alias) {
-ba905
+		$alias_value = $alias['address'];
 		$alias_name = $alias['name'];
 		if(stristr($alias_value, " ")) {
 			$alias_split = split(" ", $alias_value);
-cb6ca6
+			foreach($alias_split as $as) {
-            f79f62d0
+				if(is_fqdn($as))
-cb6ca6
+					add_hostname_to_watch($as);
+			}
 		} else {
-            f79f62d0
+			if(is_fqdn($alias_value))
-ba905
+				add_hostname_to_watch($alias_value);
-cb6ca6
+            Scott Ullrich
+	}
+}
-ed54b93
+function is_fqdn($fqdn) {
 	$hostname = false;
 	if(preg_match("/[-A-Z0-9\.]+\.[-A-Z0-9\.]+/i", $fqdn)) {
 		$hostname = true;
+	}
 	if(preg_match("/\.\./", $fqdn)) {
 		$hostname = false;
+	}
-aae364d
+	if(preg_match("/^\./i", $fqdn)) {
-ed54b93
+		$hostname = false;
+	}
-            c941ea1c
+	if(preg_match("/\//i", $fqdn)) {
 		$hostname = false;
+	}
-ed54b93
+	return($hostname);
+}
-aaa95
+function pfsense_default_state_size() {
   /* get system memory amount */
   $memory = get_memory();
   $avail = $memory[0];
   /* Be cautious and only allocate 10% of system memory to the state table */
   $max_states = (int) ($avail/10)*1000;
   return $max_states;
+}
-a9db752
+function rule_popup($src,$srcport,$dst,$dstport){
 global $config;
 $aliases_array = array();
 if($config['aliases']['alias'] <> "" and is_array($config['aliases']['alias']))
+{
 $span_begin = "";
 		$alias_src_span_begin = "";
 		$alias_src_span_end = "";
 		$alias_src_port_span_begin = "";
 		$alias_src_port_span_end = "";
 		$alias_dst_span_begin = "";
 		$alias_dst_span_end = "";
 		$alias_dst_port_span_begin = "";
 		$alias_dst_port_span_end = "";
 		$alias_content_text = "";
 	foreach($config['aliases']['alias'] as $alias_name)
+	{
 	 	$alias_addresses = explode (" ", $alias_name['address']);
 	 	$alias_details = explode ("||", $alias_name['detail']);
 	 	$alias_objects_with_details = "";
 	 	$counter = 0;
 	 	foreach($alias_addresses as $alias_ports_address)
+	 	{
 			$alias_objects_with_details .= $alias_addresses[$counter];
 			$alias_detail_default = strpos ($alias_details[$counter],"Entry added");
 			if ($alias_details[$counter] != "" && $alias_detail_default === False){
 				$alias_objects_with_details .=" - " . $alias_details[$counter];
+			}
 			$alias_objects_with_details .= "<br>";
 			$counter++;
+		}
 		//max character length for caption field
 		$maxlength = 60;
 		$alias_descr_substr = $alias_name['descr'];
 		$alias_content_text = htmlspecialchars($alias_objects_with_details);
 		$alias_caption = htmlspecialchars($alias_descr_substr . ":");
 		$strlength = strlen ($alias_caption);
 		if ($strlength >= $maxlength)
 			$alias_caption = substr($alias_caption, 0, $maxlength) . "...";
 		$span_begin = "<span style=\"cursor: help;\" onmouseover=\"domTT_activate(this, event, 'content', '<h1>$alias_caption</h1><p>$alias_content_text</p>', 'trail', true, 'delay', 0, 'fade', 'both', 'fadeMax', 93, 'styleClass', 'niceTitle');\" onmouseout=\"this.style.color = ''; domTT_mouseout(this, event);\"><U>";
 		if ($alias_name['name'] == $src)
+	 	{
 			$alias_src_span_begin = $span_begin;
+		}
 	 	if ($alias_name['name'] == $srcport)
+	 	{
 			$alias_src_port_span_begin = $span_begin;
+		}
 		if ($alias_name['name'] == $dst)
+	 	{
 			$alias_dst_span_begin = $span_begin;
+		}
 		if ($alias_name['name'] == $dstport)
+	 	{
 			$alias_dst_port_span_begin = $span_begin;
+		}
+	}
 	$descriptions = array ();
 	$descriptions['src'] = $alias_src_span_begin;
 	$descriptions['srcport'] = $alias_src_port_span_begin;
 	$descriptions['dst'] = $alias_dst_span_begin;
 	$descriptions['dstport'] = $alias_dst_port_span_begin;
 	return $descriptions;
+  }
+}
-            9140757d
+function download_file_with_progress_bar($url_file, $destination_file, $readbody = 'read_body') {
 	global $ch, $fout, $file_size, $downloaded;
 	$file_size  = 1;
 	$downloaded = 1;
 	/* open destination file */
 	$fout = fopen($destination_file, "wb");
 	/*
 	 *	Originally by Author: Keyvan Minoukadeh
 	 *	Modified by Scott Ullrich to return Content-Length size
          */
 	$ch = curl_init();
 	curl_setopt($ch, CURLOPT_URL, $url_file);
 	curl_setopt($ch, CURLOPT_HEADERFUNCTION, 'read_header');
 	curl_setopt($ch, CURLOPT_WRITEFUNCTION, $readbody);
 	curl_setopt($ch, CURLOPT_NOPROGRESS, '1');
 	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, '5');
-            ed241396
+	curl_setopt($ch, CURLOPT_TIMEOUT, 0);
-            9140757d
+	curl_exec($ch);
 	$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 	if($fout)
 		fclose($fout);
 	curl_close($ch);
 	return ($http_code == 200) ? true : $http_code;
+}
 function read_header($ch, $string) {
 	global $file_size, $fout;
 	$length = strlen($string);
 	$regs = "";
 	ereg("(Content-Length:) (.*)", $string, $regs);
 	if($regs[2] <> "") {
 		$file_size = intval($regs[2]);
+	}
 	ob_flush();
 	return $length;
+}
 function read_body($ch, $string) {
 	global $fout, $file_size, $downloaded, $sendto, $static_status, $static_output, $lastseen;
 	$length = strlen($string);
 	$downloaded += intval($length);
 	$downloadProgress = round(100 * (1 - $downloaded / $file_size), 0);
 	$downloadProgress = 100 - $downloadProgress;
 	if($lastseen <> $downloadProgress and $downloadProgress < 101) {
 		if($sendto == "status") {
 			$tostatus = $static_status . $downloadProgress . "%";
 			update_status($tostatus);
 		} else {
 			$tooutput = $static_output . $downloadProgress . "%";
 			update_output_window($tooutput);
+		}
 		update_progress_bar($downloadProgress);
 		$lastseen = $downloadProgress;
+	}
 	if($fout)
 		fwrite($fout, $string);
 	ob_flush();
 	return $length;
+}
-c7e0
+/* Compare the current hostname DNS to the DNS cache we made
  * if it has changed we return the old records
  * if no change we return true */
 function compare_hostname_to_dnscache($hostname) {
 	if(!is_dir("/var/db/dnscache")) {
 		mkdir("/var/db/dnscache");
+	}
 	$hostname = trim($hostname);
 	if(is_readable("/var/db/dnscache/{$hostname}")) {
 		$oldcontents = file_get_contents("/var/db/dnscache/{$hostname}");
 	} else {
 		$oldcontents = "";
+	}
 	if((is_fqdn($hostname)) && (!is_ipaddr($hostname))) {
 		$domrecords = array();
 		$domips = array();
 		exec("host -t A $hostname", $domrecords, $rethost);
 		if($rethost == 0) {
 			foreach($domrecords as $domr) {
 				$doml = explode(" ", $domr);
 				$domip = $doml[3];
 				/* fill array with domain ip addresses */
 				if(is_ipaddr($domip)) {
 					$domips[] = $domip;
+				}
+			}
+		}
 		sort($domips);
 		$contents = "";
 		if(! empty($domips)) {
 			foreach($domips as $ip) {
 				$contents .= "$ip\n";
+			}
+		}
+	}
 	if(trim($oldcontents) != trim($contents)) {
 		log_error("DNSCACHE: Found old IP {$oldcontents} and new IP {$contents}");
 		return ($oldcontents);
 	} else {
 		return false;
+	}
+}
-            afb2de1b
+?>

Project

General

Profile

pfSense