pfSense

Merge remote branch 'upstream/master'

Conflicts:
etc/inc/openvpn.inc

Bug #1560.IPsec GUI needs to reject duplicate subnets in phase 2s for a given phase 1 (fixing p2 edit)

Bug #1560.IPsec GUI needs to reject duplicate subnets in phase 2s for a given phase 1 (improvement of previous patch)

Merge remote branch 'upstream/master'

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

Bug #1560. IPsec GUI needs to reject duplicate subnets in phase 2s for a given phase 1(site-to-site).

Bug #1560. IPsec GUI needs to reject duplicate subnets in phase 2s for a given phase 1(mobile clients).

enlarge various address fields for IPv6 addresses

Add the ability to differentiate between v4 and v6 tunnels. Bill says he can test

Make sure to resolve the gateway name before passing it off to the IPsec reload function

Add other interfaces to local network selection and show proper names. Fixes #965

Fix XSS issues

Do not include 'remoteid' javascript functions for mobile ipsec. Ticket #797

Corrections gettext() calls on vpn_ipsec_phase2.php

Implement gettext() calls on vpn_ipsec_phase2.php

Remove Logs tab from OpenVPN, as it is no longer needed.

Add status/log icons to IPsec pages.

Add PSK tab to all IPsec pages, it was missing from some.

Ticket #430. Give a none option to allow for roadwarriors configs.

When editing a P2: reset netmask to 24 only when it is not specified, in case of a new P2. Ticket #352

Ticket #352. Allow 0 mask in remote network bits.

fix text

Rework includes/require. This saves about 4 megabytes.
Simplify get_memory(). Tested on mips/i386

add links to IPsec logs under IPsec status and other pages

Include functions.inc which will then include ipsec.inc

Fix interface list usage

WARN: Please ask before introducing old code on what have changed!

• Reorganize the 'apply' button infrustructure in the GUI.
  - Present three new functions is/mark/clear_subsystem_dirty('name_of_subsystem'). This makes easier to create such things without needing to introduce new globals.
  - Convert all pages to the new infrustructure...

Modify IPsec code to allow for transport mode. All existing configurations are
marked as tunnel for backwards compatibility. There are problems with the spd
read code which Will likely choke on transport entries. We can fix this later.

Move the IPsec pinghost option from phase1 to phase2. Correct some
bugs that were preventing the local address from being selected.

Reload phase2 tunnel items when adding, remoing or editing a phase 2 entry.

Migrate IPsec certificate management to centralized system.

Cleanup ipsec interfaces a bit and make sure they are displayed in tabs for consistency.

Rewrite the pfsense privilege system with the following goals in mind ...

1) Redefine page privileges to not use static urls
2) Accurate generation of privilege definitions from source
3) Merging the user and group privileges into a single set
4) Allow any privilege to be added to users or groups w/ inheritance...

Fix a few bugs in the IPsec pages HTML output that were causing problems
with IE.

Introduce a new and improved version of IPsec mobile client support. The
mobile client tab is now used to configure user authentication (Xauth) and
client configuration (mode-cfg) options. User authentication is currently
limited to system password file entries. This will be extended to support...

Overhaul IPsec related code. Shared functions have been consolidated into
a new file named /etc/ipsec.inc. Tunnel definitions have been split into
phase1 and phase2. This allows any number of phase2 definitions to be
created for a single phase1 definition. Several facets of configuration...