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

| Branch: | Tag: | Revision:

root/etc/inc/pfsense-utils.inc @ 1a3d911e

-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.
+ *
  */
-b0
+/*
 	pfSense_BUILDER_BINARIES:	/sbin/sysctl	/sbin/ifconfig	/sbin/pfctl	/usr/local/bin/php /usr/bin/netstat
 	pfSense_BUILDER_BINARIES:	/bin/df	/usr/bin/grep	/usr/bin/awk	/bin/rm	/usr/sbin/pwd_mkdb	/usr/bin/host
 	pfSense_BUILDER_BINARIES:	/sbin/kldload
 	pfSense_MODULE:	utils
 */
-            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);
-b30505
+	if(isAllowedPage($security_url, $_SESSION['Username']))
-            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() {
-            da17d77e
+	global $g;
 	return "{$g['tmp_path']}/tmp-" . time();
-becf
+            Scott Ullrich
 /****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 */
-            a2934331
+	$int = get_real_interface($interface);
 	if($int <> "")
 		$interface = $int;
 	$int_family = preg_split("/[0-9]+/", $interface);
-            a7c6604c
+	$options = strtolower(`/sbin/ifconfig -m {$interface} | grep capabilities`);
-becf
+	$supported_ints = array('fxp');
-            a7c6604c
+	if (in_array($int_family, $supported_ints)) {
-            a2934331
+		if(isset($config['system']['do_not_use_nic_microcode']))
 			continue;
 		if(does_interface_exist($interface))
 			mwexec("/sbin/ifconfig {$interface} link0");
+	}
-becf
+            Scott Ullrich
-            a7c6604c
+	/* skip vlans for checksumming and polling */
 	if(stristr($interface, "vlan"))
-becf
+		return;
-            a7c6604c
+	if($config['system']['disablechecksumoffloading']) {
-            a2934331
+		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");
-            a7c6604c
+	} else {
-            a2934331
+		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) {
-            a2934331
+			mwexec("/sbin/ifconfig {$interface} polling 2>/dev/null");
-d98f634
+		} else {
-            f69f34f1
+			mwexec("/sbin/ifconfig {$interface} -polling 2>/dev/null");
-d98f634
+            Scott Ullrich
-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) {
-ecde49
+			if($rule['target'] && $rule['target'] == $alias)
-becf
+				return true;
-ecde49
+			if($rule['source']['address'] && $rule['source']['address'] == $alias)
 				return true;
 			if($rule['destination']['address'] && $rule['destination']['address'] == $alias)
-becf
+				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
-f82b11
+ *   sets up sysctls for polling
-becf
+ * 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");
-b1aa7
+			mwexec("/sbin/sysctl kern.polling.idle_poll=1");
-becf
+		} 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;
+}
 /*
  * 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 == "")
-b39
+		$carp_query = split("\n", `/sbin/ifconfig $carpinterface | grep carp`);
-becf
+	foreach($carp_query as $int) {
-b39
+		if(stristr($int, "MASTER"))
 			return "MASTER";
 		if(stristr($int, "BACKUP"))
 			return "BACKUP";
 		if(stristr($int, "INIT"))
 			return "INIT";
-becf
+            Scott Ullrich
 	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;
-f76920c
+    $status = exec_command("/sbin/ifconfig {$pfsyncinterface} | /usr/bin/awk '/pfsync:/ {print \$5}'");
-becf
+    return $status;
+}
 /*
  * 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);
+}
 /*
  *   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;
+}
 /****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) {
-d857
+	if (!is_string($haystack))
 		return;
-becf
+	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;
+}
 /*
  *  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);
-d5
+	if ($section_xml != -1)
 		$config[$section] = &$section_xml;
 	@unlink($g['tmp_path'] . "/tmpxml");
-becf
+	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')){
-            da17d77e
+	global $g;
-becf
+	function php_check_syntax($code_to_check, &$errormessage){
 		return false;
-            da17d77e
+		$fout = fopen("{$g['tmp_path']}/codetocheck.php","w");
-becf
+		$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);
-            da17d77e
+		$command = "/usr/local/bin/php -l {$g['tmp_path']}/codetocheck.php";
-becf
+		$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;
-f8f00c
+            Ermal Lu?i
-            ffba4976
+	$xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl'];
-becf
+	$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);
-c36
+	// If the ALT PKG Repo has a username/password set, use it.
 	if($config['system']['altpkgrepo']['username'] &&
 	   $config['system']['altpkgrepo']['password']) {
 		$username = $config['system']['altpkgrepo']['username'];
 		$password = $config['system']['altpkgrepo']['password'];
 		$cli->setCredentials($username, $password);
+	}
-becf
+	$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/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
-            a5d6f60b
+	/* XXX: Use locks?! */
 	if (file_exists("{$g['tmp_path']}/reloading_all")) {
 		log_error("WARNING: Recursive call to interfaces sync!");
 		return;
+	}
-becf
+	touch("{$g['tmp_path']}/reloading_all");
-            c0836064
+	if($g['debug'])
-becf
+		log_error("reload_interfaces_sync() is starting.");
 	/* parse config.xml again */
 	$config = parse_config(true);
