Commit Graph

22112 Commits

Author SHA1 Message Date
Phil Davis
df0cb10bbe Provide get_uptime_sec in a common include file
so it is available to anything that cares.
2013-08-29 00:09:40 -07:00
Renato Botelho
58ddb24fc6 Merge pull request #785 from phil-davis/master
Tidy up use of hw.physmem and hw.realmem from get_memory()
2013-08-28 16:58:43 -07:00
Phil Davis
5517f60472 Use physmem and realmem from get_memory() in the appropriate places 2013-08-28 13:13:37 -07:00
Phil Davis
6b0739ac37 Use new names for get_memory parameters 2013-08-28 13:11:11 -07:00
Phil Davis
386758bba9 Use hw.physmem when calculating pfsense_default_state_size
hw.physmem is the actual amount of memory that FreeBSD/pfSense can get its hands on, so use this for the calculation.
2013-08-28 13:09:08 -07:00
Phil Davis
493360f50a Use updated get_memory var names
The value of minimum_ram_warning is designed to be compared to hw.physmem - so do that. Usse the appropriate physmem or realmem value in each place.
2013-08-28 13:05:10 -07:00
Phil Davis
517fb89ed6 Improve var names in get_memory
realmem is the amount of actual (real) memory installed - the size of the RAM card - e.g. 256MB
physmem is the amount of memory available to FreeBSD after BIOS, video... has stolen some of realmem.
The variable names currently used are not very helpful for code readability. This standardises them. No functional change here.
2013-08-28 13:01:13 -07:00
jim-p
f6339216b7 s/require/require_once/g for filter.inc to avoid redeclaration errors in some rare cases. 2013-08-28 13:54:30 -04:00
jim-p
495dd80476 If upgrading NanoBSD, try to grab the previous timezone file so the zone is preserved on the next boot. 2013-08-28 10:48:17 -04:00
jim-p
fa92a6a49e Also run mtree check post-upgrade. 2013-08-28 10:44:24 -04:00
jim-p
aed005392c Support the names used by the status page as well as those used internally by service entries. 2013-08-28 09:00:30 -04:00
Renato Botelho
4b1c16b9ce Merge pull request #783 from phil-davis/master
Add option to specify client management port for OpenVPN client export use
2013-08-26 04:33:07 -07:00
Phil Davis
faf61f12de Add option to specify client management port for OpenVPN client export use
See forum http://forum.pfsense.org/index.php/topic,63668.0.html and OpenVPN Manager GitHub discussion https://github.com/jochenwierum/openvpn-manager/issues/17
This allows a different client management port to be specified for use by OpenVPN client export when generating a client config for use with OpenVPN manager. Typically a company could have multiple offices with OpenVPN "road-warrior" access. Some users might need to connect to different offices at different times, so they would have multiple OpenVPN client configs installed on their laptop. For this to work with OpenVPN Manager, each client config needs to have a different management channel - only 1 can use the default of "166". The company can chooose a different number in the road-warrior server "client parameters" section at each office. Then the generated client config from each office will have a unique management channel port number.
2013-08-25 23:23:54 -07:00
Jim P
a91773bb8c Merge pull request #781 from PiBa-NL/CreateCertificate_DigestAlgorithm
Certificate Manager, for 'Create an internal Certificate' use the correct 'Digest Algorithm'
2013-08-23 14:39:21 -07:00
PiBa-NL
8f07b51c8d Certificate Manager, for 'Create an internal Certificate' use the correct 'Digest Algorithm' 2013-08-23 21:48:57 +02:00
Renato Botelho
083a9e6d0b Delete old route for remote gateway when its IP changes. It fixes #3155 2013-08-22 16:14:24 -03:00
Chris Buechler
afde5956f4 fix text to remove non-applicable copy/paste from v4 relay 2013-08-21 22:33:41 -05:00
jim-p
4475997eb6 Fixup check for existing easyrule block rule to account for the ipproto and when the ipproto is blank. 2013-08-21 15:20:37 -04:00
jim-p
b4dcdbcff5 Remove this particular form tag that doesn't appear to serve any purpose on this page, and breaks the drop-down zone selector. Fixes #3153 2013-08-20 21:24:40 -04:00
jim-p
eb0287e96f Add patch from the ticket to fix #3149 2013-08-20 15:41:17 -04:00
Renato Botelho
d318da67a0 Add scope to target when it is a link-local, it helps ticket #3150 2013-08-20 16:30:04 -03:00
Renato Botelho
bd6ff3288a Add scope to target when it is a link-local, it helps ticket #3150 2013-08-20 14:37:42 -03:00
Renato Botelho
86797a929b Merge pull request #779 from CharlieMarshall/fileCss
remove css from edit.php page
2013-08-20 04:17:34 -07:00
jim-p
e56cb3de7d Attempt to recognize pfsync entries from pf logs. 2013-08-19 13:54:22 -04:00
Charlie Marshall
4fd091046f remove css 2013-08-18 22:37:48 +01:00
jim-p
304161667b Strip off scope before attempting to resolve the IPv6 IP here. 2013-08-17 21:31:49 -04:00
Chris Buechler
44e72b7c25 Fix selection of IPv6 target IP for IPv6 Outbound NAT rules.
This makes it possible (without source hacking) to do many:1 NAT of IPv6.

