Make sure to push elements we don't recognize on the stack too.
Add upgrade code that updates the dynamic gateway names to their new format new $if_$type.Redmine Ticket #2332. I've tested a simple upgrade with 3 dynamic Wans with varying names and that appears to have succeeded. Needs more testing.
Feature #2123 Backup RRD files using the xml dump and restore from RRD tools
http://redmine.pfsense.org/issues/2123
Remove slipped line
Make vips vhid be unique per parent interface!
Move CARP settings from pkg XML to a real PHP page
https://redmine.pfsense.org/issues/647
Unbreak the upgrade_config.inc, sorry
More memory optimizations for the RRD upgrade. Ticket #1758 #2159
Update the upgrade function so we use less memory here too to make sure it succeeds on Nano.Related to ticket. #2159 #1758
Fixes #1999. Upgrade bvoucher config as well during CP upgrade to multi-instance
PPTP upgrade needs to declare $config a global.
Fix LZO setting for Upgraded OpenVPN (was turning compression on even if old config had it disabled.)
Fix upgrade code for 1.2.3 with assigned OpenVPN interface.
Don't ignore when multiple OpenVPN DNS, NTP, WINS, etc servers were specified in 1.2.3 when upgrading. 1.2.3 separated by ;, 2.x uses separate vars.
Safer for 1.2.3 upgrades to assume OpenVPN interface == any, since 1.2.3 didn't have a way to bind to an interface. Otherwise people accepting connections on opt interfaces on 1.2.3 will break on upgrade until the proper interface is selected in the GUI
Unbreak a number of explode() replacements which required preg_split()
The function split() is replaced by the function explode(). Starting with PHP 5.3 this is deprecated and with version 6 gone.Replacing it surpresses all the warnings
Convert MTU from 1.2.3 to MSS on 2.0, fixes #1886
Fix SMTP monitor check in upgrade code, too.
Fix the 2nd grow command, add spaceTicket #1758
Ok, let's try not to corrupt the RRD files on upgrade. Leave the RRA archives for the 720 minutes average at 1000.Then run a rrdtool resize command to grow the RRA by 1000 and 2000 for the 60 and 720 average respectively.Attempts to further fix ticket #1758
Add the OOM memory restructuring fix from Ticket #1758 into mainline for nanoBSD upgrades.
Move the old databases to the backup folder in confFixes ticket #1758
Restore the RRD backup before attempting a migration as this bites the nanobsd users.We immediately backup the new databases to a new rrd.tgz file. The old database will be moved to /rootFix for ticket #1758
Add the multi instance CP to master branch. This allows to define CP with different properties on different interfaces.
Merge remote-tracking branch 'upstream/master'
Conflicts: etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/interfaces.inc etc/inc/services.inc etc/inc/xmlrpc_client.inc usr/local/www/fbegin.inc usr/local/www/services_dhcp.php
Merge remote-tracking branch 'mainline/master' into inc
Conflicts: etc/inc/priv.defs.inc
Merge remote branch 'upstream/master'
Check if an item is an array before treating it as such in the upgrade code.
Add proper checks in auth code for testing if the section has been set in the config. Also do the same in the ugprade code
In upgrade code for server load balancing, set redirect_mode. Also in the backend code, assume redirect_mode as the default if it's not set.
Fix off-by-one in OpenVPN "local" to "ipaddr" conversion.
Add LB monitor types to config during upgrade, or they will be missing from boxes upgraded from 1.2.3.
Conflicts: etc/inc/globals.inc etc/inc/upgrade_config.inc
Upgrade sync username to latest config version.
Conflicts: etc/inc/voucher.inc usr/local/www/fbegin.inc
Conflicts: conf.default/config.xml etc/inc/filter.inc etc/inc/globals.inc etc/inc/pfsense-utils.inc etc/inc/upgrade_config.inc usr/local/www/interfaces.php
Rather make use of $global variable for RRD path.
Remove out-dated RRD file as it will cause broken images to appear on RRD graphs page.
Conflicts: etc/inc/interfaces.inc etc/inc/upgrade_config.inc etc/inc/vpn.inc
When converting 1.2.3 LB pools to 2.0 gateway groups, strip invalid characters from the group names and update any rules referencing the old name. Fixes #1515
Fix PPTP server radius settings upgrade from 1.2.3. Fixes #1292
Conflicts: usr/local/www/status_rrd_graph_img.php
Remove rndtest sysctl since the kernel module is not anymore part of our kernels. Leftover noticed by: Jim
Conflicts: etc/inc/pfsense-utils.inc
Fix PPPoE upgrade, the <pppoe> tag is considered an array these days and the upgrade code wasn't treating it properly, accessing it directly instead of using the first entry ([0]). Fixes #1439 - PPPoE credentials upgrade properly now.
Conflicts: etc/inc/gwlb.inc
Conflicts: etc/inc/filter.inc usr/local/www/themes/the_wall/rrdcolors.inc.php
CRL is read in as an array now, so even in the imported config it will appear to be an array even though it can only have one value. Fixes #1358
Conflicts: etc/inc/voucher.inc
Check for "aes 256" as IPsec encryption type, not just rijndael.
Add some upgrade code for IPsec mobile clients. Passes php -l but needs more testing.
Conflicts: etc/inc/interfaces.inc etc/inc/priv.defs.inc etc/inc/shaper.inc etc/inc/system.inc
Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc etc/inc/priv.defs.inc etc/inc/services.inc...
Keep a table of gateways we added for static routes to prevent us from making multiple entries to the same IP address
Enable the IPv6 allow toggle, otherwise the other IPv6 rules do not work.
Merge the config upgrade code, there was a mismatch, the one who merged this wrong should get a pointy hat.
Resolve merge conflict
Only change protocol if it's set and not empty.
Add upgrade code to ensure rule protocols are all lower case.
Fix admins group permission setting when upgrading from 1.2.3.
Correct IPsec carp interface upgrade code, off by one
Use full path to pw
Add missing _relayd group, and when upgrading from 1.2.3, add _relayd group and user.
Correct the vlan upgrade code to continue when we fixed up the interface
Correct the config path to the vip array
Attempted fix that should convert the old carp[$i] naming to vip[$vhid]
Make sure we iterate by the vlan number lest we end up with a empty variable? Hopefully fix new vlan name not being assigned to interfaces section
Correct the gateway group member name to the correct GW_". strtoupper($if) uppercase. This fixes outbound load balancer pools upgraded from 1.2.3not working
Do not rely on php new foreach by reference and use the old method of chaning array members by using full path. This fixes nat 1:1 upgrades.
Change wording
Add support for IPv6 counters to the RRD graphs. This adds 4 more data sources in the rrd file.The graphing code colors are currently a mismatch and sorts waiting for someone with eyes to adjust to something usefulOther themes still need adjustingPackets graph isn't done, that needs the same modification as the traffic counters....
Merge branch 'master' into inc
Conflicts: etc/inc/captiveportal.inc etc/inc/config.console.inc etc/inc/config.lib.inc etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/ipsec.inc etc/inc/pkg-utils.inc etc/inc/shaper.inc...
Add the cron job a different way. There have been a couple reports of losing CAs during the config upgrade and this was the only added function at the time.
Bump config version, add upgrade code to setup cron job for URL table update script.
Ticket #491. Correct username/password name fields so upgrade works correctly.
Forgot to up the array count.
Add kern.ipc.maxsockbuf to upgrade config and remove extra whitespace.
Instead of replacing the whole array just add the new vlanif member to the config. Should fix issues reported in http://forum.pfsense.org/index.php/topic,28202.15.html
nuke trailing carriage returns
Merge remote branch 'mainline/master' into inc
Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/gwlb.inc etc/inc/interfaces.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc...
Ticket #491. Do not actually check for enable to exist but for host since enable might be unset explicitly by the user. This should re-enable configs to work.
Store upgraded monitor IPs in gateway items, not accidentally as bogus interfaces. This was causing some configs to upgrade and then get stuck in a reassignment loop after the next reboot.
Make the RRD path if it doesn't yet exist at this point.
Remove hw.bce.tso_enable item it is loader.conf only per jimp
Some fixes for the upgrade code for captive portal users.
Remove the old field even if empty in rename_field.
Conflicts: etc/inc/PEAR.inc etc/inc/filter.inc
Remove trailing carriage return
Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/priv.defs.inc etc/inc/system.inc etc/inc/upgrade_config.inc etc/inc/vpn.inc