-            a5d6f60b
+	/* enable routing */
 	system_routing_enable();
 	if($g['debug'])
 		log_error("Enabling system routing");
-becf
+            Scott Ullrich
-            c0836064
+	if($g['debug'])
-becf
+		log_error("Cleaning up Interfaces");
-ee1ec5
+	/* set up interfaces */
 	interfaces_configure();
-becf
+            Scott Ullrich
-            a5d6f60b
+	/* remove reloading_all trigger */
-            c0836064
+	if($g['debug'])
-            a5d6f60b
+		log_error("Removing {$g['tmp_path']}/reloading_all");
-becf
+            Scott Ullrich
 	/* start devd back up */
-            da17d77e
+	mwexec("/bin/rm {$g['tmp_path']}/reload*");
-becf
+            Scott Ullrich
 /****f* pfsense-utils/reload_all
  * NAME
  *   reload_all - triggers a reload of all settings
  *   * INPUTS
  *   none
  * RESULT
  *   none
  ******/
 function reload_all() {
-            da17d77e
+	global $g;
 	touch("{$g['tmp_path']}/reload_all");
-becf
+            Scott Ullrich
 /****f* pfsense-utils/reload_interfaces
  * NAME
  *   reload_interfaces - triggers a reload of all interfaces
  * INPUTS
  *   none
  * RESULT
  *   none
  ******/
 function reload_interfaces() {
-            da17d77e
+	global $g;
 	touch("{$g['tmp_path']}/reload_interfaces");
-becf
+            Scott Ullrich
 /****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;
-            a5d6f60b
+	/* XXX: Use locks?! */
         if (file_exists("{$g['tmp_path']}/reloading_all")) {
                 log_error("WARNING: Recursive call to reload all sync!");
                 return;
+        }
-becf
+	touch("{$g['tmp_path']}/reloading_all");
 	/* 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();
 	/* enable routing */
 	system_routing_enable();
-            a5d6f60b
+	/* set up interfaces */
 	interfaces_configure();
-becf
+            Scott Ullrich
 	/* start dyndns service */
 	services_dyndns_configure();
 	/* configure cron service */
 	configure_cron();
 	/* start the NTP client */
 	system_ntp_configure();
 	/* sync pw database */
 	conf_mount_rw();
-b0c5879
+	unlink_if_exists("/etc/spwd.db.tmp");
-becf
+	mwexec("/usr/sbin/pwd_mkdb -d /etc/ /etc/master.passwd");
 	conf_mount_ro();
 	/* restart sshd */
-            da17d77e
+	@touch("{$g['tmp_path']}/start_sshd");
-becf
+            Scott Ullrich
 	/* restart webConfigurator if needed */
-            da17d77e
+	touch("{$g['tmp_path']}/restart_webgui");
-becf
+            Scott Ullrich
-            da17d77e
+	mwexec("/bin/rm {$g['tmp_path']}/reload*");
-becf
+            Scott Ullrich
-            a46e450c
+function auto_login() {
 	global $config;
 	if(isset($config['system']['disableconsolemenu']))
-f81609a
+		$status = false;
 	else
 		$status = true;
-becf
+	$gettytab = file_get_contents("/etc/gettytab");
 	$getty_split = split("\n", $gettytab);
 	conf_mount_rw();
-d38f
+	$fd = false;
-            e7df76d2
+	$tries = 0;
 	while (!$fd && $tries < 100) {
-d38f
+		$fd = fopen("/etc/gettytab", "w");
-            e7df76d2
+		$tries++;
+	}
 	if (!$fd) {
 		conf_mount_ro();
-ac19c1d
+		log_error("Enabling auto login was not possible.");
-            e7df76d2
+		return;
-d38f
+            Ermal Lu?i
-becf
+	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) {
-            c1fdf37f
+		if(stristr($tty, "ttyd0") or stristr($tty, "ttyu0")) {
-becf
+			if(isset($config['system']['enableserial'])) {
-            fd946c7e
+				fwrite($fd, "ttyu0	\"/usr/libexec/getty bootupcli\"	cons25	on	secure\n");
-becf
+			} else {
-            fd946c7e
+				fwrite($fd, "ttyu0	\"/usr/libexec/getty bootupcli\"	cons25	off	secure\n");
-            ca8e4ed2
+            Scott Ullrich
-becf
+		} else {
 			fwrite($fd, $tty . "\n");
+		}
+	}
 	fclose($fd);
-            a46e450c
+	auto_login();
-becf
+	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;
+}
-ebe7028
+function convert_seconds_to_hms($sec){
-            63292199
+	$min=$hrs=0;
-ebe7028
+	if ($sec != 0){
 		$min = floor($sec/60);
 		$sec %= 60;
+	}
 	if ($min != 0){
 		$hrs = floor($min/60);
 		$min %= 60;
+	}
 	if ($sec < 10)
 		$sec = "0".$sec;
 	if ($min < 10)
 		$min = "0".$min;
 	if ($hrs < 10)
 		$hrs = "0".$hrs;
 	$result = $hrs.":".$min.":".$sec;
 	return $result;
+}
-eb2f33a
+            Scott Ullrich
-            63292199
+/* Compute the total uptime from the ppp uptime log file in the conf directory */
 /* Written by: gnoahb@gmail.com */
 function get_ppp_uptime($port){
 	if (file_exists("/conf/{$port}.log")){
     	$saved_time = file_get_contents("/conf/{$port}.log");
     	$uptime_data = explode("\n",$saved_time);
 		$sec=0;
 		foreach($uptime_data as $upt) {
 			$sec += substr($upt, 1 + strpos($upt, " "));
+ 		}
 		return convert_seconds_to_hms($sec);
 	} else {
 		$total_time = "No session history data found!";
 		return $total_time;
+	}
+}
-eb2f33a
+            Scott Ullrich
-            6189988d
+//returns interface information
 function get_interface_info($ifdescr) {
-ebe7028
+	global $config, $linkinfo, $netstatrninfo, $g;
-            6189988d
+            Scott Dale
 	$ifinfo = array();
-ee1ec5
+	/* if list */
 	$iflist = get_configured_interface_with_descr(false,true);
-            a469927d
+            Scott Ullrich
-ee1ec5
+	$found = false;
     	foreach ($iflist as $if => $ifname) {
-ae852
+    		if ($ifdescr == $if || $ifdescr == $ifname) {
-ee1ec5
+			$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);
-            cb074893
+	$chkif = $ifinfo['if'];
-c79427
+            Ermal Lu?i
 	exec("/usr/bin/netstat -I {$chkif} -nWb -f link", $linkinfo);
-            6189988d
+	$linkinfo = preg_split("/\s+/", $linkinfo[1]);
-            cb074893
+            Ermal Lu?i
 	$ifinfotmp = pfSense_get_interface_addresses($chkif);
 	$ifinfo['status'] = $ifinfotmp['status'];
 	$ifinfo['macaddr'] = $ifinfotmp['macaddr'];
 	$ifinfo['ipaddr'] = $ifinfotmp['ipaddr'];
 	$ifinfo['subnet'] = $ifinfotmp['subnet'];
-            a216a03a
+	if (isset($ifinfotmp['link0']))
-            cb074893
+		$link0 = "down";
-            b8103b06
+            Scott Ullrich
-            cb074893
+	if (preg_match("/^enc|^tun|^ppp|^pptp|^ovpn/i", $chkif)) {
-            fb707f4a
+		$ifinfo['inpkts'] = $linkinfo[3];
-b0c
+		$ifinfo['outpkts'] = $linkinfo[6];
-            fb707f4a
+	} else {
-            6189988d
+		$ifinfo['inerrs'] = $linkinfo[5];
-a92b286
+		$ifinfo['outerrs'] = $linkinfo[9];
 		$ifinfo['collisions'] = $linkinfo[11];
-            6189988d
+            Scott Dale
-b0c
+	/* Use pfctl for non wrapping 64 bit counters */
-            b5a8483c
+	/* Pass */
-            cb074893
+	exec("/sbin/pfctl -vvsI -i {$chkif}", $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 = "";
-            c90f2471
+            gnhb
 	unset($linkinfo);
 	exec("/usr/bin/netstat -I " . $ifinfo['if'] . " -nWb -f link", $linkinfo);
 	$linkinfo = preg_split("/\s+/", $linkinfo[1]);
-            cb074893
+	switch ($config['interfaces'][$ifdescr]['ipaddr']) {
 	 /* DHCP? -> see if dhclient is up */
-ee1ec5
+	case "dhcp":
 	case "carpdev-dhcp":
-c79427
+		/* see if dhclient is up */
-            c4f31aca
+		if (find_dhclient_process($ifinfo['if']) <> "")
-c79427
+			$ifinfo['dhcplink'] = "up";
 		else
 			$ifinfo['dhcplink'] = "down";
-b3f
+            Ermal Luçi
-ee1ec5
+		break;
-            6189988d
+	/* PPPoE interface? -> get status from virtual interface */
-ee1ec5
+	case "pppoe":
-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":
-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";
-d7b21de
+		break;
-eb2f33a
+	/* PPP interface? -> get uptime for this session and cumulative uptime from the persistant log file in conf */
-ebe7028
+	case "ppp":
-            c90f2471
+		if ("{$ifinfo['if']}*" == $linkinfo[0])
 			$ifinfo['ppplink'] = "down";
 		else if ($ifinfo['if'] == $linkinfo[0])
 			$ifinfo['ppplink'] = "up";
 		else
 			$ifinfo['ppplink'] = "down" ;
 		if (empty($ifinfo['status']))
 			$ifinfo['status'] = "down";
-ae852
+		$dev = $config['interfaces'][$if]['if'];
 		if (empty($dev))
 			break;
 		if (file_exists("/dev/{$dev}")) {
-            b4974cf4
+			if (file_exists("{$g['varrun_path']}/ppp_{$if}.pid")) {
-            c90f2471
+				$ifinfo['pppinfo'] = "{$ifinfo['if']}";
-            63292199
+				$sec = trim(`/usr/local/sbin/ppp-uptime.sh {$ifinfo['if']}`);
-            c90f2471
+        		$ifinfo['ppp_uptime'] = convert_seconds_to_hms($sec);
+			}
-ae852
+		} else {
-            c90f2471
+			$ifinfo['nodevice'] = 1;
 			$ifinfo['pppinfo'] = $dev . " device not present! Is the modem attached to the system?";
-ae852
+            Ermal
 		// Calculate cumulative uptime for PPP link. Useful for connections that have per minute/hour contracts so you don't go over!
-            63292199
+		$ifinfo['ppp_uptime_accumulated'] = get_ppp_uptime($ifinfo['if']);
-eb2f33a
+            Scott Ullrich
-ee1ec5
+		break;
-b3f
+	default:
 		break;
-            6189988d
+            Scott Dale
 	if ($ifinfo['status'] == "up") {
 		/* try to determine media with ifconfig */
 		unset($ifconfiginfo);
-a6b7d
+		exec("/sbin/ifconfig " . $ifinfo['if'], $ifconfiginfo);
 		$wifconfiginfo = array();
 		if(is_interface_wireless($ifdescr)) {
 			exec("/sbin/ifconfig {$ifinfo['if']} list sta", $wifconfiginfo);
 			array_shift($wifconfiginfo);
+		}
-            6189988d
+		$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];
-            b8103b06
+				if($ifinfo['status'] == "running")
 					$ifinfo['status'] = "up";
-            6189988d
+            Scott Dale
 			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];
+			}
+		}
-a6b7d
+		foreach($wifconfiginfo as $ici) {
 			$elements = preg_split("/[ ]+/i", $ici);
 			if ($elements[0] != "") {
 				$ifinfo['bssid'] = $elements[0];
+			}
 			if ($elements[3] != "") {
 				$ifinfo['rate'] = $elements[3];
+			}
 			if ($elements[4] != "") {
 				$ifinfo['rssi'] = $elements[4];
+			}
+		}
-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
-            a5f94f14
+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
+}
-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;
+}
-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)) {
-            a5f91ef4
+		if($g['debug']) {
 			log_error("DNSCACHE: Found old IP {$oldcontents} and new IP {$contents}");
+		}
-c7e0
+		return ($oldcontents);
 	} else {
 		return false;
+	}
+}
-f18f59
+/*
  * load_glxsb() - Load the glxsb crypto module if enabled in config.
  */
 function load_glxsb() {
 	global $config, $g;
 	$is_loaded = `/sbin/kldstat | /usr/bin/grep -c glxsb`;
 	if (isset($config['system']['glxsb_enable']) && ($is_loaded == 0)) {
 		mwexec("/sbin/kldload glxsb");
+	}
+}
-            cde4f5d3
+/****f* pfsense-utils/isvm
  * NAME
  *   isvm
  * INPUTS
  *	 none
  * RESULT
  *   returns true if machine is running under a virtual environment
  ******/
 function isvm() {
 	$virtualenvs = array("vmware", "parallels", "qemu", "bochs", "plex86");
-f76920c
+	$bios_vendor = strtolower(`/bin/kenv | /usr/bin/awk -F= '/smbios.bios.vendor/ {print $2}'`);
-            cde4f5d3
+	if(in_array($bios_vendor, $virtualenvs))
 		return true;
 	else
 		return false;
+}
-            e0d0eb71
+function get_freebsd_version() {
-            ab1ab2ac
+	$version = trim(`/usr/bin/uname -r | /usr/bin/cut  -d'.' -f1`);
-b3ef23e
+	return $version;
-            e0d0eb71
+            Scott Ullrich
-            b31da21e
+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');
         curl_setopt($ch, CURLOPT_TIMEOUT, 0);
         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;
+}
-            84677257
+/*
  *   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();
+}
 /*
  *   update_output_window: update top textarea dynamically.
  */
 function update_status($status) {
         global $pkg_interface;
         if($pkg_interface == "console") {
                 echo $status . "\n";
         } else {
                 echo "\n<script type=\"text/javascript\">this.document.forms[0].status.value=\"" . $status . "\";</script>";
+        }
         /* 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}%";
+        }
+}
-            f5d637bc
+/* Split() is being DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 6.0.0. Relying on this feature is highly discouraged. */
 if(!function_exists("split")) {
 	function split($seperator, $haystack, $limit = null) {
 		return preg_split($seperator, $haystack, $limit);
+	}
+}
-fd2e8
+function update_alias_names_upon_change($section, $subsection, $fielda, $fieldb, $new_alias_name, $origname) {
 	global $g, $config, $pconfig, $debug;
-            b6db8ea3
+	if(!$origname)
 		return;
 	if($debug) $fd = fopen("{$g['tmp_path']}/print_r", "a");
 	if($debug) fwrite($fd, print_r($pconfig, true));
 	if($fieldb) {
 		if($debug) fwrite($fd, "fieldb exists\n");
 		for ($i = 0; isset($config["$section"]["$subsection"][$i]["$fielda"]); $i++) {
 			if($debug) fwrite($fd, "$i\n");
 			if($config["$section"]["$subsection"][$i]["$fielda"]["$fieldb"] == $origname) {
 				if($debug) fwrite($fd, "Setting old alias value $origname to $new_alias_name\n");
 				$config["$section"]["$subsection"][$i]["$fielda"]["$fieldb"] = $new_alias_name;
+			}
+		}
 	} else {
 		if($debug) fwrite($fd, "fieldb does not exist\n");
 		for ($i = 0; isset($config["$section"]["$subsection"][$i]["$fielda"]); $i++) {
 			if($config["$section"]["$subsection"][$i]["$fielda"] == $origname) {
 				$config["$section"]["$subsection"][$i]["$fielda"] = $new_alias_name;
 				if($debug) fwrite($fd, "Setting old alias value $origname to $new_alias_name\n");
+			}
+		}
+	}
 	if($debug) fclose($fd);
+}
-            f6ba4bd1
+            Scott Ullrich
 function update_alias_url_data() {
 	global $config, $g;
 	/* item is a url type */
 	$lockkey = lock('config');
 	for($x=0; $x<count($config['aliases']['alias']); $x++) {
 		if($config['aliases']['alias'][$x]['aliasurl']) {
 			/* fetch down and add in */
 			$isfirst = 0;
 			$temp_filename = tempnam("{$g['tmp_path']}/", "alias_import");
 			unlink($temp_filename);
 			$fda = fopen("{$g['tmp_path']}/tmpfetch","w");
 			fwrite($fda, "/usr/bin/fetch -q -o \"{$temp_filename}/aliases\" \"" . $config['aliases']['alias'][$x]['aliasurl'] . "\"");
 			fclose($fda);
 			mwexec("/bin/mkdir -p {$temp_filename}");
 			mwexec("/usr/bin/fetch -q -o \"{$temp_filename}/aliases\" \"" . $config['aliases']['alias'][$x]['aliasurl'] . "\"");
 			/* if the item is tar gzipped then extract */
 			if(stristr($config['aliases']['alias'][$x]['aliasurl'], ".tgz"))
 				process_alias_tgz($temp_filename);
-b2a
+			if(stristr($config['aliases']['alias'][$x]['aliasurl'], ".zip"))
 				process_alias_unzip($temp_filename);
-            f6ba4bd1
+			if(file_exists("{$temp_filename}/aliases")) {
 				$file_contents = file_get_contents("{$temp_filename}/aliases");
 				$file_contents = str_replace("#", "\n#", $file_contents);
 				$file_contents_split = split("\n", $file_contents);
 				foreach($file_contents_split as $fc) {
 					$tmp = trim($fc);
 					if(stristr($fc, "#")) {
 						$tmp_split = split("#", $tmp);
 						$tmp = trim($tmp_split[0]);
+					}
 					if(trim($tmp) <> "") {
 						if($isfirst == 1)
 							$address .= " ";
 						$address .= $tmp;
 						$isfirst = 1;
+					}
+				}
 				if($isfirst == 0) {
 					/* nothing was found */
 					$dont_update = true;
 					break;
+				}
 				if(!$dont_update) {
 					$config['aliases']['alias'][$x]['address'] = $address;
 					$updated = true;
+				}
 				mwexec("/bin/rm -rf {$temp_filename}");
+			}
+		}
+	}
 	if($updated)
 		write_config();
 	unlock($lockkey);
+}
-b2a
+function process_alias_unzip($temp_filename) {
 	if(!file_exists("/usr/local/bin/unzip"))
 		return;
 	mwexec("/bin/mv {$temp_filename}/aliases {$temp_filename}/aliases.zip");
 	mwexec("/usr/local/bin/unzip {$temp_filename}/aliases.tgz -d {$temp_filename}/aliases/");
 	unlink("{$temp_filename}/aliases.zip");
 	$files_to_process = return_dir_as_array("{$temp_filename}/");
 	/* foreach through all extracted files and build up aliases file */
 	$fd = fopen("{$temp_filename}/aliases", "w");
 	foreach($files_to_process as $f2p) {
 		$file_contents = file_get_contents($f2p);
 		fwrite($fd, $file_contents);
 		unlink($f2p);
+	}
 	fclose($fd);
+}
-            f6ba4bd1
+function process_alias_tgz($temp_filename) {
-b2a
+	if(!file_exists("/usr/bin/tar"))
 		return;
-            f6ba4bd1
+	mwexec("/bin/mv {$temp_filename}/aliases {$temp_filename}/aliases.tgz");
 	mwexec("/usr/bin/tar xzf {$temp_filename}/aliases.tgz -C {$temp_filename}/aliases/");
 	unlink("{$temp_filename}/aliases.tgz");
 	$files_to_process = return_dir_as_array("{$temp_filename}/");
 	/* foreach through all extracted files and build up aliases file */
 	$fd = fopen("{$temp_filename}/aliases", "w");
 	foreach($files_to_process as $f2p) {
 		$file_contents = file_get_contents($f2p);
 		fwrite($fd, $file_contents);
 		unlink($f2p);
+	}
 	fclose($fd);
+}
-            a76c1c45
+function version_compare_dates($a, $b) {
 	$a_time = strtotime($a);
 	$b_time = strtotime($b);
 	if ((!$a_time) || (!$b_time)) {
 		return FALSE;
 	} else {
 		if ($a < $b)
 			return -1;
 		elseif ($a == $b)
 			return 0;
 		else
 			return 1;
+	}
+}
 function version_get_string_value($a) {
 	$strs = array(
 => "ALPHA-ALPHA",
 => "ALPHA",
 => "BETA",
 => "B",
 => "RC",
 => "RELEASE"
 	);
 	$major = 0;
 	$minor = 0;
 	foreach ($strs as $num => $str) {
 		if (substr($a, 0, strlen($str)) == $str) {
 			$major = $num;
 			$n = substr($a, strlen($str));
 			if (is_numeric($n))
 				$minor = $n;
 			break;
+		}
+	}
 	return "{$major}.{$minor}";
+}
 function version_compare_string($a, $b) {
 	return version_compare_numeric(version_get_string_value($a), version_get_string_value($b));
+}
 function version_compare_numeric($a, $b) {
 	$a_arr = explode('.', rtrim($a, '.0'));
 	$b_arr = explode('.', rtrim($b, '.0'));
 	foreach ($a_arr as $n => $val) {
 		if (array_key_exists($n, $b_arr)) {
 			// So far so good, both have values at this minor version level. Compare.
 			if ($val > $b_arr[$n])
 				return 1;
 			elseif ($val < $b_arr[$n])
 				return -1;
 		} else {
 			// a is greater, since b doesn't have any minor version here.
 			return 1;
+		}
+	}
 	if (count($b_arr) > count($a_arr)) {
 		// b is longer than a, so it must be greater.
 		return -1;
 	} else {
 		// Both a and b are of equal length and value.
 		return 0;
+	}
+}
 function pfs_version_compare($cur_time, $cur_text, $remote) {
 	// First try date compare
 	$v = version_compare_dates($cur_time, $b);
 	if ($v === FALSE) {
 		// If that fails, try to compare by string
 		// Before anything else, simply test if the strings are equal
 		if ($cur_text == $remote)
 			return 0;
 		list($cur_num, $cur_str) = explode('-', $cur_text);
 		list($rem_num, $rem_str) = explode('-', $remote);
 		// First try to compare the numeric parts of the version string.
 		$v = version_compare_numeric($cur_num, $rem_num);
 		// If the numeric parts are the same, compare the string parts.
 		if ($v == 0)
 			return version_compare_string($cur_str, $rem_str);
+	}
 	return $v;
+}
-            c7de8be4
+function process_alias_urltable($name, $url, $freq, $forceupdate=false) {
 	$urltable_prefix = "/var/db/aliastables/";
 	$urltable_filename = $urltable_prefix . $name . ".txt";
 	// Make the aliases directory if it doesn't exist
 	if (!file_exists($urltable_prefix)) {
 		mkdir($urltable_prefix);
 	} elseif (!is_dir($urltable_prefix)) {
 		unlink($urltable_prefix);
 		mkdir($urltable_prefix);
+	}
 	// If the file doesn't exist or is older than update_freq days, fetch a new copy.
 	if (!file_exists($urltable_filename)
 		|| ((time() - filemtime($urltable_filename)) > ($freq * 86400))
 		|| $forceupdate) {
 		// Try to fetch the URL supplied
 		conf_mount_rw();
 		unlink_if_exists($urltable_filename . ".tmp");
 		// Use fetch to grab data since these may be large files, we don't want to process them through PHP if we can help it.
 		mwexec("/usr/bin/fetch -q -o " . escapeshellarg($urltable_filename . ".tmp") . " " . escapeshellarg($url));
 		// Remove comments. Might need some grep-fu to only allow lines that look like IPs/subnets
 		mwexec("/usr/bin/grep -v '^#' " . escapeshellarg($urltable_filename . ".tmp") . " > " . escapeshellarg($urltable_filename));
 		unlink_if_exists($urltable_filename . ".tmp");
 		conf_mount_ro();
 		if (filesize($urltable_filename)) {
 			return true;
 		} else {
 			// If it's unfetchable or an empty file, bail
 			return false;
+		}
 	} else {
 		// File exists, and it doesn't need updated.
 		return -1;
+	}
+}
-fd5444
+function get_real_slice_from_glabel($label) {
 	$label = escapeshellarg($label);
 	return trim(`/sbin/glabel list | /usr/bin/grep -B2 ufs/{$label} | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' '`);
+}
 function nanobsd_get_boot_slice() {
 	return trim(`/sbin/mount | /usr/bin/grep pfsense | /usr/bin/cut -d'/' -f4 | /usr/bin/cut -d' ' -f1`);
+}
 function nanobsd_get_boot_drive() {
 	return trim(`/sbin/glabel list | /usr/bin/grep -B2 ufs/pfsense | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' ' | /usr/bin/cut -d's' -f1`);
+}
 function nanobsd_get_active_slice() {
 	$boot_drive = nanobsd_get_boot_drive();
 	$active = trim(`gpart show $boot_drive | grep '\[active\]' | awk '{print $3;}'`);
 	return "{$boot_drive}s{$active}";
+}
 function nanobsd_get_size() {
 	return strtoupper(file_get_contents("/etc/nanosize.txt"));
+}
-b5f276f
+function nanobsd_switch_boot_slice() {
-fd5444
+	global $SLICE, $OLDSLICE, $TOFLASH, $COMPLETE_PATH, $COMPLETE_BOOT_PATH;
 	global $GLABEL_SLICE, $UFS_ID, $OLD_UFS_ID, $BOOTFLASH;
 	global $BOOT_DEVICE, $REAL_BOOT_DEVICE, $BOOT_DRIVE, $ACTIVE_SLICE;
 	nanobsd_detect_slice_info();
-b5f276f
+	if ($BOOTFLASH == $ACTIVE_SLICE) {
 		$slice = $TOFLASH;
 	} else {
 		$slice = $BOOTFLASH;
+	}
-fd5444
+	for ($i = 0; $i < ob_get_level(); $i++) { ob_end_flush(); }
 	ob_implicit_flush(1);
 	if(strstr($slice, "s2")) {
 		$ASLICE="2";
 		$AOLDSLICE="1";
 		$AGLABEL_SLICE="pfsense1";
 		$AUFS_ID="1";
 		$AOLD_UFS_ID="0";
 	} else {
 		$ASLICE="1";
 		$AOLDSLICE="2";
 		$AGLABEL_SLICE="pfsense0";
 		$AUFS_ID="0";
 		$AOLD_UFS_ID="1";
+	}
 	$ATOFLASH="{$BOOT_DRIVE}s{$ASLICE}";
 	$ACOMPLETE_PATH="{$BOOT_DRIVE}s{$ASLICE}a";
 	$ABOOTFLASH="{$BOOT_DRIVE}s{$AOLDSLICE}";
 	conf_mount_rw();
 	exec("sysctl kern.geom.debugflags=16");
 	exec("gpart set -a active -i {$ASLICE} {$BOOT_DRIVE}");
 	exec("/usr/sbin/boot0cfg -s {$ASLICE} -v /dev/{$BOOT_DRIVE}");
-b5f276f
+	// We can't update these if they are mounted now.
 	if ($BOOTFLASH != $slice) {
 		exec("/sbin/tunefs -L ${AGLABEL_SLICE} /dev/$ACOMPLETE_PATH");
 		nanobsd_update_fstab($AGLABEL_SLICE, $ACOMPLETE_PATH, $AOLD_UFS_ID, $AUFS_ID);
+	}
-fd5444
+	exec("/sbin/sysctl kern.geom.debugflags=0");
 	conf_mount_ro();
+}
-b5f276f
+function nanobsd_clone_slice() {
-fd5444
+	global $SLICE, $OLDSLICE, $TOFLASH, $COMPLETE_PATH, $COMPLETE_BOOT_PATH;
 	global $GLABEL_SLICE, $UFS_ID, $OLD_UFS_ID, $BOOTFLASH;
 	global $BOOT_DEVICE, $REAL_BOOT_DEVICE, $BOOT_DRIVE, $ACTIVE_SLICE;
 	nanobsd_detect_slice_info();
 	for ($i = 0; $i < ob_get_level(); $i++) { ob_end_flush(); }
 	ob_implicit_flush(1);
 	exec("/sbin/sysctl kern.geom.debugflags=16");
 	exec("/bin/dd if=/dev/zero of=/dev/{$TOFLASH} bs=1m count=1");
 	exec("/bin/dd if=/dev/{$BOOTFLASH} of=/dev/{$TOFLASH} bs=64k");
 	exec("/sbin/tunefs -L {$GLABEL_SLICE} /dev/{$COMPLETE_PATH}");
-b5f276f
+	$status = nanobsd_update_fstab($GLABEL_SLICE, $COMPLETE_PATH, $OLD_UFS_ID, $UFS_ID);
-fd5444
+	exec("/sbin/sysctl kern.geom.debugflags=0");
 	if($status) {
 		return false;
 	} else {
 		return true;
+	}
+}
-b5f276f
+function nanobsd_update_fstab($gslice, $complete_path, $oldufs, $newufs) {
 	$tmppath = "/tmp/{$gslice}";
 	$fstabpath = "/tmp/{$gslice}/etc/fstab";
 	exec("/bin/mkdir {$tmppath}");
 	exec("/sbin/fsck_ufs -y /dev/{$complete_path}");
 	exec("/sbin/mount /dev/ufs/{$gslice} {$tmppath}");
 	exec("/bin/cp /etc/fstab {$fstabpath}");
 	if (!file_exists($fstabpath)) {
 		$fstab = <<<EOF
 /dev/ufs/{$gslice} / ufs ro 1 1
 /dev/ufs/cf /cf ufs ro 1 1
 EOF;
 		if (file_put_contents($fstabpath, $fstab))
 			$status = true;
 		else
 			$status = false;
 	} else {
 		$status = exec("sed -i \"\" \"s/pfsense{$oldufs}/pfsense{$newufs}/g\" {$fstabpath}");
+	}
 	exec("/sbin/umount {$tmppath}");
 	exec("/bin/rmdir {$tmppath}");
 	return $status;
+}
-fd5444
+function nanobsd_detect_slice_info() {
 	global $SLICE, $OLDSLICE, $TOFLASH, $COMPLETE_PATH, $COMPLETE_BOOT_PATH;
 	global $GLABEL_SLICE, $UFS_ID, $OLD_UFS_ID, $BOOTFLASH;
 	global $BOOT_DEVICE, $REAL_BOOT_DEVICE, $BOOT_DRIVE, $ACTIVE_SLICE;
 	$BOOT_DEVICE=nanobsd_get_boot_slice();
 	$REAL_BOOT_DEVICE=get_real_slice_from_glabel($BOOT_DEVICE);
 	$BOOT_DRIVE=nanobsd_get_boot_drive();
 	$ACTIVE_SLICE=nanobsd_get_active_slice();
 	// Detect which slice is active and set information.
 	if(strstr($REAL_BOOT_DEVICE, "s1")) {
 		$SLICE="2";
 		$OLDSLICE="1";
 		$GLABEL_SLICE="pfsense1";
 		$UFS_ID="1";
 		$OLD_UFS_ID="0";
-            a76c1c45
+            jim-p
-fd5444
+	} else {
 		$SLICE="1";
 		$OLDSLICE="2";
 		$GLABEL_SLICE="pfsense0";
 		$UFS_ID="0";
 		$OLD_UFS_ID="1";
+	}
 	$TOFLASH="{$BOOT_DRIVE}s{$SLICE}";
 	$COMPLETE_PATH="{$BOOT_DRIVE}s{$SLICE}a";
 	$COMPLETE_BOOT_PATH="{$BOOT_DRIVE}s{$OLDSLICE}";
 	$BOOTFLASH="{$BOOT_DRIVE}s{$OLDSLICE}";
+}
-ae852
+?>

Project

General

Profile

pfSense