Some will rejoice. Some will curse.

This should really only be done in limited, specific circumstances. Don't develop the IPv4 NAT mentality with IPv6.
2013-08-17 05:11:48 -05:00
Renato Botelho
5ef99bd9fd Obsolete more ntp binaries from base 2013-08-16 17:06:06 -03:00
Renato Botelho
6d501aefc2 Use ntpdate from ports also and obsolete base one 2013-08-16 16:55:17 -03:00
Ermal
17921b7e8d Ooops fix this to add only th einterface 2013-08-16 19:49:03 +00:00
Renato Botelho
62580df45f Obsolete base ntpd since we are using the one from ports 2013-08-16 16:43:41 -03:00
Ermal
42f33846eb Add scope identifier to target when its link-local 2013-08-16 19:35:34 +00:00
jim-p
f7ff77fa80 Fix Diag > Tables AJAX fadeOut after deletion for rows with CIDR mask format. 2013-08-16 14:48:33 -04:00
Ermal
420aa48b98 Add also a special case so the correct ip is returned for the case when WAN is v4 PPP type and v6 is DHCP but with option fetch v6 info from v4. 2013-08-16 15:00:41 +00:00
Ermal
f253e9281f When using DHCPv6 and only requesting a prefix the communication on the WAN interface will be over link-local so return the link-local address of the interface in this case rather than nothing. 2013-08-16 14:45:55 +00:00
Ermal
ebcbc110d0 Optimize a bit to try and convrt back to friendly interface only when needed 2013-08-16 14:35:13 +00:00
Ermal
45c07f1673 Resolves #2627. When WANv4 is PPP and v6 is DHCP but the option get v6 info from v4 is ticked the real interface is different. For WANv4 is pppXX and for v6 is the real underlying interface. Take this into consideration during interface_bring_down to properly cleanup things 2013-08-16 14:34:16 +00:00
Ermal
c289c48a1f Correctly remove IPv6 addresses from the interface rather than just erroring out. The same trick that works for IPv4 of not specifying address does not work with v6 2013-08-16 14:11:40 +00:00
Ermal
a55dd5371d Even if called with wrong parameters try to do something rather than return here. 2013-08-16 13:38:15 +00:00
Ermal
b77d19c768 Add the check even here when dealing with ipv6 addreses 2013-08-16 10:40:48 +00:00
Ermal
55909a9adf Handle link local addresses with embedded interface scope on is_ipaddrv6 and also on dnsmasq which is not yet there for these addresses 2013-08-16 10:33:31 +00:00
Ermal
8b22629028 Unbreak limitrules and probably pfblocker errors. Spotted-by: Jim 2013-08-15 19:31:13 +00:00
Renato Botelho
bc317d1e25 Merge pull request #776 from CharlieMarshall/helper
improve the look of the pop up helper widget
2013-08-15 12:17:55 -07:00
Renato Botelho
f59c7ae0b5 Merge pull request #772 from CharlieMarshall/jQueryWidgets
convert dashboard progress bars to jqueryUI
2013-08-15 12:17:37 -07:00
Charlie Marshall
5ef8ec8891 fix swap & temp 2013-08-15 19:17:27 +01:00
jim-p
108e868d70 When renaming or deleting a virtual server, clean up the old relayd anchor name. Otherwise the rules are still there and valid, and will cause problems as they will override the new VS settings. Also clear out the anchors when stopping relayd or starting fresh that way no old settings could conflict. 2013-08-15 13:46:45 -04:00
Renato Botelho
c0fc63d15a Improve sh syntax using ${} for all variables 2013-08-15 08:39:07 -03:00
Ermal
174a331e19 Also take dhcpv6 into consideration even here. 2013-08-15 09:02:34 +00:00
Ermal
5c4fdda353 Synchronize dhcpv6 as well if dhcp sync setting is on. Reported-by: http://forum.pfsense.org/index.php/topic,65487.0.html 2013-08-15 09:01:00 +00:00
Ermal
2c3924a16a Cleanup some code that is not needed anymore 2013-08-14 23:16:02 +00:00