diff options
Diffstat (limited to 'src/etc')
69 files changed, 1019 insertions, 5376 deletions
diff --git a/src/etc/fbtab b/src/etc/fbtab deleted file mode 100644 index 06d2d61..0000000 --- a/src/etc/fbtab +++ /dev/null @@ -1,4 +0,0 @@ -# $FreeBSD: src/etc/fbtab,v 1.3 1999/09/13 17:09:07 peter Exp $ -# -#/dev/ttyv0 0600 /dev/console -#/dev/ttyv0 0600 /dev/pcaudio:/dev/pcaudioctl diff --git a/src/etc/gettytab b/src/etc/gettytab deleted file mode 100644 index 5af5aae..0000000 --- a/src/etc/gettytab +++ /dev/null @@ -1,235 +0,0 @@ -# $FreeBSD: stable/10/etc/gettytab 241708 2012-10-18 22:20:02Z peterj $ -# from: @(#)gettytab 5.14 (Berkeley) 3/27/91 -# -# Most of the table entries here are just copies of the old getty table, -# it is by no means certain, or even likely, that any of them are optimal -# for any purpose whatever. Nor is it likely that more than a couple are -# even correct. -# -# The default gettytab entry, used to set defaults for all other -# entries, and in cases where getty is called with no table name. -# -# cb, ce and ck are desirable on most crt's. The non-crt entries need to -# be changed to turn them off (:cb@:ce@:ck@:). -# -# lc should always be on; it's a remainder of some stone age when there -# have been terminals around not being able of handling lower-case -# characters. Those terminals aren't supported any longer, but getty is -# `smart' about them by default. -# -# Parity defaults to even, but the Pc entry and all the `std' entries -# specify no parity. The different parities are: -# (none): same as ep for getty. login will use terminal as is. -# ep: getty will use raw mode (cs8 -parenb) (unless rw is set) and -# fake parity. login will use even parity (cs7 parenb -parodd). -# op: same as ep except odd parity (cs7 parenb parodd) for login. -# getty will fake odd parity as well. -# ap: same as ep except -inpck instead of inpck for login. -# ap overrides op and ep. -# np: 1. don't fake parity in getty. The fake parity garbles -# characters on non-terminals (like pccons) that don't -# support parity. It would probably better for getty not to -# try to fake parity. It could just use cbreak mode so as -# not to force cs8 and let the hardware handle the parity. -# login has to be rely on the hardware anyway. -# 2. set cs8 -parenb -istrip -inpck. -# ep:op: same as ap. -# -default:\ - :cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\ - :if=/etc/issue: - -# -# Fixed speed entries -# -# The "std.NNN" names are known to the special case -# portselector code in getty, however they can -# be assigned to any table desired. -# The "NNN-baud" names are known to the special case -# autobaud code in getty, and likewise can -# be assigned to any table desired (hopefully the same speed). -# -a|std.110|110-baud:\ - :np:nd#1:cd#1:uc:sp#110: -b|std.134|134.5-baud:\ - :np:nd#1:cd#2:ff#1:td#1:sp#134:ht:nl: -1|std.150|150-baud:\ - :np:nd#1:cd#2:td#1:fd#1:sp#150:ht:nl:lm=\E\72\6\6\17login\72 : -c|std.300|300-baud:\ - :np:nd#1:cd#1:sp#300: -d|std.600|600-baud:\ - :np:nd#1:cd#1:sp#600: -f|std.1200|1200-baud:\ - :np:fd#1:sp#1200: -6|std.2400|2400-baud:\ - :np:sp#2400: -7|std.4800|4800-baud:\ - :np:sp#4800: -2|std.9600|9600-baud:\ - :np:sp#9600: -g|std.19200|19200-baud:\ - :np:sp#19200: -std.38400|38400-baud:\ - :np:sp#38400: -std.57600|57600-baud:\ - :np:sp#57600: -std.115200|115200-baud:\ - :np:sp#115200: -std.230400|230400-baud:\ - :np:sp#230400: - -# -# Entry specifying explicit device settings. See termios(4) and -# /usr/include/termios.h, too. The entry forces the tty into -# CLOCAL mode (so no DCD is required), and uses Xon/Xoff flow control. -# -# cflags: CLOCAL | HUPCL | CREAD | CS8 -# oflags: OPOST | ONLCR | OXTABS -# iflags: IXOFF | IXON | ICRNL | IGNPAR -# lflags: IEXTEN | ICANON | ISIG | ECHOCTL | ECHO | ECHOK | ECHOE | ECHOKE -# -# The `0' flags don't have input enabled. The `1' flags don't echo. -# (Echoing is done inside getty itself.) -# -local.9600|CLOCAL tty @ 9600 Bd:\ - :c0#0x0000c300:c1#0x0000cb00:c2#0x0000cb00:\ - :o0#0x00000007:o1#0x00000002:o2#0x00000007:\ - :i0#0x00000704:i1#0x00000000:i2#0x00000704:\ - :l0#0x000005cf:l1#0x00000000:l2#0x000005cf:\ - :sp#9600:np: - -# -# Dial in rotary tables, speed selection via 'break' -# -0|d300|Dial-300:\ - :nx=d1200:cd#2:sp#300: -d1200|Dial-1200:\ - :nx=d150:fd#1:sp#1200: -d150|Dial-150:\ - :nx=d110:lm@:tc=150-baud: -d110|Dial-110:\ - :nx=d300:tc=300-baud: - -# -# Fast dialup terminals, 2400/1200/300 rotary (can start either way) -# -D2400|d2400|Fast-Dial-2400:\ - :nx=D1200:tc=2400-baud: -3|D1200|Fast-Dial-1200:\ - :nx=D300:tc=1200-baud: -5|D300|Fast-Dial-300:\ - :nx=D2400:tc=300-baud: - -# -#telebit (19200) -# -t19200:\ - :nx=t2400:tc=19200-baud: -t2400:\ - :nx=t1200:tc=2400-baud: -t1200:\ - :nx=t19200:tc=1200-baud: - -# -#telebit (9600) -# -t9600:\ - :nx=t2400a:tc=9600-baud: -t2400a:\ - :nx=t1200a:tc=2400-baud: -t1200a:\ - :nx=t9600:tc=1200-baud: - -# -# Odd special case terminals -# --|tty33|asr33|Pity the poor user of this beast:\ - :tc=110-baud: - -4|Console|Console Decwriter II:\ - :nd@:cd@:rw:tc=300-baud: - -e|Console-1200|Console Decwriter III:\ - :fd@:nd@:cd@:rw:tc=1200-baud: - -i|Interdata console:\ - :uc:sp#0: - -l|lsi chess terminal:\ - :sp#300: - -X|Xwindow|X window system:\ - :fd@:nd@:cd@:rw:sp#9600: - -P|Pc|Pc console:\ - :ht:np:sp#9600: - -al.Pc:\ - :ht:np:sp#9600:al=root: - -# Weirdo special case for fast crt's with hardcopy devices -# -8|T9600|CRT with hardcopy:\ - :nx=T300:tc=9600-baud: -9|T300|CRT with hardcopy (300):\ - :nx=T9600:tc=300-baud: - -# -# Plugboard, and misc other terminals -# -plug-9600|Plugboard-9600:\ - :pf#1:tc=9600-baud: -p|P9600|Plugboard-9600-rotary:\ - :pf#1:nx=P300:tc=9600-baud: -q|P300|Plugboard-300:\ - :pf#1:nx=P1200:tc=300-baud: -r|P1200|Plugboard-1200:\ - :pf#1:nx=P9600:tc=1200-baud: - -# -# XXXX Port selector -# -s|DSW|Port Selector:\ - :ps:sp#2400: - -# -# Auto-baud speed detect entry for Micom 600. -# Special code in getty will switch this out -# to one of the NNN-baud entries. -# -A|Auto-baud:\ - :ab:sp#2400:f0#040: - -# -# autologin - automatically log in as root -# - -autologin|al.9600:\ - :al=root:tc=std.9600: -al.19200:\ - :al=root:tc=std.19200: -al.38400:\ - :al=root:tc=std.38400: -al.57600:\ - :al=root:tc=std.57600: -al.115200:\ - :al=root:tc=std.115200: -al.230400:\ - :al=root:tc=std.230400: - -# -# Entries for 3-wire serial terminals. These don't supply carrier, so -# clocal needs to be set, and crtscts needs to be unset. -# -3wire.9600|9600-3wire:\ - :np:nc:sp#9600: -3wire.19200|19200-3wire:\ - :np:nc:sp#19200: -3wire.38400|38400-3wire:\ - :np:nc:sp#38400: -3wire.57600|57600-3wire:\ - :np:nc:sp#57600: -3wire.115200|115200-3wire:\ - :np:nc:sp#115200: -3wire.230400|230400-3wire:\ - :np:nc:sp#230400: diff --git a/src/etc/inc/IPv6.inc b/src/etc/inc/IPv6.inc index faacb8d..bfc8124 100644 --- a/src/etc/inc/IPv6.inc +++ b/src/etc/inc/IPv6.inc @@ -1,9 +1,5 @@ <?php -/* - pfSense_MODULE: utils -*/ - /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */ /** diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index 92b9705..fffe84f 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -165,7 +165,7 @@ if (function_exists("display_error_form") && !isset($config['system']['webgui'][ $referrer_host = str_replace(array("[", "]"), "", $referrer_host); if ($referrer_host) { if (strcasecmp($referrer_host, $config['system']['hostname'] . "." . $config['system']['domain']) == 0 || - strcasecmp($referrer_host, $config['system']['hostname']) == 0) { + strcasecmp($referrer_host, $config['system']['hostname']) == 0) { $found_host = true; } @@ -1126,11 +1126,11 @@ function ldap_get_groups($username, $authcfg) { $gresults = isset($authcfg['ldap_rfc2307']) ? $info : $info[0][$ldapgroupattribute]; - if(is_array($gresults)) { + if (is_array($gresults)) { /* Iterate through the groups and throw them into an array */ foreach ($gresults as $grp) { - if (((isset($authcfg['ldap_rfc2307'])) && (stristr($grp["dn"], "CN=") !== false)) - || ((!isset($authcfg['ldap_rfc2307'])) && (stristr($grp, "CN=") !== false))) { + if (((isset($authcfg['ldap_rfc2307'])) && (stristr($grp["dn"], "CN=") !== false)) || + ((!isset($authcfg['ldap_rfc2307'])) && (stristr($grp, "CN=") !== false))) { $grpsplit = isset($authcfg['ldap_rfc2307']) ? explode(",", $grp["dn"]) : explode(",", $grp); $memberof[] = preg_replace("/CN=/i", "", $grpsplit[0]); } diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc index a60712d..c3536c8 100644 --- a/src/etc/inc/authgui.inc +++ b/src/etc/inc/authgui.inc @@ -1,7 +1,4 @@ <?php -/* - pfSense_MODULE: authgui -*/ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. * Copyright (c) 2005-2006 Bill Marquette <bill.marquette@gmail.com> @@ -130,7 +127,7 @@ function display_error_form($http_code, $desc) { $cssfile = "/bootstrap/css/pfSense.css"; if (isset($config['system']['webgui']['webguicss'])) { - if(file_exists("bootstrap/css/" . $config['system']['webgui']['webguicss'])) { + if (file_exists("bootstrap/css/" . $config['system']['webgui']['webguicss'])) { $cssfile = "/bootstrap/css/" . $config['system']['webgui']['webguicss']; } } @@ -139,6 +136,7 @@ function display_error_form($http_code, $desc) { <!DOCTYPE html> <html lang="en"> <head> + <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="<?=$cssfile?>" /> <title><?=gettext("Error: not allowed"); ?></title> </head> @@ -233,7 +231,7 @@ if ($local_ip == false) { $cssfile = "/bootstrap/css/pfSense.css"; if (isset($config['system']['webgui']['webguicss'])) { - if(file_exists("bootstrap/css/" . $config['system']['webgui']['webguicss'])) { + if (file_exists("bootstrap/css/" . $config['system']['webgui']['webguicss'])) { $cssfile = "/bootstrap/css/" . $config['system']['webgui']['webguicss']; } } @@ -242,6 +240,7 @@ if (isset($config['system']['webgui']['webguicss'])) { <!DOCTYPE html> <html lang="en"> <head> + <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="<?=$cssfile?>" /> <title><?=gettext("Login"); ?></title> <script type="text/javascript"> diff --git a/src/etc/inc/captiveportal.inc b/src/etc/inc/captiveportal.inc index 7bfaf44..6be3ba4 100644 --- a/src/etc/inc/captiveportal.inc +++ b/src/etc/inc/captiveportal.inc @@ -35,11 +35,6 @@ via returned RADIUS attributes. This page has been modified to delete any added rules which may have been created by other per-user code (index.php, etc). These changes are (c) 2004 Keycom PLC. - - pfSense_BUILDER_BINARIES: /sbin/ipfw /sbin/route - pfSense_BUILDER_BINARIES: /usr/local/sbin/lighttpd /usr/local/bin/minicron /sbin/pfctl - pfSense_BUILDER_BINARIES: /bin/hostname /bin/cp - pfSense_MODULE: captiveportal */ /* include all configuration functions */ @@ -545,8 +540,9 @@ EOD; $rulenum++; $cprules .= "add {$rulenum} pass ip from table(100) to any out\n"; $rulenum++; - foreach ($cpips as $cpip) + foreach ($cpips as $cpip) { $cprules .= "table 100 add {$cpip}\n"; + } $cprules .= "add {$rulenum} pass ip from any to 255.255.255.255 in\n"; $rulenum++; $cprules .= "add {$rulenum} pass ip from 255.255.255.255 to any out\n"; @@ -1522,7 +1518,11 @@ function captiveportal_write_elements() { if (is_array($cpcfg['element'])) { conf_mount_rw(); foreach ($cpcfg['element'] as $data) { - if (!@file_put_contents("{$g['captiveportal_element_path']}/{$data['name']}", base64_decode($data['content']))) { + /* Do not attempt to decode or write out empty files. */ + if (empty($data['content']) || empty(base64_decode($data['content']))) { + unlink_if_exists("{$g['captiveportal_element_path']}/{$data['name']}"); + touch("{$g['captiveportal_element_path']}/{$data['name']}"); + } elseif (!@file_put_contents("{$g['captiveportal_element_path']}/{$data['name']}", base64_decode($data['content']))) { printf(gettext("Error: cannot open '%s' in captiveportal_write_elements()%s"), $data['name'], "\n"); return 1; } diff --git a/src/etc/inc/certs.inc b/src/etc/inc/certs.inc index 9c36228..6d260e6 100644 --- a/src/etc/inc/certs.inc +++ b/src/etc/inc/certs.inc @@ -25,8 +25,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - pfSense_MODULE: certificate_manager */ define("OPEN_SSL_CONF_PATH", "/etc/ssl/openssl.cnf"); diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc index 33194bf..ce9dfd2 100644 --- a/src/etc/inc/config.console.inc +++ b/src/etc/inc/config.console.inc @@ -36,10 +36,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - pfSense_BUILDER_BINARIES: /sbin/mount /sbin/umount /sbin/halt /sbin/fsck - pfSense_MODULE: config */ function set_networking_interfaces_ports() { @@ -101,15 +97,13 @@ BEGIN MANUAL CONFIGURATION OR WE WILL PROCEED WITH AUTO CONFIGURATION. EOD; } - echo <<<EOD - -Do you want to set up VLANs first? - -If you are not going to use VLANs, or only for optional interfaces, you should -say no here and use the webConfigurator to configure VLANs later, if required. - -Do you want to set up VLANs now [y|n]? -EOD; + echo "\n" . gettext("Do you want to set up VLANs first?"); + echo "\n" . + gettext( + "If you are not going to use VLANs, or only for optional interfaces, you should\n" . + "say no here and use the webConfigurator to configure VLANs later, if required.") . + "\n"; + echo "\n" . gettext("Do you want to set up VLANs now [y|n]?") . " "; if ($auto_assign) { $key = timeout(); @@ -314,10 +308,7 @@ EOD; echo "OPT" . ($i+1) . " -> " . $optif[$i] . "\n"; } - echo <<<EOD - -Do you want to proceed [y|n]? -EOD; + echo "\n" . gettext("Do you want to proceed [y|n]?") . " "; $key = chop(fgets($fp)); } @@ -330,13 +321,8 @@ EOD; $config['interfaces']['lan']['enable'] = true; } elseif (!platform_booting() && !$auto_assign) { -echo <<<EODD - -You have chosen to remove the LAN interface. - -Would you like to remove the LAN IP address and -unload the interface now? [y|n]? -EODD; + echo "\n" . gettext("You have chosen to remove the LAN interface.") . "\n"; + echo "\n" . gettext("Would you like to remove the LAN IP address and \nunload the interface now [y|n]?") . " "; if (strcasecmp(chop(fgets($fp)), "y") == 0) { if (isset($config['interfaces']['lan']) && $config['interfaces']['lan']['if']) { @@ -497,13 +483,8 @@ function vlan_setup() { $iflist = get_interface_list(); if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) { - - echo <<<EOD - -WARNING: all existing VLANs will be cleared if you proceed! - -Do you want to proceed [y|n]? -EOD; + echo "\n" . gettext("WARNING: all existing VLANs will be cleared if you proceed!") . "\n"; + echo "\n" . gettext("Do you want to proceed [y|n]?") . " "; if (strcasecmp(chop(fgets($fp)), "y") != 0) { return; @@ -563,4 +544,63 @@ EOD; } } +function check_for_alternate_interfaces() { + global $config; + + // If the WAN and/or LAN devices in the factory default config do not exist, + // then look for alternate devices. + // This lets many systems boot a factory default config without being + // forced to do interface assignment on the console. + + $specplatform = system_identify_specific_platform(); + $default_device = array(); + + // If we recognise the platform, then specify the devices directly. + switch ($specplatform['name']) { + case 'alix': + $default_device['wan'] = "vr1"; + $default_device['lan'] = "vr0"; + break; + case 'APU': + $default_device['wan'] = "re1"; + $default_device['lan'] = "re2"; + break; + case 'RCC-VE': + $default_device['wan'] = "igb0"; + $default_device['lan'] = "igb1"; + break; + default: + $default_device['wan'] = ""; + $default_device['lan'] = ""; + break; + } + + // Other common device names can be put here and will be looked for + // if the system was not one of the known platforms. + $other_devices_arr['wan'] = array("vr1", "re1", "igb0", "em0"); + $other_devices_arr['lan'] = array("vr0", "re2", "igb1", "em1"); + $interface_assignment_changed = false; + + foreach ($other_devices_arr as $ifname => $other_devices) { + if (!does_interface_exist($config['interfaces'][$ifname]['if'])) { + if (does_interface_exist($default_device[$ifname])) { + $config['interfaces'][$ifname]['if'] = $default_device[$ifname]; + $interface_assignment_changed = true; + } else { + foreach ($other_devices as $other_device) { + if (does_interface_exist($other_device)) { + $config['interfaces'][$ifname]['if'] = $other_device; + $interface_assignment_changed = true; + break; + } + } + } + } + } + + if ($interface_assignment_changed) { + write_config("Factory default boot detected WAN " . $config['interfaces']['wan']['if'] . " and LAN " . $config['interfaces']['lan']['if']); + } +} + ?> diff --git a/src/etc/inc/config.gui.inc b/src/etc/inc/config.gui.inc index 175a811..0883ede 100644 --- a/src/etc/inc/config.gui.inc +++ b/src/etc/inc/config.gui.inc @@ -36,10 +36,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - pfSense_BUILDER_BINARIES: /sbin/mount /sbin/umount /sbin/halt /sbin/fsck - pfSense_MODULE: config */ require_once("globals.inc"); diff --git a/src/etc/inc/config.inc b/src/etc/inc/config.inc index b3395c8..5f038fa 100644 --- a/src/etc/inc/config.inc +++ b/src/etc/inc/config.inc @@ -36,10 +36,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - pfSense_BUILDER_BINARIES: /sbin/mount /sbin/umount /sbin/halt /sbin/fsck - pfSense_MODULE: config */ if (!function_exists('platform_booting')) { @@ -217,6 +213,18 @@ if (isset($config['system']['timezone']) && } date_default_timezone_set("$timezone"); +/* Set the default interface language */ +if ($config['system']['language'] <> "") { + $g['language'] = $config['system']['language']; +} elseif ($g['language'] == "") { + $g['language'] = 'en_US'; +} + +if (!function_exists('set_language')) { + require_once("pfsense-utils.inc"); +} +set_language($g['language']); + if ($config_parsed == true) { /* process packager manager custom rules */ if (is_dir("/usr/local/pkg/parse_config")) { diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 0ea97b3..62763b0 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -37,10 +37,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - pfSense_BUILDER_BINARIES: /sbin/mount /sbin/umount /sbin/halt - pfSense_MODULE: config */ /****f* config/encrypted_configxml @@ -515,7 +511,7 @@ function safe_write_file($file, $content, $force_binary) { * null ******/ /* save the system configuration */ -function write_config($desc="Unknown", $backup = true) { +function write_config($desc="Unknown", $backup = true, $write_config_only = false) { global $config, $g; if (!empty($_SERVER['REMOTE_ADDR'])) { @@ -580,6 +576,12 @@ function write_config($desc="Unknown", $backup = true) { unlock($lockkey); + if ($write_config_only) { + /* tell kernel to sync fs data */ + conf_mount_ro(); + return $config; + } + unlink_if_exists("/usr/local/pkg/pf/carp_sync_client.php"); /* tell kernel to sync fs data */ diff --git a/src/etc/inc/crypt.inc b/src/etc/inc/crypt.inc index 2710dd3..f621588 100644 --- a/src/etc/inc/crypt.inc +++ b/src/etc/inc/crypt.inc @@ -25,10 +25,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - pfSense_BUILDER_BINARIES: /usr/bin/openssl - pfSense_MODULE: crypto - */ function crypt_data($val, $pass, $opt) { diff --git a/src/etc/inc/dyndns.class b/src/etc/inc/dyndns.class index 610afad..1d1641b 100644 --- a/src/etc/inc/dyndns.class +++ b/src/etc/inc/dyndns.class @@ -33,6 +33,8 @@ * - DNSimple (dnsimple.com) * - Google Domains (domains.google.com) * - DNS Made Easy (www.dnsmadeeasy.com) + * - SPDNS (spdns.de) + * - SPDNS IPv6 (spdns.de) * +----------------------------------------------------+ * Requirements: * - PHP version 4.0.2 or higher with the CURL Library and the PCRE Library @@ -79,6 +81,8 @@ * DNSimple - Last Tested: 09 February 2015 * Google Domains - Last Tested: 27 April 2015 * DNS Made Easy - Last Tested: 27 April 2015 + * SPDNS - Last Tested: 04 December 2015 + * SPDNS IPv6 - Last Tested: 04 December 2015 * +====================================================+ * * @author E.Kristensen @@ -179,6 +183,7 @@ switch ($dnsService) { case 'he-net-v6': case 'custom-v6': + case 'spdns-v6': $this->_useIPv6 = true; break; default: @@ -254,6 +259,8 @@ case 'dnsimple': case 'googledomains': case 'dnsmadeeasy': + case 'spdns': + case 'spdns-v6': $this->_update(); if ($this->_dnsDummyUpdateDone == true) { // If a dummy update was needed, then sleep a while and do the update again to put the proper address back. @@ -293,7 +300,7 @@ $ch = curl_init(); if ($this->_useIPv6 == false) { - curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4 ); + curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); } if ($this->_dnsService != 'ods' and $this->_dnsService != 'route53 ') { @@ -684,7 +691,7 @@ case 'cloudflare': $needsIP = TRUE; $dnsServer ='api.cloudflare.com'; - $dnsHost = str_replace(' ','', $this->_dnsHost); + $dnsHost = str_replace(' ', '', $this->_dnsHost); $host_names = explode(".", $dnsHost); $bottom_host_name = $host_names[count($host_names)-2] . "." . $host_names[count($host_names)-1]; @@ -700,12 +707,12 @@ curl_setopt($ch, CURLOPT_URL, $getZoneId); $output = json_decode(curl_exec($ch)); $zone = $output->result[0]->id; - if ($zone){ // If zone ID was found get host ID + if ($zone) { // If zone ID was found get host ID $getHostId = "https://{$dnsServer}/client/v4/zones/{$zone}/dns_records?name={$this->_dnsHost}"; curl_setopt($ch, CURLOPT_URL, $getHostId); $output = json_decode(curl_exec($ch)); $host = $output->result[0]->id; - if ($host){ // If host ID was found update host + if ($host) { // If host ID was found update host $hostData = array( "content" => "{$this->_dnsIP}", "type" => "A", @@ -717,7 +724,7 @@ $updateHostId = "https://{$dnsServer}/client/v4/zones/{$zone}/dns_records/{$host}"; curl_setopt($ch, CURLOPT_URL, $updateHostId); curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); - curl_setopt($ch, CURLOPT_POSTFIELDS,$data_json); + curl_setopt($ch, CURLOPT_POSTFIELDS, $data_json); } } break; @@ -821,6 +828,23 @@ $server = "https://cp.dnsmadeeasy.com/servlet/updateip"; curl_setopt($ch, CURLOPT_URL, $server . '?username=' . $this->_dnsUser . '&password=' . $this->_dnsPass . '&id=' . $this->_dnsHost . '&ip=' . $this->_dnsIP); break; + case 'spdns': + case 'spdns-v6': + $needsIP = FALSE; + if ($this->_dnsVerboseLog) { + log_error("SPDNS: ({$this->_dnsHost}) DNS update() starting."); + } + curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); + $server = "https://update.spdns.de/nic/update"; + $port = ""; + if ($this->_dnsServer) { + $server = $this->_dnsServer; + } + if ($this->_dnsPort) { + $port = ":" . $this->_dnsPort; + } + curl_setopt($ch, CURLOPT_URL, $server .$port . '?hostname=' . $this->_dnsHost . '&myip=' . $this->_dnsIP); + break; default: break; } @@ -1279,17 +1303,14 @@ break; case 'cloudflare': $output = json_decode($data); - if ($output->result->content === $this->_dnsIP){ + if ($output->result->content === $this->_dnsIP) { $status = "DynDNS: (Success) {$this->_dnsHost} updated to {$this->_dnsIP}"; $successful_update = true; - } - elseif ($output->errors[0]->code === 9103){ + } elseif ($output->errors[0]->code === 9103) { $status = "DynDNS ({$this->_dnsHost}): ERROR - Invalid Credentials! Don't forget to use API Key for password field with CloudFlare."; - } - elseif (($output->success) && (!$output->result[0]->id)) { + } elseif (($output->success) && (!$output->result[0]->id)) { $status = "DynDNS ({$this->_dnsHost}): ERROR - Zone or Host ID was not found, check your hostname."; - } - else { + } else { $status = "DynDNS ({$this->_dnsHost}): UNKNOWN ERROR - {$output->errors[0]->message}"; log_error("DynDNS ({$this->_dnsHost}): PAYLOAD: {$data}"); } @@ -1417,6 +1438,26 @@ break; } break; + case 'spdns': + case 'spdns-v6': + if (preg_match('/notfqdn/i', $data)) { + $status = "phpDynDNS ({$this->_dnsHost}): (Error) Not A FQDN!"; + } else if (preg_match('/nohost/i', $data)) { + $status = "phpDynDNS ({$this->_dnsHost}): (Error) No such host"; + } else if (preg_match('/nochg/i', $data)) { + $status = "phpDynDNS ({$this->_dnsHost}): (Success) No Change In IP Address"; + $successful_update = true; + } else if (preg_match('/good/i', $data)) { + $status = "phpDynDNS ({$this->_dnsHost}): (Success) IP Address Changed Successfully! (".$this->_dnsIP.")"; + $successful_update = true; + } else if (preg_match('/badauth/i', $data)) { + $status = "phpDynDNS ({$this->_dnsHost}): (Error) User Authorization Failed"; + } else { + $status = "phpDynDNS ({$this->_dnsHost}): (Unknown Response)"; + log_error("phpDynDNS ({$this->_dnsHost}): PAYLOAD: {$data}"); + $this->_debug($data); + } + break; } if ($successful_update == true) { diff --git a/src/etc/inc/easyrule.inc b/src/etc/inc/easyrule.inc index 199e7d0..e91c8a5 100644 --- a/src/etc/inc/easyrule.inc +++ b/src/etc/inc/easyrule.inc @@ -27,10 +27,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: - pfSense_MODULE: filter -*/ $blockaliasname = 'EasyRuleBlockHosts'; $protocols_with_ports = array('tcp', 'udp'); @@ -53,8 +49,9 @@ function easyrule_find_rule_interface($int) { } /* add ipsec interfaces */ - if (ipsec_enabled()) + if (ipsec_enabled()) { $iflist["enc0"] = "IPSEC"; + } if (isset($iflist[$int])) { return $int; diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index f236289..e2f016c 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -31,10 +31,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - pfSense_BUILDER_BINARIES: /sbin/kldload /usr/sbin/tcpdump /sbin/pfctl /bin/rm - pfSense_BUILDER_BINARIES: /usr/sbin/inetd - pfSense_MODULE: filter */ @@ -430,31 +426,32 @@ function filter_configure_sync($delete_states_if_needed = true) { * then output the contents of the error to the caller */ if ($rules_loading <> 0) { - $saved_line_error = $rules_error[0]; - $line_error = explode(":", $rules_error[0]); - $line_number = $line_error[1]; - $line_split = file("{$g['tmp_path']}/rules.debug"); - if (is_array($line_split)) { - $line_error = sprintf(gettext('The line in question reads [%1$d]: %2$s'), $line_number, $line_split[$line_number-1]); - } - unset($line_split); - - /* Brutal ugly hack but required -- PF is stuck, unwedge */ - if (strstr("$rules_error[0]", "busy")) { - exec("/sbin/pfctl -d; /sbin/pfctl -e; /sbin/pfctl -f {$g['tmp_path']}/rules.debug"); - $error_msg = gettext("PF was wedged/busy and has been reset."); - file_notice("pf_busy", $error_msg, "pf_busy", ""); - } else { - $_grbg = exec("/sbin/pfctl -o basic -f {$g['tmp_path']}/rules.debug.old 2>&1"); + foreach ($rules_error as $errorline) { + $saved_line_error = $errorline; + $line_error = explode(":", $errorline); + $line_number = $line_error[1]; + $line_split = file("{$g['tmp_path']}/rules.debug"); + if (is_array($line_split)) { + $line_error = sprintf(gettext('The line in question reads [%1$d]: %2$s'), $line_number, $line_split[$line_number-1]); + } + unset($line_split); + + /* Brutal ugly hack but required -- PF is stuck, unwedge */ + if (strstr("$rules_error[0]", "busy")) { + exec("/sbin/pfctl -d; /sbin/pfctl -e; /sbin/pfctl -f {$g['tmp_path']}/rules.debug"); + $error_msg = gettext("PF was wedged/busy and has been reset."); + file_notice("pf_busy", $error_msg, "pf_busy", ""); + } else { + $_grbg = exec("/sbin/pfctl -o basic -f {$g['tmp_path']}/rules.debug.old 2>&1"); + } + if ($line_error and $line_number) { + file_notice("filter_load", sprintf(gettext('There were error(s) loading the rules: %1$s - %2$s'), $saved_line_error, $line_error), "Filter Reload", ""); + update_filter_reload_status(sprintf(gettext('There were error(s) loading the rules: %1$s - %2$s'), $saved_line_error, $line_error)); + unlock($filterlck); + return; + } } unset($rules_loading, $rules_error); - - if ($line_error and $line_number) { - file_notice("filter_load", sprintf(gettext('There were error(s) loading the rules: %1$s - %2$s'), $saved_line_error, $line_error), "Filter Reload", ""); - update_filter_reload_status(sprintf(gettext('There were error(s) loading the rules: %1$s - %2$s'), $saved_line_error, $line_error)); - unlock($filterlck); - return; - } } # If we are not using bogonsv6 then we can remove any bogonsv6 table from the running pf (if the table is not there, the kill is still fine). @@ -2871,7 +2868,7 @@ function filter_generate_user_rule($rule) { (isset($rule['max-src-conn-rate']) and $rule['max-src-conn-rate'] <> "") or (isset($rule['max-src-conn-rates']) and $rule['max-src-conn-rates'] <> ""))) or (isset($rule['sloppy'])) or - (isset($rule['nopfsync'])) ) { + (isset($rule['nopfsync']))) { $aline['flags'] .= "( "; if (isset($rule['sloppy'])) { $aline['flags'] .= "sloppy "; @@ -3323,7 +3320,7 @@ EOD; } /* allow access to DHCP relay on interfaces */ - if(isset($config['dhcrelay']['enable'])) { + if (isset($config['dhcrelay']['enable'])) { $dhcifaces = explode(",", $dhcrelaycfg['interface']); foreach ($dhcifaces as $dhcrelayif) { if ($dhcrelayif == $on) { diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc index ea45aa9..6226ba2 100644 --- a/src/etc/inc/filter_log.inc +++ b/src/etc/inc/filter_log.inc @@ -52,10 +52,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/bin/tail /usr/local/sbin/clog - pfSense_MODULE: filter -*/ require 'config.inc'; @@ -79,10 +75,65 @@ function conv_log_filter($logfile, $nentries, $tail = 50, $filtertext = "", $fil /* Always do a reverse tail, to be sure we're grabbing the 'end' of the log. */ $logarr = ""; + if ($logfile == "{$g['varlog_path']}/system.log") { $logfile_type = "system"; } + else if ($logfile == "{$g['varlog_path']}/gateways.log") { $logfile_type = "system"; } + else if ($logfile == "{$g['varlog_path']}/routing.log") { $logfile_type = "system"; } + else if ($logfile == "{$g['varlog_path']}/resolver.log") { $logfile_type = "system"; } + else if ($logfile == "{$g['varlog_path']}/wireless.log") { $logfile_type = "system"; } + + else if ($logfile == "{$g['varlog_path']}/filter.log") { $logfile_type = "firewall"; } + else if ($logfile == "{$g['varlog_path']}/dhcpd.log") { $logfile_type = "system"; } + else if ($logfile == "{$g['varlog_path']}/portalauth.log") { $logfile_type = "system"; } + else if ($logfile == "{$g['varlog_path']}/ipsec.log") { $logfile_type = "system"; } + else if ($logfile == "{$g['varlog_path']}/ppp.log") { $logfile_type = "system"; } + + else if ($logfile == "{$g['varlog_path']}/vpn.log") { $logfile_type = "tbd"; } + else if ($logfile == "{$g['varlog_path']}/pptps.log") { $logfile_type = "tbd"; } + else if ($logfile == "{$g['varlog_path']}/poes.log") { $logfile_type = "tbd"; } + else if ($logfile == "{$g['varlog_path']}/l2tps.log") { $logfile_type = "tbd"; } + + else if ($logfile == "{$g['varlog_path']}/relayd.log") { $logfile_type = "system"; } + else if ($logfile == "{$g['varlog_path']}/openvpn.log") { $logfile_type = "system"; } + else if ($logfile == "{$g['varlog_path']}/ntpd.log") { $logfile_type = "system"; } + + else { $logfile_type = "unknown"; } + + if ($logfile_type == 'firewall') { + $pattern = "filterlog:"; + } + else if ($logfile_type == 'system') { + + $month_pattern = "[a-zA-Z]{3}"; + $day_pattern = "[0-9]{1,2}"; + $time_pattern = "[0-9]{2}:[0-9]{2}:[0-9]{2}"; + + $date_pattern = "\(" . $month_pattern . "\ +" . $day_pattern . "\ +" . $time_pattern . "\)"; + + $host_pattern = "\(.*?\)"; +# $host_pattern = "\([a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]\)"; + + $process_pattern = "\(.*?\)\(?::\ +\)?"; + $pid_pattern = "\(?:\[[0-9:]*\]\)?:?"; + $process_pid_pattern = $process_pattern . $pid_pattern; + + $log_message_pattern = "\(.*\)"; + + $pattern = "^" . $date_pattern . "\ +" . $host_pattern . "\ +" . $process_pid_pattern . "\ +" . $log_message_pattern . "$"; + } + else if ($logfile_type == 'tbd') { + $pattern = "^\(.*\)$"; + } + else if ($logfile_type == 'unknown') { + $pattern = "^\(.*\)$"; + } + else { + $pattern = "^\(.*\)$"; + } + if (isset($config['system']['usefifolog'])) { - exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . " | /usr/bin/grep 'filterlog:' | /usr/bin/tail -r -n {$tail}", $logarr); + exec("/usr/sbin/fifolog_reader " . escapeshellarg($logfile) . " | /usr/bin/grep -E $pattern | /usr/bin/tail -r -n {$tail}", $logarr); } else { - exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . " | /usr/bin/grep -v \"CLOG\" | /usr/bin/grep -v \"\033\" | /usr/bin/grep 'filterlog:' | /usr/bin/tail -r -n {$tail}", $logarr); + exec("/usr/local/sbin/clog " . escapeshellarg($logfile) . " | /usr/bin/grep -v \"CLOG\" | /usr/bin/grep -v \"\033\" | /usr/bin/grep -E $pattern | /usr/bin/tail -r -n {$tail}", $logarr); } $filterlog = array(); @@ -94,7 +145,12 @@ function conv_log_filter($logfile, $nentries, $tail = 50, $filtertext = "", $fil break; } - $flent = parse_filter_line($logent); + if ($logfile_type == 'firewall') { $flent = parse_firewall_log_line($logent); } + else if ($logfile_type == 'system') { $flent = parse_system_log_line($logent); } + else if ($logfile_type == 'tbd') { $flent = array(); } + else if ($logfile_type == 'unknown') { $flent = parse_unknown_log_line($logent); } + else { $flent = array(); } + if (!$filterinterface || ($filterinterface == $flent['interface'])) { if ((($flent != "") && (!is_array($filtertext)) && (match_filter_line($flent, $filtertext))) || (($flent != "") && (is_array($filtertext)) && (match_filter_field($flent, $filtertext)))) { @@ -104,7 +160,13 @@ function conv_log_filter($logfile, $nentries, $tail = 50, $filtertext = "", $fil } } /* Since the lines are in reverse order, flip them around if needed based on the user's preference */ - return isset($config['syslog']['reverse']) ? $filterlog : array_reverse($filterlog); + # First get the "General Logging Options" (global) chronological order setting. Then apply specific log override if set. + $reverse = isset($config['syslog']['reverse']); + $specific_log = basename($logfile, '.log') . '_settings'; + if ($config['syslog'][$specific_log]['cronorder'] == 'forward') $reverse = false; + if ($config['syslog'][$specific_log]['cronorder'] == 'reverse') $reverse = true; + + return ($reverse) ? $filterlog : array_reverse($filterlog); } function escape_filter_regex($filtertext) { @@ -159,7 +221,80 @@ function in_arrayi($needle, $haystack) { return in_array(strtolower($needle), array_map('strtolower', $haystack)); } -function parse_filter_line($line) { +function parse_unknown_log_line($line) { + global $config, $g; + + $flent = array(); + $log_split = ""; + + $month_pattern = "[a-zA-Z]{3}"; + $day_pattern = "[0-9]{1,2}"; + $time_pattern = "[0-9]{2}:[0-9]{2}:[0-9]{2}"; + + $date_pattern = "(" . $month_pattern . "\ +" . $day_pattern . "\ +" . $time_pattern . ")"; + + $log_message_pattern = "(.*)"; + + $pattern = "/^" . $date_pattern . "\ +" . $log_message_pattern . "$/"; + + if (!preg_match($pattern, $line, $log_split)) { + return ""; + } + + list($all, $flent['time'], $flent['message']) = $log_split; + + /* If there is time, and message, fields, then the line should be usable/good */ + if (!((trim($flent['time']) == "") && (trim($flent['message']) == ""))) { + return $flent; + } else { + if ($g['debug']) { + log_error(sprintf(gettext("There was a error parsing log entry: %s. Please report to mailing list or forum."), $line)); + } + return ""; + } +} + +function parse_system_log_line($line) { + global $config, $g; + + $flent = array(); + $log_split = ""; + + $month_pattern = "[a-zA-Z]{3}"; + $day_pattern = "[0-9]{1,2}"; + $time_pattern = "[0-9]{2}:[0-9]{2}:[0-9]{2}"; + + $date_pattern = "(" . $month_pattern . "\ +" . $day_pattern . "\ +" . $time_pattern . ")"; + + $host_pattern = "(.*?)"; +# $host_pattern = "([a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])"; + + $process_pattern = "(.*?)(?::\ +)?"; + $pid_pattern = "(?:\[([0-9:]*)\])?:?"; + $process_pid_pattern = $process_pattern . $pid_pattern; + + $log_message_pattern = "(.*)"; + + $pattern = "/^" . $date_pattern . "\ +" . $host_pattern . "\ +" . $process_pid_pattern . "\ +" . $log_message_pattern . "$/"; + + if (!preg_match($pattern, $line, $log_split)) { + return ""; + } + + list($all, $flent['time'], $flent['host'], $flent['process'], $flent['pid'], $flent['message']) = $log_split; + + /* If there is time, process, and message, fields, then the line should be usable/good */ + if (!((trim($flent['time']) == "") && (trim($flent['process']) == "") && (trim($flent['message']) == ""))) { + return $flent; + } else { + if ($g['debug']) { + log_error(sprintf(gettext("There was a error parsing log entry: %s. Please report to mailing list or forum."), $line)); + } + return ""; + } +} + +function parse_firewall_log_line($line) { global $config, $g; $flent = array(); @@ -294,7 +429,7 @@ function parse_filter_line($line) { return $flent; } else { if ($g['debug']) { - log_error(sprintf(gettext("There was a error parsing rule: %s. Please report to mailing list or forum."), $errline)); + log_error(sprintf(gettext("There was a error parsing rule: %s. Please report to mailing list or forum."), $line)); } return ""; } @@ -421,7 +556,7 @@ function find_action_image($action) { function handle_ajax($nentries, $tail = 50) { global $config; if ($_GET['lastsawtime'] or $_POST['lastsawtime']) { - global $filter_logfile,$filterent; + global $filter_logfile, $filterent; if ($_GET['lastsawtime']) { $lastsawtime = $_GET['lastsawtime']; } @@ -444,12 +579,12 @@ function handle_ajax($nentries, $tail = 50) { } if ($log_row['act'] == "block") { - $icon_act = "fa-times icon-danger"; + $icon_act = "fa-times text-danger"; } else { - $icon_act = "fa-check icon-success"; + $icon_act = "fa-check text-success"; } - $btn = '<i class="fa ' . $icon_act . ' icon-pointer" title="' . $log_row['act'] . '/' . $log_row['tracker'] . '" onclick="javascript:getURL(\'diag_logs_filter.php?getrulenum=' . $log_row['rulenum'] . ',' . $log_row['tracker'] . ',' . $log_row['act'] . '\', outputrule);"></i>'; + $btn = '<i class="fa ' . $icon_act . ' icon-pointer" title="' . $log_row['act'] . '/' . $log_row['tracker'] . '" onclick="javascript:getURL(\'status_logs_filter.php?getrulenum=' . $log_row['rulenum'] . ',' . $log_row['tracker'] . ',' . $log_row['act'] . '\', outputrule);"></i>'; $new_rules .= "{$btn}||{$log_row['time']}||{$log_row['interface']}||{$log_row['srcip']}||{$log_row['srcport']}||{$log_row['dstip']}||{$log_row['dstport']}||{$log_row['proto']}||{$log_row['version']}||" . time() . "||\n"; } } diff --git a/src/etc/inc/functions.inc b/src/etc/inc/functions.inc index b95dec4..1edd6a3 100644 --- a/src/etc/inc/functions.inc +++ b/src/etc/inc/functions.inc @@ -28,9 +28,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - pfSense_MODULE: utils - */ /* BEGIN compatibility goo with HEAD */ diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 893590d..56ad540 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -1,37 +1,62 @@ <?php -/* - globals.inc - part of pfSense (https://www.pfsense.org) - Copyright (C) 2004-2010 Scott Ullrich - - Originally Part of m0n0wall - Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - 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) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - pfSense_MODULE: utils - -*/ +/* ==================================================================== + * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. 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. + * + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgment: + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution. (http://www.pfsense.org/). + * + * 4. The names "pfSense" and "pfSense Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * coreteam@pfsense.org. + * + * 5. Products derived from this software may not be called "pfSense" + * nor may "pfSense" appear in their names without prior written + * permission of the Electric Sheep Fencing, LLC. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution (http://www.pfsense.org/). + * + * THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY + * EXPRESSED 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 pfSense PROJECT OR + * ITS CONTRIBUTORS 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) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ==================================================================== + * + */ + + +// Global defines + +// Automatic panel collapse +define(COLLAPSIBLE, 0x08); +define(SEC_CLOSED, 0x04); +define(SEC_OPEN, 0x00); global $g; $g = array( @@ -59,7 +84,7 @@ $g = array( "product_name" => "pfSense", "product_version" => trim(file_get_contents("/etc/version"), " \n"), "product_copyright" => "Electric Sheep Fencing LLC", - "product_copyright_url" => "http://www.electricsheepfencing.com", + "product_copyright_url" => "https://pfsense.org/license", "product_copyright_years" => "2004 - ".date("Y"), "product_website" => "www.pfsense.org", "product_website_footer" => "https://www.pfsense.org/?gui=bootstrap", @@ -71,7 +96,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "13.0", + "latest_config" => "13.1", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/growl.class b/src/etc/inc/growl.class index 8f639e5..a6fbcc1 100644 --- a/src/etc/inc/growl.class +++ b/src/etc/inc/growl.class @@ -1,8 +1,4 @@ <?PHP -/* - pfSense_MODULE: notifications -*/ - class Growl { const GROWL_PRIORITY_LOW = -2; @@ -99,4 +95,4 @@ } } -?>
\ No newline at end of file +?> diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc index 9880cdc..6ef69a4 100644 --- a/src/etc/inc/gwlb.inc +++ b/src/etc/inc/gwlb.inc @@ -25,136 +25,135 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - pfSense_BUILDER_BINARIES: /sbin/route /usr/local/sbin/apinger - pfSense_MODULE: routing - */ + require_once("config.inc"); require_once("rrd.inc"); -/* Returns an array of default values used for apinger.conf */ -function return_apinger_defaults() { +/* Returns an array of default values used for dpinger */ +function return_dpinger_defaults() { return array( "latencylow" => "200", "latencyhigh" => "500", "losslow" => "10", "losshigh" => "20", - "interval" => "1", - "down" => "10", - "avg_delay_samples" => "10", - "avg_loss_samples" => "50", - "avg_loss_delay_samples" => "20"); + "interval" => "250", + "loss_interval" => "500", + "time_period" => "25000", + "alert_interval" => "1000"); } -/* - * Creates monitoring configuration file and - * adds appropriate static routes. - */ -function setup_gateways_monitor() { - global $config, $g; +function running_dpinger_processes() { + global $g; - $gateways_arr = return_gateways_array(); - if (!is_array($gateways_arr)) { - log_error("No gateways to monitor. Apinger will not be run."); - killbypid("{$g['varrun_path']}/apinger.pid"); - @unlink("{$g['varrun_path']}/apinger.status"); - return; - } + $pidfiles = glob("{$g['varrun_path']}/dpinger_*.pid"); - $apinger_debug = ""; - if (isset($config['system']['apinger_debug'])) { - $apinger_debug = "debug on"; + $result = array(); + if ($pidfiles === FALSE) { + return $result; } - $apinger_default = return_apinger_defaults(); - $apingerconfig = <<<EOD - -# pfSense apinger configuration file. Automatically Generated! - -{$apinger_debug} - -## User and group the pinger should run as -user "root" -group "wheel" - -## Mailer to use (default: "/usr/lib/sendmail -t") -#mailer "/var/qmail/bin/qmail-inject" - -## Location of the pid-file (default: "/var/run/apinger.pid") -pid_file "{$g['varrun_path']}/apinger.pid" - -## Format of timestamp (%s macro) (default: "%b %d %H:%M:%S") -#timestamp_format "%Y%m%d%H%M%S" + foreach ($pidfiles as $pidfile) { + $result[] = preg_replace('/^dpinger_(\w+)\.pid$/', "$1", + basename($pidfile)); + } -status { - ## File where the status information should be written to - file "{$g['varrun_path']}/apinger.status" - ## Interval between file updates - ## when 0 or not set, file is written only when SIGUSR1 is received - interval 5s + return $result; } -######################################## -# RRDTool status gathering configuration -# Interval between RRD updates -rrd interval 60s; +/* + * Stop one or more dpinger process + * default parameter $gwname is '*' that will kill all running sessions + * If a gateway name is passed, only this one will be killed + */ +function stop_dpinger($gwname = '*') { + global $g; -## These parameters can be overridden in a specific alarm configuration -alarm default { - command on "/usr/local/sbin/pfSctl -c 'service reload dyndns %T' -c 'service reload ipsecdns' -c 'service reload openvpn %T' -c 'filter reload' " - command off "/usr/local/sbin/pfSctl -c 'service reload dyndns %T' -c 'service reload ipsecdns' -c 'service reload openvpn %T' -c 'filter reload' " - combine 10s -} + $pidfiles = glob("{$g['varrun_path']}/dpinger_{$gwname}.pid"); -## "Down" alarm definition. -## This alarm will be fired when target doesn't respond for 30 seconds. -alarm down "down" { - time {$apinger_default['down']}s -} + if ($pidfiles === FALSE) { + return; + } -## "Delay" alarm definition. -## This alarm will be fired when responses are delayed more than 200ms -## it will be canceled, when the delay drops below 100ms -alarm delay "delay" { - delay_low {$apinger_default['latencylow']}ms - delay_high {$apinger_default['latencyhigh']}ms + foreach ($pidfiles as $pidfile) { + if (isvalidpid($pidfile)) { + killbypid($pidfile); + } else { + @unlink($pidfile); + } + } } -## "Loss" alarm definition. -## This alarm will be fired when packet loss goes over 20% -## it will be canceled, when the loss drops below 10% -alarm loss "loss" { - percent_low {$apinger_default['losslow']} - percent_high {$apinger_default['losshigh']} +function start_dpinger($gateway) { + global $g; + + $dpinger_defaults = return_dpinger_defaults(); + + $pidfile = "{$g['varrun_path']}/dpinger_{$gateway['name']}.pid"; + $socket = "{$g['varrun_path']}/dpinger_{$gateway['name']}.sock"; + $alarm_cmd = "{$g['etc_path']}/rc.gateway_alarm {$gateway['name']}"; + + $params = "-S "; /* Log warnings via syslog */ + $params .= "-B {$gateway['gwifip']} "; /* Bind src address */ + $params .= "-p {$pidfile} "; /* PID filename */ + $params .= "-U {$socket} "; /* Status Socket */ + $params .= "-C \"{$alarm_cmd}\" "; /* Command to run on alarm */ + + $params .= "-s " . + (isset($gateway['interval']) && is_numeric($gateway['interval']) + ? $gateway['interval'] + : $dpinger_defaults['interval'] + ) . " "; + + $params .= "-l " . + (isset($gateway['loss_interval']) && is_numeric($gateway['loss_interval']) + ? $gateway['loss_interval'] + : $dpinger_defaults['loss_interval'] + ) . " "; + + $params .= "-t " . + (isset($gateway['time_period']) && is_numeric($gateway['time_period']) + ? $gateway['time_period'] + : $dpinger_defaults['time_period'] + ) . " "; + + $params .= "-A " . + (isset($gateway['alert_interval']) && is_numeric($gateway['alert_interval']) + ? $gateway['alert_interval'] + : $dpinger_defaults['alert_interval'] + ) . " "; + + $params .= "-D " . + (isset($gateway['latencyhigh']) && is_numeric($gateway['latencyhigh']) + ? $gateway['latencyhigh'] + : $dpinger_defaults['latencyhigh'] + ) . " "; + + $params .= "-L " . + (isset($gateway['losshigh']) && is_numeric($gateway['losshigh']) + ? $gateway['losshigh'] + : $dpinger_defaults['losshigh'] + ) . " "; + + mwexec_bg("/usr/local/bin/dpinger {$params} {$gateway['monitor']}"); } -target default { - ## How often the probe should be sent - interval {$apinger_default['interval']}s - - ## How many replies should be used to compute average delay - ## for controlling "delay" alarms - avg_delay_samples {$apinger_default['avg_delay_samples']} - - ## How many probes should be used to compute average loss - avg_loss_samples {$apinger_default['avg_loss_samples']} - - ## The delay (in samples) after which loss is computed - ## without this delays larger than interval would be treated as loss - avg_loss_delay_samples {$apinger_default['avg_loss_delay_samples']} - - ## Names of the alarms that may be generated for the target - alarms "down","delay","loss" - - ## Location of the RRD - #rrd file "{$g['vardb_path']}/rrd/apinger-%t.rrd" -} +/* + * Creates monitoring configuration file and + * adds appropriate static routes. + */ +function setup_gateways_monitor() { + global $config, $g; -EOD; + $gateways_arr = return_gateways_array(); + if (!is_array($gateways_arr)) { + log_error("No gateways to monitor. dpinger will not run."); + stop_dpinger(); + return; + } $monitor_ips = array(); - foreach ($gateways_arr as $name => $gateway) { + foreach ($gateways_arr as $gwname => $gateway) { /* Do not monitor if such was requested */ if (isset($gateway['monitor_disable'])) { continue; @@ -172,7 +171,7 @@ EOD; continue; } - /* Interface ip is needed since apinger will bind a socket to it. + /* Interface ip is needed since dpinger will bind a socket to it. * However the config GUI should already have checked this and when * PPoE is used the IP address is set to "dynamic". So using is_ipaddrv4 * or is_ipaddrv6 to identify packet type would be wrong, especially as @@ -262,176 +261,124 @@ EOD; } $monitor_ips[] = $gateway['monitor']; - $apingercfg = "target \"{$gateway['monitor']}\" {\n"; - $apingercfg .= " description \"{$name}\"\n"; - $apingercfg .= " srcip \"{$gwifip}\"\n"; - - ## How often the probe should be sent - if (!empty($gateway['interval']) && is_numeric($gateway['interval'])) { - $interval = intval($gateway['interval']); # Restrict to Integer - if ($interval < 1) { - $interval = 1; # Minimum - } - if ($interval != $apinger_default['interval']) { # If not default value - $apingercfg .= " interval " . $interval . "s\n"; - } - } + $gateways_arr[$gwname]['enable_dpinger'] = true; + $gateways_arr[$gwname]['gwifip'] = $gwifip; + } - ## How many replies should be used to compute average delay - ## for controlling "delay" alarms - if (!empty($gateway['avg_delay_samples']) && is_numeric($gateway['avg_delay_samples'])) { - $avg_delay_samples = intval($gateway['avg_delay_samples']); # Restrict to Integer - if ($avg_delay_samples < 1) { - $avg_delay_samples = 1; # Minimum - } - if ($avg_delay_samples != $apinger_default['avg_delay_samples']) { # If not default value - $apingercfg .= " avg_delay_samples " . $avg_delay_samples . "\n"; - } - } + stop_dpinger(); - ## How many probes should be used to compute average loss - if (!empty($gateway['avg_loss_samples']) && is_numeric($gateway['avg_loss_samples'])) { - $avg_loss_samples = intval($gateway['avg_loss_samples']); # Restrict to Integer - if ($avg_loss_samples < 1) { - $avg_loss_samples = 1; # Minimum - } - if ($avg_loss_samples != $apinger_default['avg_loss_samples']) { # If not default value - $apingercfg .= " avg_loss_samples " . $avg_loss_samples . "\n"; - } + /* Start new processes */ + foreach ($gateways_arr as $gateway) { + if (isset($gateway['enable_dpinger'])) { + start_dpinger($gateway); } + } - ## The delay (in samples) after which loss is computed - ## without this delays larger than interval would be treated as loss - if (!empty($gateway['avg_loss_delay_samples']) && is_numeric($gateway['avg_loss_delay_samples'])) { - $avg_loss_delay_samples = intval($gateway['avg_loss_delay_samples']); # Restrict to Integer - if ($avg_loss_delay_samples < 1) { - $avg_loss_delay_samples = 1; # Minimum - } - if ($avg_loss_delay_samples != $apinger_default['avg_loss_delay_samples']) { # If not default value - $apingercfg .= " avg_loss_delay_samples " . $avg_loss_delay_samples . "\n"; - } - } + return 0; +} - $alarms = ""; - $alarmscfg = ""; - $override = false; - if (!empty($gateway['losslow'])) { - $alarmscfg .= "alarm loss \"{$name}loss\" {\n"; - $alarmscfg .= "\tpercent_low {$gateway['losslow']}\n"; - $alarmscfg .= "\tpercent_high {$gateway['losshigh']}\n"; - $alarmscfg .= "}\n"; - $alarms .= "\"{$name}loss\""; - $override = true; - } else { - if ($override == true) { - $alarms .= ","; - } - $alarms .= "\"loss\""; - $override = true; - } - if (!empty($gateway['latencylow'])) { - $alarmscfg .= "alarm delay \"{$name}delay\" {\n"; - $alarmscfg .= "\tdelay_low {$gateway['latencylow']}ms\n"; - $alarmscfg .= "\tdelay_high {$gateway['latencyhigh']}ms\n"; - $alarmscfg .= "}\n"; - if ($override == true) { - $alarms .= ","; - } - $alarms .= "\"{$name}delay\""; - $override = true; - } else { - if ($override == true) { - $alarms .= ","; - } - $alarms .= "\"delay\""; - $override = true; - } - if (!empty($gateway['down'])) { - $alarmscfg .= "alarm down \"{$name}down\" {\n"; - $alarmscfg .= "\ttime {$gateway['down']}s\n"; - $alarmscfg .= "}\n"; - if ($override == true) { - $alarms .= ","; - } - $alarms .= "\"{$name}down\""; - $override = true; - } else { - if ($override == true) { - $alarms .= ","; - } - $alarms .= "\"down\""; - $override = true; - } - if ($override == true) { - $apingercfg .= "\talarms override {$alarms};\n"; - } +function get_dpinger_status($gwname) { + global $g; - if (isset($gateway['force_down'])) { - $apingercfg .= "\tforce_down on\n"; - } + $socket = "{$g['varrun_path']}/dpinger_{$gwname}.sock"; + + if (!file_exists($socket)) { + log_error("dpinger: status socket {$socket} not found"); + return false; + } - $apingercfg .= " rrd file \"{$g['vardb_path']}/rrd/{$gateway['name']}-quality.rrd\"\n"; - $apingercfg .= "}\n"; - $apingercfg .= "\n"; + $fp = stream_socket_client("unix://{$socket}", $errno, $errstr, 10); + if (!$fp) { + log_error("dpinger: cannot connect to status socket {$socket} - $errstr ($errno)"); + return false; + } - $apingerconfig .= $alarmscfg; - $apingerconfig .= $apingercfg; + $status = ''; + while (!feof($fp)) { + $status .= fgets($fp, 1024); + } + fclose($fp); + + $r = array(); + list( + $r['latency_avg'], + $r['latency_stddev'], + $r['loss'], + $r['alarm_on'], + $r['srcip'], + $r['targetip'] + ) = explode(' ', preg_replace('/\n/', '', $status)); - # Create gateway quality RRD with settings more suitable for pfSense graph set, - # since apinger uses default step (300; 5 minutes) and other settings that don't - # match the pfSense gateway quality graph set. - create_gateway_quality_rrd("{$g['vardb_path']}/rrd/{$gateway['name']}-quality.rrd"); + $gateways_arr = return_gateways_array(); + unset($gw); + if (isset($gateways_arr[$gwname])) { + $gw = $gateways_arr[$gwname]; } - @file_put_contents("{$g['varetc_path']}/apinger.conf", $apingerconfig); - unset($apingerconfig); - /* Restart apinger process */ - if (isvalidpid("{$g['varrun_path']}/apinger.pid")) { - sigkillbypid("{$g['varrun_path']}/apinger.pid", "HUP"); - } else { - /* start a new apinger process */ - @unlink("{$g['varrun_path']}/apinger.status"); - sleep(1); - mwexec_bg("/usr/local/sbin/apinger -c {$g['varetc_path']}/apinger.conf"); - sleep(1); - sigkillbypid("{$g['varrun_path']}/apinger.pid", "USR1"); + $r['latency_avg'] = round($r['latency_avg']/1000, 3); + $r['latency_stddev'] = round($r['latency_stddev']/1000, 3); + + $r['status'] = "none"; + if (isset($gw) && isset($gw['force_down'])) { + $r['status'] = "force_down"; + } else if ($r['alarm_on'] == 1) { + $r['status'] = "down"; + } else if (isset($gw)) { + $dpinger_defaults = return_dpinger_defaults(); + if (isset($gw['latencylow']) && + is_numeric($gw['latencylow'])) { + $latencylow = $gw['latencylow']; + } else { + $latencylow = $dpinger_defaults['latencylow']; + } + + if ($r['latency_avg'] > $latencylow) { + $r['status'] = "delay"; + } else { + if (isset($gw['losslow']) && + is_numeric($gw['losslow'])) { + $losslow = $gw['losslow']; + } else { + $losslow = $dpinger_defaults['losslow']; + } + + if ($r['loss'] > $losslow) { + $r['status'] = "loss"; + } + } } - return 0; + return $r; } -/* return the status of the apinger targets as a array */ +/* return the status of the dpinger targets as an array */ function return_gateways_status($byname = false) { global $config, $g; - $apingerstatus = array(); - /* Always get the latest status from apinger */ - if (file_exists("{$g['varrun_path']}/apinger.pid")) { - sigkillbypid("{$g['varrun_path']}/apinger.pid", "USR1"); - } - if (file_exists("{$g['varrun_path']}/apinger.status")) { - $apingerstatus = file("{$g['varrun_path']}/apinger.status"); - } else { - $apingerstatus = array(); - } - + $dpinger_gws = running_dpinger_processes(); $status = array(); - foreach ($apingerstatus as $line) { - $info = explode("|", $line); + + $gateways_arr = return_gateways_array(); + + foreach ($dpinger_gws as $gwname) { + $dpinger_status = get_dpinger_status($gwname); + if ($dpinger_status === false) { + continue; + } + if ($byname == false) { - $target = $info[0]; + $target = $dpinger_status['targetip']; } else { - $target = $info[2]; + $target = $gwname; } $status[$target] = array(); - $status[$target]['monitorip'] = $info[0]; - $status[$target]['srcip'] = $info[1]; - $status[$target]['name'] = $info[2]; - $status[$target]['lastcheck'] = $info[5] ? date('r', $info[5]) : date('r'); - $status[$target]['delay'] = empty($info[6]) ? "0ms" : round($info[6], 1) ."ms" ; - $status[$target]['loss'] = empty($info[7]) ? "0.0%" : round($info[7], 1) . "%"; - $status[$target]['status'] = trim($info[8]); + $status[$target]['monitorip'] = $dpinger_status['targetip']; + $status[$target]['srcip'] = $dpinger_status['srcip']; + $status[$target]['name'] = $gwname; + $status[$target]['delay'] = empty($dpinger_status['latency_avg']) ? "0ms" : $dpinger_status['latency_avg'] . "ms"; + $status[$target]['loss'] = empty($dpinger_status['loss']) ? "0.0%" : round($dpinger_status['loss'], 1) . "%"; + $status[$target]['status'] = $dpinger_status['status']; } /* tack on any gateways that have monitoring disabled @@ -441,7 +388,7 @@ function return_gateways_status($byname = false) { if (!isset($gwitem['monitor_disable'])) { continue; } - if (!is_ipaddr($gwitem['monitorip'])) { + if (!is_ipaddr($gwitem['monitor'])) { $realif = $gwitem['interface']; $tgtip = get_interface_gateway($realif); if (!is_ipaddr($tgtip)) { @@ -449,7 +396,7 @@ function return_gateways_status($byname = false) { } $srcip = find_interface_ip($realif); } else { - $tgtip = $gwitem['monitorip']; + $tgtip = $gwitem['monitor']; $srcip = find_interface_ip($realif); } if ($byname == true) { @@ -462,7 +409,6 @@ function return_gateways_status($byname = false) { if ($target == "none") { $target = $gwitem['name']; $status[$target]['name'] = $gwitem['name']; - $status[$target]['lastcheck'] = date('r'); $status[$target]['delay'] = "0.0ms"; $status[$target]['loss'] = "100.0%"; $status[$target]['status'] = "down"; @@ -470,7 +416,6 @@ function return_gateways_status($byname = false) { $status[$target]['monitorip'] = $tgtip; $status[$target]['srcip'] = $srcip; $status[$target]['name'] = $gwitem['name']; - $status[$target]['lastcheck'] = date('r'); $status[$target]['delay'] = "0.0ms"; $status[$target]['loss'] = "0.0%"; $status[$target]['status'] = "none"; @@ -1249,4 +1194,4 @@ function gateway_is_gwgroup_member($name) { return $members; } -?>
\ No newline at end of file +?> diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 8767615..8b6643b 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -33,12 +33,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - pfSense_BUILDER_BINARIES: /sbin/dhclient /bin/sh /usr/bin/grep /usr/bin/xargs /usr/bin/awk /usr/local/sbin/choparp - pfSense_BUILDER_BINARIES: /sbin/ifconfig /sbin/route /usr/sbin/ngctl /usr/sbin/arp /bin/kill /usr/local/sbin/mpd5 - pfSense_BUILDER_BINARIES: /usr/local/sbin/dhcp6c - pfSense_MODULE: interfaces - */ /* include all configuration functions */ @@ -824,7 +818,7 @@ function interface_gre_configure(&$gre, $grekey = "") { /* Do not change the order here for more see gre(4) NOTES section. */ if (is_ipaddrv6($gre['remote-addr'])) { mwexec("/sbin/ifconfig {$greif} inet6 tunnel {$realifip6} " . escapeshellarg($gre['remote-addr'])); - }else{ + } else { mwexec("/sbin/ifconfig {$greif} tunnel {$realifip} " . escapeshellarg($gre['remote-addr'])); } if ((is_ipaddrv6($gre['tunnel-local-addr'])) || (is_ipaddrv6($gre['tunnel-remote-addr']))) { @@ -945,7 +939,7 @@ function interface_gif_configure(&$gif, $gifkey = "") { if (is_ipaddrv6($gif['remote-addr'])) { mwexec("/sbin/ifconfig {$gifif} inet6 tunnel {$realifip} " . escapeshellarg($gif['remote-addr'])); } else { - mwexec("/sbin/ifconfig {$gifif} tunnel {$realifip} " . escapeshellarg($gif['remote-addr'])); + mwexec("/sbin/ifconfig {$gifif} tunnel {$realifip} " . escapeshellarg($gif['remote-addr'])); } if ((is_ipaddrv6($gif['tunnel-local-addr'])) || (is_ipaddrv6($gif['tunnel-remote-addr']))) { /* XXX: The prefixlen argument for tunnels of ipv6 is useless since it needs to be 128 as enforced by kernel */ @@ -5241,17 +5235,19 @@ function get_possible_listen_ips($include_ipv6_link_local=false) { /* XXX: Maybe use array_merge below? */ $carplist = get_configured_carp_interface_list(); foreach ($carplist as $cif => $carpip) { - if (get_vip_descr($carpip)) + if (get_vip_descr($carpip)) { $interfaces[$cif] = $carpip . ' (' . get_vip_descr($carpip) . ')'; - else + } else { $interfaces[$cif] = $carpip; + } } $aliaslist = get_configured_ip_aliases_list(); foreach ($aliaslist as $aliasip => $aliasif) { - if (get_vip_descr($aliasip)) + if (get_vip_descr($aliasip)) { $interfaces[$aliasip] = $aliasip . ' (' . get_vip_descr($aliasip) . ')'; - else + } else { $interfaces[$aliasip] = $aliasip; + } } $interfaces['lo0'] = 'Localhost'; diff --git a/src/etc/inc/ipsec.auth-user.php b/src/etc/inc/ipsec.auth-user.php index 99e62ce..a504d11 100755 --- a/src/etc/inc/ipsec.auth-user.php +++ b/src/etc/inc/ipsec.auth-user.php @@ -31,10 +31,6 @@ */ /* - pfSense_BUILDER_BINARIES: - pfSense_MODULE: openvpn -*/ -/* * ipsec calls this script to authenticate a user * based on a username and password. We lookup these * in our config.xml file and check the credentials. diff --git a/src/etc/inc/ipsec.inc b/src/etc/inc/ipsec.inc index de9ee00..b1e8c19 100644 --- a/src/etc/inc/ipsec.inc +++ b/src/etc/inc/ipsec.inc @@ -28,10 +28,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - pfSense_BUILDER_BINARIES: /sbin/setkey /sbin/route - pfSense_MODULE: ipsec - */ /* IPsec defines */ @@ -205,8 +201,9 @@ $p2_pfskeygroups = array( function ipsec_enabled() { global $config; - if (!isset($config['ipsec']) || !is_array($config['ipsec'])) + if (!isset($config['ipsec']) || !is_array($config['ipsec'])) { return false; + } /* Check if we have at least one phase 1 entry. */ if (!isset($config['ipsec']['phase1']) || @@ -216,8 +213,9 @@ function ipsec_enabled() { } /* Check if at least one phase 1 entry is enabled. */ foreach ($config['ipsec']['phase1'] as $phase1) { - if (!isset($phase1['disabled'])) + if (!isset($phase1['disabled'])) { return true; + } } return false; @@ -477,8 +475,9 @@ function ipsec_phase2_status(&$ipsec_status, &$phase2) { */ function ipsec_list_sa() { - if (ipsec_enabled()) + if (ipsec_enabled()) { return pfSense_ipsec_list_sa(); + } return array(); } diff --git a/src/etc/inc/itemid.inc b/src/etc/inc/itemid.inc index c698cfa..1cbe34a 100644 --- a/src/etc/inc/itemid.inc +++ b/src/etc/inc/itemid.inc @@ -1,10 +1,6 @@ <?php /* - pfSense_MODULE: utils -*/ - -/* Copyright (C) 2009 Janne Enberg <janne.enberg@lietu.net> All rights reserved. @@ -105,4 +101,4 @@ function get_unique_id() { return uniqid("nat_", true); } -?>
\ No newline at end of file +?> diff --git a/src/etc/inc/led.inc b/src/etc/inc/led.inc index a08eef4..241d013 100644 --- a/src/etc/inc/led.inc +++ b/src/etc/inc/led.inc @@ -7,10 +7,6 @@ * LED control library that wraps around the functionality of led(4) * */ -/* - pfSense_BUILDER_BINARIES: /bin/echo - pfSense_MODULE: utils -*/ $led_root = "/dev/led/led"; @@ -353,4 +349,4 @@ function char_to_morse($char) { } } -?>
\ No newline at end of file +?> diff --git a/src/etc/inc/meta.inc b/src/etc/inc/meta.inc index ac8bdfc..28bf408 100644 --- a/src/etc/inc/meta.inc +++ b/src/etc/inc/meta.inc @@ -23,9 +23,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - pfSense_MODULE: utils - */ /* diff --git a/src/etc/inc/notices.inc b/src/etc/inc/notices.inc index 0a1657c..92f74a1 100644 --- a/src/etc/inc/notices.inc +++ b/src/etc/inc/notices.inc @@ -32,11 +32,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /bin/echo - pfSense_MODULE: notifications -*/ - require_once("globals.inc"); require_once("led.inc"); diff --git a/src/etc/inc/openvpn.auth-user.php b/src/etc/inc/openvpn.auth-user.php index f994eb7..a95051d 100644 --- a/src/etc/inc/openvpn.auth-user.php +++ b/src/etc/inc/openvpn.auth-user.php @@ -31,10 +31,6 @@ */ /* - pfSense_BUILDER_BINARIES: - pfSense_MODULE: openvpn -*/ -/* * OpenVPN calls this script to authenticate a user * based on a username and password. We lookup these * in our config.xml file and check the credentials. @@ -117,7 +113,7 @@ if (file_exists("{$g['varetc_path']}/openvpn/{$modeid}.ca")) { $authenticated = false; -if (($strictusercn === true) && ($common_name != $username)) { +if (($strictusercn === true) && (mb_strtolower($common_name) !== mb_strtolower($username))) { syslog(LOG_WARNING, "Username does not match certificate common name ({$username} != {$common_name}), access denied.\n"); if (isset($_GET['username'])) { echo "FAILED"; diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc index 8ca00ac..da666e3 100644 --- a/src/etc/inc/openvpn.inc +++ b/src/etc/inc/openvpn.inc @@ -37,12 +37,8 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - pfSense_BUILDER_BINARIES: /usr/local/sbin/openvpn /usr/bin/openssl /sbin/ifconfig - pfSense_MODULE: openvpn - */ + require_once('config.inc'); require_once("certs.inc"); require_once('pfsense-utils.inc'); @@ -131,8 +127,9 @@ function openvpn_build_mode_list() { $list = array(); - foreach ($openvpn_server_modes as $name => $desc) + foreach ($openvpn_server_modes as $name => $desc) { $list[$name] = $desc; + } return($list); } @@ -143,24 +140,28 @@ function openvpn_build_if_list() { $interfaces = get_configured_interface_with_descr(); $carplist = get_configured_carp_interface_list(); - foreach ($carplist as $cif => $carpip) + foreach ($carplist as $cif => $carpip) { $interfaces[$cif.'|'.$carpip] = $carpip." (".get_vip_descr($carpip).")"; + } $aliaslist = get_configured_ip_aliases_list(); - foreach ($aliaslist as $aliasip => $aliasif) + foreach ($aliaslist as $aliasip => $aliasif) { $interfaces[$aliasif.'|'.$aliasip] = $aliasip." (".get_vip_descr($aliasip).")"; + } $grouplist = return_gateway_groups_array(); foreach ($grouplist as $name => $group) { - if($group['ipprotocol'] != inet) + if ($group['ipprotocol'] != inet) { continue; + } - if($group[0]['vip'] != "") + if ($group[0]['vip'] != "") { $vipif = $group[0]['vip']; - else + } else { $vipif = $group[0]['int']; + } $interfaces[$name] = "GW Group {$name}"; } @@ -168,8 +169,9 @@ function openvpn_build_if_list() { $interfaces['lo0'] = "Localhost"; $interfaces['any'] = "any"; - foreach ($interfaces as $iface => $ifacename) + foreach ($interfaces as $iface => $ifacename) { $list[$iface] = $ifacename; + } return($list); } @@ -183,8 +185,9 @@ function openvpn_build_crl_list() { $caname = ""; $ca = lookup_ca($crl['caref']); - if ($ca) + if ($ca) { $caname = " (CA: {$ca['descr']})"; + } $list[$crl['refid']] = $crl['descr'] . $caname; } @@ -192,7 +195,7 @@ function openvpn_build_crl_list() { return($list); } -function openvpn_build_cert_list($include_none = false) { +function openvpn_build_cert_list($include_none = false, $prioritize_server_certs = false) { global $a_cert; if ($include_none) { @@ -201,28 +204,50 @@ function openvpn_build_cert_list($include_none = false) { $list = array(); } - foreach ($a_cert as $cert) { - $caname = ""; - $inuse = ""; - $revoked = ""; - $ca = lookup_ca($cert['caref']); + $non_server_list = array(); - if ($ca) - $caname = " (CA: {$ca['descr']})"; + if ($prioritize_server_certs) { + $list[' '] = "===== Server Certificates ====="; + $non_server_list[' '] = "===== Non-Server Certificates ====="; + } - if ($pconfig['certref'] == $cert['refid']) - $selected = "selected"; + foreach ($a_cert as $cert) { + $properties = array(); + $propstr = ""; + $ca = lookup_ca($cert['caref']); + $purpose = cert_get_purpose($cert['crt'], true); - if (cert_in_use($cert['refid'])) - $inuse = " *In Use"; + if ($purpose['server'] == "Yes") { + $properties[] = "Server: Yes"; + } elseif ($prioritize_server_certs) { + $properties[] = "Server: NO"; + } + if ($ca) { + $properties[] = "CA: {$ca['descr']}"; + } + if (cert_in_use($cert['refid'])) { + $properties[] = "In Use"; + } + if (is_cert_revoked($cert)) { + $properties[] = "Revoked"; + } - if (is_cert_revoked($cert)) - $revoked = " *Revoked"; + if (!empty($properties)) { + $propstr = " (" . implode(", ", $properties) . ")"; + } - $list[$cert['refid']] = $cert['descr'] . $caname . $inuse . $revoked; + if ($prioritize_server_certs) { + if ($purpose['server'] == "Yes") { + $list[$cert['refid']] = $cert['descr'] . $propstr; + } else { + $non_server_list[$cert['refid']] = $cert['descr'] . $propstr; + } + } else { + $list[$cert['refid']] = $cert['descr'] . $propstr; + } } - return($list); + return(array('server' => $list, 'non-server' => $non_server_list)); } function openvpn_build_bridge_list() { @@ -232,16 +257,19 @@ function openvpn_build_bridge_list() { $serverbridge_interface = array_merge($serverbridge_interface, get_configured_interface_with_descr()); $carplist = get_configured_carp_interface_list(); - foreach ($carplist as $cif => $carpip) + foreach ($carplist as $cif => $carpip) { $serverbridge_interface[$cif.'|'.$carpip] = $carpip." (".get_vip_descr($carpip).")"; + } $aliaslist = get_configured_ip_aliases_list(); - foreach ($aliaslist as $aliasip => $aliasif) + foreach ($aliaslist as $aliasip => $aliasif) { $serverbridge_interface[$aliasif.'|'.$aliasip] = $aliasip." (".get_vip_descr($aliasip).")"; + } - foreach ($serverbridge_interface as $iface => $ifacename) + foreach ($serverbridge_interface as $iface => $ifacename) { $list[$iface] = htmlspecialchars($ifacename); + } return($list); } @@ -584,7 +612,7 @@ function openvpn_add_keyfile(& $data, & $conf, $mode_id, $directive, $opt = "") } function openvpn_reconfigure($mode, $settings) { - global $g, $config; + global $g, $config, $openvpn_tls_server_modes; if (empty($settings)) { return; diff --git a/src/etc/inc/openvpn.tls-verify.php b/src/etc/inc/openvpn.tls-verify.php index c23eb5d..ea17207 100644 --- a/src/etc/inc/openvpn.tls-verify.php +++ b/src/etc/inc/openvpn.tls-verify.php @@ -30,10 +30,6 @@ */ /* - pfSense_BUILDER_BINARIES: - pfSense_MODULE: openvpn -*/ -/* * OpenVPN calls this script to validate a certificate * This script is called ONCE per DEPTH of the certificate chain * Normal operation would have two runs - one for the server certificate diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index f9049fa..41b5c7d 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -31,13 +31,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /sbin/ifconfig /sbin/pfctl /usr/local/bin/php-cgi - 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 -*/ - /****f* pfsense-utils/have_natpfruleint_access * NAME * have_natpfruleint_access @@ -408,11 +401,13 @@ function get_carp_interface_status($carpinterface) { global $config; foreach ($config['virtualip']['vip'] as $carp) { - if ($carp['mode'] != "carp") + if ($carp['mode'] != "carp") { continue; + } $carpif = "_vip{$carp['uniqid']}"; - if ($carpinterface !== $carpif) + if ($carpinterface !== $carpif) { continue; + } $interface = get_real_interface($carp['interface']); $vhid = $carp['vhid']; @@ -1810,7 +1805,7 @@ function update_status($status) { global $pkg_interface; if ($pkg_interface == "console") { - echo "\r{$status}"; + print ("{$status}"); } /* ensure that contents are written out */ @@ -2759,66 +2754,6 @@ function get_locale_list() { return $locales; } -function system_get_language_code() { - global $config, $g_languages; - - // a language code, as per [RFC3066] - $language = $config['system']['language']; - //$code = $g_languages[$language]['code']; - $code = str_replace("_", "-", $language); - - if (empty($code)) { - $code = "en-US"; // Set default code. - } - - return $code; -} - -function system_get_language_codeset() { - global $config, $g_languages; - - $language = $config['system']['language']; - $codeset = $g_languages[$language]['codeset']; - - if (empty($codeset)) { - $codeset = "UTF-8"; // Set default codeset. - } - - return $codeset; -} - -/* Available languages/locales */ -$g_languages = array ( - "sq" => array("codeset" => "UTF-8", "desc" => gettext("Albanian")), - "bg" => array("codeset" => "UTF-8", "desc" => gettext("Bulgarian")), - "zh_CN" => array("codeset" => "UTF-8", "desc" => gettext("Chinese (Simplified)")), - "zh_TW" => array("codeset" => "UTF-8", "desc" => gettext("Chinese (Traditional)")), - "nl" => array("codeset" => "UTF-8", "desc" => gettext("Dutch")), - "da" => array("codeset" => "UTF-8", "desc" => gettext("Danish")), - "en_US" => array("codeset" => "UTF-8", "desc" => gettext("English")), - "fi" => array("codeset" => "UTF-8", "desc" => gettext("Finnish")), - "fr" => array("codeset" => "UTF-8", "desc" => gettext("French")), - "de" => array("codeset" => "UTF-8", "desc" => gettext("German")), - "el" => array("codeset" => "UTF-8", "desc" => gettext("Greek")), - "hu" => array("codeset" => "UTF-8", "desc" => gettext("Hungarian")), - "it" => array("codeset" => "UTF-8", "desc" => gettext("Italian")), - "ja" => array("codeset" => "UTF-8", "desc" => gettext("Japanese")), - "ko" => array("codeset" => "UTF-8", "desc" => gettext("Korean")), - "lv" => array("codeset" => "UTF-8", "desc" => gettext("Latvian")), - "nb" => array("codeset" => "UTF-8", "desc" => gettext("Norwegian (Bokmal)")), - "pl" => array("codeset" => "UTF-8", "desc" => gettext("Polish")), - "pt_BR" => array("codeset" => "UTF-8", "desc" => gettext("Portuguese (Brazil)")), - "pt" => array("codeset" => "UTF-8", "desc" => gettext("Portuguese (Portugal)")), - "ro" => array("codeset" => "UTF-8", "desc" => gettext("Romanian")), - "ru" => array("codeset" => "UTF-8", "desc" => gettext("Russian")), - "sl" => array("codeset" => "UTF-8", "desc" => gettext("Slovenian")), - "tr" => array("codeset" => "UTF-8", "desc" => gettext("Turkish")), - "es" => array("codeset" => "UTF-8", "desc" => gettext("Spanish")), - "sv" => array("codeset" => "UTF-8", "desc" => gettext("Swedish")), - "sk" => array("codeset" => "UTF-8", "desc" => gettext("Slovak")), - "cs" => array("codeset" => "UTF-8", "desc" => gettext("Czech")) -); - function return_hex_ipv4($ipv4) { if (!is_ipaddrv4($ipv4)) { return(false); diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index d76afbc..1509206 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -53,9 +53,6 @@ * ==================================================================== * */ -/* - pfSense_MODULE: pkg -*/ require_once("globals.inc"); require_once("service-utils.inc"); @@ -192,7 +189,7 @@ function pkg_call($params, $mute = false) { $now = time(); - if(($now - $started) >= $maxwaittime) { + if (($now - $started) >= $maxwaittime) { $rc = -1; proc_terminate($process); break; @@ -204,7 +201,7 @@ function pkg_call($params, $mute = false) { fclose($pipes[2]); proc_close($process); - if(!isset($rc)) { + if (!isset($rc)) { $rc = $status['exitcode']; } @@ -353,7 +350,7 @@ function get_package_id($package_name) { foreach ($config['installedpackages']['package'] as $idx => $pkg) { if ($pkg['name'] == $package_name || - get_package_internal_name($pkg) == $package_name) { + get_package_internal_name($pkg) == $package_name) { return $idx; } } @@ -702,10 +699,9 @@ function install_package_xml($package_name) { return false; } - $configfile = substr(strrchr($pkg_info['config_file'], '/'), 1); - if (file_exists("/usr/local/pkg/" . $configfile)) { + if (file_exists("/usr/local/pkg/" . $pkg_info['configurationfile'])) { update_status(gettext("Loading package configuration... ")); - $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $configfile, "packagegui"); + $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $pkg_info['configurationfile'], "packagegui"); update_status(gettext("done.") . "\n"); update_status(gettext("Configuring package components...") . "\n"); if (!empty($pkg_config['filter_rules_needed'])) { diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc index fa9f19b..06d0418 100644 --- a/src/etc/inc/priv.defs.inc +++ b/src/etc/inc/priv.defs.inc @@ -23,7 +23,7 @@ $priv_list['page-status-carp'] = array(); $priv_list['page-status-carp']['name'] = gettext("WebCfg - Status: CARP"); $priv_list['page-status-carp']['descr'] = gettext("Allow access to the 'Status: CARP' page."); $priv_list['page-status-carp']['match'] = array(); -$priv_list['page-status-carp']['match'][] = "carp_status.php*"; +$priv_list['page-status-carp']['match'][] = "status_carp.php*"; $priv_list['page-diagnostics-crash-reporter'] = array(); $priv_list['page-diagnostics-crash-reporter']['name'] = gettext("WebCfg - Crash reporter"); @@ -89,25 +89,25 @@ $priv_list['page-status-ipsec'] = array(); $priv_list['page-status-ipsec']['name'] = gettext("WebCfg - Status: IPsec"); $priv_list['page-status-ipsec']['descr'] = gettext("Allow access to the 'Status: IPsec' page."); $priv_list['page-status-ipsec']['match'] = array(); -$priv_list['page-status-ipsec']['match'][] = "diag_ipsec.php*"; +$priv_list['page-status-ipsec']['match'][] = "status_ipsec.php*"; $priv_list['page-status-ipsec-leases'] = array(); $priv_list['page-status-ipsec-leases']['name'] = gettext("WebCfg - Status: IPsec: Leases"); $priv_list['page-status-ipsec-leases']['descr'] = gettext("Allow access to the 'Status: IPsec: Leases' page."); $priv_list['page-status-ipsec-leases']['match'] = array(); -$priv_list['page-status-ipsec-leases']['match'][] = "diag_ipsec_leases.php*"; +$priv_list['page-status-ipsec-leases']['match'][] = "status_ipsec_leases.php*"; $priv_list['page-status-ipsec-sad'] = array(); $priv_list['page-status-ipsec-sad']['name'] = gettext("WebCfg - Status: IPsec: SAD"); $priv_list['page-status-ipsec-sad']['descr'] = gettext("Allow access to the 'Status: IPsec: SAD' page."); $priv_list['page-status-ipsec-sad']['match'] = array(); -$priv_list['page-status-ipsec-sad']['match'][] = "diag_ipsec_sad.php*"; +$priv_list['page-status-ipsec-sad']['match'][] = "status_ipsec_sad.php*"; $priv_list['page-status-ipsec-spd'] = array(); $priv_list['page-status-ipsec-spd']['name'] = gettext("WebCfg - Status: IPsec: SPD"); $priv_list['page-status-ipsec-spd']['descr'] = gettext("Allow access to the 'Status: IPsec: SPD' page."); $priv_list['page-status-ipsec-spd']['match'] = array(); -$priv_list['page-status-ipsec-spd']['match'][] = "diag_ipsec_spd.php*"; +$priv_list['page-status-ipsec-spd']['match'][] = "status_ipsec_spd.php*"; $priv_list['page-diagnostics-limiter-info'] = array(); $priv_list['page-diagnostics-limiter-info']['name'] = gettext("WebCfg - Diagnostics: Limiter Info"); @@ -119,37 +119,37 @@ $priv_list['page-diagnostics-logs-system'] = array(); $priv_list['page-diagnostics-logs-system']['name'] = gettext("WebCfg - Status: Logs: System"); $priv_list['page-diagnostics-logs-system']['descr'] = gettext("Allow access to the 'Status: System Logs: General' page."); $priv_list['page-diagnostics-logs-system']['match'] = array(); -$priv_list['page-diagnostics-logs-system']['match'][] = "diag_logs.php"; +$priv_list['page-diagnostics-logs-system']['match'][] = "status_logs.php"; $priv_list['page-diagnostics-logs-firewall'] = array(); $priv_list['page-diagnostics-logs-firewall']['name'] = gettext("WebCfg - Status: Logs: Firewall"); $priv_list['page-diagnostics-logs-firewall']['descr'] = gettext("Allow access to the 'Status: Logs: Firewall' page."); $priv_list['page-diagnostics-logs-firewall']['match'] = array(); -$priv_list['page-diagnostics-logs-firewall']['match'][] = "diag_logs_filter.php*"; +$priv_list['page-diagnostics-logs-firewall']['match'][] = "status_logs_filter.php*"; $priv_list['page-diagnostics-logs-firewall-dynamic'] = array(); $priv_list['page-diagnostics-logs-firewall-dynamic']['name'] = gettext("WebCfg - Status: System Logs: Firewall (Dynamic View)"); $priv_list['page-diagnostics-logs-firewall-dynamic']['descr'] = gettext("Allow access to the 'Status: System Logs: Firewall (Dynamic View)' page"); $priv_list['page-diagnostics-logs-firewall-dynamic']['match'] = array(); -$priv_list['page-diagnostics-logs-firewall-dynamic']['match'][] = "diag_logs_filter_dynamic.php*"; +$priv_list['page-diagnostics-logs-firewall-dynamic']['match'][] = "status_logs_filter_dynamic.php*"; $priv_list['page-diagnostics-logs-firewall-summary'] = array(); $priv_list['page-diagnostics-logs-firewall-summary']['name'] = gettext("WebCfg - Status: System Logs: Firewall Log Summary"); $priv_list['page-diagnostics-logs-firewall-summary']['descr'] = gettext("Allow access to the 'Status: System Logs: Firewall Log Summary' page"); $priv_list['page-diagnostics-logs-firewall-summary']['match'] = array(); -$priv_list['page-diagnostics-logs-firewall-summary']['match'][] = "diag_logs_filter_summary.php*"; +$priv_list['page-diagnostics-logs-firewall-summary']['match'][] = "status_logs_filter_summary.php*"; $priv_list['page-diagnostics-logs-settings'] = array(); $priv_list['page-diagnostics-logs-settings']['name'] = gettext("WebCfg - Status: Logs: Settings"); $priv_list['page-diagnostics-logs-settings']['descr'] = gettext("Allow access to the 'Status: Logs: Settings' page."); $priv_list['page-diagnostics-logs-settings']['match'] = array(); -$priv_list['page-diagnostics-logs-settings']['match'][] = "diag_logs_settings.php*"; +$priv_list['page-diagnostics-logs-settings']['match'][] = "status_logs_settings.php*"; $priv_list['page-diagnostics-logs-pptpvpn'] = array(); $priv_list['page-diagnostics-logs-pptpvpn']['name'] = gettext("WebCfg - Status: Logs: VPN"); $priv_list['page-diagnostics-logs-pptpvpn']['descr'] = gettext("Allow access to the 'Status: Logs: VPN' page."); $priv_list['page-diagnostics-logs-pptpvpn']['match'] = array(); -$priv_list['page-diagnostics-logs-pptpvpn']['match'][] = "diag_logs_vpn.php*"; +$priv_list['page-diagnostics-logs-pptpvpn']['match'][] = "status_logs_vpn.php*"; $priv_list['page-diagnostics-nanobsd'] = array(); $priv_list['page-diagnostics-nanobsd']['name'] = gettext("WebCfg - Diagnostics: NanoBSD"); @@ -185,7 +185,7 @@ $priv_list['page-status-packagelogs'] = array(); $priv_list['page-status-packagelogs']['name'] = gettext("WebCfg - Status: Package logs"); $priv_list['page-status-packagelogs']['descr'] = gettext("Allow access to the 'Status: Package logs' page."); $priv_list['page-status-packagelogs']['match'] = array(); -$priv_list['page-status-packagelogs']['match'][] = "diag_pkglogs.php*"; +$priv_list['page-status-packagelogs']['match'][] = "status_pkglogs.php*"; $priv_list['page-diagnostics-resetstate'] = array(); $priv_list['page-diagnostics-resetstate']['name'] = gettext("WebCfg - Diagnostics: Reset states"); @@ -227,7 +227,7 @@ $priv_list['page-diagnostics-system-pftop'] = array(); $priv_list['page-diagnostics-system-pftop']['name'] = gettext("WebCfg - Diagnostics: pfTop"); $priv_list['page-diagnostics-system-pftop']['descr'] = gettext("Allows access to the 'Diagnostics: pfTop' page"); $priv_list['page-diagnostics-system-pftop']['match'] = array(); -$priv_list['page-diagnostics-system-pftop']['match'][] = "diag_system_pftop.php*"; +$priv_list['page-diagnostics-system-pftop']['match'][] = "diag_pftop.php*"; $priv_list['page-diagnostics-tables'] = array(); $priv_list['page-diagnostics-tables']['name'] = gettext("WebCfg - Diagnostics: pf Table IP addresses"); @@ -422,7 +422,7 @@ $priv_list['page-diagnostics-haltsystem'] = array(); $priv_list['page-diagnostics-haltsystem']['name'] = gettext("WebCfg - Diagnostics: Halt system"); $priv_list['page-diagnostics-haltsystem']['descr'] = gettext("Allow access to the 'Diagnostics: Halt system' page."); $priv_list['page-diagnostics-haltsystem']['match'] = array(); -$priv_list['page-diagnostics-haltsystem']['match'][] = "halt.php*"; +$priv_list['page-diagnostics-haltsystem']['match'][] = "diag_halt.php*"; $priv_list['page-xmlrpcinterfacestats'] = array(); $priv_list['page-xmlrpcinterfacestats']['name'] = gettext("WebCfg - XMLRPC Interface Stats"); @@ -638,7 +638,7 @@ $priv_list['page-diagnostics-rebootsystem'] = array(); $priv_list['page-diagnostics-rebootsystem']['name'] = gettext("WebCfg - Diagnostics: Reboot System"); $priv_list['page-diagnostics-rebootsystem']['descr'] = gettext("Allow access to the 'Diagnostics: Reboot System' page."); $priv_list['page-diagnostics-rebootsystem']['match'] = array(); -$priv_list['page-diagnostics-rebootsystem']['match'][] = "reboot.php*"; +$priv_list['page-diagnostics-rebootsystem']['match'][] = "diag_reboot.php*"; $priv_list['page-diagnostics-restart-httpd'] = array(); $priv_list['page-diagnostics-restart-httpd']['name'] = gettext("WebCfg - Diagnostics: Restart Web Server Daemon"); @@ -1278,13 +1278,13 @@ $priv_list['page-services-pppoeserver'] = array(); $priv_list['page-services-pppoeserver']['name'] = gettext("WebCfg - Services: PPPoE Server"); $priv_list['page-services-pppoeserver']['descr'] = gettext("Allow access to the 'Services: PPPoE Server' page."); $priv_list['page-services-pppoeserver']['match'] = array(); -$priv_list['page-services-pppoeserver']['match'][] = "vpn_pppoe.php*"; +$priv_list['page-services-pppoeserver']['match'][] = "services_pppoe.php*"; $priv_list['page-services-pppoeserver-edit'] = array(); $priv_list['page-services-pppoeserver-edit']['name'] = gettext("WebCfg - Services: PPPoE Server: Edit"); $priv_list['page-services-pppoeserver-edit']['descr'] = gettext("Allow access to the 'Services: PPPoE Server: Edit' page."); $priv_list['page-services-pppoeserver-edit']['match'] = array(); -$priv_list['page-services-pppoeserver-edit']['match'][] = "vpn_pppoe_edit.php*"; +$priv_list['page-services-pppoeserver-edit']['match'][] = "services_pppoe_edit.php*"; $priv_list['page-pfsensewizardsubsystem'] = array(); $priv_list['page-pfsensewizardsubsystem']['name'] = gettext("WebCfg - pfSense wizard subsystem"); diff --git a/src/etc/inc/priv.inc b/src/etc/inc/priv.inc index 0d51085..676351b 100644 --- a/src/etc/inc/priv.inc +++ b/src/etc/inc/priv.inc @@ -39,10 +39,6 @@ */ -/* - pfSense_MODULE: auth -*/ - require_once("priv.defs.inc"); /* Load and process custom privs. */ diff --git a/src/etc/inc/priv/user.priv.inc b/src/etc/inc/priv/user.priv.inc index d3290fe..fca9be2 100644 --- a/src/etc/inc/priv/user.priv.inc +++ b/src/etc/inc/priv/user.priv.inc @@ -22,7 +22,7 @@ $priv_list['page-dashboard-all']['match'][] = "graph.php*"; $priv_list['page-dashboard-all']['match'][] = "graph_cpu.php*"; $priv_list['page-dashboard-all']['match'][] = "getstats.php*"; $priv_list['page-dashboard-all']['match'][] = "ifstats.php*"; -$priv_list['page-dashboard-all']['match'][] = "diag_logs_filter_dynamic.php*"; +$priv_list['page-dashboard-all']['match'][] = "status_logs_filter_dynamic.php*"; $priv_list['page-dashboard-widgets'] = array(); $priv_list['page-dashboard-widgets']['name'] = gettext("WebCfg - Dashboard widgets (direct access)."); @@ -70,66 +70,66 @@ $priv_list['page-status-systemlogs-portalauth'] = array(); $priv_list['page-status-systemlogs-portalauth']['name'] = gettext("WebCfg - Status: System logs: Portal Auth"); $priv_list['page-status-systemlogs-portalauth']['descr'] = gettext("Allow access to the 'Status: System logs: Portal Auth' page."); $priv_list['page-status-systemlogs-portalauth']['match'] = array(); -$priv_list['page-status-systemlogs-portalauth']['match'][] = "diag_logs.php?logfile=portalauth"; +$priv_list['page-status-systemlogs-portalauth']['match'][] = "status_logs.php?logfile=portalauth"; $priv_list['page-diagnostics-logs-dhcp'] = array(); $priv_list['page-diagnostics-logs-dhcp']['name'] = gettext("WebCfg - Status: Logs: DHCP"); $priv_list['page-diagnostics-logs-dhcp']['descr'] = gettext("Allow access to the 'Status: Logs: DHCP' page."); $priv_list['page-diagnostics-logs-dhcp']['match'] = array(); -$priv_list['page-diagnostics-logs-dhcp']['match'][] = "diag_logs.php?logfile=dhcpd"; +$priv_list['page-diagnostics-logs-dhcp']['match'][] = "status_logs.php?logfile=dhcpd"; $priv_list['page-diagnostics-logs-gateways'] = array(); $priv_list['page-diagnostics-logs-gateways']['name'] = gettext("WebCfg - Status: Logs: Gateways"); $priv_list['page-diagnostics-logs-gateways']['descr'] = gettext("Allow access to the 'Status: Logs: System: Gateways' page."); $priv_list['page-diagnostics-logs-gateways']['match'] = array(); -$priv_list['page-diagnostics-logs-gateways']['match'][] = "diag_logs.php?logfile=gateways"; +$priv_list['page-diagnostics-logs-gateways']['match'][] = "status_logs.php?logfile=gateways"; $priv_list['page-diagnostics-logs-resolver'] = array(); $priv_list['page-diagnostics-logs-resolver']['name'] = gettext("WebCfg - Status: Logs: Resolver"); $priv_list['page-diagnostics-logs-resolver']['descr'] = gettext("Allow access to the 'Status: Logs: System: Resolver' page."); $priv_list['page-diagnostics-logs-resolver']['match'] = array(); -$priv_list['page-diagnostics-logs-resolver']['match'][] = "diag_logs.php?logfile=resolver"; +$priv_list['page-diagnostics-logs-resolver']['match'][] = "status_logs.php?logfile=resolver"; $priv_list['page-status-systemlogs-ipsecvpn'] = array(); $priv_list['page-status-systemlogs-ipsecvpn']['name'] = gettext("WebCfg - Status: System logs: IPsec VPN"); $priv_list['page-status-systemlogs-ipsecvpn']['descr'] = gettext("Allow access to the 'Status: System logs: IPsec VPN' page."); $priv_list['page-status-systemlogs-ipsecvpn']['match'] = array(); -$priv_list['page-status-systemlogs-ipsecvpn']['match'][] = "diag_logs.php?logfile=ipsec"; +$priv_list['page-status-systemlogs-ipsecvpn']['match'][] = "status_logs.php?logfile=ipsec"; $priv_list['page-status-systemlogs-ntpd'] = array(); $priv_list['page-status-systemlogs-ntpd']['name'] = gettext("WebCfg - Status: System logs: NTP"); $priv_list['page-status-systemlogs-ntpd']['descr'] = gettext("Allow access to the 'Status: System logs: NTP' page."); $priv_list['page-status-systemlogs-ntpd']['match'] = array(); -$priv_list['page-status-systemlogs-ntpd']['match'][] = "diag_logs.php?logfile=ntpd"; +$priv_list['page-status-systemlogs-ntpd']['match'][] = "status_logs.php?logfile=ntpd"; $priv_list['page-status-systemlogs-openvpn'] = array(); $priv_list['page-status-systemlogs-openvpn']['name'] = gettext("WebCfg - Status: System logs: OpenVPN"); $priv_list['page-status-systemlogs-openvpn']['descr'] = gettext("Allow access to the 'Status: System logs: OpenVPN' page."); $priv_list['page-status-systemlogs-openvpn']['match'] = array(); -$priv_list['page-status-systemlogs-openvpn']['match'][] = "diag_logs.php?logfile=openvpn"; +$priv_list['page-status-systemlogs-openvpn']['match'][] = "status_logs.php?logfile=openvpn"; $priv_list['page-status-systemlogs-ppp'] = array(); $priv_list['page-status-systemlogs-ppp']['name'] = gettext("WebCfg - Status: System logs: IPsec VPN"); $priv_list['page-status-systemlogs-ppp']['descr'] = gettext("Allow access to the 'Status: System logs: IPsec VPN' page."); $priv_list['page-status-systemlogs-ppp']['match'] = array(); -$priv_list['page-status-systemlogs-ppp']['match'][] = "diag_logs.php?logfile=ppp"; +$priv_list['page-status-systemlogs-ppp']['match'][] = "status_logs.php?logfile=ppp"; $priv_list['page-status-systemlogs-loadbalancer'] = array(); $priv_list['page-status-systemlogs-loadbalancer']['name'] = gettext("WebCfg - Status: System logs: Load Balancer"); $priv_list['page-status-systemlogs-loadbalancer']['descr'] = gettext("Allow access to the 'Status: System logs: Load Balancer' page."); $priv_list['page-status-systemlogs-loadbalancer']['match'] = array(); -$priv_list['page-status-systemlogs-loadbalancer']['match'][] = "diag_logs.php?logfile=relayd"; +$priv_list['page-status-systemlogs-loadbalancer']['match'][] = "status_logs.php?logfile=relayd"; $priv_list['page-status-systemlogs-routing'] = array(); $priv_list['page-status-systemlogs-routing']['name'] = gettext("WebCfg - Status: System logs: Routing"); $priv_list['page-status-systemlogs-routing']['descr'] = gettext("Allow access to the 'Status: System logs: System: Routing' page."); $priv_list['page-status-systemlogs-routing']['match'] = array(); -$priv_list['page-status-systemlogs-routing']['match'][] = "diag_logs.php?logfile=routing"; +$priv_list['page-status-systemlogs-routing']['match'][] = "status_logs.php?logfile=routing"; $priv_list['page-status-systemlogs-wireless'] = array(); $priv_list['page-status-systemlogs-wireless']['name'] = gettext("WebCfg - Status: System logs: Wireless"); $priv_list['page-status-systemlogs-wireless']['descr'] = gettext("Allow access to the 'Status: System logs: System: Wireless' page."); $priv_list['page-status-systemlogs-wireless']['match'] = array(); -$priv_list['page-status-systemlogs-wireless']['match'][] = "diag_logs.php?logfile=wireless"; +$priv_list['page-status-systemlogs-wireless']['match'][] = "status_logs.php?logfile=wireless"; ?> diff --git a/src/etc/inc/radius.inc b/src/etc/inc/radius.inc index ac610bd..a63b831 100644 --- a/src/etc/inc/radius.inc +++ b/src/etc/inc/radius.inc @@ -47,10 +47,6 @@ */ -/* - pfSense_MODULE: auth -*/ - require_once("PEAR.inc"); require_once("radius_authentication.inc"); require_once("radius_accounting.inc"); diff --git a/src/etc/inc/rrd.inc b/src/etc/inc/rrd.inc index 1459c93..11bab43 100644 --- a/src/etc/inc/rrd.inc +++ b/src/etc/inc/rrd.inc @@ -28,11 +28,6 @@ */ -/* - pfSense_BUILDER_BINARIES: /bin/rm /usr/bin/nice /usr/local/bin/rrdtool /bin/cd - pfSense_MODULE: rrd -*/ - /* include all configuration functions */ function dump_rrd_to_xml($rrddatabase, $xmldumpfile) { @@ -50,7 +45,7 @@ function dump_rrd_to_xml($rrddatabase, $xmldumpfile) { function restore_rrd() { global $g, $config; - $rrddbpath = "/var/db/rrd/"; + $rrddbpath = "{$g['vardb_path']}/rrd/"; $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; $rrdrestore = ""; @@ -211,7 +206,7 @@ function enable_rrd_graphing() { echo gettext("Generating RRD graphs..."); } - $rrddbpath = "/var/db/rrd/"; + $rrddbpath = "{$g['vardb_path']}/rrd/"; $rrdgraphpath = "/usr/local/www/rrd"; $traffic = "-traffic.rrd"; @@ -278,7 +273,7 @@ function enable_rrd_graphing() { $captiveportalvalid = $rrdcaptiveportalinterval * 2; $ntpdvalid = $rrdntpdinterval * 2; $dhcpdvalid = $rrddhcpdinterval * 2; - + /* Assume 2*10GigE for now */ $downstream = 2500000000; $upstream = 2500000000; @@ -323,11 +318,11 @@ function enable_rrd_graphing() { } if (platform_booting()) { - if (!is_dir("{$g['vardb_path']}/rrd")) { - mkdir("{$g['vardb_path']}/rrd", 0775); + if (!is_dir($rrddbpath)) { + mkdir($rrddbpath, 0775); } - @chown("{$g['vardb_path']}/rrd", "nobody"); + @chown($rrddbpath, "nobody"); } /* process all real and pseudo interfaces */ @@ -915,11 +910,11 @@ function enable_rrd_graphing() { } /* End NTP statistics */ - + /* Start dhcpd statistics */ if (is_array($config['dhcpd'])) { foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { - if (isset($config['dhcpd'][$dhcpif]['statsgraph'])) { + if (isset($config['dhcpd'][$dhcpif]['statsgraph'])) { if (!file_exists("$rrddbpath$dhcpif$dhcpd")) { $rrdcreate = "$rrdtool create $rrddbpath$dhcpif$dhcpd --step $rrddhcpdinterval "; $rrdcreate .= "DS:leases:GAUGE:$dhcpdvalid:0:100000 "; @@ -950,12 +945,52 @@ function enable_rrd_graphing() { $rrdupdatesh .= "# polling leases for dhcp \n"; $rrdupdatesh .= "DHCP=`${php} -q ${dhcpd_gather} '${dhcpif}'`\n"; $rrdupdatesh .= "$rrdtool update $rrddbpath$dhcpif$dhcpd \${DHCP}\n"; - + } } } /* END dhcpd statistics */ + /* Start gateway quality */ + $rrdupdatesh .= <<<EOD + +# Gateway quality graphs +for sock in {$g['varrun_path']}/dpinger_*.sock; do + if [ ! -S "\$sock" ]; then + continue + fi + loss=\$(/usr/bin/nc -U \$sock | awk '{ print \$3 }') + delay=\$(/usr/bin/nc -U \$sock | awk '{ print \$1 }') + + if echo "\$loss" | grep -Eqv '^[0-9]+\$'; then + loss="U" + fi + if echo "\$delay" | grep -Eqv '^[0-9]+\$'; then + delay="U" + else + # Convert delay to millisecond + delay=\$(echo "scale=7; \$delay / 1000 / 1000" | /usr/bin/bc) + fi + + gw=\$(echo \$sock | sed 's,^.*dpinger_,,; s,\.sock,,') + if [ ! -f {$rrddbpath}\$gw-quality.rrd ]; then + {$rrdtool} create {$rrddbpath}\$gw-quality.rrd --step 60 \\ + DS:loss:GAUGE:120:0:100 \\ + DS:delay:GAUGE:120:0:100000 \\ + RRA:AVERAGE:0.5:1:1200 \\ + RRA:AVERAGE:0.5:5:720 \\ + RRA:AVERAGE:0.5:60:1860 \\ + RRA:AVERAGE:0.5:1440:2284 + + {$rrdtool} update {$rrddbpath}\$gw-quality.rrd -t loss:delay N:U:U + fi + + {$rrdtool} update {$rrddbpath}\$gw-quality.rrd -t loss:delay N:\$loss:\$delay +done + +EOD; + /* End gateway quality */ + $rrdupdatesh .= "sleep 60\n"; $rrdupdatesh .= "done\n"; log_error(gettext("Creating rrd update script")); @@ -989,41 +1024,6 @@ function enable_rrd_graphing() { } -# Create gateway quality RRD with settings suitable for pfSense graph set. -function create_gateway_quality_rrd($rrd_file) { - global $g; - - $rrdinterval = 60; - $valid = $rrdinterval * 2; - $rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool"; - - /* GATEWAY QUALITY, set up the rrd file */ - if (!file_exists("$rrd_file")) { - $rrdcreate = "$rrdtool create $rrd_file --step $rrdinterval "; - $rrdcreate .= "DS:loss:GAUGE:$valid:0:100 "; - $rrdcreate .= "DS:delay:GAUGE:$valid:0:100000 "; - $rrdcreate .= "RRA:AVERAGE:0.5:1:1200 "; - $rrdcreate .= "RRA:AVERAGE:0.5:5:720 "; - $rrdcreate .= "RRA:AVERAGE:0.5:60:1860 "; - $rrdcreate .= "RRA:AVERAGE:0.5:1440:2284 "; - - create_new_rrd($rrdcreate); - unset($rrdcreate); - } - - /* enter UNKNOWN values in the RRD so it knows we rebooted. */ - if (platform_booting()) { - if (!is_dir("{$g['vardb_path']}/rrd")) { - mkdir("{$g['vardb_path']}/rrd", 0775); - } - - @chown("{$g['vardb_path']}/rrd", "nobody"); - - mwexec("$rrdtool update $rrd_file N:U:U"); - } - unset($rrdtool, $rrdinterval, $valid, $rrd_file); -} - function kill_traffic_collector() { global $g; diff --git a/src/etc/inc/service-utils.inc b/src/etc/inc/service-utils.inc index c97c7c9..ca72d5f 100644 --- a/src/etc/inc/service-utils.inc +++ b/src/etc/inc/service-utils.inc @@ -32,10 +32,6 @@ */ -/* - pfSense_BUILDER_BINARIES: /bin/pgrep /bin/sh /usr/bin/killall - pfSense_MODULE: utils -*/ require_once("globals.inc"); require_once("captiveportal.inc"); require_once("openvpn.inc"); @@ -322,7 +318,7 @@ function get_services() { $gateways_arr = return_gateways_array(); if (is_array($gateways_arr)) { $pconfig = array(); - $pconfig['name'] = "apinger"; + $pconfig['name'] = "dpinger"; $pconfig['description'] = gettext("Gateway Monitoring Daemon"); $services[] = $pconfig; } @@ -527,7 +523,7 @@ function get_service_control_GET_links($service, $addname = false) { default: $output .= "<a href=\"status_services.php?mode=stopservice&service={$service['name']}\">"; } - $output .= "<i class=\"fa fa-stop\" title=\"" . sprintf(gettext("Stop %sService"), $stitle) . "\"></i></a>"; + $output .= "<i class=\"fa fa-stop-circle-o\" title=\"" . sprintf(gettext("Stop %sService"), $stitle) . "\"></i></a>"; } else { $service_enabled = is_service_enabled($service['name']); @@ -581,7 +577,7 @@ function get_service_control_links($service, $addname = false) { $output .= '<a href="#" id="stopservice-' . $service['name'] . '">'; } - $output .= "<i class=\"fa fa-stop\" title=\"" . sprintf(gettext("Stop %sService"), $stitle) . "\"></i></a>"; + $output .= "<i class=\"fa fa-stop-circle-o\" title=\"" . sprintf(gettext("Stop %sService"), $stitle) . "\"></i></a>"; } else { $service_enabled = is_service_enabled($service['name']); @@ -609,7 +605,7 @@ function service_control_start($name, $extras) { case 'openntpd': system_ntp_configure(); break; - case 'apinger': + case 'dpinger': setup_gateways_monitor(); break; case 'bsnmpd': @@ -678,8 +674,8 @@ function service_control_stop($name, $extras) { case 'openntpd': killbyname("openntpd"); break; - case 'apinger': - killbypid("{$g['varrun_path']}/apinger.pid"); + case 'dpinger': + stop_dpinger(); break; case 'bsnmpd': killbypid("{$g['varrun_path']}/snmpd.pid"); @@ -748,8 +744,7 @@ function service_control_restart($name, $extras) { case 'openntpd': system_ntp_configure(); break; - case 'apinger': - killbypid("{$g['varrun_path']}/apinger.pid"); + case 'dpinger': setup_gateways_monitor(); break; case 'bsnmpd': diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index 2b4cd4a..0a1d56a 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -30,16 +30,8 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/killall /bin/pgrep /bin/sh /usr/local/sbin/dhcpd /usr/local/sbin/igmpproxy - pfSense_BUILDER_BINARIES: /sbin/ifconfig /usr/local/sbin/dnsmasq - pfSense_BUILDER_BINARIES: /usr/local/sbin/miniupnpd /usr/sbin/radvd - pfSense_BUILDER_BINARIES: /usr/local/sbin/dhcleases6 /usr/sbin/bsnmpd - pfSense_MODULE: utils -*/ - -define('DYNDNS_PROVIDER_VALUES', 'citynetwork cloudflare custom custom-v6 dnsexit dnsimple dnsmadeeasy dnsomatic dyndns dyndns-custom dyndns-static dyns easydns eurodns freedns glesys googledomains gratisdns he-net he-net-v6 he-net-tunnelbroker loopia namecheap noip noip-free ods opendns ovh-dynhost route53 selfhost zoneedit'); -define('DYNDNS_PROVIDER_DESCRIPTIONS', 'City Network,CloudFlare,Custom,Custom (v6),DNSexit,DNSimple,DNS Made Easy,DNS-O-Matic,DynDNS (dynamic),DynDNS (custom),DynDNS (static),DyNS,easyDNS,Euro Dns,freeDNS,GleSYS,Google Domains,GratisDNS,HE.net,HE.net (v6),HE.net Tunnelbroker,Loopia,Namecheap,No-IP,No-IP (free),ODS.org,OpenDNS,OVH DynHOST,Route 53,SelfHost,ZoneEdit'); +define('DYNDNS_PROVIDER_VALUES', 'citynetwork cloudflare custom custom-v6 dnsexit dnsimple dnsmadeeasy dnsomatic dyndns dyndns-custom dyndns-static dyns easydns eurodns freedns glesys googledomains gratisdns he-net he-net-v6 he-net-tunnelbroker loopia namecheap noip noip-free ods opendns ovh-dynhost route53 selfhost spdns spdns-v6 zoneedit'); +define('DYNDNS_PROVIDER_DESCRIPTIONS', 'City Network,CloudFlare,Custom,Custom (v6),DNSexit,DNSimple,DNS Made Easy,DNS-O-Matic,DynDNS (dynamic),DynDNS (custom),DynDNS (static),DyNS,easyDNS,Euro Dns,freeDNS,GleSYS,Google Domains,GratisDNS,HE.net,HE.net (v6),HE.net Tunnelbroker,Loopia,Namecheap,No-IP,No-IP (free),ODS.org,OpenDNS,OVH DynHOST,Route 53,SelfHost,SPDNS,SPDNS (v6),ZoneEdit'); /* implement ipv6 route advertising daemon */ function services_radvd_configure($blacklist = array()) { diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc index 8d391a1..160e49c 100644 --- a/src/etc/inc/shaper.inc +++ b/src/etc/inc/shaper.inc @@ -1310,7 +1310,12 @@ class priq_queue { function build_form() { - $sform = new Form(); + $sform = new Form(new Form_Button( + 'Submit', + 'Save' + )); + + $sform->setAction("firewall_shaper.php"); $section = new Form_Section(""); @@ -1323,13 +1328,20 @@ class priq_queue { )); $section->addInput(new Form_Input( - 'name', + 'newname', 'Name', 'text', $this->GetQname() ))->setHelp('Enter the name of the queue here. Do not use spaces and limit the size to 15 characters.'); $section->addInput(new Form_Input( + 'name', + null, + 'hidden', + $this->GetQname() + )); + + $section->addInput(new Form_Input( 'priority', 'Priority', 'number', @@ -1351,7 +1363,8 @@ class priq_queue { 'default', null, null, - $this->GetDefault() + $this->GetDefault(), + 'default' ))->setHelp('Default Queue'); } @@ -1381,7 +1394,7 @@ class priq_queue { null, null, !empty($this->GetCodel()) - ))->setHelp('<a target="_new" href="http://www.openbsd.org/faq/pf/queueing.html#ecn">' . gettext('Explicit Congestion Notification') . '</a>'); + ))->setHelp('<a target="_new" href="http://www.openbsd.org/faq/pf/queueing.html#ecn">' . gettext('Codel Active Queue') . '</a>'); $group->setHelp('Select options for this queue'); @@ -1394,14 +1407,21 @@ class priq_queue { $this->GetDescription() )); - $section->addInput(new Form_Input( + $sform->add($section); + + $sform->addGlobal(new Form_Input( 'interface', null, 'hidden', $this->GetInterface() )); - $sform->add($section); + $sform->addGlobal(new Form_Input( + 'name', + null, + 'hidden', + $this->GetQname() + )); return($sform); } @@ -3741,8 +3761,9 @@ EOD; $form .= "<tbody>"; // If there are no bandwidths defined, make a blank one for convenience - if(empty($bandwidth)) + if (empty($bandwidth)) { $bandwidth = array(0 => array('bw' => '', 'bwscale' => 'Kb', 'bwsched' => 'none')); + } if (is_array($bandwidth)) { foreach ($bandwidth as $bwidx => $bw) { @@ -3810,6 +3831,7 @@ EOD; $sform = new Form(); + $sform->setAction("firewall_shaper.php"); $section = new Form_Section('Limiters'); @@ -4132,7 +4154,7 @@ class dnqueue_class extends dummynet_class { $sform = new Form(); - + $sform->setAction("firewall_shaper.php"); $section = new Form_Section('Limiters'); $section->addInput(new Form_Checkbox( @@ -4169,11 +4191,12 @@ class dnqueue_class extends dummynet_class { $bandwidth = $this->GetBandwidth(); // Delete a row - if(isset($_GET['delbwrow']) && (count($bandwidth) > 0)) + if (isset($_GET['delbwrow']) && (count($bandwidth) > 0)) { unset($bandwidth[$_GET['delbwrow']]); + } // Add a row - if($_GET['newbwrow']) { + if ($_GET['newbwrow']) { array_push($bandwidth, array(count($bandwidth) => array('bw' => '', 'burst' => '', 'bwscale' => 'Kb', 'bwsched' => 'none') )); } @@ -4182,7 +4205,7 @@ class dnqueue_class extends dummynet_class { $row = 0; $numrows = count($bandwidth) - 1; - if($numrows >= 0) { + if ($numrows >= 0) { foreach ($bandwidth as $bwidx => $bw) { $group = new Form_Group($row == 0 ? 'Bandwidth':null); @@ -4213,8 +4236,9 @@ class dnqueue_class extends dummynet_class { 'firewall_shaper_vinterface.php?pipe=' . $pipe . '&queue=' . $qname . '&action=' . $action . '&delbwrow=' . $bwidx ))->removeClass('btn-primary')->addClass('btn-danger btn-sm'); - if($row == $numrows) + if ($row == $numrows) { $group->setHelp('Bandwidth is the rate (e.g. Mbit/s) to which traffic in this limiter will be restricted.'); + } $section->add($group); $row++; diff --git a/src/etc/inc/smtp.inc b/src/etc/inc/smtp.inc index 035a30a..9a70e90 100644 --- a/src/etc/inc/smtp.inc +++ b/src/etc/inc/smtp.inc @@ -6,10 +6,6 @@ * */ -/* - pfSense_MODULE: notifications -*/ - class smtp_class { var $user=""; diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index ce58b10..01189c9 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -28,16 +28,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /usr/sbin/powerd /usr/bin/killall /sbin/route - pfSense_BUILDER_BINARIES: /bin/hostname /bin/ls /usr/sbin/syslogd - pfSense_BUILDER_BINARIES: /usr/sbin/pccardd /usr/local/sbin/lighttpd /bin/chmod /bin/mkdir - pfSense_BUILDER_BINARIES: /usr/bin/tar /usr/local/sbin/ntpd /usr/local/sbin/ntpdate - pfSense_BUILDER_BINARIES: /usr/bin/nohup /sbin/dmesg /usr/local/sbin/atareinit /sbin/kldload - pfSense_BUILDER_BINARIES: /usr/local/sbin/filterdns - pfSense_MODULE: utils -*/ - function activate_powerd() { global $config, $g; @@ -587,7 +577,7 @@ function system_routing_configure($interface = "") { } $gateways_arr = return_gateways_array(false, true); - foreach($gateways_arr as $gateway) { + foreach ($gateways_arr as $gateway) { // setup static interface routes for nonlocal gateways if (isset($gateway["nonlocalgateway"])) { $srgatewayip = $gateway['gateway']; @@ -788,7 +778,7 @@ function system_syslogd_get_remote_servers($syslogcfg, $facility = "*.*") { // Rather than repeatedly use the same code, use this function to build a list of remote servers. $facility .= " ". $remote_servers = ""; - $pad_to = 56; + $pad_to = max(strlen($facility), 56); $padding = ceil(($pad_to - strlen($facility))/8)+1; if ($syslogcfg['remoteserver']) { $remote_servers .= "{$facility}" . str_repeat("\t", $padding) . "@" . system_syslogd_fixup_server($syslogcfg['remoteserver']) . "\n"; @@ -838,7 +828,7 @@ function system_syslogd_start() { $syslogd_extra = ""; if (isset($syslogcfg)) { - $separatelogfacilities = array('ntp', 'ntpd', 'ntpdate', 'charon', 'ipsec_starter', 'openvpn', 'pptps', 'poes', 'l2tps', 'relayd', 'hostapd', 'dnsmasq', 'filterdns', 'unbound', 'dhcpd', 'dhcrelay', 'dhclient', 'dhcp6c', 'apinger', 'radvd', 'routed', 'olsrd', 'zebra', 'ospfd', 'bgpd', 'miniupnpd', 'filterlog'); + $separatelogfacilities = array('ntp', 'ntpd', 'ntpdate', 'charon', 'ipsec_starter', 'openvpn', 'pptps', 'poes', 'l2tps', 'relayd', 'hostapd', 'dnsmasq', 'filterdns', 'unbound', 'dhcpd', 'dhcrelay', 'dhclient', 'dhcp6c', 'dpinger', 'radvd', 'routed', 'olsrd', 'zebra', 'ospfd', 'bgpd', 'miniupnpd', 'filterlog'); $syslogconf = ""; if ($config['installedpackages']['package']) { foreach ($config['installedpackages']['package'] as $package) { @@ -898,11 +888,11 @@ function system_syslogd_start() { $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*"); } - $syslogconf .= "!apinger\n"; + $syslogconf .= "!dpinger\n"; if (!isset($syslogcfg['disablelocallogging'])) { $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/gateways.log\n"; } - if (isset($syslogcfg['apinger'])) { + if (isset($syslogcfg['dpinger'])) { $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*"); } @@ -947,11 +937,7 @@ function system_syslogd_start() { local3.* {$log_directive}{$g['varlog_path']}/vpn.log local4.* {$log_directive}{$g['varlog_path']}/portalauth.log local7.* {$log_directive}{$g['varlog_path']}/dhcpd.log -*.notice;kern.debug;lpr.info;mail.crit;daemon.none; {$log_directive}{$g['varlog_path']}/system.log -news.err;local0.none;local3.none;local4.none; {$log_directive}{$g['varlog_path']}/system.log -local7.none {$log_directive}{$g['varlog_path']}/system.log -security.* {$log_directive}{$g['varlog_path']}/system.log -auth.info;authpriv.info;daemon.info {$log_directive}{$g['varlog_path']}/system.log +*.notice;kern.debug;lpr.info;mail.crit;daemon.none;news.err;local0.none;local3.none;local4.none;local7.none;security.*;auth.info;authpriv.info;daemon.info {$log_directive}{$g['varlog_path']}/system.log auth.info;authpriv.info |exec /usr/local/sbin/sshlockout_pf 15 *.emerg * @@ -967,11 +953,7 @@ EOD; $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "local7.*"); } if (isset($syslogcfg['system'])) { - $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.notice;kern.debug;lpr.info;mail.crit;"); - $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "news.err;local0.none;local3.none;local7.none"); - $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "security.*"); - $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "auth.info;authpriv.info;daemon.info"); - $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.emerg"); + $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.emerg;*.notice;kern.debug;lpr.info;mail.crit;news.err;local0.none;local3.none;local7.none;security.*;auth.info;authpriv.info;daemon.info"); } if (isset($syslogcfg['logall'])) { // Make everything mean everything, including facilities excluded above. diff --git a/src/etc/inc/unbound.inc b/src/etc/inc/unbound.inc index 35613e8..ccae458 100644 --- a/src/etc/inc/unbound.inc +++ b/src/etc/inc/unbound.inc @@ -25,10 +25,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - pfSense_BUILDER_BINARIES: /usr/local/sbin/unbound /usr/local/sbin/unbound-anchor /usr/local/sbin/unbound-checkconf - pfSense_BUILDER_BINARIES: /usr/local/sbin/unbound-control /usr/local/sbin/unbound-control-setup - pfSense_MODULE: unbound */ /* include all configuration functions */ diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 4605990..05088a9 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -52,10 +52,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /usr/bin/find /bin/cd /usr/local/bin/rrdtool /usr/bin/nice - pfSense_MODULE: config -*/ if (!function_exists("dump_rrd_to_xml")) { require("rrd.inc"); @@ -3841,6 +3837,7 @@ function upgrade_118_to_119() { } function upgrade_119_to_120() { + require_once("ipsec.inc"); global $config, $ipsec_log_cats; if (!is_array($config['ipsec'])) { @@ -4032,7 +4029,7 @@ function upgrade_125_to_126() { /* subtract 2 from ipsec log levels. the value stored in the config.xml * will now match the strongswan level exactly. */ - foreach(array_keys($ipsec_log_cats) as $cat) { + foreach (array_keys($ipsec_log_cats) as $cat) { if (!isset($config['ipsec']["ipsec_{$cat}"])) { $new_level = $def_loglevel; } else { @@ -4114,11 +4111,15 @@ function upgrade_128_to_129() { if ($sysctl['tunable'] == "net.inet.ip.fastforwarding") { unset($config['sysctl']['item'][$idx]); } + if ($sysctl['tunable'] == "net.inet.ipsec.debug") { + $config['sysctl']['item'][$idx]['value'] = "0"; + } } /* IPSEC is always on in 2.3. */ - if (isset($config['ipsec']['enable'])) + if (isset($config['ipsec']['enable'])) { unset($config['ipsec']['enable']); + } } function upgrade_129_to_130() { @@ -4137,4 +4138,54 @@ function upgrade_129_to_130() { } } +function upgrade_130_to_131() { + global $config; + + if (isset($config['syslog']['apinger'])) { + $config['syslog']['dpinger'] = true; + unset($config['syslog']['apinger']); + } + + if (isset($config['system']['apinger_debug'])) { + unset($config['system']['apinger_debug']); + } + + if (!isset($config['gateways']['gateway_item']) || + !is_array($config['gateways']['gateway_item'])) { + return; + } + + foreach ($config['gateways']['gateway_item'] as &$gw) { + // dpinger uses milliseconds + if (isset($gw['interval']) && + is_numeric($gw['interval'])) { + $gw['interval'] = $gw['interval'] * 1000; + } + if (isset($gw['down']) && + is_numeric($gw['down'])) { + $gw['loss_interval'] = $gw['down'] * 1000; + unset($gw['down']); + } + + if (isset($gw['avg_delay_samples'])) { + unset($gw['avg_delay_samples']); + } + if (isset($gw['avg_delay_samples_calculated'])) { + unset($gw['avg_delay_samples_calculated']); + } + if (isset($gw['avg_loss_samples'])) { + unset($gw['avg_loss_samples']); + } + if (isset($gw['avg_loss_samples_calculated'])) { + unset($gw['avg_loss_samples_calculated']); + } + if (isset($gw['avg_loss_delay_samples'])) { + unset($gw['avg_loss_delay_samples']); + } + if (isset($gw['avg_loss_delay_samples_calculated'])) { + unset($gw['avg_loss_delay_samples_calculated']); + } + } +} + ?> diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index e9cb7cb..4f13187 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -55,12 +55,6 @@ * ==================================================================== * */ -/* - pfSense_BUILDER_BINARIES: /bin/ps /bin/kill /usr/bin/killall /sbin/ifconfig /usr/bin/netstat - pfSense_BUILDER_BINARIES: /usr/bin/awk /sbin/dmesg /sbin/ping /usr/local/sbin/gzsig /usr/sbin/arp - pfSense_BUILDER_BINARIES: /sbin/conscontrol /sbin/devd /bin/ps - pfSense_MODULE: utils -*/ /* kill a process by pid file */ function killbypid($pidfile) { @@ -1046,21 +1040,24 @@ function get_configured_carp_interface_list($carpinterface = '', $family = 'inet $iflist = array(); - if (!is_array($config['virtualip']['vip']) || empty($config['virtualip']['vip'])) + if (!is_array($config['virtualip']['vip']) || empty($config['virtualip']['vip'])) { return $iflist; + } $viparr = &$config['virtualip']['vip']; foreach ($viparr as $vip) { - if ($vip['mode'] != "carp") + if ($vip['mode'] != "carp") { continue; + } if (empty($carpinterface)) { $iflist["_vip{$vip['uniqid']}"] = $vip['subnet']; continue; } - if ($carpinterface != "_vip{$vip['uniqid']}") + if ($carpinterface != "_vip{$vip['uniqid']}") { continue; + } switch ($what) { case 'subnet': @@ -1483,8 +1480,9 @@ function mwexec($command, $nologentry = false, $clearsigmask = false, $backgroun // run in foreground, and (optionally) log if nonzero return $outputarray = array(); exec("$command 2>&1", $outputarray, $retval); - if (($retval <> 0) && (!$nologentry || isset($config['system']['developerspew']))) + if (($retval <> 0) && (!$nologentry || isset($config['system']['developerspew']))) { log_error(sprintf(gettext("The command '%1\$s' returned exit code '%2\$d', the output was '%3\$s' "), $command, $retval, implode(" ", $outputarray))); + } } if ($clearsigmask) { @@ -1499,13 +1497,13 @@ function mwexec_bg($command, $clearsigmask = false) { return mwexec($command, false, $clearsigmask, true); } -/* unlink a file, if it exists */ +/* unlink a file, or pattern-match of a file, if it exists + if the file/path contains glob() compatible wildcards, all matching files will be unlinked + if no matches, no error occurs */ function unlink_if_exists($fn) { $to_do = glob($fn); - if (is_array($to_do)) { - foreach ($to_do as $filename) { - @unlink($filename); - } + if (is_array($to_do) && count($to_do) > 0) { + array_map("unlink", $to_do); } else { @unlink($fn); } @@ -1583,17 +1581,6 @@ function alias_expand_urltable($name) { return null; } -/* verify (and remove) the digital signature on a file - returns 0 if OK */ -function verify_digital_signature($fname) { - global $g; - - if (!file_exists("/usr/local/sbin/gzsig")) { - return 4; - } - - return mwexec("/usr/local/sbin/gzsig verify {$g['etc_path']}/pubkey.pem < " . escapeshellarg($fname)); -} - /* obtain MAC address given an IP address by looking at the ARP table */ function arp_get_mac_by_ip($ip) { mwexec("/sbin/ping -c 1 -t 1 " . escapeshellarg($ip), true); diff --git a/src/etc/inc/voucher.inc b/src/etc/inc/voucher.inc index 2e0f5f5..31078e2 100644 --- a/src/etc/inc/voucher.inc +++ b/src/etc/inc/voucher.inc @@ -29,11 +29,6 @@ */ -/* - pfSense_BUILDER_BINARIES: /usr/local/bin/voucher - pfSense_MODULE: captiveportal -*/ - /* include all configuration functions */ if (!function_exists('captiveportal_syslog')) { require_once("captiveportal.inc"); @@ -588,8 +583,9 @@ function voucher_configure_zone($sync = false) { $roll = $rollent['number']; $len = ($rollent['count'] >> 3) + 1; - if (strlen(base64_decode($rollent['used'])) != $len) + if (strlen(base64_decode($rollent['used'])) != $len) { $rollent['used'] = base64_encode(str_repeat("\000", $len)); + } voucher_write_used_db($roll, $rollent['used']); $minutes = $rollent['minutes']; $active_vouchers = array(); diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc index 09f514b..50f0b01 100644 --- a/src/etc/inc/vpn.inc +++ b/src/etc/inc/vpn.inc @@ -32,13 +32,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: /sbin/ifconfig - pfSense_BUILDER_BINARIES: /usr/local/sbin/ipsec /usr/local/libexec/ipsec/charon /usr/local/libexec/ipsec/starter - pfSense_BUILDER_BINARIES: /usr/local/sbin/filterdns /usr/local/sbin/mpd4 - pfSense_MODULE: vpn -*/ - require_once("ipsec.inc"); require_once("filter.inc"); @@ -138,6 +131,7 @@ function vpn_ipsec_configure($restart = false) { /* get the automatic ping_hosts.sh ready */ unlink_if_exists("{$g['vardb_path']}/ipsecpinghosts"); touch("{$g['vardb_path']}/ipsecpinghosts"); + $ipsecpinghostsactive = false; /* service may have been enabled, disabled, or otherwise changed in a way requiring rule updates */ filter_configure(); @@ -386,6 +380,7 @@ function vpn_ipsec_configure($restart = false) { } if (is_ipaddr($srcip)) { $ipsecpinghosts[] = "{$srcip}|{$dstip}|3|||||{$family}|\n"; + $ipsecpinghostsactive = true; } } } @@ -1221,7 +1216,8 @@ EOD; $tunneltype = "type = transport"; if ((($ph1ent['authentication_method'] == "xauth_psk_server") || - ($ph1ent['authentication_method'] == "pre_shared_key")) && isset($ph1ent['mobile'])) { + ($ph1ent['authentication_method'] == "pre_shared_key")) && + isset($ph1ent['mobile'])) { $left_spec = "%any"; } else { $tmpsubnet = ipsec_get_phase1_src($ph1ent); @@ -1437,6 +1433,11 @@ EOD; } } + // run ping_hosts.sh once if it's enabled to avoid wait for minicron + if ($ipsecpinghostsactive == true) { + mwexec_bg("/usr/local/bin/ping_hosts.sh"); + } + if ($natfilterrules == true) { filter_configure(); } diff --git a/src/etc/inc/vslb.inc b/src/etc/inc/vslb.inc index 1c509a9..cb2c50b 100644 --- a/src/etc/inc/vslb.inc +++ b/src/etc/inc/vslb.inc @@ -27,12 +27,6 @@ */ -/* - pfSense_BUILDER_BINARIES: /usr/local/sbin/relayd - pfSense_MODULE: routing -*/ - - /* include all configuration functions */ class Monitor { diff --git a/src/etc/inc/xmlreader.inc b/src/etc/inc/xmlreader.inc index 99034fc..3982c60 100644 --- a/src/etc/inc/xmlreader.inc +++ b/src/etc/inc/xmlreader.inc @@ -29,10 +29,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_MODULE: utils -*/ - /* The following items will be treated as arrays in config.xml */ function listtags() { /* diff --git a/src/etc/inc/xmlrpc.inc b/src/etc/inc/xmlrpc.inc index 3658063..001777c 100644 --- a/src/etc/inc/xmlrpc.inc +++ b/src/etc/inc/xmlrpc.inc @@ -26,11 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. */ -/* - pfSense_BUILDER_BINARIES: - pfSense_MODULE: utils -*/ - require_once("auth.inc"); require_once("xmlrpc_client.inc"); diff --git a/src/etc/login.conf b/src/etc/login.conf index 1e61a9f..98324e2 100644 --- a/src/etc/login.conf +++ b/src/etc/login.conf @@ -35,7 +35,7 @@ default:\ :maxproc=unlimited:\ :sbsize=unlimited:\ :vmemoryuse=unlimited:\ - :idletime=unlimited:\ + :idletime=unlimited:\ :priority=0:\ :ignoretime@:\ :umask=022: @@ -81,7 +81,7 @@ russian|Russian Users Accounts:\ ###################################################################### ## ## Example entries -## +## ###################################################################### ###################################################################### diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles index 95a0d93..9a6e3e1 100644 --- a/src/etc/pfSense.obsoletedfiles +++ b/src/etc/pfSense.obsoletedfiles @@ -8,6 +8,7 @@ /etc/auth.conf /etc/current-supfile /etc/defaults/pccard.conf +/etc/fbtab /etc/freebsd-update.conf /etc/gnats /etc/hostid @@ -739,6 +740,7 @@ /usr/local/share/strongswan/templates/config/plugins/smp.conf /usr/local/share/xml /usr/local/www/auto_complete_helper.js +/usr/local/www/carp_status.php /usr/local/www/classes/maintable.inc /usr/local/www/code-syntax-highlighter /usr/local/www/csrf/csrf-secret.php @@ -749,8 +751,16 @@ /usr/local/www/dfuife.css /usr/local/www/dfuife.js /usr/local/www/diag_dhcp_leases.php +/usr/local/www/diag_ipsec.php +/usr/local/www/diag_ipsec_leases.php +/usr/local/www/diag_ipsec_sad.php +/usr/local/www/diag_ipsec_spd.php +/usr/local/www/diag_logs.php /usr/local/www/diag_logs_auth.php /usr/local/www/diag_logs_dhcp.php +/usr/local/www/diag_logs_filter.php +/usr/local/www/diag_logs_filter_dynamic.php +/usr/local/www/diag_logs_filter_summary.php /usr/local/www/diag_logs_gateways.php /usr/local/www/diag_logs_ipsec.php /usr/local/www/diag_logs_ntpd.php @@ -759,10 +769,14 @@ /usr/local/www/diag_logs_relayd.php /usr/local/www/diag_logs_resolver.php /usr/local/www/diag_logs_routing.php +/usr/local/www/diag_logs_settings.php /usr/local/www/diag_logs_slbd.php +/usr/local/www/diag_logs_vpn.php /usr/local/www/diag_logs_wireless.php /usr/local/www/diag_patterns.php +/usr/local/www/diag_pkglogs.php /usr/local/www/diag_showbogons.php +/usr/local/diag_system_pftop.php /usr/local/www/dom-drag.js /usr/local/www/draglist.js /usr/local/www/dtree.js @@ -776,11 +790,11 @@ /usr/local/www/firewall_shaper_edit.php /usr/local/www/firewall_shaper_layer7.php /usr/local/www/firewall_shaper_queues_edit.php -/usr/local/www/fend.inc /usr/local/www/fred-bg.png /usr/local/www/fred.png /usr/local/www/green_dot.jpg /usr/local/www/gui.css +/usr/local/www/halt.php /usr/local/www/headjs.php /usr/local/www/ifstats.cgi /usr/local/www/includes/javascript.inc.php @@ -816,6 +830,7 @@ /usr/local/www/protochart/ProtoChart.js /usr/local/www/protochart/excanvas-compressed.js /usr/local/www/protochart/excanvas.js +/usr/local/www/reboot.php /usr/local/www/row_helper.js /usr/local/www/row_helper_dynamic.js /usr/local/www/row_toggle.js @@ -858,6 +873,8 @@ /usr/local/www/vpn_openvpn_crl_edit.php /usr/local/www/vpn_openvpn_srv.php /usr/local/www/vpn_openvpn_srv_edit.php +/usr/local/www/vpn_pppoe.php +/usr/local/www/vpn_pppoe_edit.php /usr/local/www/vpn_pppoe_users.php /usr/local/www/vpn_pppoe_users_edit.php /usr/local/www/wizards/traffic_shaper_wizard.inc diff --git a/src/etc/phpshellsessions/gitsync b/src/etc/phpshellsessions/gitsync index dceeaa9..3aa072f 100644 --- a/src/etc/phpshellsessions/gitsync +++ b/src/etc/phpshellsessions/gitsync @@ -48,7 +48,7 @@ while (!empty($temp_args)) { switch ($arg) { case "--help": echo "Usage: playback gitsync [options] [[repository] <branch>]\nOptions:\n"; - foreach($valid_args as $arg_name => $arg_desc) { + foreach ($valid_args as $arg_name => $arg_desc) { echo $arg_name . "\n" . $arg_desc; } exit; diff --git a/src/etc/printcap b/src/etc/printcap deleted file mode 100644 index e69de29..0000000 --- a/src/etc/printcap +++ /dev/null diff --git a/src/etc/protocols b/src/etc/protocols deleted file mode 100644 index 763cbcd..0000000 --- a/src/etc/protocols +++ /dev/null @@ -1,158 +0,0 @@ -# -# Internet protocols -# -# $FreeBSD: stable/10/etc/protocols 250453 2013-05-10 13:57:44Z eadler $ -# from: @(#)protocols 5.1 (Berkeley) 4/17/89 -# -# See also http://www.iana.org/assignments/protocol-numbers -# -ip 0 IP # internet protocol, pseudo protocol number -#hopopt 0 HOPOPT # hop-by-hop options for ipv6 -icmp 1 ICMP # internet control message protocol -igmp 2 IGMP # internet group management protocol -ggp 3 GGP # gateway-gateway protocol -ipencap 4 IP-ENCAP # IP encapsulated in IP (officially ``IP'') -st2 5 ST2 # ST2 datagram mode (RFC 1819) (officially ``ST'') -tcp 6 TCP # transmission control protocol -cbt 7 CBT # CBT, Tony Ballardie <A.Ballardie@cs.ucl.ac.uk> -egp 8 EGP # exterior gateway protocol -igp 9 IGP # any private interior gateway (Cisco: for IGRP) -bbn-rcc 10 BBN-RCC-MON # BBN RCC Monitoring -nvp 11 NVP-II # Network Voice Protocol -pup 12 PUP # PARC universal packet protocol -argus 13 ARGUS # ARGUS -emcon 14 EMCON # EMCON -xnet 15 XNET # Cross Net Debugger -chaos 16 CHAOS # Chaos -udp 17 UDP # user datagram protocol -mux 18 MUX # Multiplexing protocol -dcn 19 DCN-MEAS # DCN Measurement Subsystems -hmp 20 HMP # host monitoring protocol -prm 21 PRM # packet radio measurement protocol -xns-idp 22 XNS-IDP # Xerox NS IDP -trunk-1 23 TRUNK-1 # Trunk-1 -trunk-2 24 TRUNK-2 # Trunk-2 -leaf-1 25 LEAF-1 # Leaf-1 -leaf-2 26 LEAF-2 # Leaf-2 -rdp 27 RDP # "reliable datagram" protocol -irtp 28 IRTP # Internet Reliable Transaction Protocol -iso-tp4 29 ISO-TP4 # ISO Transport Protocol Class 4 -netblt 30 NETBLT # Bulk Data Transfer Protocol -mfe-nsp 31 MFE-NSP # MFE Network Services Protocol -merit-inp 32 MERIT-INP # MERIT Internodal Protocol -dccp 33 DCCP # Datagram Congestion Control Protocol -3pc 34 3PC # Third Party Connect Protocol -idpr 35 IDPR # Inter-Domain Policy Routing Protocol -xtp 36 XTP # Xpress Tranfer Protocol -ddp 37 DDP # Datagram Delivery Protocol -idpr-cmtp 38 IDPR-CMTP # IDPR Control Message Transport Proto -tp++ 39 TP++ # TP++ Transport Protocol -il 40 IL # IL Transport Protocol -ipv6 41 IPV6 # ipv6 -sdrp 42 SDRP # Source Demand Routing Protocol -ipv6-route 43 IPV6-ROUTE # routing header for ipv6 -ipv6-frag 44 IPV6-FRAG # fragment header for ipv6 -idrp 45 IDRP # Inter-Domain Routing Protocol -rsvp 46 RSVP # Resource ReSerVation Protocol -gre 47 GRE # Generic Routing Encapsulation -dsr 48 DSR # Dynamic Source Routing Protocol -bna 49 BNA # BNA -esp 50 ESP # encapsulating security payload -ah 51 AH # authentication header -i-nlsp 52 I-NLSP # Integrated Net Layer Security TUBA -swipe 53 SWIPE # IP with Encryption -narp 54 NARP # NBMA Address Resolution Protocol -mobile 55 MOBILE # IP Mobility -tlsp 56 TLSP # Transport Layer Security Protocol -skip 57 SKIP # SKIP -ipv6-icmp 58 IPV6-ICMP icmp6 # ICMP for IPv6 -ipv6-nonxt 59 IPV6-NONXT # no next header for ipv6 -ipv6-opts 60 IPV6-OPTS # destination options for ipv6 -# 61 # any host internal protocol -cftp 62 CFTP # CFTP -# 63 # any local network -sat-expak 64 SAT-EXPAK # SATNET and Backroom EXPAK -kryptolan 65 KRYPTOLAN # Kryptolan -rvd 66 RVD # MIT Remote Virtual Disk Protocol -ippc 67 IPPC # Internet Pluribus Packet Core -# 68 # any distributed filesystem -sat-mon 69 SAT-MON # SATNET Monitoring -visa 70 VISA # VISA Protocol -ipcv 71 IPCV # Internet Packet Core Utility -cpnx 72 CPNX # Computer Protocol Network Executive -cphb 73 CPHB # Computer Protocol Heart Beat -wsn 74 WSN # Wang Span Network -pvp 75 PVP # Packet Video Protocol -br-sat-mon 76 BR-SAT-MON # Backroom SATNET Monitoring -sun-nd 77 SUN-ND # SUN ND PROTOCOL-Temporary -wb-mon 78 WB-MON # WIDEBAND Monitoring -wb-expak 79 WB-EXPAK # WIDEBAND EXPAK -iso-ip 80 ISO-IP # ISO Internet Protocol -vmtp 81 VMTP # Versatile Message Transport -secure-vmtp 82 SECURE-VMTP # SECURE-VMTP -vines 83 VINES # VINES -ttp 84 TTP # TTP -#iptm 84 IPTM # Protocol Internet Protocol Traffic -nsfnet-igp 85 NSFNET-IGP # NSFNET-IGP -dgp 86 DGP # Dissimilar Gateway Protocol -tcf 87 TCF # TCF -eigrp 88 EIGRP # Enhanced Interior Routing Protocol (Cisco) -ospf 89 OSPFIGP # Open Shortest Path First IGP -sprite-rpc 90 Sprite-RPC # Sprite RPC Protocol -larp 91 LARP # Locus Address Resolution Protocol -mtp 92 MTP # Multicast Transport Protocol -ax.25 93 AX.25 # AX.25 Frames -ipip 94 IPIP # Yet Another IP encapsulation -micp 95 MICP # Mobile Internetworking Control Pro. -scc-sp 96 SCC-SP # Semaphore Communications Sec. Pro. -etherip 97 ETHERIP # Ethernet-within-IP Encapsulation -encap 98 ENCAP # Yet Another IP encapsulation -# 99 # any private encryption scheme -gmtp 100 GMTP # GMTP -ifmp 101 IFMP # Ipsilon Flow Management Protocol -pnni 102 PNNI # PNNI over IP -pim 103 PIM # Protocol Independent Multicast -aris 104 ARIS # ARIS -scps 105 SCPS # SCPS -qnx 106 QNX # QNX -a/n 107 A/N # Active Networks -ipcomp 108 IPComp # IP Payload Compression Protocol -snp 109 SNP # Sitara Networks Protocol -compaq-peer 110 Compaq-Peer # Compaq Peer Protocol -ipx-in-ip 111 IPX-in-IP # IPX in IP -carp 112 CARP vrrp # Common Address Redundancy Protocol -pgm 113 PGM # PGM Reliable Transport Protocol -# 114 # any 0-hop protocol -l2tp 115 L2TP # Layer Two Tunneling Protocol -ddx 116 DDX # D-II Data Exchange -iatp 117 IATP # Interactive Agent Transfer Protocol -stp 118 STP # Schedule Transfer Protocol -srp 119 SRP # SpectraLink Radio Protocol -uti 120 UTI # UTI -smp 121 SMP # Simple Message Protocol -sm 122 SM # SM -ptp 123 PTP # Performance Transparency Protocol -isis 124 ISIS # ISIS over IPv4 -fire 125 FIRE -crtp 126 CRTP # Combat Radio Transport Protocol -crudp 127 CRUDP # Combat Radio User Datagram -sscopmce 128 SSCOPMCE -iplt 129 IPLT -sps 130 SPS # Secure Packet Shield -pipe 131 PIPE # Private IP Encapsulation within IP -sctp 132 SCTP # Stream Control Transmission Protocol -fc 133 FC # Fibre Channel -rsvp-e2e-ignore 134 RSVP-E2E-IGNORE # Aggregation of RSVP for IP reservations -mobility-header 135 Mobility-Header # Mobility Support in IPv6 -udplite 136 UDPLite # The UDP-Lite Protocol -mpls-in-ip 137 MPLS-IN-IP # Encapsulating MPLS in IP -manet 138 MANET # MANET Protocols (RFC5498) -hip 139 HIP # Host Identity Protocol (RFC5201) -shim6 140 SHIM6 # Shim6 Protocol (RFC5533) -wesp 141 WESP # Wrapped Encapsulating Security Payload (RFC5840) -rohc 142 ROHC # Robust Header Compression (RFC5858) -# 138-254 # Unassigned -pfsync 240 PFSYNC # PF Synchronization -# 253-254 # Use for experimentation and testing (RFC3692) -# 255 # Reserved -divert 258 DIVERT # Divert pseudo-protocol [non IANA] diff --git a/src/etc/pubkey.pem b/src/etc/pubkey.pem deleted file mode 100644 index 7dd575d..0000000 --- a/src/etc/pubkey.pem +++ /dev/null @@ -1 +0,0 @@ -ssh-dss AAAAB3NzaC1kc3MAAACBAN08c22jym3KCRUF8/rKNXgU/J0vv6UC9eCta/ATTNgeW/z2rp/HsjcPkMLx9dLaqufShC0VzsUbGlqCsdQT8jfwBiLG2pjUkX20qTStRG/rs9Tv0rS/8eVNT/DbQ6zL3PTdp+XAIq+KQLucqcBazTqSzyF7ghZ7OVmsX1/ixTP3AAAAFQCYcP378X/dQ08l6u8O5uvEtxbvEwAAAIEAyOOuWttXGrprzBhKrjhop58bZTOZp0J0IMHMwi/J+K3HUuPZnaltGoW21MjqSvVor4m22r/3b8aUIom+jp4I/bmpxTOUgO6owTlCVX614fGPWcCw2M017aghQ/vUa/92DaMLO//FYD8X2b7WgyPNrJh9ckZ14oncBleJUfXmue8AAACBAKw00/IkoMJzTumFfT9+Jb442O1KZvtGyj1YWpyYXf3xbQFGXND7m4rTIS2zPvTcOauCHbZwZ9uBxE4zTdlGJ4XirPEbWwOl1TU71bZ3OqonVesyqSC04LLiuLGlIHyXxyc/UCzg1UL8mCBlLzqmPUkJoL0ZINo8Raqip8WM63KM root@freebsd-nexus-computers.pfsense.org diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index 478e3f5..df434f2 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -132,6 +132,12 @@ if (file_exists("/root/firmware.tgz")) { unlink("/root/firmware.tgz"); } +/* Reinstall of packages after reboot has been requested */ +if (file_exists('/conf/needs_package_sync_after_reboot')) { + touch('/conf/needs_package_sync'); + @unlink('/conf/needs_package_sync_after_reboot'); +} + /* start devd (dhclient now uses it) */ echo "Starting device manager (devd)..."; mute_kernel_msgs(); @@ -152,6 +158,10 @@ echo "done.\n"; /* run any early shell commands specified in config.xml */ system_do_shell_commands(1); +if (file_exists("/conf/trigger_initial_wizard")) { + check_for_alternate_interfaces(); +} + /* * Determine if we need to throw a interface exception * and ask the user to reassign interfaces. This will diff --git a/src/etc/rc.carpbackup b/src/etc/rc.carpbackup index 32cb319..e74ea3c 100755 --- a/src/etc/rc.carpbackup +++ b/src/etc/rc.carpbackup @@ -50,7 +50,7 @@ $friendly_descr = convert_friendly_interface_to_friendly_descr($friendly); $vips = link_interface_to_vips($friendly, '', $vhid); $carp_iface = "{$friendly}_vip{$vhid}"; -if(is_array($vips)) { +if (is_array($vips)) { foreach ($vips as $vip) { $notificationmsg = sprintf('Carp cluster member "(%1$s): (%2$s)" has resumed the state "BACKUP" for vhid %3$s', $argument, $friendly_descr, $vhid); diff --git a/src/etc/rc.gateway_alarm b/src/etc/rc.gateway_alarm new file mode 100755 index 0000000..a1afb65 --- /dev/null +++ b/src/etc/rc.gateway_alarm @@ -0,0 +1,63 @@ +#!/bin/sh +# +# rc.gateway_alarm +# +# Copyright (c) 2015 Electric Sheep Fencing, LLC. 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. +# +# 3. All advertising materials mentioning features or use of this software +# must display the following acknowledgment: +# "This product includes software developed by the pfSense Project +# for use in the pfSense® software distribution. (http://www.pfsense.org/). +# +# 4. The names "pfSense" and "pfSense Project" must not be used to +# endorse or promote products derived from this software without +# prior written permission. For written permission, please contact +# coreteam@pfsense.org. +# +# 5. Products derived from this software may not be called "pfSense" +# nor may "pfSense" appear in their names without prior written +# permission of the Electric Sheep Fencing, LLC. +# +# 6. Redistributions of any form whatsoever must retain the following +# acknowledgment: +# +# "This product includes software developed by the pfSense Project +# for use in the pfSense software distribution (http://www.pfsense.org/). +# +# THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY +# EXPRESSED 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 pfSense PROJECT OR +# ITS CONTRIBUTORS 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) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +# OF THE POSSIBILITY OF SUCH DAMAGE. + +GW="$1" + +if [ -z "$GW" ]; then + exit 1 +fi + +/usr/local/sbin/pfSctl \ + -c "service reload dyndns ${GW}" \ + -c "service reload ipsecdns" \ + -c "service reload openvpn ${GW}" \ + -c "filter reload" >/dev/null 2>&1 + +exit $? diff --git a/src/etc/rc.initial.defaults b/src/etc/rc.initial.defaults index 40ceaf9..c80a18d 100755 --- a/src/etc/rc.initial.defaults +++ b/src/etc/rc.initial.defaults @@ -36,24 +36,13 @@ $fp = fopen('php://stdin', 'r'); - echo <<<EOD - -You are about to reset the firewall to factory defaults. -The firewall will reboot after resetting the configuration. - -Do you want to proceed [y|n]? -EOD; + echo "\n" . gettext("You are about to reset the firewall to factory defaults."); + echo "\n" . gettext("The firewall will reboot after resetting the configuration."); + echo "\n" . gettext("Do you want to proceed [y|n]?") . " "; if (strcasecmp(chop(fgets($fp)), "y") == 0) { - reset_factory_defaults(); - - echo <<<EOD - -{$g['product_name']} is rebooting now. - -EOD; - + echo "\n" . sprintf(gettext("%s is rebooting now."), $g['product_name']) . "\n"; system_reboot_sync(); } diff --git a/src/etc/rc.initial.halt b/src/etc/rc.initial.halt index df91ded..27377b5 100755 --- a/src/etc/rc.initial.halt +++ b/src/etc/rc.initial.halt @@ -37,21 +37,11 @@ $fp = fopen('php://stdin', 'r'); - echo <<<EOD - -{$g['product_name']} will shutdown and halt system. This may take a few minutes, depending on your hardware. - -Do you want to proceed [y|n]? -EOD; + echo "\n" . sprintf(gettext("%s will shutdown and halt system. This may take a few minutes, depending on your hardware."), $g['product_name']) . "\n"; + echo gettext("Do you want to proceed [y|n]?") . " "; if (strcasecmp(chop(fgets($fp)), "y") == 0) { - - echo <<<EOD - -{$g['product_name']} will shutdown and halt system now. - -EOD; - + echo "\n" . sprintf(gettext("%s will shutdown and halt system now."), $g['product_name']) . "\n"; system_halt(); } diff --git a/src/etc/rc.initial.password b/src/etc/rc.initial.password index 0e13f7c..969745b 100755 --- a/src/etc/rc.initial.password +++ b/src/etc/rc.initial.password @@ -40,14 +40,14 @@ echo "\n" . gettext(' The webConfigurator admin password and privileges will be reset to the default (which is "' . strtolower($g['product_name']) . '").') . "\n" . - gettext('Do you want to proceed [y|n]?'); + gettext('Do you want to proceed [y|n]?') . " "; if (strcasecmp(chop(fgets($fp)), "y") == 0) { if (isset($config['system']['webgui']['authmode']) && - $config['system']['webgui']['authmode'] != "Local Database") { + $config['system']['webgui']['authmode'] != "Local Database") { echo "\n" . gettext(' The User manager authentication server is set to "' . $config['system']['webgui']['authmode'] . '".') . "\n" . - gettext('Do you want to set it back to Local Database [y|n]?'); + gettext('Do you want to set it back to Local Database [y|n]?') . " "; if (strcasecmp(chop(fgets($fp)), "y") == 0) { $config['system']['webgui']['authmode'] = "Local Database"; } @@ -76,7 +76,7 @@ The User manager authentication server is set to "' . $config['system']['webgui' write_config(gettext("password changed from console menu")); echo "\n" . gettext(' -The password for the webConfigurator has been reset and +The password for the webConfigurator has been reset and the default username has been set to "admin".') . "\n" . gettext(' Remember to set the password to something else than diff --git a/src/etc/rc.initial.reboot b/src/etc/rc.initial.reboot index 6f70407..fdcc480 100755 --- a/src/etc/rc.initial.reboot +++ b/src/etc/rc.initial.reboot @@ -37,21 +37,11 @@ $fp = fopen('php://stdin', 'r'); - echo <<<EOD - -{$g['product_name']} will reboot. This may take a few minutes, depending on your hardware. - -Do you want to proceed [y|n]? -EOD; + echo "\n" . sprintf(gettext("%s will reboot. This may take a few minutes, depending on your hardware."), $g['product_name']) . "\n"; + echo gettext("Do you want to proceed [y|n]?") . " "; if (strcasecmp(chop(fgets($fp)), "y") == 0) { - - echo <<<EOD - -{$g['product_name']} is rebooting now. - -EOD; - + echo "\n" . sprintf(gettext("%s is rebooting now."), $g['product_name']) . "\n"; system_reboot_sync(); } diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip index ea44b81..45cef96 100755 --- a/src/etc/rc.newwanip +++ b/src/etc/rc.newwanip @@ -216,8 +216,8 @@ if (!is_ipaddr($oldip) || $curwanip != $oldip || !is_ipaddrv4($config['interface /* * Some services (e.g. dyndns, see ticket #4066) depend on * filter_configure() to be called before, otherwise pass out - * route-to rules have the old ip set in 'from' and connection - * do not go through correct link + * route-to rules have the old ip set in 'from' and connections + * do not go through the correct link */ filter_configure_sync(); diff --git a/src/etc/rc.openvpn b/src/etc/rc.openvpn index cda8067..790f9c8 100755 --- a/src/etc/rc.openvpn +++ b/src/etc/rc.openvpn @@ -76,7 +76,7 @@ if (isset($_GET['interface'])) { } if ((is_array($config['openvpn']['openvpn-server']) && count($config['openvpn']['openvpn-server'])) || - (is_array($config['openvpn']['openvpn-client']) && count($config['openvpn']['openvpn-client']))) { + (is_array($config['openvpn']['openvpn-client']) && count($config['openvpn']['openvpn-client']))) { if (empty($argument) || $argument == "all") { $argument = "all"; $log_text = "all"; diff --git a/src/etc/rc.packages b/src/etc/rc.packages index 643ee85..ae15f11 100755 --- a/src/etc/rc.packages +++ b/src/etc/rc.packages @@ -73,15 +73,17 @@ if ($pkg == '' || $when == '') { pkg_remove_prefix($pkg); switch ($when) { -case "post-install": - install_package_xml($pkg); - break; -case "deinstall": -case "post-deinstall": - delete_package_xml($pkg, $when); - break; -default: - usage(); + case "post-install": + install_package_xml($pkg); + break; + case "post-deinstall": + delete_package_xml($pkg, $when); + break; + case "pre-install": + case "deinstall": + break; + default: + usage(); } ?> diff --git a/src/etc/services b/src/etc/services deleted file mode 100644 index 1f85da0..0000000 --- a/src/etc/services +++ /dev/null @@ -1,4111 +0,0 @@ -# -# Network services, Internet style -# -# Note that it is presently the policy of IANA to assign a single well-known -# port number for both TCP and UDP; hence, most entries here have two entries -# even if the protocol doesn't support UDP operations. -# -# The latest IANA port assignments can be gotten from -# -# http://www.iana.org/assignments/port-numbers -# -# The Well Known Ports are those from 0 through 1023. -# The Registered Ports are those from 1024 through 49151 -# The Dynamic and/or Private Ports are those from 49152 through 65535 -# -# Kerberos services are for Kerberos v4, and are unofficial. Sites running -# v5 should uncomment v5 entries and comment v4 entries. -# -# $FreeBSD: src/etc/services,v 1.62.2.12 2003/02/01 16:48:17 schweikh Exp $ -# From: @(#)services 5.8 (Berkeley) 5/9/91 -# -# WELL KNOWN PORT NUMBERS -# -rtmp 1/ddp #Routing Table Maintenance Protocol -tcpmux 1/tcp #TCP Port Service Multiplexer -tcpmux 1/udp #TCP Port Service Multiplexer -nbp 2/ddp #Name Binding Protocol -compressnet 2/tcp #Management Utility -compressnet 2/udp #Management Utility -compressnet 3/tcp #Compression Process -compressnet 3/udp #Compression Process -echo 4/ddp #AppleTalk Echo Protocol -rje 5/tcp #Remote Job Entry -rje 5/udp #Remote Job Entry -zip 6/ddp #Zone Information Protocol -echo 7/tcp -echo 7/udp -discard 9/tcp sink null -discard 9/udp sink null -systat 11/tcp users #Active Users -systat 11/udp users #Active Users -daytime 13/tcp -daytime 13/udp -qotd 17/tcp quote #Quote of the Day -qotd 17/udp quote #Quote of the Day -msp 18/tcp #Message Send Protocol -msp 18/udp #Message Send Protocol -chargen 19/tcp ttytst source #Character Generator -chargen 19/udp ttytst source #Character Generator -ftp-data 20/tcp #File Transfer [Default Data] -ftp-data 20/udp #File Transfer [Default Data] -ftp 21/tcp #File Transfer [Control] -ftp 21/udp #File Transfer [Control] -ssh 22/tcp #Secure Shell Login -ssh 22/udp #Secure Shell Login -telnet 23/tcp -telnet 23/udp -# 24/tcp any private mail system -# 24/udp any private mail system -smtp 25/tcp mail #Simple Mail Transfer -smtp 25/udp mail #Simple Mail Transfer -nsw-fe 27/tcp #NSW User System FE -nsw-fe 27/udp #NSW User System FE -msg-icp 29/tcp #MSG ICP -msg-icp 29/udp #MSG ICP -msg-auth 31/tcp #MSG Authentication -msg-auth 31/udp #MSG Authentication -dsp 33/tcp #Display Support Protocol -dsp 33/udp #Display Support Protocol -# 35/tcp any private printer server -# 35/udp any private printer server -time 37/tcp timserver -time 37/udp timserver -rap 38/tcp #Route Access Protocol -rap 38/udp #Route Access Protocol -rlp 39/tcp resource #Resource Location Protocol -rlp 39/udp resource #Resource Location Protocol -graphics 41/tcp -graphics 41/udp -nameserver 42/tcp name #Host Name Server -nameserver 42/udp name #Host Name Server -nicname 43/tcp whois -nicname 43/udp whois -mpm-flags 44/tcp #MPM FLAGS Protocol -mpm-flags 44/udp #MPM FLAGS Protocol -mpm 45/tcp #Message Processing Module [recv] -mpm 45/udp #Message Processing Module [recv] -mpm-snd 46/tcp #MPM [default send] -mpm-snd 46/udp #MPM [default send] -ni-ftp 47/tcp #NI FTP -ni-ftp 47/udp #NI FTP -auditd 48/tcp #Digital Audit Daemon -auditd 48/udp #Digital Audit Daemon -tacacs 49/tcp #Login Host Protocol (TACACS) -tacacs 49/udp #Login Host Protocol (TACACS) -re-mail-ck 50/tcp #Remote Mail Checking Protocol -re-mail-ck 50/udp #Remote Mail Checking Protocol -la-maint 51/tcp #IMP Logical Address Maintenance -la-maint 51/udp #IMP Logical Address Maintenance -xns-time 52/tcp #XNS Time Protocol -xns-time 52/udp #XNS Time Protocol -domain 53/tcp #Domain Name Server -domain 53/udp #Domain Name Server -xns-ch 54/tcp #XNS Clearinghouse -xns-ch 54/udp #XNS Clearinghouse -isi-gl 55/tcp #ISI Graphics Language -isi-gl 55/udp #ISI Graphics Language -xns-auth 56/tcp #XNS Authentication -xns-auth 56/udp #XNS Authentication -mtp 57/tcp # deprecated -#PROBLEMS!============================================================== -# 57/tcp any private terminal access -#PROBLEMS!============================================================== -# 57/udp any private terminal access -xns-mail 58/tcp #XNS Mail -xns-mail 58/udp #XNS Mail -# 59/tcp any private file service -# 59/udp any private file service -ni-mail 61/tcp #NI MAIL -ni-mail 61/udp #NI MAIL -acas 62/tcp #ACA Services -acas 62/udp #ACA Services -whois++ 63/tcp -whois++ 63/udp -covia 64/tcp #Communications Integrator (CI) -covia 64/udp #Communications Integrator (CI) -tacacs-ds 65/tcp #TACACS-Database Service -tacacs-ds 65/udp #TACACS-Database Service -sql*net 66/tcp #Oracle SQL*NET -sql*net 66/udp #Oracle SQL*NET -bootps 67/tcp dhcps #Bootstrap Protocol Server -bootps 67/udp dhcps #Bootstrap Protocol Server -bootpc 68/tcp dhcpc #Bootstrap Protocol Client -bootpc 68/udp dhcpc #Bootstrap Protocol Client -tftp 69/tcp #Trivial File Transfer -tftp 69/udp #Trivial File Transfer -tftp-proxy 6969/udp -gopher 70/tcp -gopher 70/udp -netrjs-1 71/tcp #Remote Job Service -netrjs-1 71/udp #Remote Job Service -netrjs-2 72/tcp #Remote Job Service -netrjs-2 72/udp #Remote Job Service -netrjs-3 73/tcp #Remote Job Service -netrjs-3 73/udp #Remote Job Service -netrjs-4 74/tcp #Remote Job Service -netrjs-4 74/udp #Remote Job Service -# 75/tcp any private dial out service -# 75/udp any private dial out service -deos 76/tcp #Distributed External Object Store -deos 76/udp #Distributed External Object Store -netrjs 77/tcp -#PROBLEMS!============================================================== -# 77/tcp any private RJE service -#PROBLEMS!============================================================== -# 77/udp any private RJE service -vettcp 78/tcp -vettcp 78/udp -finger 79/tcp -finger 79/udp -http 80/tcp www www-http #World Wide Web HTTP -http 80/udp www www-http #World Wide Web HTTP -hosts2-ns 81/tcp #HOSTS2 Name Server -hosts2-ns 81/udp #HOSTS2 Name Server -xfer 82/tcp #XFER Utility -xfer 82/udp #XFER Utility -mit-ml-dev 83/tcp #MIT ML Device -mit-ml-dev 83/udp #MIT ML Device -ctf 84/tcp #Common Trace Facility -ctf 84/udp #Common Trace Facility -mit-ml-dev 85/tcp #MIT ML Device -mit-ml-dev 85/udp #MIT ML Device -mfcobol 86/tcp #Micro Focus Cobol -mfcobol 86/udp #Micro Focus Cobol -ttylink 87/tcp -#PROBLEMS!=========================================================== -# 87/tcp any private terminal link -#PROBLEMS!=========================================================== -# 87/udp any private terminal link -kerberos-sec 88/tcp kerberos # krb5 # Kerberos (v5) -kerberos-sec 88/udp kerberos # krb5 # Kerberos (v5) -su-mit-tg 89/tcp #SU/MIT Telnet Gateway -su-mit-tg 89/udp #SU/MIT Telnet Gateway -dnsix 90/tcp #DNSIX Securit Attribute Token Map -dnsix 90/udp #DNSIX Securit Attribute Token Map -mit-dov 91/tcp #MIT Dover Spooler -mit-dov 91/udp #MIT Dover Spooler -npp 92/tcp #Network Printing Protocol -npp 92/udp #Network Printing Protocol -dcp 93/tcp #Device Control Protocol -dcp 93/udp #Device Control Protocol -objcall 94/tcp #Tivoli Object Dispatcher -objcall 94/udp #Tivoli Object Dispatcher -supdup 95/tcp -supdup 95/udp -dixie 96/tcp #DIXIE Protocol Specification -dixie 96/udp #DIXIE Protocol Specification -swift-rvf 97/tcp #Swift Remote Virtural File Protocol -swift-rvf 97/udp #Swift Remote Virtural File Protocol -tacnews 98/tcp #TAC News, Unofficial: Red Hat linuxconf -tacnews 98/udp #TAC News, Unofficial: Red Hat linuxconf -metagram 99/tcp #Metagram Relay -metagram 99/udp #Metagram Relay -newacct 100/tcp #[unauthorized use] -hostname 101/tcp hostnames #NIC Host Name Server -hostname 101/udp hostnames #NIC Host Name Server -iso-tsap 102/tcp tsap #ISO-TSAP Class 0 -iso-tsap 102/udp tsap #ISO-TSAP Class 0 -gppitnp 103/tcp #Genesis Point-to-Point Trans Net -gppitnp 103/udp #Genesis Point-to-Point Trans Net -acr-nema 104/tcp #ACR-NEMA Digital Imag. & Comm. 300 -acr-nema 104/udp #ACR-NEMA Digital Imag. & Comm. 300 -csnet-ns 105/tcp cso-ns cso #Mailbox Name Nameserver -csnet-ns 105/udp cso-ns cso #Mailbox Name Nameserver -pop3pw 106/tcp 3com-tsmux #Eudora compatible PW changer -3com-tsmux 106/udp -rtelnet 107/tcp #Remote Telnet Service -rtelnet 107/udp #Remote Telnet Service -snagas 108/tcp #SNA Gateway Access Server -snagas 108/udp #SNA Gateway Access Server -pop2 109/tcp postoffice #Post Office Protocol - Version 2 -pop2 109/udp postoffice #Post Office Protocol - Version 2 -pop3 110/tcp #Post Office Protocol - Version 3 -pop3 110/udp #Post Office Protocol - Version 3 -sunrpc 111/tcp rpcbind #SUN Remote Procedure Call -sunrpc 111/udp rpcbind #SUN Remote Procedure Call -mcidas 112/tcp #McIDAS Data Transmission Protocol -mcidas 112/udp #McIDAS Data Transmission Protocol -auth 113/tcp ident tap #Authentication Service -auth 113/udp ident tap #Authentication Service -audionews 114/tcp #Audio News Multicast -audionews 114/udp #Audio News Multicast -sftp 115/tcp #Simple File Transfer Protocol -sftp 115/udp #Simple File Transfer Protocol -ansanotify 116/tcp #ANSA REX Notify -ansanotify 116/udp #ANSA REX Notify -uucp-path 117/tcp #UUCP Path Service -uucp-path 117/udp #UUCP Path Service -sqlserv 118/tcp #SQL Services -sqlserv 118/udp #SQL Services -nntp 119/tcp usenet #Network News Transfer Protocol -nntp 119/udp usenet #Network News Transfer Protocol -cfdptkt 120/tcp -cfdptkt 120/udp -erpc 121/tcp #Encore Expedited Remote Pro.Call -erpc 121/udp #Encore Expedited Remote Pro.Call -smakynet 122/tcp -smakynet 122/udp -ntp 123/tcp #Network Time Protocol -ntp 123/udp #Network Time Protocol -ansatrader 124/tcp #ANSA REX Trader -ansatrader 124/udp #ANSA REX Trader -locus-map 125/tcp #Locus PC-Interface Net Map Ser -locus-map 125/udp #Locus PC-Interface Net Map Ser -unitary 126/tcp #Unisys Unitary Login -unitary 126/udp #Unisys Unitary Login -locus-con 127/tcp #Locus PC-Interface Conn Server -locus-con 127/udp #Locus PC-Interface Conn Server -gss-xlicen 128/tcp #GSS X License Verification -gss-xlicen 128/udp #GSS X License Verification -pwdgen 129/tcp #Password Generator Protocol -pwdgen 129/udp #Password Generator Protocol -cisco-fna 130/tcp #cisco FNATIVE -cisco-fna 130/udp #cisco FNATIVE -cisco-tna 131/tcp #cisco TNATIVE -cisco-tna 131/udp #cisco TNATIVE -cisco-sys 132/tcp #cisco SYSMAINT -cisco-sys 132/udp #cisco SYSMAINT -statsrv 133/tcp #Statistics Service -statsrv 133/udp #Statistics Service -ingres-net 134/tcp #INGRES-NET Service -ingres-net 134/udp #INGRES-NET Service -loc-srv 135/tcp epmap #Location Service -loc-srv 135/udp epmap #Location Service -profile 136/tcp #PROFILE Naming System -profile 136/udp #PROFILE Naming System -netbios-ns 137/tcp #NETBIOS Name Service -netbios-ns 137/udp #NETBIOS Name Service -netbios-dgm 138/tcp #NETBIOS Datagram Service -netbios-dgm 138/udp #NETBIOS Datagram Service -netbios-ssn 139/tcp #NETBIOS Session Service -netbios-ssn 139/udp #NETBIOS Session Service -emfis-data 140/tcp #EMFIS Data Service -emfis-data 140/udp #EMFIS Data Service -emfis-cntl 141/tcp #EMFIS Control Service -emfis-cntl 141/udp #EMFIS Control Service -bl-idm 142/tcp #Britton-Lee IDM -bl-idm 142/udp #Britton-Lee IDM -imap 143/tcp imap2 imap4 #Interim Mail Access Protocol v2 -imap 143/udp imap2 imap4 #Interim Mail Access Protocol v2 -NeWS 144/tcp # Window System -NeWS 144/udp # Window System -#PROBLEMS!============================================================== -#uma 144/tcp #Universal Management Architecture -#uma 144/udp #Universal Management Architecture -#PROBLEMS!============================================================== -uaac 145/tcp #UAAC Protocol -uaac 145/udp #UAAC Protocol -iso-tp0 146/tcp -iso-tp0 146/udp -iso-ip 147/tcp -iso-ip 147/udp -cronus 148/tcp jargon #CRONUS-SUPPORT -cronus 148/udp jargon #CRONUS-SUPPORT -aed-512 149/tcp #AED 512 Emulation Service -aed-512 149/udp #AED 512 Emulation Service -sql-net 150/tcp -sql-net 150/udp -hems 151/tcp -hems 151/udp -bftp 152/tcp #Background File Transfer Program -bftp 152/udp #Background File Transfer Program -sgmp 153/tcp -sgmp 153/udp -netsc-prod 154/tcp -netsc-prod 154/udp -netsc-dev 155/tcp -netsc-dev 155/udp -sqlsrv 156/tcp #SQL Service -sqlsrv 156/udp #SQL Service -knet-cmp 157/tcp #KNET/VM Command/Message Protocol -knet-cmp 157/udp #KNET/VM Command/Message Protocol -pcmail-srv 158/tcp #PCMail Server -pcmail-srv 158/udp #PCMail Server -nss-routing 159/tcp -nss-routing 159/udp -sgmp-traps 160/tcp -sgmp-traps 160/udp -snmp 161/tcp -snmp 161/udp -snmptrap 162/tcp snmp-trap -snmptrap 162/udp snmp-trap -cmip-man 163/tcp #CMIP/TCP Manager -cmip-man 163/udp #CMIP/TCP Manager -cmip-agent 164/tcp #CMIP/TCP Agent -smip-agent 164/udp #CMIP/TCP Agent -xns-courier 165/tcp #Xerox -xns-courier 165/udp #Xerox -s-net 166/tcp #Sirius Systems -s-net 166/udp #Sirius Systems -namp 167/tcp -namp 167/udp -rsvd 168/tcp -rsvd 168/udp -send 169/tcp -send 169/udp -print-srv 170/tcp #Network PostScript -print-srv 170/udp #Network PostScript -multiplex 171/tcp #Network Innovations Multiplex -multiplex 171/udp #Network Innovations Multiplex -cl/1 172/tcp #Network Innovations CL/1 -cl/1 172/udp #Network Innovations CL/1 -xyplex-mux 173/tcp -xyplex-mux 173/udp -mailq 174/tcp -mailq 174/udp -vmnet 175/tcp -vmnet 175/udp -genrad-mux 176/tcp -genrad-mux 176/udp -xdmcp 177/tcp #X Display Manager Control Protocol -xdmcp 177/udp #X Display Manager Control Protocol -NextStep 178/tcp nextstep NeXTStep #NextStep Window Server -NextStep 178/udp nextstep NeXTStep #NextStep Window Server -bgp 179/tcp #Border Gateway Protocol -bgp 179/udp #Border Gateway Protocol -ris 180/tcp #Intergraph -ris 180/udp #Intergraph -unify 181/tcp -unify 181/udp -audit 182/tcp #Unisys Audit SITP -audit 182/udp #Unisys Audit SITP -ocbinder 183/tcp -ocbinder 183/udp -ocserver 184/tcp -ocserver 184/udp -remote-kis 185/tcp -remote-kis 185/udp -kis 186/tcp #KIS Protocol -kis 186/udp #KIS Protocol -aci 187/tcp #Application Communication Interface -aci 187/udp #Application Communication Interface -mumps 188/tcp #Plus Five's MUMPS -mumps 188/udp #Plus Five's MUMPS -qft 189/tcp #Queued File Transport -qft 189/udp #Queued File Transport -gacp 190/tcp #Gateway Access Control Protocol -gacp 190/udp cacp #Gateway Access Control Protocol -prospero 191/tcp #Prospero Directory Service -prospero 191/udp #Prospero Directory Service -osu-nms 192/tcp #OSU Network Monitoring System -osu-nms 192/udp #OSU Network Monitoring System -srmp 193/tcp #Spider Remote Monitoring Protocol -srmp 193/udp #Spider Remote Monitoring Protocol -irc 194/tcp #Internet Relay Chat Protocol -irc 194/udp #Internet Relay Chat Protocol -dn6-nlm-aud 195/tcp #DNSIX Network Level Module Audit -dn6-nlm-aud 195/udp #DNSIX Network Level Module Audit -dn6-smm-red 196/tcp #DNSIX Session Mgt Module Audit Redir -dn6-smm-red 196/udp #DNSIX Session Mgt Module Audit Redir -dls 197/tcp #Directory Location Service -dls 197/udp #Directory Location Service -dls-mon 198/tcp #Directory Location Service Monitor -dls-mon 198/udp #Directory Location Service Monitor -smux 199/tcp -smux 199/udp -src 200/tcp #IBM System Resource Controller -src 200/udp #IBM System Resource Controller -at-rtmp 201/tcp #AppleTalk Routing Maintenance -at-rtmp 201/udp #AppleTalk Routing Maintenance -at-nbp 202/tcp #AppleTalk Name Binding -at-nbp 202/udp #AppleTalk Name Binding -at-3 203/tcp #AppleTalk Unused -at-3 203/udp #AppleTalk Unused -at-echo 204/tcp #AppleTalk Echo -at-echo 204/udp #AppleTalk Echo -at-5 205/tcp #AppleTalk Unused -at-5 205/udp #AppleTalk Unused -at-zis 206/tcp #AppleTalk Zone Information -at-zis 206/udp #AppleTalk Zone Information -at-7 207/tcp #AppleTalk Unused -at-7 207/udp #AppleTalk Unused -at-8 208/tcp #AppleTalk Unused -at-8 208/udp #AppleTalk Unused -qmtp 209/tcp #The Quick Mail Transfer Protocol -qmtp 209/udp #The Quick Mail Transfer Protocol -#PROBLEMS!============================================================== -#tam 209/tcp #Trivial Authenticated Mail Protocol -#tam 209/udp #Trivial Authenticated Mail Protocol -#PROBLEMS!============================================================== -z39.50 210/tcp wais #ANSI Z39.50 -z39.50 210/udp wais #ANSI Z39.50 -914c/g 211/tcp #Texas Instruments 914C/G Terminal -914c/g 211/udp #Texas Instruments 914C/G Terminal -anet 212/tcp #ATEXSSTR -anet 212/udp #ATEXSSTR -ipx 213/tcp -ipx 213/udp -vmpwscs 214/tcp -vmpwscs 214/udp -softpc 215/tcp #Insignia Solutions -softpc 215/udp #Insignia Solutions -CAIlic 216/tcp atls #Computer Associates Int'l License Server -CAIlic 216/udp atls #Computer Associates Int'l License Server -dbase 217/tcp #dBASE Unix -dbase 217/udp #dBASE Unix -mpp 218/tcp #Netix Message Posting Protocol -mpp 218/udp #Netix Message Posting Protocol -uarps 219/tcp #Unisys ARPs -uarps 219/udp #Unisys ARPs -#imap3@220 was never used and never should have been allocated. See PR 46294. -#imap3 220/tcp #Interactive Mail Access Protocol v3 -#imap3 220/udp #Interactive Mail Access Protocol v3 -fln-spx 221/tcp #Berkeley rlogind with SPX auth -fln-spx 221/udp #Berkeley rlogind with SPX auth -rsh-spx 222/tcp #Berkeley rshd with SPX auth -rsh-spx 222/udp #Berkeley rshd with SPX auth -cdc 223/tcp #Certificate Distribution Center -cdc 223/udp #Certificate Distribution Center -direct 242/tcp -direct 242/udp -sur-meas 243/tcp #Survey Measurement -sur-meas 243/udp #Survey Measurement -dayna 244/tcp -dayna 244/udp -link 245/tcp -link 245/udp -dsp3270 246/tcp #Display Systems Protocol -dsp3270 246/udp #Display Systems Protocol -subntbcst_tftp 247/tcp #subntbcst_tftp -subntbcst_tftp 247/udp #subntbcst_tftp -bhfhs 248/tcp -bhfhs 248/udp -# 249-255 reserved -rap 256/tcp -rap 256/udp -set 257/tcp #secure electronic transaction -set 257/udp #secure electronic transaction -yak-chat 258/tcp #yak winsock personal chat -yak-chat 258/udp #yak winsock personal chat -esro-gen 259/tcp #efficient short remote operations -esro-gen 259/udp #efficient short remote operations -openport 260/tcp -openport 260/udp -nsiiops 261/tcp #iiop name service over tls/ssl -nsiiops 261/udp #iiop name service over tls/ssl -arcisdms 262/tcp -arcisdms 262/udp -hdap 263/tcp -hdap 263/udp -bgmp 264/tcp -bgmp 264/udp -# 265-279 unassigned -http-mgmt 280/tcp -http-mgmt 280/udp -personal-link 281/tcp -personal-link 281/udp -cableport-ax 282/tcp #cable port a/x -cableport-ax 282/udp #cable port a/x -# 283-307 unassigned -novastorbakcup 308/tcp #novastor backup -novastorbakcup 308/udp #novastor backup -entrusttime 309/tcp -entrusttime 309/udp -bhmds 310/tcp -bhmds 310/udp -asip-webadmin 311/tcp #appleshare ip webadmin -asip-webadmin 311/udp #appleshare ip webadmin -vslmp 312/tcp -vslmp 312/udp -magenta-logic 313/tcp -magenta-logic 313/udp -opalis-robot 314/tcp -opalis-robot 314/udp -dpsi 315/tcp -dpsi 315/udp -decauth 316/tcp -decauth 316/udp -zannet 317/tcp -zannet 317/udp -# 318-320 #unassigned -pip 321/tcp -pip 321/udp -# 322-343 #unassigned -pdap 344/tcp #Prospero Data Access Protocol -pdap 344/udp #Prospero Data Access Protocol -pawserv 345/tcp #Perf Analysis Workbench -pawserv 345/udp #Perf Analysis Workbench -zserv 346/tcp #Zebra server -zserv 346/udp #Zebra server -fatserv 347/tcp #Fatmen Server -fatserv 347/udp #Fatmen Server -csi-sgwp 348/tcp #Cabletron Management Protocol -csi-sgwp 348/udp #Cabletron Management Protocol -mftp 349/tcp -mftp 349/udp -matip-type-a 350/tcp #MATIP Type A -matip-type-a 350/udp -matip-type-b 351/tcp #MATIP Type B -matip-type-b 351/udp -bhoetty 351/tcp #unassigned but widespread use -bhoetty 351/udp #unassigned but widespread use -dtag-ste-sb 352/tcp #DTAG -dtag-ste-sb 352/udp #DTAG -bhoedap4 352/tcp #unassigned but widespread use -bhoedap4 352/udp #unassigned but widespread use -ndsauth 353/tcp -ndsauth 353/udp -bh611 354/tcp -bh611 354/udp -datex-asn 355/tcp -datex-asn 355/udp -cloanto-net-1 356/tcp #Cloanto Net 1 -cloanto-net-1 356/udp -bhevent 357/tcp -bhevent 357/udp -shrinkwrap 358/tcp -shrinkwrap 358/udp -tenebris_nts 359/tcp #Tenebris Network Trace Service -tenebris_nts 359/udp #Tenebris Network Trace Service -scoi2odialog 360/tcp -scoi2odialog 360/udp -semantix 361/tcp -semantix 361/udp -srssend 362/tcp #SRS Send -srssend 362/udp #SRS Send -rsvp_tunnel 363/tcp -rsvp_tunnel 363/udp -aurora-cmgr 364/tcp -aurora-cmgr 364/udp -dtk 365/tcp #Deception Tool Kit - Fred Cohen <fc@all.net> -dtk 365/udp #Deception Tool Kit - Fred Cohen <fc@all.net> -odmr 366/tcp -odmr 366/udp -mortgageware 367/tcp -mortgageware 367/udp -qbikgdp 368/tcp #QbikGDP -qbikgdp 368/udp -rpc2portmap 369/tcp -rpc2portmap 369/udp -codaauth2 370/tcp -codaauth2 370/udp -clearcase 371/tcp -clearcase 371/udp -ulistserv 372/tcp ulistproc #Unix Listserv -ulistserv 372/udp ulistproc #Unix Listserv -legent-1 373/tcp #Legent Corporation (now Computer Associates Intl.) -legent-1 373/udp #Legent Corporation (now Computer Associates Intl.) -legent-2 374/tcp #Legent Corporation (now Computer Associates Intl.) -legent-2 374/udp #Legent Corporation (now Computer Associates Intl.) -hassle 375/tcp -hassle 375/udp -nip 376/tcp #Amiga Envoy Network Inquiry Proto -nip 376/udp #Amiga Envoy Network Inquiry Proto -tnETOS 377/tcp #NEC Corporation -tnETOS 377/udp #NEC Corporation -dsETOS 378/tcp #NEC Corporation -dsETOS 378/udp #NEC Corporation -is99c 379/tcp #TIA/EIA/IS-99 modem client -is99c 379/udp #TIA/EIA/IS-99 modem client -is99s 380/tcp #TIA/EIA/IS-99 modem server -is99s 380/udp #TIA/EIA/IS-99 modem server -hp-collector 381/tcp #hp performance data collector -hp-collector 381/udp #hp performance data collector -hp-managed-node 382/tcp #hp performance data managed node -hp-managed-node 382/udp #hp performance data managed node -hp-alarm-mgr 383/tcp #hp performance data alarm manager -hp-alarm-mgr 383/udp #hp performance data alarm manager -arns 384/tcp #A Remote Network Server System -arns 384/udp #A Remote Network Server System -ibm-app 385/tcp #IBM Application -ibm-app 385/udp #IBM Application -asa 386/tcp #ASA Message Router Object Def. -asa 386/udp #ASA Message Router Object Def. -aurp 387/tcp #Appletalk Update-Based Routing Pro. -aurp 387/udp #Appletalk Update-Based Routing Pro. -unidata-ldm 388/tcp #Unidata LDM Version 4 -unidata-ldm 388/udp #Unidata LDM Version 4 -ldap 389/tcp #Lightweight Directory Access Protocol -ldap 389/udp #Lightweight Directory Access Protocol -uis 390/tcp -uis 390/udp -synotics-relay 391/tcp #SynOptics SNMP Relay Port -synotics-relay 391/udp #SynOptics SNMP Relay Port -synotics-broker 392/tcp #SynOptics Port Broker Port -synotics-broker 392/udp #SynOptics Port Broker Port -dis 393/tcp #Data Interpretation System -dis 393/udp #Data Interpretation System -embl-ndt 394/tcp #EMBL Nucleic Data Transfer -embl-ndt 394/udp #EMBL Nucleic Data Transfer -netcp 395/tcp #NETscout Control Protocol -netcp 395/udp #NETscout Control Protocol -netware-ip 396/tcp #Novell Netware over IP -netware-ip 396/udp #Novell Netware over IP -mptn 397/tcp #Multi Protocol Trans. Net. -mptn 397/udp #Multi Protocol Trans. Net. -kryptolan 398/tcp -kryptolan 398/udp -iso-tsap-c2 399/tcp #ISO-TSAP Class 2 -iso-tsap-c2 399/udp #ISO-TSAP Class 2 -work-sol 400/tcp #Workstation Solutions -work-sol 400/udp #Workstation Solutions -ups 401/tcp #Uninterruptible Power Supply -ups 401/udp #Uninterruptible Power Supply -genie 402/tcp #Genie Protocol -genie 402/udp #Genie Protocol -decap 403/tcp -decap 403/udp -nced 404/tcp -nced 404/udp -ncld 405/tcp -ncld 405/udp -imsp 406/tcp #Interactive Mail Support Protocol -imsp 406/udp #Interactive Mail Support Protocol -timbuktu 407/tcp -timbuktu 407/udp -prm-sm 408/tcp #Prospero Resource Manager Sys. Man. -prm-sm 408/udp #Prospero Resource Manager Sys. Man. -prm-nm 409/tcp #Prospero Resource Manager Node Man. -prm-nm 409/udp #Prospero Resource Manager Node Man. -decladebug 410/tcp #DECLadebug Remote Debug Protocol -decladebug 410/udp #DECLadebug Remote Debug Protocol -rmt 411/tcp #Remote MT Protocol -rmt 411/udp #Remote MT Protocol -synoptics-trap 412/tcp #Trap Convention Port -synoptics-trap 412/udp #Trap Convention Port -smsp 413/tcp -smsp 413/udp -infoseek 414/tcp -infoseek 414/udp -bnet 415/tcp -bnet 415/udp -silverplatter 416/tcp -silverplatter 416/udp -onmux 417/tcp -onmux 417/udp -hyper-g 418/tcp -hyper-g 418/udp -ariel1 419/tcp -ariel1 419/udp -smpte 420/tcp -smpte 420/udp -ariel2 421/tcp -ariel2 421/udp -ariel3 422/tcp -ariel3 422/udp -opc-job-start 423/tcp #IBM Operations Planning and Control Start -opc-job-start 423/udp #IBM Operations Planning and Control Start -opc-job-track 424/tcp #IBM Operations Planning and Control Track -opc-job-track 424/udp #IBM Operations Planning and Control Track -icad-el 425/tcp -icad-el 425/udp -smartsdp 426/tcp -smartsdp 426/udp -svrloc 427/tcp #Server Location -svrloc 427/udp #Server Location -ocs_cmu 428/tcp -ocs_cmu 428/udp -ocs_amu 429/tcp -ocs_amu 429/udp -utmpsd 430/tcp -utmpsd 430/udp -utmpcd 431/tcp -utmpcd 431/udp -iasd 432/tcp -iasd 432/udp -nnsp 433/tcp -nnsp 433/udp -mobileip-agent 434/tcp -mobileip-agent 434/udp -mobilip-mn 435/tcp -mobilip-mn 435/udp -dna-cml 436/tcp -dna-cml 436/udp -comscm 437/tcp -comscm 437/udp -dsfgw 438/tcp -dsfgw 438/udp -dasp 439/tcp -dasp 439/udp -sgcp 440/tcp -sgcp 440/udp -decvms-sysmgt 441/tcp -decvms-sysmgt 441/udp -cvc_hostd 442/tcp -cvc_hostd 442/udp -https 443/tcp -https 443/udp -snpp 444/tcp #Simple Network Paging Protocol -snpp 444/udp #Simple Network Paging Protocol -# [RFC1568] -microsoft-ds 445/tcp -microsoft-ds 445/udp -ddm-rdb 446/tcp -ddm-rdb 446/udp -ddm-dfm 447/tcp -ddm-dfm 447/udp -ddm-ssl 448/tcp ddm-byte -ddm-ssl 448/udp ddm-byte -as-servermap 449/tcp #AS Server Mapper -as-servermap 449/udp #AS Server Mapper -tserver 450/tcp -tserver 450/udp -sfs-smp-net 451/tcp #Cray Network Semaphore server -sfs-smp-net 451/udp #Cray Network Semaphore server -sfs-config 452/tcp #Cray SFS config server -sfs-config 452/udp #Cray SFS config server -creativeserver 453/tcp #CreativeServer -creativeserver 453/udp #CreativeServer -contentserver 454/tcp #ContentServer -contentserver 454/udp #ContentServer -creativepartnr 455/tcp #CreativePartnr -creativepartnr 455/udp #CreativePartnr -macon-tcp 456/tcp -macon-udp 456/udp -scohelp 457/tcp -scohelp 457/udp -appleqtc 458/tcp #apple quick time -appleqtc 458/udp #apple quick time -ampr-rcmd 459/tcp -ampr-rcmd 459/udp -skronk 460/tcp -skronk 460/udp -datasurfsrv 461/tcp -datasurfsrv 461/udp -datasurfsrvsec 462/tcp -datasurfsrvsec 462/udp -alpes 463/tcp -alpes 463/udp -# -kpasswd5 464/tcp # Kerberos (v5) -kpasswd5 464/udp # Kerberos (v5) -#PROBLEMS!============================================================== -# IANA has offically assigned these two ports as ``kpasswd'' -#kpasswd 464/tcp # Kerberos (v5) -#kpasswd 464/udp # Kerberos (v5) -#PROBLEMS!============================================================== -smtps 465/tcp #smtp protocol over TLS/SSL (was ssmtp) -smtps 465/udp #smtp protocol over TLS/SSL (was ssmtp) -digital-vrc 466/tcp -digital-vrc 466/udp -mylex-mapd 467/tcp -mylex-mapd 467/udp -photuris 468/tcp -photuris 468/udp -rcp 469/tcp #Radio Control Protocol -rcp 469/udp #Radio Control Protocol -scx-proxy 470/tcp -scx-proxy 470/udp -mondex 471/tcp -mondex 471/udp -ljk-login 472/tcp -ljk-login 472/udp -hybrid-pop 473/tcp -hybrid-pop 473/udp -tn-tl-w1 474/tcp -tn-tl-w2 474/udp -tcpnethaspsrv 475/tcp -tcpnethaspsrv 475/udp -tn-tl-fd1 476/tcp -tn-tl-fd1 476/udp -ss7ns 477/tcp -ss7ns 477/udp -spsc 478/tcp -spsc 478/udp -iafserver 479/tcp -iafserver 479/udp -iafdbase 480/tcp -iafdbase 480/udp -ph 481/tcp -ph 481/udp -bgs-nsi 482/tcp -bgs-nsi 482/udp -ulpnet 483/tcp -ulpnet 483/udp -integra-sme 484/tcp #Integra Software Management Environment -integra-sme 484/udp #Integra Software Management Environment -powerburst 485/tcp #Air Soft Power Burst -powerburst 485/udp #Air Soft Power Burst -avian 486/tcp -avian 486/udp -saft 487/tcp #saft Simple Asynchronous File Transfer -saft 487/udp #saft Simple Asynchronous File Transfer -gss-http 488/tcp -gss-http 488/udp -nest-protocol 489/tcp -nest-protocol 489/udp -micom-pfs 490/tcp -micom-pfs 490/udp -go-login 491/tcp -go-login 491/udp -ticf-1 492/tcp #Transport Independent Convergence for FNA -ticf-1 492/udp #Transport Independent Convergence for FNA -ticf-2 493/tcp #Transport Independent Convergence for FNA -ticf-2 493/udp #Transport Independent Convergence for FNA -pov-ray 494/tcp -pov-ray 494/udp -intecourier 495/tcp -intecourier 495/udp -pim-rp-disc 496/tcp -pim-rp-disc 496/udp -dantz 497/tcp -dantz 497/udp -siam 498/tcp -siam 498/udp -iso-ill 499/tcp #ISO ILL Protocol -iso-ill 499/udp #ISO ILL Protocol -isakmp 500/tcp -isakmp 500/udp -stmf 501/tcp -stmf 501/udp -asa-appl-proto 502/tcp -asa-appl-proto 502/udp -intrinsa 503/tcp -intrinsa 503/udp -citadel 504/tcp -citadel 504/udp -mailbox-lm 505/tcp -mailbox-lm 505/udp -ohimsrv 506/tcp -ohimsrv 506/udp -crs 507/tcp -crs 507/udp -xvttp 508/tcp -xvttp 508/udp -snare 509/tcp -snare 509/udp -fcp 510/tcp #FirstClass Protocol -fcp 510/udp #FirstClass Protocol -passgo 511/tcp -passgo 511/udp -# -# Berkeley-specific services -# -exec 512/tcp #remote process execution; -# authentication performed using -# passwords and UNIX login names -biff 512/udp comsat #used by mail system to notify users -# of new mail received; currently -# receives messages only from -# processes on the same machine -login 513/tcp #remote login a la telnet; -# automatic authentication performed -# based on priviledged port numbers -# and distributed data bases which -# identify "authentication domains" -who 513/udp whod #maintains data bases showing who's -# logged in to machines on a local -# net and the load average of the -# machine -shell 514/tcp cmd #like exec, but automatic -# authentication is performed as for -# login server -syslog 514/udp -printer 515/tcp spooler -printer 515/udp spooler -videotex 516/tcp -videotex 516/udp -talk 517/tcp #like tenex link, but across -# machine - unfortunately, doesn't -# use link protocol (this is actually -# just a rendezvous port from which a -# tcp connection is established) -talk 517/udp #like tenex link, but across -# machine - unfortunately, doesn't -# use link protocol (this is actually -# just a rendezvous port from which a -# tcp connection is established) -ntalk 518/tcp -ntalk 518/udp -utime 519/tcp unixtime -utime 519/udp unixtime -efs 520/tcp #extended file name server -router 520/udp route routed #local routing process (on site); -# uses variant of Xerox NS routing -# information protocol -ripng 521/tcp -ripng 521/udp -ulp 522/tcp -ulp 522/udp -ibm-db2 523/tcp -ibm-db2 523/udp -ncp 524/tcp -ncp 524/udp -timed 525/tcp timeserver -timed 525/udp timeserver -tempo 526/tcp newdate -tempo 526/udp newdate -stx 527/tcp #Stock IXChange -stx 527/udp #Stock IXChange -custix 528/tcp #Customer IXChange -custix 528/udp #Customer IXChange -irc-serv 529/tcp -irc-serv 529/udp -courier 530/tcp rpc -courier 530/udp rpc -conference 531/tcp chat -conference 531/udp chat -netnews 532/tcp readnews -netnews 532/udp readnews -netwall 533/tcp #for emergency broadcasts -netwall 533/udp #for emergency broadcasts -mm-admin 534/tcp #MegaMedia Admin -mm-admin 534/udp #MegaMedia Admin -iiop 535/tcp -iiop 535/udp -opalis-rdv 536/tcp -opalis-rdv 536/udp -nmsp 537/tcp #Networked Media Streaming Protocol -nmsp 537/udp #Networked Media Streaming Protocol -gdomap 538/tcp -gdomap 538/udp -apertus-ldp 539/tcp #Apertus Technologies Load Determination -apertus-ldp 539/udp #Apertus Technologies Load Determination -uucp 540/tcp uucpd -uucp 540/udp uucpd -uucp-rlogin 541/tcp -uucp-rlogin 541/udp -commerce 542/tcp -commerce 542/udp -klogin 543/tcp # Kerberos (v4/v5) -klogin 543/udp # Kerberos (v4/v5) -kshell 544/tcp krcmd # Kerberos (v4/v5) -kshell 544/udp krcmd # Kerberos (v4/v5) -appleqtcsrvr 545/tcp -appleqtcsrvr 545/udp -dhcpv6-client 546/tcp #DHCPv6 Client -dhcpv6-client 546/udp #DHCPv6 Client -dhcpv6-server 547/tcp #DHCPv6 Server -dhcpv6-server 547/udp #DHCPv6 Server -afpovertcp 548/tcp #AFP over TCP -afpovertcp 548/udp #AFP over TCP -idfp 549/tcp -idfp 549/udp -new-rwho 550/tcp new-who -new-rwho 550/udp new-who -cybercash 551/tcp -cybercash 551/udp -deviceshare 552/tcp -deviceshare 552/udp -pirp 553/tcp -pirp 553/udp -rtsp 554/tcp #Real Time Stream Control Protocol -rtsp 554/udp #Real Time Stream Control Protocol -dsf 555/tcp -dsf 555/udp -remotefs 556/tcp rfs rfs_server # Brunhoff remote filesystem -remotefs 556/udp rfs rfs_server # Brunhoff remote filesystem -openvms-sysipc 557/tcp -openvms-sysipc 557/udp -sdnskmp 558/tcp -sdnskmp 558/udp -teedtap 559/tcp -teedtap 559/udp -rmonitor 560/tcp rmonitord -rmonitor 560/udp rmonitord -monitor 561/tcp -monitor 561/udp -chshell 562/tcp chcmd -chshell 562/udp chcmd -nntps 563/tcp snntp #nntp protocol over TLS/SSL -nntps 563/udp snntp #nntp protocol over TLS/SSL -9pfs 564/tcp #plan 9 file service -9pfs 564/udp #plan 9 file service -whoami 565/tcp -whoami 565/udp -streettalk 566/tcp -banyan-rpc 567/tcp -banyan-rpc 567/udp -ms-shuttle 568/tcp #Microsoft shuttle -ms-shuttle 568/udp #Microsoft shuttle -ms-rome 569/tcp #Microsoft rome -ms-rome 569/udp #Microsoft rome -meter 570/tcp #demon -meter 570/udp #demon -umeter 571/tcp #udemon -umeter 571/udp #udemon -sonar 572/tcp -sonar 572/udp -banyan-vip 573/tcp -banyan-vip 573/udp -ftp-agent 574/tcp #FTP Software Agent System -ftp-agent 574/udp #FTP Software Agent System -vemmi 575/tcp -vemmi 575/udp -ipcd 576/tcp -ipcd 576/udp -vnas 577/tcp -vnas 577/udp -ipdd 578/tcp -ipdd 578/udp -decbsrv 579/tcp -decbsrv 579/udp -sntp-heartbeat 580/tcp -sntp-heartbeat 580/udp -bdp 581/tcp #Bundle Discovery Protocol -bdp 581/udp #Bundle Discovery Protocol -scc-security 582/tcp -scc-security 582/udp -philips-vc 583/tcp #Philips Video-Conferencing -philips-vc 583/udp #Philips Video-Conferencing -keyserver 584/tcp -keyserver 584/udp -#imap4-ssl@585 never should have been allocated. See PR 46294. -#imap4-ssl 585/tcp #IMAP4+SSL (use of 585 is not recommended, -#imap4-ssl 585/udp # use 993 instead) -password-chg 586/tcp -password-chg 586/udp -submission 587/tcp -submission 587/udp -cal 588/tcp -cal 588/udp -eyelink 589/tcp -eyelink 589/udp -tns-cml 590/tcp -tns-cml 590/udp -http-alt 591/tcp #FileMaker, Inc. - HTTP Alternate (see Port 80) -http-alt 591/udp #FileMaker, Inc. - HTTP Alternate (see Port 80) -eudora-set 592/tcp -eudora-set 592/udp -http-rpc-epmap 593/tcp #HTTP RPC Ep Map -http-rpc-epmap 593/udp #HTTP RPC Ep Map -tpip 594/tcp -tpip 594/udp -cab-protocol 595/tcp -cab-protocol 595/udp -smsd 596/tcp -smsd 596/udp -ptcnameservice 597/tcp #PTC Name Service -ptcnameservice 597/udp #PTC Name Service -sco-websrvrmg3 598/tcp #SCO Web Server Manager 3 -sco-websrvrmg3 598/udp #SCO Web Server Manager 3 -acp 599/tcp #Aeolon Core Protocol -acp 599/udp #Aeolon Core Protocol -ipcserver 600/tcp #Sun IPC server -ipcserver 600/udp #Sun IPC server -nqs 607/tcp -nqs 607/udp -urm 606/tcp #Cray Unified Resource Manager -urm 606/udp #Cray Unified Resource Manager -sift-uft 608/tcp #Sender-Initiated/Unsolicited File Transfer -sift-uft 608/udp #Sender-Initiated/Unsolicited File Transfer -npmp-trap 609/tcp -npmp-trap 609/udp -npmp-local 610/tcp -npmp-local 610/udp -npmp-gui 611/tcp -npmp-gui 611/udp -sshell 614/tcp #SSLshell -sshell 614/udp -ipp 631/tcp #IPP (Internet Printing Protocol) -ipp 631/udp #IPP (Internet Printing Protocol) -ginad 634/tcp -ginad 634/udp -ldaps 636/tcp sldap #ldap protocol over TLS/SSL -ldaps 636/udp sldap -mdqs 666/tcp -mdqs 666/udp -#PROBLEMS!=============================================== -doom 666/tcp #doom Id Software -doom 666/udp #doom Id Software -#PROBLEMS!=============================================== -acap 674/tcp #Application Configuration Access Protocol -acap 674/udp #Application Configuration Access Protocol -elcsd 704/tcp #errlog copy/server daemon -elcsd 704/udp #errlog copy/server daemon -entrustmanager 709/tcp #EntrustManager -entrustmanager 709/udp #EntrustManager -netviewdm1 729/tcp #IBM NetView DM/6000 Server/Client -netviewdm1 729/udp #IBM NetView DM/6000 Server/Client -netviewdm2 730/tcp #IBM NetView DM/6000 send/tcp -netviewdm2 730/udp #IBM NetView DM/6000 send/tcp -netviewdm3 731/tcp #IBM NetView DM/6000 receive/tcp -netviewdm3 731/udp #IBM NetView DM/6000 receive/tcp -netgw 741/tcp -netgw 741/udp -netrcs 742/tcp #Network based Rev. Cont. Sys. -netrcs 742/udp #Network based Rev. Cont. Sys. -flexlm 744/tcp #Flexible License Manager -flexlm 744/udp #Flexible License Manager -fujitsu-dev 747/tcp #Fujitsu Device Control -fujitsu-dev 747/udp #Fujitsu Device Control -ris-cm 748/tcp #Russell Info Sci Calendar Manager -ris-cm 748/udp #Russell Info Sci Calendar Manager -kerberos-adm 749/tcp #Kerberos administration (v5) -kerberos-adm 749/udp #Kerberos administration (v5) -kerberos-iv 750/udp kdc # Kerberos (v4) -kerberos-iv 750/tcp kdc # Kerberos (v4) -#PROBLEMS!======================================================== -#rfile 750/tcp -#loadav 750/udp -#PROBLEMS!======================================================== -kerberos_master 751/tcp # Kerberos `kadmin' (v4) -kerberos_master 751/udp # Kerberos `kadmin' (v4) -#PROBLEMS!======================================================== -pump 751/tcp -pump 751/udp -#PROBLEMS!======================================================== -qrh 752/tcp -qrh 752/udp -rrh 753/tcp -rrh 753/udp -krb_prop 754/tcp krb5_prop # kerberos/v5 server propagation -#PROBLEMS!======================================================== -tell 754/tcp #send -#PROBLEMS!======================================================== -tell 754/udp #send -nlogin 758/tcp -nlogin 758/udp -con 759/tcp -con 759/udp -krbupdate 760/tcp kreg # Kerberos (v4) registration -#PROBLEMS!======================================================== -ns 760/tcp -#PROBLEMS!======================================================== -ns 760/udp -kpasswd 761/tcp kpwd # Kerberos (v4) "passwd" -#PROBLEMS!======================================================== -rxe 761/tcp -#PROBLEMS!======================================================== -rxe 761/udp -quotad 762/tcp -quotad 762/udp -cycleserv 763/tcp -cycleserv 763/udp -omserv 764/tcp -omserv 764/udp -webster 765/tcp -webster 765/udp -phonebook 767/tcp #phone -phonebook 767/udp #phone -vid 769/tcp -vid 769/udp -cadlock 770/tcp -cadlock 770/udp -rtip 771/tcp -rtip 771/udp -cycleserv2 772/tcp -cycleserv2 772/udp -submit 773/tcp -notify 773/udp -rpasswd 774/tcp -acmaint_dbd 774/udp -entomb 775/tcp -acmaint_transd 775/udp -wpages 776/tcp -wpages 776/udp -wpgs 780/tcp -wpgs 780/udp -concert 786/tcp -concert 786/udp -mdbs_daemon 800/tcp -mdbs_daemon 800/udp -device 801/tcp -device 801/udp -supfilesrv 871/tcp # for SUP -rsync 873/tcp -rsync 873/udp -accessbuilder 888/tcp -accessbuilder 888/udp -swat 901/tcp # samba web configuration tool -ftps-data 989/tcp # ftp protocol, data, over TLS/SSL -ftps-data 989/udp -ftps 990/tcp # ftp protocol, control, over TLS/SSL -ftps 990/udp -telnets 992/tcp # telnet protocol over TLS/SSL -telnets 992/udp -imaps 993/tcp # imap4 protocol over TLS/SSL -imaps 993/udp -ircs 994/tcp # irc protocol over TLS/SSL -ircs 994/udp -pop3s 995/tcp spop3 # pop3 protocol over TLS/SSL -pop3s 995/udp spop3 -vsinet 996/tcp -vsinet 996/udp -maitrd 997/tcp -maitrd 997/udp -busboy 998/tcp -puparp 998/udp -garcon 999/tcp -applix 999/udp #Applix ac -puprouter 999/tcp -puprouter 999/udp -cadlock 1000/tcp -ock 1000/udp -# -# REGISTERED PORT NUMBERS -# -blackjack 1025/tcp #network blackjack -blackjack 1025/udp #network blackjack -iad1 1030/tcp #BBN IAD -iad1 1030/udp #BBN IAD -iad2 1031/tcp #BBN IAD -iad2 1031/udp #BBN IAD -iad3 1032/tcp #BBN IAD -iad3 1032/udp #BBN IAD -nim 1058/tcp -nim 1058/udp -nimreg 1059/tcp -nimreg 1059/udp -instl_boots 1067/tcp #Installation Bootstrap Proto. Serv. -instl_boots 1067/udp #Installation Bootstrap Proto. Serv. -instl_bootc 1068/tcp #Installation Bootstrap Proto. Cli. -instl_bootc 1068/udp #Installation Bootstrap Proto. Cli. -socks 1080/tcp -socks 1080/udp -ansoft-lm-1 1083/tcp #Anasoft License Manager -ansoft-lm-1 1083/udp #Anasoft License Manager -ansoft-lm-2 1084/tcp #Anasoft License Manager -ansoft-lm-2 1084/udp #Anasoft License Manager -webobjects 1085/tcp #Web Objects -webobjects 1085/udp #Web Objects -kpop 1109/tcp #Unofficial -kpop 1109/udp #Unofficial -nfsd-status 1110/tcp #Cluster status info -nfsd-keepalive 1110/udp #Client status info -supfiledbg 1127/tcp # for SUP -nfa 1155/tcp #Network File Access -nfa 1155/udp #Network File Access -phone 1167/udp #conference calling -skkserv 1178/tcp #SKK (kanji input) -lupa 1212/tcp -lupa 1212/udp -nerv 1222/tcp #SNI R&D network -nerv 1222/udp #SNI R&D network -hermes 1248/tcp -hermes 1248/udp -healthd 1281/tcp #healthd -healthd 1281/udp #healthd -alta-ana-lm 1346/tcp #Alta Analytics License Manager -alta-ana-lm 1346/udp #Alta Analytics License Manager -bbn-mmc 1347/tcp #multi media conferencing -bbn-mmc 1347/udp #multi media conferencing -bbn-mmx 1348/tcp #multi media conferencing -bbn-mmx 1348/udp #multi media conferencing -sbook 1349/tcp #Registration Network Protocol -sbook 1349/udp #Registration Network Protocol -editbench 1350/tcp #Registration Network Protocol -editbench 1350/udp #Registration Network Protocol -equationbuilder 1351/tcp #Digital Tool Works (MIT) -equationbuilder 1351/udp #Digital Tool Works (MIT) -lotusnote 1352/tcp #Lotus Note -lotusnote 1352/udp #Lotus Note -relief 1353/tcp #Relief Consulting -relief 1353/udp #Relief Consulting -rightbrain 1354/tcp #RightBrain Software -rightbrain 1354/udp #RightBrain Software -intuitive-edge 1355/tcp #Intuitive Edge -intuitive-edge 1355/udp #Intuitive Edge -cuillamartin 1356/tcp #CuillaMartin Company -cuillamartin 1356/udp #CuillaMartin Company -pegboard 1357/tcp #Electronic PegBoard -pegboard 1357/udp #Electronic PegBoard -connlcli 1358/tcp -connlcli 1358/udp -ftsrv 1359/tcp -ftsrv 1359/udp -mimer 1360/tcp -mimer 1360/udp -linx 1361/tcp -linx 1361/udp -timeflies 1362/tcp -timeflies 1362/udp -ndm-requester 1363/tcp #Network DataMover Requester -ndm-requester 1363/udp #Network DataMover Requester -ndm-server 1364/tcp #Network DataMover Server -ndm-server 1364/udp #Network DataMover Server -adapt-sna 1365/tcp #Network Software Associates -adapt-sna 1365/udp #Network Software Associates -netware-csp 1366/tcp #Novell NetWare Comm Service Platform -netware-csp 1366/udp #Novell NetWare Comm Service Platform -dcs 1367/tcp -dcs 1367/udp -screencast 1368/tcp -screencast 1368/udp -gv-us 1369/tcp #GlobalView to Unix Shell -gv-us 1369/udp #GlobalView to Unix Shell -us-gv 1370/tcp #Unix Shell to GlobalView -us-gv 1370/udp #Unix Shell to GlobalView -fc-cli 1371/tcp #Fujitsu Config Protocol -fc-cli 1371/udp #Fujitsu Config Protocol -fc-ser 1372/tcp #Fujitsu Config Protocol -fc-ser 1372/udp #Fujitsu Config Protocol -chromagrafx 1373/tcp -chromagrafx 1373/udp -molly 1374/tcp #EPI Software Systems -molly 1374/udp #EPI Software Systems -bytex 1375/tcp -bytex 1375/udp -ibm-pps 1376/tcp #IBM Person to Person Software -ibm-pps 1376/udp #IBM Person to Person Software -cichlid 1377/tcp #Cichlid License Manager -cichlid 1377/udp #Cichlid License Manager -elan 1378/tcp #Elan License Manager -elan 1378/udp #Elan License Manager -dbreporter 1379/tcp #Integrity Solutions -dbreporter 1379/udp #Integrity Solutions -telesis-licman 1380/tcp #Telesis Network License Manager -telesis-licman 1380/udp #Telesis Network License Manager -apple-licman 1381/tcp #Apple Network License Manager -apple-licman 1381/udp #Apple Network License Manager -#udt_os 1382/tcp -#udt_os 1382/udp -gwha 1383/tcp #GW Hannaway Network License Manager -gwha 1383/udp #GW Hannaway Network License Manager -os-licman 1384/tcp #Objective Solutions License Manager -os-licman 1384/udp #Objective Solutions License Manager -atex_elmd 1385/tcp #Atex Publishing License Manager -atex_elmd 1385/udp #Atex Publishing License Manager -checksum 1386/tcp #CheckSum License Manager -checksum 1386/udp #CheckSum License Manager -cadsi-lm 1387/tcp #Computer Aided Design Software Inc LM -cadsi-lm 1387/udp #Computer Aided Design Software Inc LM -objective-dbc 1388/tcp #Objective Solutions DataBase Cache -objective-dbc 1388/udp #Objective Solutions DataBase Cache -iclpv-dm 1389/tcp #Document Manager -iclpv-dm 1389/udp #Document Manager -iclpv-sc 1390/tcp #Storage Controller -iclpv-sc 1390/udp #Storage Controller -iclpv-sas 1391/tcp #Storage Access Server -iclpv-sas 1391/udp #Storage Access Server -iclpv-pm 1392/tcp #Print Manager -iclpv-pm 1392/udp #Print Manager -iclpv-nls 1393/tcp #Network Log Server -iclpv-nls 1393/udp #Network Log Server -iclpv-nlc 1394/tcp #Network Log Client -iclpv-nlc 1394/udp #Network Log Client -iclpv-wsm 1395/tcp #PC Workstation Manager software -iclpv-wsm 1395/udp #PC Workstation Manager software -dvl-activemail 1396/tcp #DVL Active Mail -dvl-activemail 1396/udp #DVL Active Mail -audio-activmail 1397/tcp #Audio Active Mail -audio-activmail 1397/udp #Audio Active Mail -video-activmail 1398/tcp #Video Active Mail -video-activmail 1398/udp #Video Active Mail -cadkey-licman 1399/tcp #Cadkey License Manager -cadkey-licman 1399/udp #Cadkey License Manager -cadkey-tablet 1400/tcp #Cadkey Tablet Daemon -cadkey-tablet 1400/udp #Cadkey Tablet Daemon -goldleaf-licman 1401/tcp #Goldleaf License Manager -goldleaf-licman 1401/udp #Goldleaf License Manager -prm-sm-np 1402/tcp #Prospero Resource Manager -prm-sm-np 1402/udp #Prospero Resource Manager -prm-nm-np 1403/tcp #Prospero Resource Manager -prm-nm-np 1403/udp #Prospero Resource Manager -igi-lm 1404/tcp #Infinite Graphics License Manager -igi-lm 1404/udp #Infinite Graphics License Manager -ibm-res 1405/tcp #IBM Remote Execution Starter -ibm-res 1405/udp #IBM Remote Execution Starter -netlabs-lm 1406/tcp #NetLabs License Manager -netlabs-lm 1406/udp #NetLabs License Manager -dbsa-lm 1407/tcp #DBSA License Manager -dbsa-lm 1407/udp #DBSA License Manager -sophia-lm 1408/tcp #Sophia License Manager -sophia-lm 1408/udp #Sophia License Manager -here-lm 1409/tcp #Here License Manager -here-lm 1409/udp #Here License Manager -hiq 1410/tcp #HiQ License Manager -hiq 1410/udp #HiQ License Manager -af 1411/tcp #AudioFile -af 1411/udp #AudioFile -innosys 1412/tcp -innosys 1412/udp -innosys-acl 1413/tcp -innosys-acl 1413/udp -ibm-mqseries 1414/tcp #IBM MQSeries -ibm-mqseries 1414/udp #IBM MQSeries -dbstar 1415/tcp -dbstar 1415/udp -novell-lu6.2 1416/tcp #Novell LU6.2 -novell-lu6.2 1416/udp #Novell LU6.2 -timbuktu-srv1 1417/tcp #Timbuktu Service 1 Port -timbuktu-srv1 1417/udp #Timbuktu Service 1 Port -timbuktu-srv2 1418/tcp #Timbuktu Service 2 Port -timbuktu-srv2 1418/udp #Timbuktu Service 2 Port -timbuktu-srv3 1419/tcp #Timbuktu Service 3 Port -timbuktu-srv3 1419/udp #Timbuktu Service 3 Port -timbuktu-srv4 1420/tcp #Timbuktu Service 4 Port -timbuktu-srv4 1420/udp #Timbuktu Service 4 Port -gandalf-lm 1421/tcp #Gandalf License Manager -gandalf-lm 1421/udp #Gandalf License Manager -autodesk-lm 1422/tcp #Autodesk License Manager -autodesk-lm 1422/udp #Autodesk License Manager -essbase 1423/tcp #Essbase Arbor Software -essbase 1423/udp #Essbase Arbor Software -hybrid 1424/tcp #Hybrid Encryption Protocol -hybrid 1424/udp #Hybrid Encryption Protocol -zion-lm 1425/tcp #Zion Software License Manager -zion-lm 1425/udp #Zion Software License Manager -sas-1 1426/tcp #Satellite-data Acquisition System 1 -sas-1 1426/udp #Satellite-data Acquisition System 1 -mloadd 1427/tcp #mloadd monitoring tool -mloadd 1427/udp #mloadd monitoring tool -informatik-lm 1428/tcp #Informatik License Manager -informatik-lm 1428/udp #Informatik License Manager -nms 1429/tcp #Hypercom NMS -nms 1429/udp #Hypercom NMS -tpdu 1430/tcp #Hypercom TPDU -tpdu 1430/udp #Hypercom TPDU -rgtp 1431/tcp #Reverse Gossip Transport -rgtp 1431/udp #Reverse Gossip Transport -blueberry-lm 1432/tcp #Blueberry Software License Manager -blueberry-lm 1432/udp #Blueberry Software License Manager -ms-sql-s 1433/tcp #Microsoft-SQL-Server -ms-sql-s 1433/udp #Microsoft-SQL-Server -ms-sql-m 1434/tcp #Microsoft-SQL-Monitor -ms-sql-m 1434/udp #Microsoft-SQL-Monitor -ibm-cics 1435/tcp -ibm-cics 1435/udp -sas-2 1436/tcp #Satellite-data Acquisition System 2 -sas-2 1436/udp #Satellite-data Acquisition System 2 -tabula 1437/tcp -tabula 1437/udp -eicon-server 1438/tcp #Eicon Security Agent/Server -eicon-server 1438/udp #Eicon Security Agent/Server -eicon-x25 1439/tcp #Eicon X25/SNA Gateway -eicon-x25 1439/udp #Eicon X25/SNA Gateway -eicon-slp 1440/tcp #Eicon Service Location Protocol -eicon-slp 1440/udp #Eicon Service Location Protocol -cadis-1 1441/tcp #Cadis License Management -cadis-1 1441/udp #Cadis License Management -cadis-2 1442/tcp #Cadis License Management -cadis-2 1442/udp #Cadis License Management -ies-lm 1443/tcp #Integrated Engineering Software -ies-lm 1443/udp #Integrated Engineering Software -marcam-lm 1444/tcp #Marcam License Management -marcam-lm 1444/udp #Marcam License Management -proxima-lm 1445/tcp #Proxima License Manager -proxima-lm 1445/udp #Proxima License Manager -ora-lm 1446/tcp #Optical Research Associates License Manager -ora-lm 1446/udp #Optical Research Associates License Manager -apri-lm 1447/tcp #Applied Parallel Research LM -apri-lm 1447/udp #Applied Parallel Research LM -oc-lm 1448/tcp #OpenConnect License Manager -oc-lm 1448/udp #OpenConnect License Manager -peport 1449/tcp -peport 1449/udp -dwf 1450/tcp #Tandem Distributed Workbench Facility -dwf 1450/udp #Tandem Distributed Workbench Facility -infoman 1451/tcp #IBM Information Management -infoman 1451/udp #IBM Information Management -gtegsc-lm 1452/tcp #GTE Government Systems License Man -gtegsc-lm 1452/udp #GTE Government Systems License Man -genie-lm 1453/tcp #Genie License Manager -genie-lm 1453/udp #Genie License Manager -interhdl_elmd 1454/tcp #interHDL License Manager -interhdl_elmd 1454/udp #interHDL License Manager -esl-lm 1455/tcp #ESL License Manager -esl-lm 1455/udp #ESL License Manager -dca 1456/tcp -dca 1456/udp -valisys-lm 1457/tcp #Valisys License Manager -valisys-lm 1457/udp #Valisys License Manager -nrcabq-lm 1458/tcp #Nichols Research Corp. -nrcabq-lm 1458/udp #Nichols Research Corp. -proshare1 1459/tcp #Proshare Notebook Application -proshare1 1459/udp #Proshare Notebook Application -proshare2 1460/tcp #Proshare Notebook Application -proshare2 1460/udp #Proshare Notebook Application -ibm_wrless_lan 1461/tcp #IBM Wireless LAN -ibm_wrless_lan 1461/udp #IBM Wireless LAN -world-lm 1462/tcp #World License Manager -world-lm 1462/udp #World License Manager -nucleus 1463/tcp -nucleus 1463/udp -msl_lmd 1464/tcp #MSL License Manager -msl_lmd 1464/udp #MSL License Manager -pipes 1465/tcp #Pipes Platform -pipes 1465/udp #Pipes Platform mfarlin@peerlogic.com -oceansoft-lm 1466/tcp #Ocean Software License Manager -oceansoft-lm 1466/udp #Ocean Software License Manager -csdmbase 1467/tcp -csdmbase 1467/udp -csdm 1468/tcp -csdm 1468/udp -aal-lm 1469/tcp #Active Analysis Limited License Manager -aal-lm 1469/udp #Active Analysis Limited License Manager -uaiact 1470/tcp #Universal Analytics -uaiact 1470/udp #Universal Analytics -csdmbase 1471/tcp -csdmbase 1471/udp -csdm 1472/tcp -csdm 1472/udp -openmath 1473/tcp -openmath 1473/udp -telefinder 1474/tcp -telefinder 1474/udp -taligent-lm 1475/tcp #Taligent License Manager -taligent-lm 1475/udp #Taligent License Manager -clvm-cfg 1476/tcp -clvm-cfg 1476/udp -ms-sna-server 1477/tcp -ms-sna-server 1477/udp -ms-sna-base 1478/tcp -ms-sna-base 1478/udp -dberegister 1479/tcp -dberegister 1479/udp -pacerforum 1480/tcp -pacerforum 1480/udp -airs 1481/tcp -airs 1481/udp -miteksys-lm 1482/tcp #Miteksys License Manager -miteksys-lm 1482/udp #Miteksys License Manager -afs 1483/tcp #AFS License Manager -afs 1483/udp #AFS License Manager -confluent 1484/tcp #Confluent License Manager -confluent 1484/udp #Confluent License Manager -lansource 1485/tcp -lansource 1485/udp -nms_topo_serv 1486/tcp -nms_topo_serv 1486/udp -localinfosrvr 1487/tcp -localinfosrvr 1487/udp -docstor 1488/tcp -docstor 1488/udp -dmdocbroker 1489/tcp -dmdocbroker 1489/udp -insitu-conf 1490/tcp -insitu-conf 1490/udp -anynetgateway 1491/tcp -anynetgateway 1491/udp -stone-design-1 1492/tcp -stone-design-1 1492/udp -netmap_lm 1493/tcp -netmap_lm 1493/udp -ica 1494/tcp -ica 1494/udp -cvc 1495/tcp -cvc 1495/udp -liberty-lm 1496/tcp -liberty-lm 1496/udp -rfx-lm 1497/tcp -rfx-lm 1497/udp -watcom-sql 1498/tcp -watcom-sql 1498/udp -fhc 1499/tcp #Federico Heinz Consultora -fhc 1499/udp #Federico Heinz Consultora -vlsi-lm 1500/tcp #VLSI License Manager -vlsi-lm 1500/udp #VLSI License Manager -sas-3 1501/tcp #Satellite-data Acquisition System 3 -sas-3 1501/udp #Satellite-data Acquisition System 3 -shivadiscovery 1502/tcp #Shiva -shivadiscovery 1502/udp #Shiva -imtc-mcs 1503/tcp #Databeam -imtc-mcs 1503/udp #Databeam -evb-elm 1504/tcp #EVB Software Engineering License Manager -evb-elm 1504/udp #EVB Software Engineering License Manager -funkproxy 1505/tcp #Funk Software, Inc. -funkproxy 1505/udp #Funk Software, Inc. -utcd 1506/tcp #Universal Time daemon (utcd) -utcd 1506/udp #Universal Time daemon (utcd) -symplex 1507/tcp -symplex 1507/udp -diagmond 1508/tcp -diagmond 1508/udp -robcad-lm 1509/tcp #Robcad, Ltd. License Manager -robcad-lm 1509/udp #Robcad, Ltd. License Manager -mvx-lm 1510/tcp #Midland Valley Exploration Ltd. Lic. Man. -mvx-lm 1510/udp #Midland Valley Exploration Ltd. Lic. Man. -3l-l1 1511/tcp -3l-l1 1511/udp -wins 1512/tcp #Microsoft's Windows Internet Name Service -wins 1512/udp #Microsoft's Windows Internet Name Service -fujitsu-dtc 1513/tcp #Fujitsu Systems Business of America, Inc -fujitsu-dtc 1513/udp #Fujitsu Systems Business of America, Inc -fujitsu-dtcns 1514/tcp #Fujitsu Systems Business of America, Inc -fujitsu-dtcns 1514/udp #Fujitsu Systems Business of America, Inc -ifor-protocol 1515/tcp -ifor-protocol 1515/udp -vpad 1516/tcp #Virtual Places Audio data -vpad 1516/udp #Virtual Places Audio data -vpac 1517/tcp #Virtual Places Audio control -vpac 1517/udp #Virtual Places Audio control -vpvd 1518/tcp #Virtual Places Video data -vpvd 1518/udp #Virtual Places Video data -vpvc 1519/tcp #Virtual Places Video control -vpvc 1519/udp #Virtual Places Video control -atm-zip-office 1520/tcp #atm zip office -atm-zip-office 1520/udp #atm zip office -ncube-lm 1521/tcp #nCube License Manager -ncube-lm 1521/udp #nCube License Manager -rna-lm 1522/tcp #Ricardo North America License Manager -rna-lm 1522/udp #Ricardo North America License Manager -cichild-lm 1523/tcp -cichild-lm 1523/udp -ingreslock 1524/tcp #ingres -ingreslock 1524/udp #ingres -prospero-np 1525/tcp #Prospero Directory Service non-priv -prospero-np 1525/udp #Prospero Directory Service non-priv -#PROBLEMS!======================================================== -orasrv 1525/tcp #oracle -orasrv 1525/udp #oracle -#PROBLEMS!======================================================== -pdap-np 1526/tcp #Prospero Data Access Prot non-priv -pdap-np 1526/udp #Prospero Data Access Prot non-priv -tlisrv 1527/tcp #oracle -tlisrv 1527/udp #oracle -mciautoreg 1528/tcp -mciautoreg 1528/udp -support 1529/tcp prmsd gnatsd # cygnus bug tracker -coauthor 1529/tcp #oracle -coauthor 1529/udp #oracle -rap-service 1530/tcp -rap-service 1530/udp -rap-listen 1531/tcp -rap-listen 1531/udp -miroconnect 1532/tcp -miroconnect 1532/udp -virtual-places 1533/tcp #Virtual Places Software -virtual-places 1533/udp #Virtual Places Software -micromuse-lm 1534/tcp -micromuse-lm 1534/udp -ampr-info 1535/tcp -ampr-info 1535/udp -ampr-inter 1536/tcp -ampr-inter 1536/udp -sdsc-lm 1537/tcp -sdsc-lm 1537/udp -3ds-lm 1538/tcp -3ds-lm 1538/udp -intellistor-lm 1539/tcp #Intellistor License Manager -intellistor-lm 1539/udp #Intellistor License Manager -rds 1540/tcp -rds 1540/udp -rds2 1541/tcp -rds2 1541/udp -gridgen-elmd 1542/tcp -gridgen-elmd 1542/udp -simba-cs 1543/tcp -simba-cs 1543/udp -aspeclmd 1544/tcp -aspeclmd 1544/udp -vistium-share 1545/tcp -vistium-share 1545/udp -abbaccuray 1546/tcp -abbaccuray 1546/udp -laplink 1547/tcp -laplink 1547/udp -axon-lm 1548/tcp #Axon License Manager -axon-lm 1548/udp #Axon License Manager -shivahose 1549/tcp #Shiva Hose -shivasound 1549/udp #Shiva Sound -3m-image-lm 1550/tcp #Image Storage license manager 3M Company -3m-image-lm 1550/udp #Image Storage license manager 3M Company -hecmtl-db 1551/tcp -hecmtl-db 1551/udp -pciarray 1552/tcp -pciarray 1552/udp -issd 1600/tcp -issd 1600/udp -# IMPORTANT NOTE: Ports 1645/1646 are the traditional radius ports used by -# many vendors without obtaining official IANA assignment. The official -# assignment is now ports 1812/1813 and users are encouraged to migrate -# when possible to these new ports. -#radius 1645/udp #RADIUS authentication protocol (old) -#radacct 1646/udp #RADIUS accounting protocol (old) -nkd 1650/tcp -nkd 1650/udp -shiva_confsrvr 1651/tcp -shiva_confsrvr 1651/udp -xnmp 1652/tcp -xnmp 1652/udp -netview-aix-1 1661/tcp -netview-aix-1 1661/udp -netview-aix-2 1662/tcp -netview-aix-2 1662/udp -netview-aix-3 1663/tcp -netview-aix-3 1663/udp -netview-aix-4 1664/tcp -netview-aix-4 1664/udp -netview-aix-5 1665/tcp -netview-aix-5 1665/udp -netview-aix-6 1666/tcp -netview-aix-6 1666/udp -netview-aix-7 1667/tcp -netview-aix-7 1667/udp -netview-aix-8 1668/tcp -netview-aix-8 1668/udp -netview-aix-9 1669/tcp -netview-aix-9 1669/udp -netview-aix-10 1670/tcp -netview-aix-10 1670/udp -netview-aix-11 1671/tcp -netview-aix-11 1671/udp -netview-aix-12 1672/tcp -netview-aix-12 1672/udp -l2f 1701/tcp #l2f -l2f 1701/udp #l2f -l2tp 1701/tcp #Layer 2 Tunnelling Protocol -l2tp 1701/udp #Layer 2 Tunnelling Protocol -pptp 1723/tcp #Point-to-point tunnelling protocol -# IMPORTANT NOTE: See comments for ports 1645/1646 when using older equipment -radius 1812/udp #RADIUS authentication protocol (IANA sanctioned) -radacct 1813/udp #RADIUS accounting protocol (IANA sanctioned) -licensedaemon 1986/tcp #cisco license management -licensedaemon 1986/udp #cisco license management -tr-rsrb-p1 1987/tcp #cisco RSRB Priority 1 port -tr-rsrb-p1 1987/udp #cisco RSRB Priority 1 port -tr-rsrb-p2 1988/tcp #cisco RSRB Priority 2 port -tr-rsrb-p2 1988/udp #cisco RSRB Priority 2 port -tr-rsrb-p3 1989/tcp #cisco RSRB Priority 3 port -tr-rsrb-p3 1989/udp #cisco RSRB Priority 3 port -#PROBLEMS!=================================================== -mshnet 1989/tcp #MHSnet system -mshnet 1989/udp #MHSnet system -#PROBLEMS!=================================================== -stun-p1 1990/tcp #cisco STUN Priority 1 port -stun-p1 1990/udp #cisco STUN Priority 1 port -stun-p2 1991/tcp #cisco STUN Priority 2 port -stun-p2 1991/udp #cisco STUN Priority 2 port -stun-p3 1992/tcp #cisco STUN Priority 3 port -stun-p3 1992/udp #cisco STUN Priority 3 port -#PROBLEMS!=================================================== -ipsendmsg 1992/tcp -ipsendmsg 1992/udp -#PROBLEMS!=================================================== -snmp-tcp-port 1993/tcp #cisco SNMP TCP port -snmp-tcp-port 1993/udp #cisco SNMP TCP port -stun-port 1994/tcp #cisco serial tunnel port -stun-port 1994/udp #cisco serial tunnel port -perf-port 1995/tcp #cisco perf port -perf-port 1995/udp #cisco perf port -tr-rsrb-port 1996/tcp #cisco Remote SRB port -tr-rsrb-port 1996/udp #cisco Remote SRB port -gdp-port 1997/tcp #cisco Gateway Discovery Protocol -gdp-port 1997/udp #cisco Gateway Discovery Protocol -x25-svc-port 1998/tcp #cisco X.25 service (XOT) -x25-svc-port 1998/udp #cisco X.25 service (XOT) -tcp-id-port 1999/tcp #cisco identification port -tcp-id-port 1999/udp #cisco identification port -callbook 2000/tcp -callbook 2000/udp -dc 2001/tcp -wizard 2001/udp #curry -globe 2002/tcp -globe 2002/udp -cfingerd 2003/tcp #GNU finger -mailbox 2004/tcp -emce 2004/udp #CCWS mm conf -berknet 2005/tcp -oracle 2005/udp -invokator 2006/tcp -raid-cc 2006/udp #raid -dectalk 2007/tcp -raid-am 2007/udp -conf 2008/tcp -terminaldb 2008/udp -news 2009/tcp -whosockami 2009/udp -search 2010/tcp -pipe_server 2010/udp -raid-cc 2011/tcp #raid -servserv 2011/udp -ttyinfo 2012/tcp -raid-ac 2012/udp -raid-am 2013/tcp -raid-cd 2013/udp -troff 2014/tcp -raid-sf 2014/udp -cypress 2015/tcp -raid-cs 2015/udp -bootserver 2016/tcp -bootserver 2016/udp -cypress-stat 2017/tcp -bootclient 2017/udp -terminaldb 2018/tcp -rellpack 2018/udp -whosockami 2019/tcp -about 2019/udp -xinupageserver 2020/tcp -xinupageserver 2020/udp -servexec 2021/tcp -xinuexpansion1 2021/udp -down 2022/tcp -xinuexpansion2 2022/udp -xinuexpansion3 2023/tcp -xinuexpansion3 2023/udp -xinuexpansion4 2024/tcp -xinuexpansion4 2024/udp -ellpack 2025/tcp -xribs 2025/udp -scrabble 2026/tcp -scrabble 2026/udp -shadowserver 2027/tcp -shadowserver 2027/udp -submitserver 2028/tcp -submitserver 2028/udp -device2 2030/tcp -device2 2030/udp -blackboard 2032/tcp -blackboard 2032/udp -glogger 2033/tcp -glogger 2033/udp -scoremgr 2034/tcp -scoremgr 2034/udp -imsldoc 2035/tcp -imsldoc 2035/udp -objectmanager 2038/tcp -objectmanager 2038/udp -lam 2040/tcp -lam 2040/udp -interbase 2041/tcp -interbase 2041/udp -isis 2042/tcp -isis 2042/udp -isis-bcast 2043/tcp -isis-bcast 2043/udp -rimsl 2044/tcp -rimsl 2044/udp -cdfunc 2045/tcp -cdfunc 2045/udp -sdfunc 2046/tcp -sdfunc 2046/udp -#dls 2047/tcp -#dls 2047/udp -dls-monitor 2048/tcp -dls-monitor 2048/udp -nfsd 2049/tcp nfs # NFS server daemon -nfsd 2049/udp nfs # NFS server daemon -#PROBLEMS!============================================================= -#shilp 2049/tcp -#shilp 2049/udp -#PROBLEMS!============================================================= -dlsrpn 2065/tcp #Data Link Switch Read Port Number -dlsrpn 2065/udp #Data Link Switch Read Port Number -dlswpn 2067/tcp #Data Link Switch Write Port Number -dlswpn 2067/udp #Data Link Switch Write Port Number -zephyr-clt 2103/udp #Zephyr serv-hm connection -zephyr-hm 2104/udp #Zephyr hostmanager -#PROBLEMS!============================================================= -#zephyr-hm-srv 2105/udp #Zephyr hm-serv connection -#PROBLEMS!============================================================= -eklogin 2105/tcp #Kerberos (v4) encrypted rlogin -eklogin 2105/udp #Kerberos (v4) encrypted rlogin -ekshell 2106/tcp #Kerberos (v4) encrypted rshell -ekshell 2106/udp #Kerberos (v4) encrypted rshell -rkinit 2108/tcp #Kerberos (v4) remote initialization -rkinit 2108/udp #Kerberos (v4) remote initialization -ats 2201/tcp #Advanced Training System Program -ats 2201/udp #Advanced Training System Program -ivs-video 2232/tcp #IVS Video default -ivs-video 2232/udp #IVS Video default -ivsd 2241/tcp #IVS Daemon -ivsd 2241/udp #IVS Daemon -pehelp 2307/tcp -pehelp 2307/udp -cvspserver 2401/tcp #CVS network server -cvspserver 2401/udp #CVS network server -venus 2430/tcp #venus -venus 2430/udp #venus -venus-se 2431/tcp #venus-se -venus-se 2431/udp #venus-se -codasrv 2432/tcp #codasrv -codasrv 2432/udp #codasrv -codasrv-se 2433/tcp #codasrv-se -codasrv-se 2433/udp #codasrv-se -rtsserv 2500/tcp #Resource Tracking system server -rtsserv 2500/udp #Resource Tracking system server -rtsclient 2501/tcp #Resource Tracking system client -rtsclient 2501/udp #Resource Tracking system client -hp-3000-telnet 2564/tcp #HP 3000 NS/VT block mode telnet -zebrasrv 2600/tcp #zebra service -zebra 2601/tcp #zebra vty -ripd 2602/tcp #RIPd vty -ripngd 2603/tcp #RIPngd vty -ospfd 2604/tcp #OSPFd vty -bgpd 2605/tcp #BGPd vty -ospf6d 2606/tcp #OSPF6d vty -listen 2766/tcp #System V listener port -www-dev 2784/tcp #world wide web - development -www-dev 2784/udp #world wide web - development -dict 2628/tcp #RFC 2229 -dict 2628/udp #RFC 2229 -eppc 3031/tcp #Remote AppleEvents/PPC Toolbox -eppc 3031/udp #Remote AppleEvents/PPC Toolbox -NSWS 3049/tcp -NSWS 3049/udp -sj3 3086/tcp #SJ3 (kanji input) -vmodem 3141/tcp -vmodem 3141/udp -ccmail 3264/tcp #cc:mail/lotus -ccmail 3264/udp #cc:mail/lotus -dec-notes 3333/tcp #DEC Notes -dec-notes 3333/udp #DEC Notes -rsvp-encap 3455/udp #RSVP encapsulated in UDP -mapper-nodemgr 3984/tcp #MAPPER network node manager -mapper-nodemgr 3984/udp #MAPPER network node manager -mapper-mapethd 3985/tcp #MAPPER TCP/IP server -mapper-mapethd 3985/udp #MAPPER TCP/IP server -mapper-ws_ethd 3986/tcp #MAPPER workstation server -mapper-ws_ethd 3986/udp #MAPPER workstation server -bmap 3421/tcp #Bull Apprise portmapper -bmap 3421/udp #Bull Apprise portmapper -prsvp 3455/tcp #RSVP Port -prsvp 3455/udp #RSVP Port -vat 3456/tcp #VAT default data -vat 3456/udp #VAT default data -vat-control 3457/tcp #VAT default control -vat-control 3457/udp #VAT default control -udt_os 3900/tcp #Unidata UDT OS -udt_os 3900/udp #Unidata UDT OS -netcheque 4008/tcp #NetCheque accounting -netcheque 4008/udp #NetCheque accounting -lockd 4045/udp # NFS lock daemon/manager -lockd 4045/tcp -nuts_dem 4132/tcp #NUTS Daemon -nuts_dem 4132/udp #NUTS Daemon -nuts_bootp 4133/tcp #NUTS Bootp Server -nuts_bootp 4133/udp #NUTS Bootp Server -rwhois 4321/tcp #Remote Who Is -rwhois 4321/udp #Remote Who Is -unicall 4343/tcp -unicall 4343/udp -krb524 4444/tcp -krb524 4444/udp -# PROBLEM krb524 assigned the port, -# PROBLEM nv used it without an assignment -nv-video 4444/tcp #NV Video default -nv-video 4444/udp #NV Video default -sae-urn 4500/tcp -sae-urn 4500/udp -fax 4557/tcp #FAX transmission service -hylafax 4559/tcp #HylaFAX client-server protocol -rfa 4672/tcp #remote file access server -rfa 4672/udp #remote file access server -commplex-main 5000/tcp -commplex-main 5000/udp -commplex-link 5001/tcp -commplex-link 5001/udp -rfe 5002/tcp #radio free ethernet -rfe 5002/udp #radio free ethernet -telelpathstart 5010/tcp -telelpathstart 5010/udp -telelpathattack 5011/tcp -telelpathattack 5011/udp -mmcc 5050/tcp #multimedia conference control tool -mmcc 5050/udp #multimedia conference control tool -rmonitor_secure 5145/tcp -rmonitor_secure 5145/udp -aol 5190/tcp #America-Online -aol 5190/udp #America-Online -aol-1 5191/tcp #AmericaOnline1 -aol-1 5191/udp #AmericaOnline1 -aol-2 5192/tcp #AmericaOnline2 -aol-2 5192/udp #AmericaOnline2 -aol-3 5193/tcp #AmericaOnline3 -aol-3 5193/udp #AmericaOnline3 -jabber-client 5222/tcp #Jabber Client Connection -jabber-client 5222/udp #Jabber Client Connection -padl2sim 5236/tcp -padl2sim 5236/udp -jabber-server 5269/tcp #Jabber Server Connection -jabber-server 5269/udp #Jabber Server Connection -hacl-hb 5300/tcp # HA cluster heartbeat -hacl-hb 5300/udp # HA cluster heartbeat -hacl-gs 5301/tcp # HA cluster general services -hacl-gs 5301/udp # HA cluster general services -hacl-cfg 5302/tcp # HA cluster configuration -hacl-cfg 5302/udp # HA cluster configuration -hacl-probe 5303/tcp # HA cluster probing -hacl-probe 5303/udp # HA cluster probing -hacl-local 5304/tcp -hacl-local 5304/udp -hacl-test 5305/tcp -hacl-test 5305/udp -cfengine 5308/tcp -cfengine 5308/udp -postgresql 5432/tcp #PostgreSQL Database -postgresql 5432/udp #PostgreSQL Database -rplay 5555/udp -canna 5680/tcp #Canna (Japanese Input) -proshareaudio 5713/tcp #proshare conf audio -proshareaudio 5713/udp #proshare conf audio -prosharevideo 5714/tcp #proshare conf video -prosharevideo 5714/udp #proshare conf video -prosharedata 5715/tcp #proshare conf data -prosharedata 5715/udp #proshare conf data -prosharerequest 5716/tcp #proshare conf request -prosharerequest 5716/udp #proshare conf request -prosharenotify 5717/tcp #proshare conf notify -prosharenotify 5717/udp #proshare conf notify -cvsup 5999/tcp #CVSup file transfer/John Polstra/FreeBSD -x11 6000/tcp #6000-6063 are assigned to X Window System -x11 6000/udp -x11-ssh 6010/tcp #Unofficial name, for convenience -x11-ssh 6010/udp -softcm 6110/tcp #HP SoftBench CM -softcm 6110/udp #HP SoftBench CM -spc 6111/tcp #HP SoftBench Sub-Process Control -spc 6111/udp #HP SoftBench Sub-Process Control -meta-corp 6141/tcp #Meta Corporation License Manager -meta-corp 6141/udp #Meta Corporation License Manager -aspentec-lm 6142/tcp #Aspen Technology License Manager -aspentec-lm 6142/udp #Aspen Technology License Manager -watershed-lm 6143/tcp #Watershed License Manager -watershed-lm 6143/udp #Watershed License Manager -statsci1-lm 6144/tcp #StatSci License Manager - 1 -statsci1-lm 6144/udp #StatSci License Manager - 1 -statsci2-lm 6145/tcp #StatSci License Manager - 2 -statsci2-lm 6145/udp #StatSci License Manager - 2 -lonewolf-lm 6146/tcp #Lone Wolf Systems License Manager -lonewolf-lm 6146/udp #Lone Wolf Systems License Manager -montage-lm 6147/tcp #Montage License Manager -montage-lm 6147/udp #Montage License Manager -ricardo-lm 6148/tcp #Ricardo North America License Manager -ricardo-lm 6148/udp #Ricardo North America License Manager -xdsxdm 6558/tcp -xdsxdm 6558/udp -ircd 6667/tcp #Internet Relay Chat (unoffical) -acmsoda 6969/tcp -acmsoda 6969/udp -afs3-fileserver 7000/tcp #file server itself -afs3-fileserver 7000/udp #file server itself -afs3-callback 7001/tcp #callbacks to cache managers -afs3-callback 7001/udp #callbacks to cache managers -afs3-prserver 7002/tcp #users & groups database -afs3-prserver 7002/udp #users & groups database -afs3-vlserver 7003/tcp #volume location database -afs3-vlserver 7003/udp #volume location database -afs3-kaserver 7004/tcp #AFS/Kerberos authentication service -afs3-kaserver 7004/udp #AFS/Kerberos authentication service -afs3-volser 7005/tcp #volume management server -afs3-volser 7005/udp #volume management server -afs3-errors 7006/tcp #error interpretation service -afs3-errors 7006/udp #error interpretation service -afs3-bos 7007/tcp #basic overseer process -afs3-bos 7007/udp #basic overseer process -afs3-update 7008/tcp #server-to-server updater -afs3-update 7008/udp #server-to-server updater -afs3-rmtsys 7009/tcp #remote cache manager service -afs3-rmtsys 7009/udp #remote cache manager service -afs3-resserver 7010/tcp #MR-AFS residence server -afs3-resserver 7010/udp #MR-AFS residence server -afs3-remio 7011/tcp #MR-AFS remote IO server -afs3-remio 7011/udp #MR-AFS remote IO server -ups-onlinet 7010/tcp #onlinet uninterruptable power supplies -ups-onlinet 7010/udp #onlinet uninterruptable power supplies -font-service 7100/tcp #X Font Service -font-service 7100/udp #X Font Service -fodms 7200/tcp #FODMS FLIP -fodms 7200/udp #FODMS FLIP -dlip 7201/tcp -dlip 7201/udp -ftp-proxy 8021/tcp # pf ftp-proxy -spamd 8025/tcp # spamd(8) -spamd-sync 8025/udp # spamd(8) synchronisation -spamd-cfg 8026/tcp # spamd(8) configuration -natd 8668/divert # Network Address Translation -jetdirect 9100/tcp #HP JetDirect card -man 9535/tcp -man 9535/udp -sd 9876/tcp #Session Director -sd 9876/udp #Session Director -amanda 10080/udp #Dump server control -amandaidx 10082/tcp #Amanda indexing -amidxtape 10083/tcp #Amanda tape indexing -isode-dua 17007/tcp -isode-dua 17007/udp -biimenu 18000/tcp #Beckman Instruments, Inc. -biimenu 18000/udp #Beckman Instruments, Inc. -19000 19000/tcp # pfSense nat bouncing -19000 19000/udp # pfSense nat bouncing -19001 19001/tcp # pfSense nat bouncing -19001 19001/udp # pfSense nat bouncing -19002 19002/tcp # pfSense nat bouncing -19002 19002/udp # pfSense nat bouncing -19003 19003/tcp # pfSense nat bouncing -19003 19003/udp # pfSense nat bouncing -19004 19004/tcp # pfSense nat bouncing -19004 19004/udp # pfSense nat bouncing -19005 19005/tcp # pfSense nat bouncing -19005 19005/udp # pfSense nat bouncing -19006 19006/tcp # pfSense nat bouncing -19006 19006/udp # pfSense nat bouncing -19007 19007/tcp # pfSense nat bouncing -19007 19007/udp # pfSense nat bouncing -19008 19008/tcp # pfSense nat bouncing -19008 19008/udp # pfSense nat bouncing -19009 19009/tcp # pfSense nat bouncing -19009 19009/udp # pfSense nat bouncing -19010 19010/tcp # pfSense nat bouncing -19010 19010/udp # pfSense nat bouncing -19011 19011/tcp # pfSense nat bouncing -19011 19011/udp # pfSense nat bouncing -19012 19012/tcp # pfSense nat bouncing -19012 19012/udp # pfSense nat bouncing -19013 19013/tcp # pfSense nat bouncing -19013 19013/udp # pfSense nat bouncing -19014 19014/tcp # pfSense nat bouncing -19014 19014/udp # pfSense nat bouncing -19015 19015/tcp # pfSense nat bouncing -19015 19015/udp # pfSense nat bouncing -19016 19016/tcp # pfSense nat bouncing -19016 19016/udp # pfSense nat bouncing -19017 19017/tcp # pfSense nat bouncing -19017 19017/udp # pfSense nat bouncing -19018 19018/tcp # pfSense nat bouncing -19018 19018/udp # pfSense nat bouncing -19019 19019/tcp # pfSense nat bouncing -19019 19019/udp # pfSense nat bouncing -19020 19020/tcp # pfSense nat bouncing -19020 19020/udp # pfSense nat bouncing -19021 19021/tcp # pfSense nat bouncing -19021 19021/udp # pfSense nat bouncing -19022 19022/tcp # pfSense nat bouncing -19022 19022/udp # pfSense nat bouncing -19023 19023/tcp # pfSense nat bouncing -19023 19023/udp # pfSense nat bouncing -19024 19024/tcp # pfSense nat bouncing -19024 19024/udp # pfSense nat bouncing -19025 19025/tcp # pfSense nat bouncing -19025 19025/udp # pfSense nat bouncing -19026 19026/tcp # pfSense nat bouncing -19026 19026/udp # pfSense nat bouncing -19027 19027/tcp # pfSense nat bouncing -19027 19027/udp # pfSense nat bouncing -19028 19028/tcp # pfSense nat bouncing -19028 19028/udp # pfSense nat bouncing -19029 19029/tcp # pfSense nat bouncing -19029 19029/udp # pfSense nat bouncing -19030 19030/tcp # pfSense nat bouncing -19030 19030/udp # pfSense nat bouncing -19031 19031/tcp # pfSense nat bouncing -19031 19031/udp # pfSense nat bouncing -19032 19032/tcp # pfSense nat bouncing -19032 19032/udp # pfSense nat bouncing -19033 19033/tcp # pfSense nat bouncing -19033 19033/udp # pfSense nat bouncing -19034 19034/tcp # pfSense nat bouncing -19034 19034/udp # pfSense nat bouncing -19035 19035/tcp # pfSense nat bouncing -19035 19035/udp # pfSense nat bouncing -19036 19036/tcp # pfSense nat bouncing -19036 19036/udp # pfSense nat bouncing -19037 19037/tcp # pfSense nat bouncing -19037 19037/udp # pfSense nat bouncing -19038 19038/tcp # pfSense nat bouncing -19038 19038/udp # pfSense nat bouncing -19039 19039/tcp # pfSense nat bouncing -19039 19039/udp # pfSense nat bouncing -19040 19040/tcp # pfSense nat bouncing -19040 19040/udp # pfSense nat bouncing -19041 19041/tcp # pfSense nat bouncing -19041 19041/udp # pfSense nat bouncing -19042 19042/tcp # pfSense nat bouncing -19042 19042/udp # pfSense nat bouncing -19043 19043/tcp # pfSense nat bouncing -19043 19043/udp # pfSense nat bouncing -19044 19044/tcp # pfSense nat bouncing -19044 19044/udp # pfSense nat bouncing -19045 19045/tcp # pfSense nat bouncing -19045 19045/udp # pfSense nat bouncing -19046 19046/tcp # pfSense nat bouncing -19046 19046/udp # pfSense nat bouncing -19047 19047/tcp # pfSense nat bouncing -19047 19047/udp # pfSense nat bouncing -19048 19048/tcp # pfSense nat bouncing -19048 19048/udp # pfSense nat bouncing -19049 19049/tcp # pfSense nat bouncing -19049 19049/udp # pfSense nat bouncing -19050 19050/tcp # pfSense nat bouncing -19050 19050/udp # pfSense nat bouncing -19051 19051/tcp # pfSense nat bouncing -19051 19051/udp # pfSense nat bouncing -19052 19052/tcp # pfSense nat bouncing -19052 19052/udp # pfSense nat bouncing -19053 19053/tcp # pfSense nat bouncing -19053 19053/udp # pfSense nat bouncing -19054 19054/tcp # pfSense nat bouncing -19054 19054/udp # pfSense nat bouncing -19055 19055/tcp # pfSense nat bouncing -19055 19055/udp # pfSense nat bouncing -19056 19056/tcp # pfSense nat bouncing -19056 19056/udp # pfSense nat bouncing -19057 19057/tcp # pfSense nat bouncing -19057 19057/udp # pfSense nat bouncing -19058 19058/tcp # pfSense nat bouncing -19058 19058/udp # pfSense nat bouncing -19059 19059/tcp # pfSense nat bouncing -19059 19059/udp # pfSense nat bouncing -19060 19060/tcp # pfSense nat bouncing -19060 19060/udp # pfSense nat bouncing -19061 19061/tcp # pfSense nat bouncing -19061 19061/udp # pfSense nat bouncing -19062 19062/tcp # pfSense nat bouncing -19062 19062/udp # pfSense nat bouncing -19063 19063/tcp # pfSense nat bouncing -19063 19063/udp # pfSense nat bouncing -19064 19064/tcp # pfSense nat bouncing -19064 19064/udp # pfSense nat bouncing -19065 19065/tcp # pfSense nat bouncing -19065 19065/udp # pfSense nat bouncing -19066 19066/tcp # pfSense nat bouncing -19066 19066/udp # pfSense nat bouncing -19067 19067/tcp # pfSense nat bouncing -19067 19067/udp # pfSense nat bouncing -19068 19068/tcp # pfSense nat bouncing -19068 19068/udp # pfSense nat bouncing -19069 19069/tcp # pfSense nat bouncing -19069 19069/udp # pfSense nat bouncing -19070 19070/tcp # pfSense nat bouncing -19070 19070/udp # pfSense nat bouncing -19071 19071/tcp # pfSense nat bouncing -19071 19071/udp # pfSense nat bouncing -19072 19072/tcp # pfSense nat bouncing -19072 19072/udp # pfSense nat bouncing -19073 19073/tcp # pfSense nat bouncing -19073 19073/udp # pfSense nat bouncing -19074 19074/tcp # pfSense nat bouncing -19074 19074/udp # pfSense nat bouncing -19075 19075/tcp # pfSense nat bouncing -19075 19075/udp # pfSense nat bouncing -19076 19076/tcp # pfSense nat bouncing -19076 19076/udp # pfSense nat bouncing -19077 19077/tcp # pfSense nat bouncing -19077 19077/udp # pfSense nat bouncing -19078 19078/tcp # pfSense nat bouncing -19078 19078/udp # pfSense nat bouncing -19079 19079/tcp # pfSense nat bouncing -19079 19079/udp # pfSense nat bouncing -19080 19080/tcp # pfSense nat bouncing -19080 19080/udp # pfSense nat bouncing -19081 19081/tcp # pfSense nat bouncing -19081 19081/udp # pfSense nat bouncing -19082 19082/tcp # pfSense nat bouncing -19082 19082/udp # pfSense nat bouncing -19083 19083/tcp # pfSense nat bouncing -19083 19083/udp # pfSense nat bouncing -19084 19084/tcp # pfSense nat bouncing -19084 19084/udp # pfSense nat bouncing -19085 19085/tcp # pfSense nat bouncing -19085 19085/udp # pfSense nat bouncing -19086 19086/tcp # pfSense nat bouncing -19086 19086/udp # pfSense nat bouncing -19087 19087/tcp # pfSense nat bouncing -19087 19087/udp # pfSense nat bouncing -19088 19088/tcp # pfSense nat bouncing -19088 19088/udp # pfSense nat bouncing -19089 19089/tcp # pfSense nat bouncing -19089 19089/udp # pfSense nat bouncing -19090 19090/tcp # pfSense nat bouncing -19090 19090/udp # pfSense nat bouncing -19091 19091/tcp # pfSense nat bouncing -19091 19091/udp # pfSense nat bouncing -19092 19092/tcp # pfSense nat bouncing -19092 19092/udp # pfSense nat bouncing -19093 19093/tcp # pfSense nat bouncing -19093 19093/udp # pfSense nat bouncing -19094 19094/tcp # pfSense nat bouncing -19094 19094/udp # pfSense nat bouncing -19095 19095/tcp # pfSense nat bouncing -19095 19095/udp # pfSense nat bouncing -19096 19096/tcp # pfSense nat bouncing -19096 19096/udp # pfSense nat bouncing -19097 19097/tcp # pfSense nat bouncing -19097 19097/udp # pfSense nat bouncing -19098 19098/tcp # pfSense nat bouncing -19098 19098/udp # pfSense nat bouncing -19099 19099/tcp # pfSense nat bouncing -19099 19099/udp # pfSense nat bouncing -19100 19100/tcp # pfSense nat bouncing -19100 19100/udp # pfSense nat bouncing -19101 19101/tcp # pfSense nat bouncing -19101 19101/udp # pfSense nat bouncing -19102 19102/tcp # pfSense nat bouncing -19102 19102/udp # pfSense nat bouncing -19103 19103/tcp # pfSense nat bouncing -19103 19103/udp # pfSense nat bouncing -19104 19104/tcp # pfSense nat bouncing -19104 19104/udp # pfSense nat bouncing -19105 19105/tcp # pfSense nat bouncing -19105 19105/udp # pfSense nat bouncing -19106 19106/tcp # pfSense nat bouncing -19106 19106/udp # pfSense nat bouncing -19107 19107/tcp # pfSense nat bouncing -19107 19107/udp # pfSense nat bouncing -19108 19108/tcp # pfSense nat bouncing -19108 19108/udp # pfSense nat bouncing -19109 19109/tcp # pfSense nat bouncing -19109 19109/udp # pfSense nat bouncing -19110 19110/tcp # pfSense nat bouncing -19110 19110/udp # pfSense nat bouncing -19111 19111/tcp # pfSense nat bouncing -19111 19111/udp # pfSense nat bouncing -19112 19112/tcp # pfSense nat bouncing -19112 19112/udp # pfSense nat bouncing -19113 19113/tcp # pfSense nat bouncing -19113 19113/udp # pfSense nat bouncing -19114 19114/tcp # pfSense nat bouncing -19114 19114/udp # pfSense nat bouncing -19115 19115/tcp # pfSense nat bouncing -19115 19115/udp # pfSense nat bouncing -19116 19116/tcp # pfSense nat bouncing -19116 19116/udp # pfSense nat bouncing -19117 19117/tcp # pfSense nat bouncing -19117 19117/udp # pfSense nat bouncing -19118 19118/tcp # pfSense nat bouncing -19118 19118/udp # pfSense nat bouncing -19119 19119/tcp # pfSense nat bouncing -19119 19119/udp # pfSense nat bouncing -19120 19120/tcp # pfSense nat bouncing -19120 19120/udp # pfSense nat bouncing -19121 19121/tcp # pfSense nat bouncing -19121 19121/udp # pfSense nat bouncing -19122 19122/tcp # pfSense nat bouncing -19122 19122/udp # pfSense nat bouncing -19123 19123/tcp # pfSense nat bouncing -19123 19123/udp # pfSense nat bouncing -19124 19124/tcp # pfSense nat bouncing -19124 19124/udp # pfSense nat bouncing -19125 19125/tcp # pfSense nat bouncing -19125 19125/udp # pfSense nat bouncing -19126 19126/tcp # pfSense nat bouncing -19126 19126/udp # pfSense nat bouncing -19127 19127/tcp # pfSense nat bouncing -19127 19127/udp # pfSense nat bouncing -19128 19128/tcp # pfSense nat bouncing -19128 19128/udp # pfSense nat bouncing -19129 19129/tcp # pfSense nat bouncing -19129 19129/udp # pfSense nat bouncing -19130 19130/tcp # pfSense nat bouncing -19130 19130/udp # pfSense nat bouncing -19131 19131/tcp # pfSense nat bouncing -19131 19131/udp # pfSense nat bouncing -19132 19132/tcp # pfSense nat bouncing -19132 19132/udp # pfSense nat bouncing -19133 19133/tcp # pfSense nat bouncing -19133 19133/udp # pfSense nat bouncing -19134 19134/tcp # pfSense nat bouncing -19134 19134/udp # pfSense nat bouncing -19135 19135/tcp # pfSense nat bouncing -19135 19135/udp # pfSense nat bouncing -19136 19136/tcp # pfSense nat bouncing -19136 19136/udp # pfSense nat bouncing -19137 19137/tcp # pfSense nat bouncing -19137 19137/udp # pfSense nat bouncing -19138 19138/tcp # pfSense nat bouncing -19138 19138/udp # pfSense nat bouncing -19139 19139/tcp # pfSense nat bouncing -19139 19139/udp # pfSense nat bouncing -19140 19140/tcp # pfSense nat bouncing -19140 19140/udp # pfSense nat bouncing -19141 19141/tcp # pfSense nat bouncing -19141 19141/udp # pfSense nat bouncing -19142 19142/tcp # pfSense nat bouncing -19142 19142/udp # pfSense nat bouncing -19143 19143/tcp # pfSense nat bouncing -19143 19143/udp # pfSense nat bouncing -19144 19144/tcp # pfSense nat bouncing -19144 19144/udp # pfSense nat bouncing -19145 19145/tcp # pfSense nat bouncing -19145 19145/udp # pfSense nat bouncing -19146 19146/tcp # pfSense nat bouncing -19146 19146/udp # pfSense nat bouncing -19147 19147/tcp # pfSense nat bouncing -19147 19147/udp # pfSense nat bouncing -19148 19148/tcp # pfSense nat bouncing -19148 19148/udp # pfSense nat bouncing -19149 19149/tcp # pfSense nat bouncing -19149 19149/udp # pfSense nat bouncing -19150 19150/tcp # pfSense nat bouncing -19150 19150/udp # pfSense nat bouncing -19151 19151/tcp # pfSense nat bouncing -19151 19151/udp # pfSense nat bouncing -19152 19152/tcp # pfSense nat bouncing -19152 19152/udp # pfSense nat bouncing -19153 19153/tcp # pfSense nat bouncing -19153 19153/udp # pfSense nat bouncing -19154 19154/tcp # pfSense nat bouncing -19154 19154/udp # pfSense nat bouncing -19155 19155/tcp # pfSense nat bouncing -19155 19155/udp # pfSense nat bouncing -19156 19156/tcp # pfSense nat bouncing -19156 19156/udp # pfSense nat bouncing -19157 19157/tcp # pfSense nat bouncing -19157 19157/udp # pfSense nat bouncing -19158 19158/tcp # pfSense nat bouncing -19158 19158/udp # pfSense nat bouncing -19159 19159/tcp # pfSense nat bouncing -19159 19159/udp # pfSense nat bouncing -19160 19160/tcp # pfSense nat bouncing -19160 19160/udp # pfSense nat bouncing -19161 19161/tcp # pfSense nat bouncing -19161 19161/udp # pfSense nat bouncing -19162 19162/tcp # pfSense nat bouncing -19162 19162/udp # pfSense nat bouncing -19163 19163/tcp # pfSense nat bouncing -19163 19163/udp # pfSense nat bouncing -19164 19164/tcp # pfSense nat bouncing -19164 19164/udp # pfSense nat bouncing -19165 19165/tcp # pfSense nat bouncing -19165 19165/udp # pfSense nat bouncing -19166 19166/tcp # pfSense nat bouncing -19166 19166/udp # pfSense nat bouncing -19167 19167/tcp # pfSense nat bouncing -19167 19167/udp # pfSense nat bouncing -19168 19168/tcp # pfSense nat bouncing -19168 19168/udp # pfSense nat bouncing -19169 19169/tcp # pfSense nat bouncing -19169 19169/udp # pfSense nat bouncing -19170 19170/tcp # pfSense nat bouncing -19170 19170/udp # pfSense nat bouncing -19171 19171/tcp # pfSense nat bouncing -19171 19171/udp # pfSense nat bouncing -19172 19172/tcp # pfSense nat bouncing -19172 19172/udp # pfSense nat bouncing -19173 19173/tcp # pfSense nat bouncing -19173 19173/udp # pfSense nat bouncing -19174 19174/tcp # pfSense nat bouncing -19174 19174/udp # pfSense nat bouncing -19175 19175/tcp # pfSense nat bouncing -19175 19175/udp # pfSense nat bouncing -19176 19176/tcp # pfSense nat bouncing -19176 19176/udp # pfSense nat bouncing -19177 19177/tcp # pfSense nat bouncing -19177 19177/udp # pfSense nat bouncing -19178 19178/tcp # pfSense nat bouncing -19178 19178/udp # pfSense nat bouncing -19179 19179/tcp # pfSense nat bouncing -19179 19179/udp # pfSense nat bouncing -19180 19180/tcp # pfSense nat bouncing -19180 19180/udp # pfSense nat bouncing -19181 19181/tcp # pfSense nat bouncing -19181 19181/udp # pfSense nat bouncing -19182 19182/tcp # pfSense nat bouncing -19182 19182/udp # pfSense nat bouncing -19183 19183/tcp # pfSense nat bouncing -19183 19183/udp # pfSense nat bouncing -19184 19184/tcp # pfSense nat bouncing -19184 19184/udp # pfSense nat bouncing -19185 19185/tcp # pfSense nat bouncing -19185 19185/udp # pfSense nat bouncing -19186 19186/tcp # pfSense nat bouncing -19186 19186/udp # pfSense nat bouncing -19187 19187/tcp # pfSense nat bouncing -19187 19187/udp # pfSense nat bouncing -19188 19188/tcp # pfSense nat bouncing -19188 19188/udp # pfSense nat bouncing -19189 19189/tcp # pfSense nat bouncing -19189 19189/udp # pfSense nat bouncing -19190 19190/tcp # pfSense nat bouncing -19190 19190/udp # pfSense nat bouncing -19191 19191/tcp # pfSense nat bouncing -19191 19191/udp # pfSense nat bouncing -19192 19192/tcp # pfSense nat bouncing -19192 19192/udp # pfSense nat bouncing -19193 19193/tcp # pfSense nat bouncing -19193 19193/udp # pfSense nat bouncing -19194 19194/tcp # pfSense nat bouncing -19194 19194/udp # pfSense nat bouncing -19195 19195/tcp # pfSense nat bouncing -19195 19195/udp # pfSense nat bouncing -19196 19196/tcp # pfSense nat bouncing -19196 19196/udp # pfSense nat bouncing -19197 19197/tcp # pfSense nat bouncing -19197 19197/udp # pfSense nat bouncing -19198 19198/tcp # pfSense nat bouncing -19198 19198/udp # pfSense nat bouncing -19199 19199/tcp # pfSense nat bouncing -19199 19199/udp # pfSense nat bouncing -19200 19200/tcp # pfSense nat bouncing -19200 19200/udp # pfSense nat bouncing -19201 19201/tcp # pfSense nat bouncing -19201 19201/udp # pfSense nat bouncing -19202 19202/tcp # pfSense nat bouncing -19202 19202/udp # pfSense nat bouncing -19203 19203/tcp # pfSense nat bouncing -19203 19203/udp # pfSense nat bouncing -19204 19204/tcp # pfSense nat bouncing -19204 19204/udp # pfSense nat bouncing -19205 19205/tcp # pfSense nat bouncing -19205 19205/udp # pfSense nat bouncing -19206 19206/tcp # pfSense nat bouncing -19206 19206/udp # pfSense nat bouncing -19207 19207/tcp # pfSense nat bouncing -19207 19207/udp # pfSense nat bouncing -19208 19208/tcp # pfSense nat bouncing -19208 19208/udp # pfSense nat bouncing -19209 19209/tcp # pfSense nat bouncing -19209 19209/udp # pfSense nat bouncing -19210 19210/tcp # pfSense nat bouncing -19210 19210/udp # pfSense nat bouncing -19211 19211/tcp # pfSense nat bouncing -19211 19211/udp # pfSense nat bouncing -19212 19212/tcp # pfSense nat bouncing -19212 19212/udp # pfSense nat bouncing -19213 19213/tcp # pfSense nat bouncing -19213 19213/udp # pfSense nat bouncing -19214 19214/tcp # pfSense nat bouncing -19214 19214/udp # pfSense nat bouncing -19215 19215/tcp # pfSense nat bouncing -19215 19215/udp # pfSense nat bouncing -19216 19216/tcp # pfSense nat bouncing -19216 19216/udp # pfSense nat bouncing -19217 19217/tcp # pfSense nat bouncing -19217 19217/udp # pfSense nat bouncing -19218 19218/tcp # pfSense nat bouncing -19218 19218/udp # pfSense nat bouncing -19219 19219/tcp # pfSense nat bouncing -19219 19219/udp # pfSense nat bouncing -19220 19220/tcp # pfSense nat bouncing -19220 19220/udp # pfSense nat bouncing -19221 19221/tcp # pfSense nat bouncing -19221 19221/udp # pfSense nat bouncing -19222 19222/tcp # pfSense nat bouncing -19222 19222/udp # pfSense nat bouncing -19223 19223/tcp # pfSense nat bouncing -19223 19223/udp # pfSense nat bouncing -19224 19224/tcp # pfSense nat bouncing -19224 19224/udp # pfSense nat bouncing -19225 19225/tcp # pfSense nat bouncing -19225 19225/udp # pfSense nat bouncing -19226 19226/tcp # pfSense nat bouncing -19226 19226/udp # pfSense nat bouncing -19227 19227/tcp # pfSense nat bouncing -19227 19227/udp # pfSense nat bouncing -19228 19228/tcp # pfSense nat bouncing -19228 19228/udp # pfSense nat bouncing -19229 19229/tcp # pfSense nat bouncing -19229 19229/udp # pfSense nat bouncing -19230 19230/tcp # pfSense nat bouncing -19230 19230/udp # pfSense nat bouncing -19231 19231/tcp # pfSense nat bouncing -19231 19231/udp # pfSense nat bouncing -19232 19232/tcp # pfSense nat bouncing -19232 19232/udp # pfSense nat bouncing -19233 19233/tcp # pfSense nat bouncing -19233 19233/udp # pfSense nat bouncing -19234 19234/tcp # pfSense nat bouncing -19234 19234/udp # pfSense nat bouncing -19235 19235/tcp # pfSense nat bouncing -19235 19235/udp # pfSense nat bouncing -19236 19236/tcp # pfSense nat bouncing -19236 19236/udp # pfSense nat bouncing -19237 19237/tcp # pfSense nat bouncing -19237 19237/udp # pfSense nat bouncing -19238 19238/tcp # pfSense nat bouncing -19238 19238/udp # pfSense nat bouncing -19239 19239/tcp # pfSense nat bouncing -19239 19239/udp # pfSense nat bouncing -19240 19240/tcp # pfSense nat bouncing -19240 19240/udp # pfSense nat bouncing -19241 19241/tcp # pfSense nat bouncing -19241 19241/udp # pfSense nat bouncing -19242 19242/tcp # pfSense nat bouncing -19242 19242/udp # pfSense nat bouncing -19243 19243/tcp # pfSense nat bouncing -19243 19243/udp # pfSense nat bouncing -19244 19244/tcp # pfSense nat bouncing -19244 19244/udp # pfSense nat bouncing -19245 19245/tcp # pfSense nat bouncing -19245 19245/udp # pfSense nat bouncing -19246 19246/tcp # pfSense nat bouncing -19246 19246/udp # pfSense nat bouncing -19247 19247/tcp # pfSense nat bouncing -19247 19247/udp # pfSense nat bouncing -19248 19248/tcp # pfSense nat bouncing -19248 19248/udp # pfSense nat bouncing -19249 19249/tcp # pfSense nat bouncing -19249 19249/udp # pfSense nat bouncing -19250 19250/tcp # pfSense nat bouncing -19250 19250/udp # pfSense nat bouncing -19251 19251/tcp # pfSense nat bouncing -19251 19251/udp # pfSense nat bouncing -19252 19252/tcp # pfSense nat bouncing -19252 19252/udp # pfSense nat bouncing -19253 19253/tcp # pfSense nat bouncing -19253 19253/udp # pfSense nat bouncing -19254 19254/tcp # pfSense nat bouncing -19254 19254/udp # pfSense nat bouncing -19255 19255/tcp # pfSense nat bouncing -19255 19255/udp # pfSense nat bouncing -19256 19256/tcp # pfSense nat bouncing -19256 19256/udp # pfSense nat bouncing -19257 19257/tcp # pfSense nat bouncing -19257 19257/udp # pfSense nat bouncing -19258 19258/tcp # pfSense nat bouncing -19258 19258/udp # pfSense nat bouncing -19259 19259/tcp # pfSense nat bouncing -19259 19259/udp # pfSense nat bouncing -19260 19260/tcp # pfSense nat bouncing -19260 19260/udp # pfSense nat bouncing -19261 19261/tcp # pfSense nat bouncing -19261 19261/udp # pfSense nat bouncing -19262 19262/tcp # pfSense nat bouncing -19262 19262/udp # pfSense nat bouncing -19263 19263/tcp # pfSense nat bouncing -19263 19263/udp # pfSense nat bouncing -19264 19264/tcp # pfSense nat bouncing -19264 19264/udp # pfSense nat bouncing -19265 19265/tcp # pfSense nat bouncing -19265 19265/udp # pfSense nat bouncing -19266 19266/tcp # pfSense nat bouncing -19266 19266/udp # pfSense nat bouncing -19267 19267/tcp # pfSense nat bouncing -19267 19267/udp # pfSense nat bouncing -19268 19268/tcp # pfSense nat bouncing -19268 19268/udp # pfSense nat bouncing -19269 19269/tcp # pfSense nat bouncing -19269 19269/udp # pfSense nat bouncing -19270 19270/tcp # pfSense nat bouncing -19270 19270/udp # pfSense nat bouncing -19271 19271/tcp # pfSense nat bouncing -19271 19271/udp # pfSense nat bouncing -19272 19272/tcp # pfSense nat bouncing -19272 19272/udp # pfSense nat bouncing -19273 19273/tcp # pfSense nat bouncing -19273 19273/udp # pfSense nat bouncing -19274 19274/tcp # pfSense nat bouncing -19274 19274/udp # pfSense nat bouncing -19275 19275/tcp # pfSense nat bouncing -19275 19275/udp # pfSense nat bouncing -19276 19276/tcp # pfSense nat bouncing -19276 19276/udp # pfSense nat bouncing -19277 19277/tcp # pfSense nat bouncing -19277 19277/udp # pfSense nat bouncing -19278 19278/tcp # pfSense nat bouncing -19278 19278/udp # pfSense nat bouncing -19279 19279/tcp # pfSense nat bouncing -19279 19279/udp # pfSense nat bouncing -19280 19280/tcp # pfSense nat bouncing -19280 19280/udp # pfSense nat bouncing -19281 19281/tcp # pfSense nat bouncing -19281 19281/udp # pfSense nat bouncing -19282 19282/tcp # pfSense nat bouncing -19282 19282/udp # pfSense nat bouncing -19283 19283/tcp # pfSense nat bouncing -19283 19283/udp # pfSense nat bouncing -19284 19284/tcp # pfSense nat bouncing -19284 19284/udp # pfSense nat bouncing -19285 19285/tcp # pfSense nat bouncing -19285 19285/udp # pfSense nat bouncing -19286 19286/tcp # pfSense nat bouncing -19286 19286/udp # pfSense nat bouncing -19287 19287/tcp # pfSense nat bouncing -19287 19287/udp # pfSense nat bouncing -19288 19288/tcp # pfSense nat bouncing -19288 19288/udp # pfSense nat bouncing -19289 19289/tcp # pfSense nat bouncing -19289 19289/udp # pfSense nat bouncing -19290 19290/tcp # pfSense nat bouncing -19290 19290/udp # pfSense nat bouncing -19291 19291/tcp # pfSense nat bouncing -19291 19291/udp # pfSense nat bouncing -19292 19292/tcp # pfSense nat bouncing -19292 19292/udp # pfSense nat bouncing -19293 19293/tcp # pfSense nat bouncing -19293 19293/udp # pfSense nat bouncing -19294 19294/tcp # pfSense nat bouncing -19294 19294/udp # pfSense nat bouncing -19295 19295/tcp # pfSense nat bouncing -19295 19295/udp # pfSense nat bouncing -19296 19296/tcp # pfSense nat bouncing -19296 19296/udp # pfSense nat bouncing -19297 19297/tcp # pfSense nat bouncing -19297 19297/udp # pfSense nat bouncing -19298 19298/tcp # pfSense nat bouncing -19298 19298/udp # pfSense nat bouncing -19299 19299/tcp # pfSense nat bouncing -19299 19299/udp # pfSense nat bouncing -19300 19300/tcp # pfSense nat bouncing -19300 19300/udp # pfSense nat bouncing -19301 19301/tcp # pfSense nat bouncing -19301 19301/udp # pfSense nat bouncing -19302 19302/tcp # pfSense nat bouncing -19302 19302/udp # pfSense nat bouncing -19303 19303/tcp # pfSense nat bouncing -19303 19303/udp # pfSense nat bouncing -19304 19304/tcp # pfSense nat bouncing -19304 19304/udp # pfSense nat bouncing -19305 19305/tcp # pfSense nat bouncing -19305 19305/udp # pfSense nat bouncing -19306 19306/tcp # pfSense nat bouncing -19306 19306/udp # pfSense nat bouncing -19307 19307/tcp # pfSense nat bouncing -19307 19307/udp # pfSense nat bouncing -19308 19308/tcp # pfSense nat bouncing -19308 19308/udp # pfSense nat bouncing -19309 19309/tcp # pfSense nat bouncing -19309 19309/udp # pfSense nat bouncing -19310 19310/tcp # pfSense nat bouncing -19310 19310/udp # pfSense nat bouncing -19311 19311/tcp # pfSense nat bouncing -19311 19311/udp # pfSense nat bouncing -19312 19312/tcp # pfSense nat bouncing -19312 19312/udp # pfSense nat bouncing -19313 19313/tcp # pfSense nat bouncing -19313 19313/udp # pfSense nat bouncing -19314 19314/tcp # pfSense nat bouncing -19314 19314/udp # pfSense nat bouncing -19315 19315/tcp # pfSense nat bouncing -19315 19315/udp # pfSense nat bouncing -19316 19316/tcp # pfSense nat bouncing -19316 19316/udp # pfSense nat bouncing -19317 19317/tcp # pfSense nat bouncing -19317 19317/udp # pfSense nat bouncing -19318 19318/tcp # pfSense nat bouncing -19318 19318/udp # pfSense nat bouncing -19319 19319/tcp # pfSense nat bouncing -19319 19319/udp # pfSense nat bouncing -19320 19320/tcp # pfSense nat bouncing -19320 19320/udp # pfSense nat bouncing -19321 19321/tcp # pfSense nat bouncing -19321 19321/udp # pfSense nat bouncing -19322 19322/tcp # pfSense nat bouncing -19322 19322/udp # pfSense nat bouncing -19323 19323/tcp # pfSense nat bouncing -19323 19323/udp # pfSense nat bouncing -19324 19324/tcp # pfSense nat bouncing -19324 19324/udp # pfSense nat bouncing -19325 19325/tcp # pfSense nat bouncing -19325 19325/udp # pfSense nat bouncing -19326 19326/tcp # pfSense nat bouncing -19326 19326/udp # pfSense nat bouncing -19327 19327/tcp # pfSense nat bouncing -19327 19327/udp # pfSense nat bouncing -19328 19328/tcp # pfSense nat bouncing -19328 19328/udp # pfSense nat bouncing -19329 19329/tcp # pfSense nat bouncing -19329 19329/udp # pfSense nat bouncing -19330 19330/tcp # pfSense nat bouncing -19330 19330/udp # pfSense nat bouncing -19331 19331/tcp # pfSense nat bouncing -19331 19331/udp # pfSense nat bouncing -19332 19332/tcp # pfSense nat bouncing -19332 19332/udp # pfSense nat bouncing -19333 19333/tcp # pfSense nat bouncing -19333 19333/udp # pfSense nat bouncing -19334 19334/tcp # pfSense nat bouncing -19334 19334/udp # pfSense nat bouncing -19335 19335/tcp # pfSense nat bouncing -19335 19335/udp # pfSense nat bouncing -19336 19336/tcp # pfSense nat bouncing -19336 19336/udp # pfSense nat bouncing -19337 19337/tcp # pfSense nat bouncing -19337 19337/udp # pfSense nat bouncing -19338 19338/tcp # pfSense nat bouncing -19338 19338/udp # pfSense nat bouncing -19339 19339/tcp # pfSense nat bouncing -19339 19339/udp # pfSense nat bouncing -19340 19340/tcp # pfSense nat bouncing -19340 19340/udp # pfSense nat bouncing -19341 19341/tcp # pfSense nat bouncing -19341 19341/udp # pfSense nat bouncing -19342 19342/tcp # pfSense nat bouncing -19342 19342/udp # pfSense nat bouncing -19343 19343/tcp # pfSense nat bouncing -19343 19343/udp # pfSense nat bouncing -19344 19344/tcp # pfSense nat bouncing -19344 19344/udp # pfSense nat bouncing -19345 19345/tcp # pfSense nat bouncing -19345 19345/udp # pfSense nat bouncing -19346 19346/tcp # pfSense nat bouncing -19346 19346/udp # pfSense nat bouncing -19347 19347/tcp # pfSense nat bouncing -19347 19347/udp # pfSense nat bouncing -19348 19348/tcp # pfSense nat bouncing -19348 19348/udp # pfSense nat bouncing -19349 19349/tcp # pfSense nat bouncing -19349 19349/udp # pfSense nat bouncing -19350 19350/tcp # pfSense nat bouncing -19350 19350/udp # pfSense nat bouncing -19351 19351/tcp # pfSense nat bouncing -19351 19351/udp # pfSense nat bouncing -19352 19352/tcp # pfSense nat bouncing -19352 19352/udp # pfSense nat bouncing -19353 19353/tcp # pfSense nat bouncing -19353 19353/udp # pfSense nat bouncing -19354 19354/tcp # pfSense nat bouncing -19354 19354/udp # pfSense nat bouncing -19355 19355/tcp # pfSense nat bouncing -19355 19355/udp # pfSense nat bouncing -19356 19356/tcp # pfSense nat bouncing -19356 19356/udp # pfSense nat bouncing -19357 19357/tcp # pfSense nat bouncing -19357 19357/udp # pfSense nat bouncing -19358 19358/tcp # pfSense nat bouncing -19358 19358/udp # pfSense nat bouncing -19359 19359/tcp # pfSense nat bouncing -19359 19359/udp # pfSense nat bouncing -19360 19360/tcp # pfSense nat bouncing -19360 19360/udp # pfSense nat bouncing -19361 19361/tcp # pfSense nat bouncing -19361 19361/udp # pfSense nat bouncing -19362 19362/tcp # pfSense nat bouncing -19362 19362/udp # pfSense nat bouncing -19363 19363/tcp # pfSense nat bouncing -19363 19363/udp # pfSense nat bouncing -19364 19364/tcp # pfSense nat bouncing -19364 19364/udp # pfSense nat bouncing -19365 19365/tcp # pfSense nat bouncing -19365 19365/udp # pfSense nat bouncing -19366 19366/tcp # pfSense nat bouncing -19366 19366/udp # pfSense nat bouncing -19367 19367/tcp # pfSense nat bouncing -19367 19367/udp # pfSense nat bouncing -19368 19368/tcp # pfSense nat bouncing -19368 19368/udp # pfSense nat bouncing -19369 19369/tcp # pfSense nat bouncing -19369 19369/udp # pfSense nat bouncing -19370 19370/tcp # pfSense nat bouncing -19370 19370/udp # pfSense nat bouncing -19371 19371/tcp # pfSense nat bouncing -19371 19371/udp # pfSense nat bouncing -19372 19372/tcp # pfSense nat bouncing -19372 19372/udp # pfSense nat bouncing -19373 19373/tcp # pfSense nat bouncing -19373 19373/udp # pfSense nat bouncing -19374 19374/tcp # pfSense nat bouncing -19374 19374/udp # pfSense nat bouncing -19375 19375/tcp # pfSense nat bouncing -19375 19375/udp # pfSense nat bouncing -19376 19376/tcp # pfSense nat bouncing -19376 19376/udp # pfSense nat bouncing -19377 19377/tcp # pfSense nat bouncing -19377 19377/udp # pfSense nat bouncing -19378 19378/tcp # pfSense nat bouncing -19378 19378/udp # pfSense nat bouncing -19379 19379/tcp # pfSense nat bouncing -19379 19379/udp # pfSense nat bouncing -19380 19380/tcp # pfSense nat bouncing -19380 19380/udp # pfSense nat bouncing -19381 19381/tcp # pfSense nat bouncing -19381 19381/udp # pfSense nat bouncing -19382 19382/tcp # pfSense nat bouncing -19382 19382/udp # pfSense nat bouncing -19383 19383/tcp # pfSense nat bouncing -19383 19383/udp # pfSense nat bouncing -19384 19384/tcp # pfSense nat bouncing -19384 19384/udp # pfSense nat bouncing -19385 19385/tcp # pfSense nat bouncing -19385 19385/udp # pfSense nat bouncing -19386 19386/tcp # pfSense nat bouncing -19386 19386/udp # pfSense nat bouncing -19387 19387/tcp # pfSense nat bouncing -19387 19387/udp # pfSense nat bouncing -19388 19388/tcp # pfSense nat bouncing -19388 19388/udp # pfSense nat bouncing -19389 19389/tcp # pfSense nat bouncing -19389 19389/udp # pfSense nat bouncing -19390 19390/tcp # pfSense nat bouncing -19390 19390/udp # pfSense nat bouncing -19391 19391/tcp # pfSense nat bouncing -19391 19391/udp # pfSense nat bouncing -19392 19392/tcp # pfSense nat bouncing -19392 19392/udp # pfSense nat bouncing -19393 19393/tcp # pfSense nat bouncing -19393 19393/udp # pfSense nat bouncing -19394 19394/tcp # pfSense nat bouncing -19394 19394/udp # pfSense nat bouncing -19395 19395/tcp # pfSense nat bouncing -19395 19395/udp # pfSense nat bouncing -19396 19396/tcp # pfSense nat bouncing -19396 19396/udp # pfSense nat bouncing -19397 19397/tcp # pfSense nat bouncing -19397 19397/udp # pfSense nat bouncing -19398 19398/tcp # pfSense nat bouncing -19398 19398/udp # pfSense nat bouncing -19399 19399/tcp # pfSense nat bouncing -19399 19399/udp # pfSense nat bouncing -19400 19400/tcp # pfSense nat bouncing -19400 19400/udp # pfSense nat bouncing -19401 19401/tcp # pfSense nat bouncing -19401 19401/udp # pfSense nat bouncing -19402 19402/tcp # pfSense nat bouncing -19402 19402/udp # pfSense nat bouncing -19403 19403/tcp # pfSense nat bouncing -19403 19403/udp # pfSense nat bouncing -19404 19404/tcp # pfSense nat bouncing -19404 19404/udp # pfSense nat bouncing -19405 19405/tcp # pfSense nat bouncing -19405 19405/udp # pfSense nat bouncing -19406 19406/tcp # pfSense nat bouncing -19406 19406/udp # pfSense nat bouncing -19407 19407/tcp # pfSense nat bouncing -19407 19407/udp # pfSense nat bouncing -19408 19408/tcp # pfSense nat bouncing -19408 19408/udp # pfSense nat bouncing -19409 19409/tcp # pfSense nat bouncing -19409 19409/udp # pfSense nat bouncing -19410 19410/tcp # pfSense nat bouncing -19410 19410/udp # pfSense nat bouncing -19411 19411/tcp # pfSense nat bouncing -19411 19411/udp # pfSense nat bouncing -19412 19412/tcp # pfSense nat bouncing -19412 19412/udp # pfSense nat bouncing -19413 19413/tcp # pfSense nat bouncing -19413 19413/udp # pfSense nat bouncing -19414 19414/tcp # pfSense nat bouncing -19414 19414/udp # pfSense nat bouncing -19415 19415/tcp # pfSense nat bouncing -19415 19415/udp # pfSense nat bouncing -19416 19416/tcp # pfSense nat bouncing -19416 19416/udp # pfSense nat bouncing -19417 19417/tcp # pfSense nat bouncing -19417 19417/udp # pfSense nat bouncing -19418 19418/tcp # pfSense nat bouncing -19418 19418/udp # pfSense nat bouncing -19419 19419/tcp # pfSense nat bouncing -19419 19419/udp # pfSense nat bouncing -19420 19420/tcp # pfSense nat bouncing -19420 19420/udp # pfSense nat bouncing -19421 19421/tcp # pfSense nat bouncing -19421 19421/udp # pfSense nat bouncing -19422 19422/tcp # pfSense nat bouncing -19422 19422/udp # pfSense nat bouncing -19423 19423/tcp # pfSense nat bouncing -19423 19423/udp # pfSense nat bouncing -19424 19424/tcp # pfSense nat bouncing -19424 19424/udp # pfSense nat bouncing -19425 19425/tcp # pfSense nat bouncing -19425 19425/udp # pfSense nat bouncing -19426 19426/tcp # pfSense nat bouncing -19426 19426/udp # pfSense nat bouncing -19427 19427/tcp # pfSense nat bouncing -19427 19427/udp # pfSense nat bouncing -19428 19428/tcp # pfSense nat bouncing -19428 19428/udp # pfSense nat bouncing -19429 19429/tcp # pfSense nat bouncing -19429 19429/udp # pfSense nat bouncing -19430 19430/tcp # pfSense nat bouncing -19430 19430/udp # pfSense nat bouncing -19431 19431/tcp # pfSense nat bouncing -19431 19431/udp # pfSense nat bouncing -19432 19432/tcp # pfSense nat bouncing -19432 19432/udp # pfSense nat bouncing -19433 19433/tcp # pfSense nat bouncing -19433 19433/udp # pfSense nat bouncing -19434 19434/tcp # pfSense nat bouncing -19434 19434/udp # pfSense nat bouncing -19435 19435/tcp # pfSense nat bouncing -19435 19435/udp # pfSense nat bouncing -19436 19436/tcp # pfSense nat bouncing -19436 19436/udp # pfSense nat bouncing -19437 19437/tcp # pfSense nat bouncing -19437 19437/udp # pfSense nat bouncing -19438 19438/tcp # pfSense nat bouncing -19438 19438/udp # pfSense nat bouncing -19439 19439/tcp # pfSense nat bouncing -19439 19439/udp # pfSense nat bouncing -19440 19440/tcp # pfSense nat bouncing -19440 19440/udp # pfSense nat bouncing -19441 19441/tcp # pfSense nat bouncing -19441 19441/udp # pfSense nat bouncing -19442 19442/tcp # pfSense nat bouncing -19442 19442/udp # pfSense nat bouncing -19443 19443/tcp # pfSense nat bouncing -19443 19443/udp # pfSense nat bouncing -19444 19444/tcp # pfSense nat bouncing -19444 19444/udp # pfSense nat bouncing -19445 19445/tcp # pfSense nat bouncing -19445 19445/udp # pfSense nat bouncing -19446 19446/tcp # pfSense nat bouncing -19446 19446/udp # pfSense nat bouncing -19447 19447/tcp # pfSense nat bouncing -19447 19447/udp # pfSense nat bouncing -19448 19448/tcp # pfSense nat bouncing -19448 19448/udp # pfSense nat bouncing -19449 19449/tcp # pfSense nat bouncing -19449 19449/udp # pfSense nat bouncing -19450 19450/tcp # pfSense nat bouncing -19450 19450/udp # pfSense nat bouncing -19451 19451/tcp # pfSense nat bouncing -19451 19451/udp # pfSense nat bouncing -19452 19452/tcp # pfSense nat bouncing -19452 19452/udp # pfSense nat bouncing -19453 19453/tcp # pfSense nat bouncing -19453 19453/udp # pfSense nat bouncing -19454 19454/tcp # pfSense nat bouncing -19454 19454/udp # pfSense nat bouncing -19455 19455/tcp # pfSense nat bouncing -19455 19455/udp # pfSense nat bouncing -19456 19456/tcp # pfSense nat bouncing -19456 19456/udp # pfSense nat bouncing -19457 19457/tcp # pfSense nat bouncing -19457 19457/udp # pfSense nat bouncing -19458 19458/tcp # pfSense nat bouncing -19458 19458/udp # pfSense nat bouncing -19459 19459/tcp # pfSense nat bouncing -19459 19459/udp # pfSense nat bouncing -19460 19460/tcp # pfSense nat bouncing -19460 19460/udp # pfSense nat bouncing -19461 19461/tcp # pfSense nat bouncing -19461 19461/udp # pfSense nat bouncing -19462 19462/tcp # pfSense nat bouncing -19462 19462/udp # pfSense nat bouncing -19463 19463/tcp # pfSense nat bouncing -19463 19463/udp # pfSense nat bouncing -19464 19464/tcp # pfSense nat bouncing -19464 19464/udp # pfSense nat bouncing -19465 19465/tcp # pfSense nat bouncing -19465 19465/udp # pfSense nat bouncing -19466 19466/tcp # pfSense nat bouncing -19466 19466/udp # pfSense nat bouncing -19467 19467/tcp # pfSense nat bouncing -19467 19467/udp # pfSense nat bouncing -19468 19468/tcp # pfSense nat bouncing -19468 19468/udp # pfSense nat bouncing -19469 19469/tcp # pfSense nat bouncing -19469 19469/udp # pfSense nat bouncing -19470 19470/tcp # pfSense nat bouncing -19470 19470/udp # pfSense nat bouncing -19471 19471/tcp # pfSense nat bouncing -19471 19471/udp # pfSense nat bouncing -19472 19472/tcp # pfSense nat bouncing -19472 19472/udp # pfSense nat bouncing -19473 19473/tcp # pfSense nat bouncing -19473 19473/udp # pfSense nat bouncing -19474 19474/tcp # pfSense nat bouncing -19474 19474/udp # pfSense nat bouncing -19475 19475/tcp # pfSense nat bouncing -19475 19475/udp # pfSense nat bouncing -19476 19476/tcp # pfSense nat bouncing -19476 19476/udp # pfSense nat bouncing -19477 19477/tcp # pfSense nat bouncing -19477 19477/udp # pfSense nat bouncing -19478 19478/tcp # pfSense nat bouncing -19478 19478/udp # pfSense nat bouncing -19479 19479/tcp # pfSense nat bouncing -19479 19479/udp # pfSense nat bouncing -19480 19480/tcp # pfSense nat bouncing -19480 19480/udp # pfSense nat bouncing -19481 19481/tcp # pfSense nat bouncing -19481 19481/udp # pfSense nat bouncing -19482 19482/tcp # pfSense nat bouncing -19482 19482/udp # pfSense nat bouncing -19483 19483/tcp # pfSense nat bouncing -19483 19483/udp # pfSense nat bouncing -19484 19484/tcp # pfSense nat bouncing -19484 19484/udp # pfSense nat bouncing -19485 19485/tcp # pfSense nat bouncing -19485 19485/udp # pfSense nat bouncing -19486 19486/tcp # pfSense nat bouncing -19486 19486/udp # pfSense nat bouncing -19487 19487/tcp # pfSense nat bouncing -19487 19487/udp # pfSense nat bouncing -19488 19488/tcp # pfSense nat bouncing -19488 19488/udp # pfSense nat bouncing -19489 19489/tcp # pfSense nat bouncing -19489 19489/udp # pfSense nat bouncing -19490 19490/tcp # pfSense nat bouncing -19490 19490/udp # pfSense nat bouncing -19491 19491/tcp # pfSense nat bouncing -19491 19491/udp # pfSense nat bouncing -19492 19492/tcp # pfSense nat bouncing -19492 19492/udp # pfSense nat bouncing -19493 19493/tcp # pfSense nat bouncing -19493 19493/udp # pfSense nat bouncing -19494 19494/tcp # pfSense nat bouncing -19494 19494/udp # pfSense nat bouncing -19495 19495/tcp # pfSense nat bouncing -19495 19495/udp # pfSense nat bouncing -19496 19496/tcp # pfSense nat bouncing -19496 19496/udp # pfSense nat bouncing -19497 19497/tcp # pfSense nat bouncing -19497 19497/udp # pfSense nat bouncing -19498 19498/tcp # pfSense nat bouncing -19498 19498/udp # pfSense nat bouncing -19499 19499/tcp # pfSense nat bouncing -19499 19499/udp # pfSense nat bouncing -19500 19500/tcp # pfSense nat bouncing -19500 19500/udp # pfSense nat bouncing -19501 19501/tcp # pfSense nat bouncing -19501 19501/udp # pfSense nat bouncing -19502 19502/tcp # pfSense nat bouncing -19502 19502/udp # pfSense nat bouncing -19503 19503/tcp # pfSense nat bouncing -19503 19503/udp # pfSense nat bouncing -19504 19504/tcp # pfSense nat bouncing -19504 19504/udp # pfSense nat bouncing -19505 19505/tcp # pfSense nat bouncing -19505 19505/udp # pfSense nat bouncing -19506 19506/tcp # pfSense nat bouncing -19506 19506/udp # pfSense nat bouncing -19507 19507/tcp # pfSense nat bouncing -19507 19507/udp # pfSense nat bouncing -19508 19508/tcp # pfSense nat bouncing -19508 19508/udp # pfSense nat bouncing -19509 19509/tcp # pfSense nat bouncing -19509 19509/udp # pfSense nat bouncing -19510 19510/tcp # pfSense nat bouncing -19510 19510/udp # pfSense nat bouncing -19511 19511/tcp # pfSense nat bouncing -19511 19511/udp # pfSense nat bouncing -19512 19512/tcp # pfSense nat bouncing -19512 19512/udp # pfSense nat bouncing -19513 19513/tcp # pfSense nat bouncing -19513 19513/udp # pfSense nat bouncing -19514 19514/tcp # pfSense nat bouncing -19514 19514/udp # pfSense nat bouncing -19515 19515/tcp # pfSense nat bouncing -19515 19515/udp # pfSense nat bouncing -19516 19516/tcp # pfSense nat bouncing -19516 19516/udp # pfSense nat bouncing -19517 19517/tcp # pfSense nat bouncing -19517 19517/udp # pfSense nat bouncing -19518 19518/tcp # pfSense nat bouncing -19518 19518/udp # pfSense nat bouncing -19519 19519/tcp # pfSense nat bouncing -19519 19519/udp # pfSense nat bouncing -19520 19520/tcp # pfSense nat bouncing -19520 19520/udp # pfSense nat bouncing -19521 19521/tcp # pfSense nat bouncing -19521 19521/udp # pfSense nat bouncing -19522 19522/tcp # pfSense nat bouncing -19522 19522/udp # pfSense nat bouncing -19523 19523/tcp # pfSense nat bouncing -19523 19523/udp # pfSense nat bouncing -19524 19524/tcp # pfSense nat bouncing -19524 19524/udp # pfSense nat bouncing -19525 19525/tcp # pfSense nat bouncing -19525 19525/udp # pfSense nat bouncing -19526 19526/tcp # pfSense nat bouncing -19526 19526/udp # pfSense nat bouncing -19527 19527/tcp # pfSense nat bouncing -19527 19527/udp # pfSense nat bouncing -19528 19528/tcp # pfSense nat bouncing -19528 19528/udp # pfSense nat bouncing -19529 19529/tcp # pfSense nat bouncing -19529 19529/udp # pfSense nat bouncing -19530 19530/tcp # pfSense nat bouncing -19530 19530/udp # pfSense nat bouncing -19531 19531/tcp # pfSense nat bouncing -19531 19531/udp # pfSense nat bouncing -19532 19532/tcp # pfSense nat bouncing -19532 19532/udp # pfSense nat bouncing -19533 19533/tcp # pfSense nat bouncing -19533 19533/udp # pfSense nat bouncing -19534 19534/tcp # pfSense nat bouncing -19534 19534/udp # pfSense nat bouncing -19535 19535/tcp # pfSense nat bouncing -19535 19535/udp # pfSense nat bouncing -19536 19536/tcp # pfSense nat bouncing -19536 19536/udp # pfSense nat bouncing -19537 19537/tcp # pfSense nat bouncing -19537 19537/udp # pfSense nat bouncing -19538 19538/tcp # pfSense nat bouncing -19538 19538/udp # pfSense nat bouncing -19539 19539/tcp # pfSense nat bouncing -19539 19539/udp # pfSense nat bouncing -19540 19540/tcp # pfSense nat bouncing -19540 19540/udp # pfSense nat bouncing -19541 19541/tcp # pfSense nat bouncing -19541 19541/udp # pfSense nat bouncing -19542 19542/tcp # pfSense nat bouncing -19542 19542/udp # pfSense nat bouncing -19543 19543/tcp # pfSense nat bouncing -19543 19543/udp # pfSense nat bouncing -19544 19544/tcp # pfSense nat bouncing -19544 19544/udp # pfSense nat bouncing -19545 19545/tcp # pfSense nat bouncing -19545 19545/udp # pfSense nat bouncing -19546 19546/tcp # pfSense nat bouncing -19546 19546/udp # pfSense nat bouncing -19547 19547/tcp # pfSense nat bouncing -19547 19547/udp # pfSense nat bouncing -19548 19548/tcp # pfSense nat bouncing -19548 19548/udp # pfSense nat bouncing -19549 19549/tcp # pfSense nat bouncing -19549 19549/udp # pfSense nat bouncing -19550 19550/tcp # pfSense nat bouncing -19550 19550/udp # pfSense nat bouncing -19551 19551/tcp # pfSense nat bouncing -19551 19551/udp # pfSense nat bouncing -19552 19552/tcp # pfSense nat bouncing -19552 19552/udp # pfSense nat bouncing -19553 19553/tcp # pfSense nat bouncing -19553 19553/udp # pfSense nat bouncing -19554 19554/tcp # pfSense nat bouncing -19554 19554/udp # pfSense nat bouncing -19555 19555/tcp # pfSense nat bouncing -19555 19555/udp # pfSense nat bouncing -19556 19556/tcp # pfSense nat bouncing -19556 19556/udp # pfSense nat bouncing -19557 19557/tcp # pfSense nat bouncing -19557 19557/udp # pfSense nat bouncing -19558 19558/tcp # pfSense nat bouncing -19558 19558/udp # pfSense nat bouncing -19559 19559/tcp # pfSense nat bouncing -19559 19559/udp # pfSense nat bouncing -19560 19560/tcp # pfSense nat bouncing -19560 19560/udp # pfSense nat bouncing -19561 19561/tcp # pfSense nat bouncing -19561 19561/udp # pfSense nat bouncing -19562 19562/tcp # pfSense nat bouncing -19562 19562/udp # pfSense nat bouncing -19563 19563/tcp # pfSense nat bouncing -19563 19563/udp # pfSense nat bouncing -19564 19564/tcp # pfSense nat bouncing -19564 19564/udp # pfSense nat bouncing -19565 19565/tcp # pfSense nat bouncing -19565 19565/udp # pfSense nat bouncing -19566 19566/tcp # pfSense nat bouncing -19566 19566/udp # pfSense nat bouncing -19567 19567/tcp # pfSense nat bouncing -19567 19567/udp # pfSense nat bouncing -19568 19568/tcp # pfSense nat bouncing -19568 19568/udp # pfSense nat bouncing -19569 19569/tcp # pfSense nat bouncing -19569 19569/udp # pfSense nat bouncing -19570 19570/tcp # pfSense nat bouncing -19570 19570/udp # pfSense nat bouncing -19571 19571/tcp # pfSense nat bouncing -19571 19571/udp # pfSense nat bouncing -19572 19572/tcp # pfSense nat bouncing -19572 19572/udp # pfSense nat bouncing -19573 19573/tcp # pfSense nat bouncing -19573 19573/udp # pfSense nat bouncing -19574 19574/tcp # pfSense nat bouncing -19574 19574/udp # pfSense nat bouncing -19575 19575/tcp # pfSense nat bouncing -19575 19575/udp # pfSense nat bouncing -19576 19576/tcp # pfSense nat bouncing -19576 19576/udp # pfSense nat bouncing -19577 19577/tcp # pfSense nat bouncing -19577 19577/udp # pfSense nat bouncing -19578 19578/tcp # pfSense nat bouncing -19578 19578/udp # pfSense nat bouncing -19579 19579/tcp # pfSense nat bouncing -19579 19579/udp # pfSense nat bouncing -19580 19580/tcp # pfSense nat bouncing -19580 19580/udp # pfSense nat bouncing -19581 19581/tcp # pfSense nat bouncing -19581 19581/udp # pfSense nat bouncing -19582 19582/tcp # pfSense nat bouncing -19582 19582/udp # pfSense nat bouncing -19583 19583/tcp # pfSense nat bouncing -19583 19583/udp # pfSense nat bouncing -19584 19584/tcp # pfSense nat bouncing -19584 19584/udp # pfSense nat bouncing -19585 19585/tcp # pfSense nat bouncing -19585 19585/udp # pfSense nat bouncing -19586 19586/tcp # pfSense nat bouncing -19586 19586/udp # pfSense nat bouncing -19587 19587/tcp # pfSense nat bouncing -19587 19587/udp # pfSense nat bouncing -19588 19588/tcp # pfSense nat bouncing -19588 19588/udp # pfSense nat bouncing -19589 19589/tcp # pfSense nat bouncing -19589 19589/udp # pfSense nat bouncing -19590 19590/tcp # pfSense nat bouncing -19590 19590/udp # pfSense nat bouncing -19591 19591/tcp # pfSense nat bouncing -19591 19591/udp # pfSense nat bouncing -19592 19592/tcp # pfSense nat bouncing -19592 19592/udp # pfSense nat bouncing -19593 19593/tcp # pfSense nat bouncing -19593 19593/udp # pfSense nat bouncing -19594 19594/tcp # pfSense nat bouncing -19594 19594/udp # pfSense nat bouncing -19595 19595/tcp # pfSense nat bouncing -19595 19595/udp # pfSense nat bouncing -19596 19596/tcp # pfSense nat bouncing -19596 19596/udp # pfSense nat bouncing -19597 19597/tcp # pfSense nat bouncing -19597 19597/udp # pfSense nat bouncing -19598 19598/tcp # pfSense nat bouncing -19598 19598/udp # pfSense nat bouncing -19599 19599/tcp # pfSense nat bouncing -19599 19599/udp # pfSense nat bouncing -19600 19600/tcp # pfSense nat bouncing -19600 19600/udp # pfSense nat bouncing -19601 19601/tcp # pfSense nat bouncing -19601 19601/udp # pfSense nat bouncing -19602 19602/tcp # pfSense nat bouncing -19602 19602/udp # pfSense nat bouncing -19603 19603/tcp # pfSense nat bouncing -19603 19603/udp # pfSense nat bouncing -19604 19604/tcp # pfSense nat bouncing -19604 19604/udp # pfSense nat bouncing -19605 19605/tcp # pfSense nat bouncing -19605 19605/udp # pfSense nat bouncing -19606 19606/tcp # pfSense nat bouncing -19606 19606/udp # pfSense nat bouncing -19607 19607/tcp # pfSense nat bouncing -19607 19607/udp # pfSense nat bouncing -19608 19608/tcp # pfSense nat bouncing -19608 19608/udp # pfSense nat bouncing -19609 19609/tcp # pfSense nat bouncing -19609 19609/udp # pfSense nat bouncing -19610 19610/tcp # pfSense nat bouncing -19610 19610/udp # pfSense nat bouncing -19611 19611/tcp # pfSense nat bouncing -19611 19611/udp # pfSense nat bouncing -19612 19612/tcp # pfSense nat bouncing -19612 19612/udp # pfSense nat bouncing -19613 19613/tcp # pfSense nat bouncing -19613 19613/udp # pfSense nat bouncing -19614 19614/tcp # pfSense nat bouncing -19614 19614/udp # pfSense nat bouncing -19615 19615/tcp # pfSense nat bouncing -19615 19615/udp # pfSense nat bouncing -19616 19616/tcp # pfSense nat bouncing -19616 19616/udp # pfSense nat bouncing -19617 19617/tcp # pfSense nat bouncing -19617 19617/udp # pfSense nat bouncing -19618 19618/tcp # pfSense nat bouncing -19618 19618/udp # pfSense nat bouncing -19619 19619/tcp # pfSense nat bouncing -19619 19619/udp # pfSense nat bouncing -19620 19620/tcp # pfSense nat bouncing -19620 19620/udp # pfSense nat bouncing -19621 19621/tcp # pfSense nat bouncing -19621 19621/udp # pfSense nat bouncing -19622 19622/tcp # pfSense nat bouncing -19622 19622/udp # pfSense nat bouncing -19623 19623/tcp # pfSense nat bouncing -19623 19623/udp # pfSense nat bouncing -19624 19624/tcp # pfSense nat bouncing -19624 19624/udp # pfSense nat bouncing -19625 19625/tcp # pfSense nat bouncing -19625 19625/udp # pfSense nat bouncing -19626 19626/tcp # pfSense nat bouncing -19626 19626/udp # pfSense nat bouncing -19627 19627/tcp # pfSense nat bouncing -19627 19627/udp # pfSense nat bouncing -19628 19628/tcp # pfSense nat bouncing -19628 19628/udp # pfSense nat bouncing -19629 19629/tcp # pfSense nat bouncing -19629 19629/udp # pfSense nat bouncing -19630 19630/tcp # pfSense nat bouncing -19630 19630/udp # pfSense nat bouncing -19631 19631/tcp # pfSense nat bouncing -19631 19631/udp # pfSense nat bouncing -19632 19632/tcp # pfSense nat bouncing -19632 19632/udp # pfSense nat bouncing -19633 19633/tcp # pfSense nat bouncing -19633 19633/udp # pfSense nat bouncing -19634 19634/tcp # pfSense nat bouncing -19634 19634/udp # pfSense nat bouncing -19635 19635/tcp # pfSense nat bouncing -19635 19635/udp # pfSense nat bouncing -19636 19636/tcp # pfSense nat bouncing -19636 19636/udp # pfSense nat bouncing -19637 19637/tcp # pfSense nat bouncing -19637 19637/udp # pfSense nat bouncing -19638 19638/tcp # pfSense nat bouncing -19638 19638/udp # pfSense nat bouncing -19639 19639/tcp # pfSense nat bouncing -19639 19639/udp # pfSense nat bouncing -19640 19640/tcp # pfSense nat bouncing -19640 19640/udp # pfSense nat bouncing -19641 19641/tcp # pfSense nat bouncing -19641 19641/udp # pfSense nat bouncing -19642 19642/tcp # pfSense nat bouncing -19642 19642/udp # pfSense nat bouncing -19643 19643/tcp # pfSense nat bouncing -19643 19643/udp # pfSense nat bouncing -19644 19644/tcp # pfSense nat bouncing -19644 19644/udp # pfSense nat bouncing -19645 19645/tcp # pfSense nat bouncing -19645 19645/udp # pfSense nat bouncing -19646 19646/tcp # pfSense nat bouncing -19646 19646/udp # pfSense nat bouncing -19647 19647/tcp # pfSense nat bouncing -19647 19647/udp # pfSense nat bouncing -19648 19648/tcp # pfSense nat bouncing -19648 19648/udp # pfSense nat bouncing -19649 19649/tcp # pfSense nat bouncing -19649 19649/udp # pfSense nat bouncing -19650 19650/tcp # pfSense nat bouncing -19650 19650/udp # pfSense nat bouncing -19651 19651/tcp # pfSense nat bouncing -19651 19651/udp # pfSense nat bouncing -19652 19652/tcp # pfSense nat bouncing -19652 19652/udp # pfSense nat bouncing -19653 19653/tcp # pfSense nat bouncing -19653 19653/udp # pfSense nat bouncing -19654 19654/tcp # pfSense nat bouncing -19654 19654/udp # pfSense nat bouncing -19655 19655/tcp # pfSense nat bouncing -19655 19655/udp # pfSense nat bouncing -19656 19656/tcp # pfSense nat bouncing -19656 19656/udp # pfSense nat bouncing -19657 19657/tcp # pfSense nat bouncing -19657 19657/udp # pfSense nat bouncing -19658 19658/tcp # pfSense nat bouncing -19658 19658/udp # pfSense nat bouncing -19659 19659/tcp # pfSense nat bouncing -19659 19659/udp # pfSense nat bouncing -19660 19660/tcp # pfSense nat bouncing -19660 19660/udp # pfSense nat bouncing -19661 19661/tcp # pfSense nat bouncing -19661 19661/udp # pfSense nat bouncing -19662 19662/tcp # pfSense nat bouncing -19662 19662/udp # pfSense nat bouncing -19663 19663/tcp # pfSense nat bouncing -19663 19663/udp # pfSense nat bouncing -19664 19664/tcp # pfSense nat bouncing -19664 19664/udp # pfSense nat bouncing -19665 19665/tcp # pfSense nat bouncing -19665 19665/udp # pfSense nat bouncing -19666 19666/tcp # pfSense nat bouncing -19666 19666/udp # pfSense nat bouncing -19667 19667/tcp # pfSense nat bouncing -19667 19667/udp # pfSense nat bouncing -19668 19668/tcp # pfSense nat bouncing -19668 19668/udp # pfSense nat bouncing -19669 19669/tcp # pfSense nat bouncing -19669 19669/udp # pfSense nat bouncing -19670 19670/tcp # pfSense nat bouncing -19670 19670/udp # pfSense nat bouncing -19671 19671/tcp # pfSense nat bouncing -19671 19671/udp # pfSense nat bouncing -19672 19672/tcp # pfSense nat bouncing -19672 19672/udp # pfSense nat bouncing -19673 19673/tcp # pfSense nat bouncing -19673 19673/udp # pfSense nat bouncing -19674 19674/tcp # pfSense nat bouncing -19674 19674/udp # pfSense nat bouncing -19675 19675/tcp # pfSense nat bouncing -19675 19675/udp # pfSense nat bouncing -19676 19676/tcp # pfSense nat bouncing -19676 19676/udp # pfSense nat bouncing -19677 19677/tcp # pfSense nat bouncing -19677 19677/udp # pfSense nat bouncing -19678 19678/tcp # pfSense nat bouncing -19678 19678/udp # pfSense nat bouncing -19679 19679/tcp # pfSense nat bouncing -19679 19679/udp # pfSense nat bouncing -19680 19680/tcp # pfSense nat bouncing -19680 19680/udp # pfSense nat bouncing -19681 19681/tcp # pfSense nat bouncing -19681 19681/udp # pfSense nat bouncing -19682 19682/tcp # pfSense nat bouncing -19682 19682/udp # pfSense nat bouncing -19683 19683/tcp # pfSense nat bouncing -19683 19683/udp # pfSense nat bouncing -19684 19684/tcp # pfSense nat bouncing -19684 19684/udp # pfSense nat bouncing -19685 19685/tcp # pfSense nat bouncing -19685 19685/udp # pfSense nat bouncing -19686 19686/tcp # pfSense nat bouncing -19686 19686/udp # pfSense nat bouncing -19687 19687/tcp # pfSense nat bouncing -19687 19687/udp # pfSense nat bouncing -19688 19688/tcp # pfSense nat bouncing -19688 19688/udp # pfSense nat bouncing -19689 19689/tcp # pfSense nat bouncing -19689 19689/udp # pfSense nat bouncing -19690 19690/tcp # pfSense nat bouncing -19690 19690/udp # pfSense nat bouncing -19691 19691/tcp # pfSense nat bouncing -19691 19691/udp # pfSense nat bouncing -19692 19692/tcp # pfSense nat bouncing -19692 19692/udp # pfSense nat bouncing -19693 19693/tcp # pfSense nat bouncing -19693 19693/udp # pfSense nat bouncing -19694 19694/tcp # pfSense nat bouncing -19694 19694/udp # pfSense nat bouncing -19695 19695/tcp # pfSense nat bouncing -19695 19695/udp # pfSense nat bouncing -19696 19696/tcp # pfSense nat bouncing -19696 19696/udp # pfSense nat bouncing -19697 19697/tcp # pfSense nat bouncing -19697 19697/udp # pfSense nat bouncing -19698 19698/tcp # pfSense nat bouncing -19698 19698/udp # pfSense nat bouncing -19699 19699/tcp # pfSense nat bouncing -19699 19699/udp # pfSense nat bouncing -19700 19700/tcp # pfSense nat bouncing -19700 19700/udp # pfSense nat bouncing -19701 19701/tcp # pfSense nat bouncing -19701 19701/udp # pfSense nat bouncing -19702 19702/tcp # pfSense nat bouncing -19702 19702/udp # pfSense nat bouncing -19703 19703/tcp # pfSense nat bouncing -19703 19703/udp # pfSense nat bouncing -19704 19704/tcp # pfSense nat bouncing -19704 19704/udp # pfSense nat bouncing -19705 19705/tcp # pfSense nat bouncing -19705 19705/udp # pfSense nat bouncing -19706 19706/tcp # pfSense nat bouncing -19706 19706/udp # pfSense nat bouncing -19707 19707/tcp # pfSense nat bouncing -19707 19707/udp # pfSense nat bouncing -19708 19708/tcp # pfSense nat bouncing -19708 19708/udp # pfSense nat bouncing -19709 19709/tcp # pfSense nat bouncing -19709 19709/udp # pfSense nat bouncing -19710 19710/tcp # pfSense nat bouncing -19710 19710/udp # pfSense nat bouncing -19711 19711/tcp # pfSense nat bouncing -19711 19711/udp # pfSense nat bouncing -19712 19712/tcp # pfSense nat bouncing -19712 19712/udp # pfSense nat bouncing -19713 19713/tcp # pfSense nat bouncing -19713 19713/udp # pfSense nat bouncing -19714 19714/tcp # pfSense nat bouncing -19714 19714/udp # pfSense nat bouncing -19715 19715/tcp # pfSense nat bouncing -19715 19715/udp # pfSense nat bouncing -19716 19716/tcp # pfSense nat bouncing -19716 19716/udp # pfSense nat bouncing -19717 19717/tcp # pfSense nat bouncing -19717 19717/udp # pfSense nat bouncing -19718 19718/tcp # pfSense nat bouncing -19718 19718/udp # pfSense nat bouncing -19719 19719/tcp # pfSense nat bouncing -19719 19719/udp # pfSense nat bouncing -19720 19720/tcp # pfSense nat bouncing -19720 19720/udp # pfSense nat bouncing -19721 19721/tcp # pfSense nat bouncing -19721 19721/udp # pfSense nat bouncing -19722 19722/tcp # pfSense nat bouncing -19722 19722/udp # pfSense nat bouncing -19723 19723/tcp # pfSense nat bouncing -19723 19723/udp # pfSense nat bouncing -19724 19724/tcp # pfSense nat bouncing -19724 19724/udp # pfSense nat bouncing -19725 19725/tcp # pfSense nat bouncing -19725 19725/udp # pfSense nat bouncing -19726 19726/tcp # pfSense nat bouncing -19726 19726/udp # pfSense nat bouncing -19727 19727/tcp # pfSense nat bouncing -19727 19727/udp # pfSense nat bouncing -19728 19728/tcp # pfSense nat bouncing -19728 19728/udp # pfSense nat bouncing -19729 19729/tcp # pfSense nat bouncing -19729 19729/udp # pfSense nat bouncing -19730 19730/tcp # pfSense nat bouncing -19730 19730/udp # pfSense nat bouncing -19731 19731/tcp # pfSense nat bouncing -19731 19731/udp # pfSense nat bouncing -19732 19732/tcp # pfSense nat bouncing -19732 19732/udp # pfSense nat bouncing -19733 19733/tcp # pfSense nat bouncing -19733 19733/udp # pfSense nat bouncing -19734 19734/tcp # pfSense nat bouncing -19734 19734/udp # pfSense nat bouncing -19735 19735/tcp # pfSense nat bouncing -19735 19735/udp # pfSense nat bouncing -19736 19736/tcp # pfSense nat bouncing -19736 19736/udp # pfSense nat bouncing -19737 19737/tcp # pfSense nat bouncing -19737 19737/udp # pfSense nat bouncing -19738 19738/tcp # pfSense nat bouncing -19738 19738/udp # pfSense nat bouncing -19739 19739/tcp # pfSense nat bouncing -19739 19739/udp # pfSense nat bouncing -19740 19740/tcp # pfSense nat bouncing -19740 19740/udp # pfSense nat bouncing -19741 19741/tcp # pfSense nat bouncing -19741 19741/udp # pfSense nat bouncing -19742 19742/tcp # pfSense nat bouncing -19742 19742/udp # pfSense nat bouncing -19743 19743/tcp # pfSense nat bouncing -19743 19743/udp # pfSense nat bouncing -19744 19744/tcp # pfSense nat bouncing -19744 19744/udp # pfSense nat bouncing -19745 19745/tcp # pfSense nat bouncing -19745 19745/udp # pfSense nat bouncing -19746 19746/tcp # pfSense nat bouncing -19746 19746/udp # pfSense nat bouncing -19747 19747/tcp # pfSense nat bouncing -19747 19747/udp # pfSense nat bouncing -19748 19748/tcp # pfSense nat bouncing -19748 19748/udp # pfSense nat bouncing -19749 19749/tcp # pfSense nat bouncing -19749 19749/udp # pfSense nat bouncing -19750 19750/tcp # pfSense nat bouncing -19750 19750/udp # pfSense nat bouncing -19751 19751/tcp # pfSense nat bouncing -19751 19751/udp # pfSense nat bouncing -19752 19752/tcp # pfSense nat bouncing -19752 19752/udp # pfSense nat bouncing -19753 19753/tcp # pfSense nat bouncing -19753 19753/udp # pfSense nat bouncing -19754 19754/tcp # pfSense nat bouncing -19754 19754/udp # pfSense nat bouncing -19755 19755/tcp # pfSense nat bouncing -19755 19755/udp # pfSense nat bouncing -19756 19756/tcp # pfSense nat bouncing -19756 19756/udp # pfSense nat bouncing -19757 19757/tcp # pfSense nat bouncing -19757 19757/udp # pfSense nat bouncing -19758 19758/tcp # pfSense nat bouncing -19758 19758/udp # pfSense nat bouncing -19759 19759/tcp # pfSense nat bouncing -19759 19759/udp # pfSense nat bouncing -19760 19760/tcp # pfSense nat bouncing -19760 19760/udp # pfSense nat bouncing -19761 19761/tcp # pfSense nat bouncing -19761 19761/udp # pfSense nat bouncing -19762 19762/tcp # pfSense nat bouncing -19762 19762/udp # pfSense nat bouncing -19763 19763/tcp # pfSense nat bouncing -19763 19763/udp # pfSense nat bouncing -19764 19764/tcp # pfSense nat bouncing -19764 19764/udp # pfSense nat bouncing -19765 19765/tcp # pfSense nat bouncing -19765 19765/udp # pfSense nat bouncing -19766 19766/tcp # pfSense nat bouncing -19766 19766/udp # pfSense nat bouncing -19767 19767/tcp # pfSense nat bouncing -19767 19767/udp # pfSense nat bouncing -19768 19768/tcp # pfSense nat bouncing -19768 19768/udp # pfSense nat bouncing -19769 19769/tcp # pfSense nat bouncing -19769 19769/udp # pfSense nat bouncing -19770 19770/tcp # pfSense nat bouncing -19770 19770/udp # pfSense nat bouncing -19771 19771/tcp # pfSense nat bouncing -19771 19771/udp # pfSense nat bouncing -19772 19772/tcp # pfSense nat bouncing -19772 19772/udp # pfSense nat bouncing -19773 19773/tcp # pfSense nat bouncing -19773 19773/udp # pfSense nat bouncing -19774 19774/tcp # pfSense nat bouncing -19774 19774/udp # pfSense nat bouncing -19775 19775/tcp # pfSense nat bouncing -19775 19775/udp # pfSense nat bouncing -19776 19776/tcp # pfSense nat bouncing -19776 19776/udp # pfSense nat bouncing -19777 19777/tcp # pfSense nat bouncing -19777 19777/udp # pfSense nat bouncing -19778 19778/tcp # pfSense nat bouncing -19778 19778/udp # pfSense nat bouncing -19779 19779/tcp # pfSense nat bouncing -19779 19779/udp # pfSense nat bouncing -19780 19780/tcp # pfSense nat bouncing -19780 19780/udp # pfSense nat bouncing -19781 19781/tcp # pfSense nat bouncing -19781 19781/udp # pfSense nat bouncing -19782 19782/tcp # pfSense nat bouncing -19782 19782/udp # pfSense nat bouncing -19783 19783/tcp # pfSense nat bouncing -19783 19783/udp # pfSense nat bouncing -19784 19784/tcp # pfSense nat bouncing -19784 19784/udp # pfSense nat bouncing -19785 19785/tcp # pfSense nat bouncing -19785 19785/udp # pfSense nat bouncing -19786 19786/tcp # pfSense nat bouncing -19786 19786/udp # pfSense nat bouncing -19787 19787/tcp # pfSense nat bouncing -19787 19787/udp # pfSense nat bouncing -19788 19788/tcp # pfSense nat bouncing -19788 19788/udp # pfSense nat bouncing -19789 19789/tcp # pfSense nat bouncing -19789 19789/udp # pfSense nat bouncing -19790 19790/tcp # pfSense nat bouncing -19790 19790/udp # pfSense nat bouncing -19791 19791/tcp # pfSense nat bouncing -19791 19791/udp # pfSense nat bouncing -19792 19792/tcp # pfSense nat bouncing -19792 19792/udp # pfSense nat bouncing -19793 19793/tcp # pfSense nat bouncing -19793 19793/udp # pfSense nat bouncing -19794 19794/tcp # pfSense nat bouncing -19794 19794/udp # pfSense nat bouncing -19795 19795/tcp # pfSense nat bouncing -19795 19795/udp # pfSense nat bouncing -19796 19796/tcp # pfSense nat bouncing -19796 19796/udp # pfSense nat bouncing -19797 19797/tcp # pfSense nat bouncing -19797 19797/udp # pfSense nat bouncing -19798 19798/tcp # pfSense nat bouncing -19798 19798/udp # pfSense nat bouncing -19799 19799/tcp # pfSense nat bouncing -19799 19799/udp # pfSense nat bouncing -19800 19800/tcp # pfSense nat bouncing -19800 19800/udp # pfSense nat bouncing -19801 19801/tcp # pfSense nat bouncing -19801 19801/udp # pfSense nat bouncing -19802 19802/tcp # pfSense nat bouncing -19802 19802/udp # pfSense nat bouncing -19803 19803/tcp # pfSense nat bouncing -19803 19803/udp # pfSense nat bouncing -19804 19804/tcp # pfSense nat bouncing -19804 19804/udp # pfSense nat bouncing -19805 19805/tcp # pfSense nat bouncing -19805 19805/udp # pfSense nat bouncing -19806 19806/tcp # pfSense nat bouncing -19806 19806/udp # pfSense nat bouncing -19807 19807/tcp # pfSense nat bouncing -19807 19807/udp # pfSense nat bouncing -19808 19808/tcp # pfSense nat bouncing -19808 19808/udp # pfSense nat bouncing -19809 19809/tcp # pfSense nat bouncing -19809 19809/udp # pfSense nat bouncing -19810 19810/tcp # pfSense nat bouncing -19810 19810/udp # pfSense nat bouncing -19811 19811/tcp # pfSense nat bouncing -19811 19811/udp # pfSense nat bouncing -19812 19812/tcp # pfSense nat bouncing -19812 19812/udp # pfSense nat bouncing -19813 19813/tcp # pfSense nat bouncing -19813 19813/udp # pfSense nat bouncing -19814 19814/tcp # pfSense nat bouncing -19814 19814/udp # pfSense nat bouncing -19815 19815/tcp # pfSense nat bouncing -19815 19815/udp # pfSense nat bouncing -19816 19816/tcp # pfSense nat bouncing -19816 19816/udp # pfSense nat bouncing -19817 19817/tcp # pfSense nat bouncing -19817 19817/udp # pfSense nat bouncing -19818 19818/tcp # pfSense nat bouncing -19818 19818/udp # pfSense nat bouncing -19819 19819/tcp # pfSense nat bouncing -19819 19819/udp # pfSense nat bouncing -19820 19820/tcp # pfSense nat bouncing -19820 19820/udp # pfSense nat bouncing -19821 19821/tcp # pfSense nat bouncing -19821 19821/udp # pfSense nat bouncing -19822 19822/tcp # pfSense nat bouncing -19822 19822/udp # pfSense nat bouncing -19823 19823/tcp # pfSense nat bouncing -19823 19823/udp # pfSense nat bouncing -19824 19824/tcp # pfSense nat bouncing -19824 19824/udp # pfSense nat bouncing -19825 19825/tcp # pfSense nat bouncing -19825 19825/udp # pfSense nat bouncing -19826 19826/tcp # pfSense nat bouncing -19826 19826/udp # pfSense nat bouncing -19827 19827/tcp # pfSense nat bouncing -19827 19827/udp # pfSense nat bouncing -19828 19828/tcp # pfSense nat bouncing -19828 19828/udp # pfSense nat bouncing -19829 19829/tcp # pfSense nat bouncing -19829 19829/udp # pfSense nat bouncing -19830 19830/tcp # pfSense nat bouncing -19830 19830/udp # pfSense nat bouncing -19831 19831/tcp # pfSense nat bouncing -19831 19831/udp # pfSense nat bouncing -19832 19832/tcp # pfSense nat bouncing -19832 19832/udp # pfSense nat bouncing -19833 19833/tcp # pfSense nat bouncing -19833 19833/udp # pfSense nat bouncing -19834 19834/tcp # pfSense nat bouncing -19834 19834/udp # pfSense nat bouncing -19835 19835/tcp # pfSense nat bouncing -19835 19835/udp # pfSense nat bouncing -19836 19836/tcp # pfSense nat bouncing -19836 19836/udp # pfSense nat bouncing -19837 19837/tcp # pfSense nat bouncing -19837 19837/udp # pfSense nat bouncing -19838 19838/tcp # pfSense nat bouncing -19838 19838/udp # pfSense nat bouncing -19839 19839/tcp # pfSense nat bouncing -19839 19839/udp # pfSense nat bouncing -19840 19840/tcp # pfSense nat bouncing -19840 19840/udp # pfSense nat bouncing -19841 19841/tcp # pfSense nat bouncing -19841 19841/udp # pfSense nat bouncing -19842 19842/tcp # pfSense nat bouncing -19842 19842/udp # pfSense nat bouncing -19843 19843/tcp # pfSense nat bouncing -19843 19843/udp # pfSense nat bouncing -19844 19844/tcp # pfSense nat bouncing -19844 19844/udp # pfSense nat bouncing -19845 19845/tcp # pfSense nat bouncing -19845 19845/udp # pfSense nat bouncing -19846 19846/tcp # pfSense nat bouncing -19846 19846/udp # pfSense nat bouncing -19847 19847/tcp # pfSense nat bouncing -19847 19847/udp # pfSense nat bouncing -19848 19848/tcp # pfSense nat bouncing -19848 19848/udp # pfSense nat bouncing -19849 19849/tcp # pfSense nat bouncing -19849 19849/udp # pfSense nat bouncing -19850 19850/tcp # pfSense nat bouncing -19850 19850/udp # pfSense nat bouncing -19851 19851/tcp # pfSense nat bouncing -19851 19851/udp # pfSense nat bouncing -19852 19852/tcp # pfSense nat bouncing -19852 19852/udp # pfSense nat bouncing -19853 19853/tcp # pfSense nat bouncing -19853 19853/udp # pfSense nat bouncing -19854 19854/tcp # pfSense nat bouncing -19854 19854/udp # pfSense nat bouncing -19855 19855/tcp # pfSense nat bouncing -19855 19855/udp # pfSense nat bouncing -19856 19856/tcp # pfSense nat bouncing -19856 19856/udp # pfSense nat bouncing -19857 19857/tcp # pfSense nat bouncing -19857 19857/udp # pfSense nat bouncing -19858 19858/tcp # pfSense nat bouncing -19858 19858/udp # pfSense nat bouncing -19859 19859/tcp # pfSense nat bouncing -19859 19859/udp # pfSense nat bouncing -19860 19860/tcp # pfSense nat bouncing -19860 19860/udp # pfSense nat bouncing -19861 19861/tcp # pfSense nat bouncing -19861 19861/udp # pfSense nat bouncing -19862 19862/tcp # pfSense nat bouncing -19862 19862/udp # pfSense nat bouncing -19863 19863/tcp # pfSense nat bouncing -19863 19863/udp # pfSense nat bouncing -19864 19864/tcp # pfSense nat bouncing -19864 19864/udp # pfSense nat bouncing -19865 19865/tcp # pfSense nat bouncing -19865 19865/udp # pfSense nat bouncing -19866 19866/tcp # pfSense nat bouncing -19866 19866/udp # pfSense nat bouncing -19867 19867/tcp # pfSense nat bouncing -19867 19867/udp # pfSense nat bouncing -19868 19868/tcp # pfSense nat bouncing -19868 19868/udp # pfSense nat bouncing -19869 19869/tcp # pfSense nat bouncing -19869 19869/udp # pfSense nat bouncing -19870 19870/tcp # pfSense nat bouncing -19870 19870/udp # pfSense nat bouncing -19871 19871/tcp # pfSense nat bouncing -19871 19871/udp # pfSense nat bouncing -19872 19872/tcp # pfSense nat bouncing -19872 19872/udp # pfSense nat bouncing -19873 19873/tcp # pfSense nat bouncing -19873 19873/udp # pfSense nat bouncing -19874 19874/tcp # pfSense nat bouncing -19874 19874/udp # pfSense nat bouncing -19875 19875/tcp # pfSense nat bouncing -19875 19875/udp # pfSense nat bouncing -19876 19876/tcp # pfSense nat bouncing -19876 19876/udp # pfSense nat bouncing -19877 19877/tcp # pfSense nat bouncing -19877 19877/udp # pfSense nat bouncing -19878 19878/tcp # pfSense nat bouncing -19878 19878/udp # pfSense nat bouncing -19879 19879/tcp # pfSense nat bouncing -19879 19879/udp # pfSense nat bouncing -19880 19880/tcp # pfSense nat bouncing -19880 19880/udp # pfSense nat bouncing -19881 19881/tcp # pfSense nat bouncing -19881 19881/udp # pfSense nat bouncing -19882 19882/tcp # pfSense nat bouncing -19882 19882/udp # pfSense nat bouncing -19883 19883/tcp # pfSense nat bouncing -19883 19883/udp # pfSense nat bouncing -19884 19884/tcp # pfSense nat bouncing -19884 19884/udp # pfSense nat bouncing -19885 19885/tcp # pfSense nat bouncing -19885 19885/udp # pfSense nat bouncing -19886 19886/tcp # pfSense nat bouncing -19886 19886/udp # pfSense nat bouncing -19887 19887/tcp # pfSense nat bouncing -19887 19887/udp # pfSense nat bouncing -19888 19888/tcp # pfSense nat bouncing -19888 19888/udp # pfSense nat bouncing -19889 19889/tcp # pfSense nat bouncing -19889 19889/udp # pfSense nat bouncing -19890 19890/tcp # pfSense nat bouncing -19890 19890/udp # pfSense nat bouncing -19891 19891/tcp # pfSense nat bouncing -19891 19891/udp # pfSense nat bouncing -19892 19892/tcp # pfSense nat bouncing -19892 19892/udp # pfSense nat bouncing -19893 19893/tcp # pfSense nat bouncing -19893 19893/udp # pfSense nat bouncing -19894 19894/tcp # pfSense nat bouncing -19894 19894/udp # pfSense nat bouncing -19895 19895/tcp # pfSense nat bouncing -19895 19895/udp # pfSense nat bouncing -19896 19896/tcp # pfSense nat bouncing -19896 19896/udp # pfSense nat bouncing -19897 19897/tcp # pfSense nat bouncing -19897 19897/udp # pfSense nat bouncing -19898 19898/tcp # pfSense nat bouncing -19898 19898/udp # pfSense nat bouncing -19899 19899/tcp # pfSense nat bouncing -19899 19899/udp # pfSense nat bouncing -19900 19900/tcp # pfSense nat bouncing -19900 19900/udp # pfSense nat bouncing -19901 19901/tcp # pfSense nat bouncing -19901 19901/udp # pfSense nat bouncing -19902 19902/tcp # pfSense nat bouncing -19902 19902/udp # pfSense nat bouncing -19903 19903/tcp # pfSense nat bouncing -19903 19903/udp # pfSense nat bouncing -19904 19904/tcp # pfSense nat bouncing -19904 19904/udp # pfSense nat bouncing -19905 19905/tcp # pfSense nat bouncing -19905 19905/udp # pfSense nat bouncing -19906 19906/tcp # pfSense nat bouncing -19906 19906/udp # pfSense nat bouncing -19907 19907/tcp # pfSense nat bouncing -19907 19907/udp # pfSense nat bouncing -19908 19908/tcp # pfSense nat bouncing -19908 19908/udp # pfSense nat bouncing -19909 19909/tcp # pfSense nat bouncing -19909 19909/udp # pfSense nat bouncing -19910 19910/tcp # pfSense nat bouncing -19910 19910/udp # pfSense nat bouncing -19911 19911/tcp # pfSense nat bouncing -19911 19911/udp # pfSense nat bouncing -19912 19912/tcp # pfSense nat bouncing -19912 19912/udp # pfSense nat bouncing -19913 19913/tcp # pfSense nat bouncing -19913 19913/udp # pfSense nat bouncing -19914 19914/tcp # pfSense nat bouncing -19914 19914/udp # pfSense nat bouncing -19915 19915/tcp # pfSense nat bouncing -19915 19915/udp # pfSense nat bouncing -19916 19916/tcp # pfSense nat bouncing -19916 19916/udp # pfSense nat bouncing -19917 19917/tcp # pfSense nat bouncing -19917 19917/udp # pfSense nat bouncing -19918 19918/tcp # pfSense nat bouncing -19918 19918/udp # pfSense nat bouncing -19919 19919/tcp # pfSense nat bouncing -19919 19919/udp # pfSense nat bouncing -19920 19920/tcp # pfSense nat bouncing -19920 19920/udp # pfSense nat bouncing -19921 19921/tcp # pfSense nat bouncing -19921 19921/udp # pfSense nat bouncing -19922 19922/tcp # pfSense nat bouncing -19922 19922/udp # pfSense nat bouncing -19923 19923/tcp # pfSense nat bouncing -19923 19923/udp # pfSense nat bouncing -19924 19924/tcp # pfSense nat bouncing -19924 19924/udp # pfSense nat bouncing -19925 19925/tcp # pfSense nat bouncing -19925 19925/udp # pfSense nat bouncing -19926 19926/tcp # pfSense nat bouncing -19926 19926/udp # pfSense nat bouncing -19927 19927/tcp # pfSense nat bouncing -19927 19927/udp # pfSense nat bouncing -19928 19928/tcp # pfSense nat bouncing -19928 19928/udp # pfSense nat bouncing -19929 19929/tcp # pfSense nat bouncing -19929 19929/udp # pfSense nat bouncing -19930 19930/tcp # pfSense nat bouncing -19930 19930/udp # pfSense nat bouncing -19931 19931/tcp # pfSense nat bouncing -19931 19931/udp # pfSense nat bouncing -19932 19932/tcp # pfSense nat bouncing -19932 19932/udp # pfSense nat bouncing -19933 19933/tcp # pfSense nat bouncing -19933 19933/udp # pfSense nat bouncing -19934 19934/tcp # pfSense nat bouncing -19934 19934/udp # pfSense nat bouncing -19935 19935/tcp # pfSense nat bouncing -19935 19935/udp # pfSense nat bouncing -19936 19936/tcp # pfSense nat bouncing -19936 19936/udp # pfSense nat bouncing -19937 19937/tcp # pfSense nat bouncing -19937 19937/udp # pfSense nat bouncing -19938 19938/tcp # pfSense nat bouncing -19938 19938/udp # pfSense nat bouncing -19939 19939/tcp # pfSense nat bouncing -19939 19939/udp # pfSense nat bouncing -19940 19940/tcp # pfSense nat bouncing -19940 19940/udp # pfSense nat bouncing -19941 19941/tcp # pfSense nat bouncing -19941 19941/udp # pfSense nat bouncing -19942 19942/tcp # pfSense nat bouncing -19942 19942/udp # pfSense nat bouncing -19943 19943/tcp # pfSense nat bouncing -19943 19943/udp # pfSense nat bouncing -19944 19944/tcp # pfSense nat bouncing -19944 19944/udp # pfSense nat bouncing -19945 19945/tcp # pfSense nat bouncing -19945 19945/udp # pfSense nat bouncing -19946 19946/tcp # pfSense nat bouncing -19946 19946/udp # pfSense nat bouncing -19947 19947/tcp # pfSense nat bouncing -19947 19947/udp # pfSense nat bouncing -19948 19948/tcp # pfSense nat bouncing -19948 19948/udp # pfSense nat bouncing -19949 19949/tcp # pfSense nat bouncing -19949 19949/udp # pfSense nat bouncing -19950 19950/tcp # pfSense nat bouncing -19950 19950/udp # pfSense nat bouncing -19951 19951/tcp # pfSense nat bouncing -19951 19951/udp # pfSense nat bouncing -19952 19952/tcp # pfSense nat bouncing -19952 19952/udp # pfSense nat bouncing -19953 19953/tcp # pfSense nat bouncing -19953 19953/udp # pfSense nat bouncing -19954 19954/tcp # pfSense nat bouncing -19954 19954/udp # pfSense nat bouncing -19955 19955/tcp # pfSense nat bouncing -19955 19955/udp # pfSense nat bouncing -19956 19956/tcp # pfSense nat bouncing -19956 19956/udp # pfSense nat bouncing -19957 19957/tcp # pfSense nat bouncing -19957 19957/udp # pfSense nat bouncing -19958 19958/tcp # pfSense nat bouncing -19958 19958/udp # pfSense nat bouncing -19959 19959/tcp # pfSense nat bouncing -19959 19959/udp # pfSense nat bouncing -19960 19960/tcp # pfSense nat bouncing -19960 19960/udp # pfSense nat bouncing -19961 19961/tcp # pfSense nat bouncing -19961 19961/udp # pfSense nat bouncing -19962 19962/tcp # pfSense nat bouncing -19962 19962/udp # pfSense nat bouncing -19963 19963/tcp # pfSense nat bouncing -19963 19963/udp # pfSense nat bouncing -19964 19964/tcp # pfSense nat bouncing -19964 19964/udp # pfSense nat bouncing -19965 19965/tcp # pfSense nat bouncing -19965 19965/udp # pfSense nat bouncing -19966 19966/tcp # pfSense nat bouncing -19966 19966/udp # pfSense nat bouncing -19967 19967/tcp # pfSense nat bouncing -19967 19967/udp # pfSense nat bouncing -19968 19968/tcp # pfSense nat bouncing -19968 19968/udp # pfSense nat bouncing -19969 19969/tcp # pfSense nat bouncing -19969 19969/udp # pfSense nat bouncing -19970 19970/tcp # pfSense nat bouncing -19970 19970/udp # pfSense nat bouncing -19971 19971/tcp # pfSense nat bouncing -19971 19971/udp # pfSense nat bouncing -19972 19972/tcp # pfSense nat bouncing -19972 19972/udp # pfSense nat bouncing -19973 19973/tcp # pfSense nat bouncing -19973 19973/udp # pfSense nat bouncing -19974 19974/tcp # pfSense nat bouncing -19974 19974/udp # pfSense nat bouncing -19975 19975/tcp # pfSense nat bouncing -19975 19975/udp # pfSense nat bouncing -19976 19976/tcp # pfSense nat bouncing -19976 19976/udp # pfSense nat bouncing -19977 19977/tcp # pfSense nat bouncing -19977 19977/udp # pfSense nat bouncing -19978 19978/tcp # pfSense nat bouncing -19978 19978/udp # pfSense nat bouncing -19979 19979/tcp # pfSense nat bouncing -19979 19979/udp # pfSense nat bouncing -19980 19980/tcp # pfSense nat bouncing -19980 19980/udp # pfSense nat bouncing -19981 19981/tcp # pfSense nat bouncing -19981 19981/udp # pfSense nat bouncing -19982 19982/tcp # pfSense nat bouncing -19982 19982/udp # pfSense nat bouncing -19983 19983/tcp # pfSense nat bouncing -19983 19983/udp # pfSense nat bouncing -19984 19984/tcp # pfSense nat bouncing -19984 19984/udp # pfSense nat bouncing -19985 19985/tcp # pfSense nat bouncing -19985 19985/udp # pfSense nat bouncing -19986 19986/tcp # pfSense nat bouncing -19986 19986/udp # pfSense nat bouncing -19987 19987/tcp # pfSense nat bouncing -19987 19987/udp # pfSense nat bouncing -19988 19988/tcp # pfSense nat bouncing -19988 19988/udp # pfSense nat bouncing -19989 19989/tcp # pfSense nat bouncing -19989 19989/udp # pfSense nat bouncing -19990 19990/tcp # pfSense nat bouncing -19990 19990/udp # pfSense nat bouncing -19991 19991/tcp # pfSense nat bouncing -19991 19991/udp # pfSense nat bouncing -19992 19992/tcp # pfSense nat bouncing -19992 19992/udp # pfSense nat bouncing -19993 19993/tcp # pfSense nat bouncing -19993 19993/udp # pfSense nat bouncing -19994 19994/tcp # pfSense nat bouncing -19994 19994/udp # pfSense nat bouncing -19995 19995/tcp # pfSense nat bouncing -19995 19995/udp # pfSense nat bouncing -19996 19996/tcp # pfSense nat bouncing -19996 19996/udp # pfSense nat bouncing -19997 19997/tcp # pfSense nat bouncing -19997 19997/udp # pfSense nat bouncing -19998 19998/tcp # pfSense nat bouncing -19998 19998/udp # pfSense nat bouncing -19999 19999/tcp # pfSense nat bouncing -19999 19999/udp # pfSense nat bouncing -dbbrowse 47557/tcp #Databeam Corporation -dbbrowse 47557/udp #Databeam Corporation -wnn4 22273/tcp #Wnn4 (Japanese input) -wnn4_Cn 22289/tcp #Wnn4 (Chinese input) -wnn4_Tw 22321/tcp #Wnn4 (Taiwanse input) -wnn4_Kr 22305/tcp #Wnn4 (Korean input) -wnn6 22273/tcp #Wnn6 (Japanese input) -wnn6_Cn 22289/tcp #Wnn6 (Chinese input) -wnn6_Tw 22321/tcp #Wnn6 (Taiwanse input) -wnn6_Kr 22305/tcp #Wnn6 (Korean input) -wnn6_DS 26208/tcp #Wnn6 (Dserver) diff --git a/src/etc/sshd b/src/etc/sshd index 05ddb63..2e59824 100755 --- a/src/etc/sshd +++ b/src/etc/sshd @@ -163,7 +163,7 @@ $generate_keys = array(); foreach ($keys as $key) { if (!file_exists("{$sshConfigDir}/ssh_host_{$key['suffix']}key") || - !file_exists("{$sshConfigDir}/ssh_host_{$key['suffix']}key.pub")) { + !file_exists("{$sshConfigDir}/ssh_host_{$key['suffix']}key.pub")) { $generate_keys[] = $key; } } diff --git a/src/etc/ssl/openssl.cnf b/src/etc/ssl/openssl.cnf index 41664e6..3ea2df5 100644 --- a/src/etc/ssl/openssl.cnf +++ b/src/etc/ssl/openssl.cnf @@ -275,7 +275,7 @@ authorityKeyIdentifier=keyid:always,issuer:always # So we do this instead. basicConstraints = CA:true -# Key usage: this is typical for a CA certificate. +# Key usage: this is typical for a CA certificate. keyUsage = cRLSign, keyCertSign # Some might want this also |
