summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-08-12 12:33:46 -0400
committerjim-p <jimp@pfsense.org>2013-08-12 12:36:50 -0400
commitf8466c3637eb87c406f0c3722eba65b843fcf56c (patch)
treef0ab7ea282102449dd62d3d6bc077d40325a329a /etc
parent3c249cfa71fb454f55aab3f292f01d24b4109392 (diff)
downloadpfsense-f8466c3637eb87c406f0c3722eba65b843fcf56c.zip
pfsense-f8466c3637eb87c406f0c3722eba65b843fcf56c.tar.gz
Fix interface selections on UPnP to show the customized descriptions entered by the user. While here, add an external interface selection knob. Fixes #3141
Conflicts: etc/inc/pkg-utils.inc
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/pkg-utils.inc16
1 files changed, 16 insertions, 0 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 67facdb..c71479c 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -1381,4 +1381,20 @@ function package_skip_tests($index,$requested_version){
/* Do not skip package list */
return false;
}
+
+function get_pkg_interfaces_select_source($include_localhost=false) {
+ $interfaces = get_configured_interface_with_descr();
+ $ssifs = array();
+ foreach ($interfaces as $iface => $ifacename) {
+ $tmp["name"] = $ifacename;
+ $tmp["value"] = $iface;
+ $ssifs[] = $tmp;
+ }
+ if ($include_localhost) {
+ $tmp["name"] = "Localhost";
+ $tmp["value"] = "lo0";
+ $ssifs[] = $tmp;
+ }
+ return $ssifs;
+}
?> \ No newline at end of file
OpenPOWER on IntegriCloud