Adding hook for interfaces allowing pfCenter and friends to add interfaces to the dropdown
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
Bug #1639. Port alias missing input validation in firewall_rules_edit.php.
Merge remote branch 'upstream/master'
Be consistent with upper and lowercase.
Make the ICMP echo request type less ambiguous, and since it's likely the main one to get used, move it to the top.
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
Remove bogus protection. We have better handling of this now.
Add missing plugin code. Move the pre_write section up a bit.
Adding a new hook system for firewall nat edit and firewall rules edit page.Basically if the directory exists it will suck in the files to extend these pags.
/usr/local/pkg/firewall_nat/input_validation/usr/local/pkg/firewall_nat/pre_write_config/usr/local/pkg/firewall_nat/htmlphpearly...
Conflicts: etc/inc/filter.inc usr/local/www/themes/the_wall/rrdcolors.inc.php
In IPsec, s/mobileclients/client/, this was changed long ago in the config but not everywhere followed.
Resolve merge conflict
Show friendly names of interface for root queues of ALTQ.
Conflicts: etc/inc/filter.inc etc/inc/vpn.inc
Fix typo/spacing issue. Resolves #1300
Use autocomplete='off' like all other fields that accept aliases, to prevent web browser auto-complete from covering up the alias list popup.
Catch up
Allow match action on Floating rules and exposed it with name Queue. More validation is needed.
Generalize pppoe server enabled check and use it elsewhere in the GUI that needed fixed. Still needs changes in filter.inc - Ticket #1243
Conflicts: etc/inc/system.inc
fix text
Enlarge subnet bits to 128
Conflicts: etc/inc/interfaces.inc etc/inc/system.inc
remove <strong> to make consistent with all other text
Add OSPF to firewall rule protocol choices
Conflicts: etc/inc/interfaces.inc etc/inc/vslb.inc usr/local/www/interfaces.php
Ticket #1043. Check for '' and not for 'default' since this is the default value of the select.
Do not allow gateways to be selected without a direction.
Allow floating rules without direction to be created again.
Resolves #1043. Do not allow limiters in floating rules without direction. It is invalid practice and while the backend skips it the user should be warned.
Conflicts: etc/inc/filter.inc etc/inc/system.inc usr/local/www/interfaces.php usr/local/www/interfaces_gif_edit.php
Fix XSS issues
Bring in XSS id fixes from m0n0wall
Use this sort before saving, so the rule just added is sorted into the proper category like the rest.
Conflicts: etc/inc/filter.inc
Change the firewall rule generation to look for the ipprotocol tag which defines inet or inet6. This makes sure that we use ipv6 addresses and change to the correct ipv6-icmp tag.
Balance <p> with </p>
Put </ul> tags inside the same <td> since they cannot span multiple of them.
Unhide the source port options on firewall rules when they are not at the defaults.
Revert "Shows source ports when they are already defined" - this only made it so they were never hidden.
This reverts commit d886ebd6d438cf9b397face67ed4f254de661a94.
Ticket #568. Do not show the save/cancel buttons on the edit page of firewall rules if that are advanced options set.
Fix text for the source port note on firewall rules.
Fix gettext mishap/typo. Cosmetic only. Fixes #857
Shows source ports when they are already defined
Merge remote branch 'mainline/master'
Conflicts: usr/local/www/diag_smart.php usr/local/www/firewall_rules_edit.php usr/local/www/interfaces.php usr/local/www/load_balancer_pool_edit.php usr/local/www/pkg_mgr_settings.php
Use
Fix gettext on firewall_rules_edit.php
Disable protocol box on associated rules, move the message, and clean up code a bit.
Remove or simplify some (s)printf calls.
Fixes #817. Tags/Marks can be used even outside floating rules.
Enforce the interface selection on associated filter rules. Ticket #780
Ticket #780. Disable the interface selection on associated nat rules.
Checked gettext() implementation on firewall_rules_edit.php
Merge remote branch 'mainline/master' into 2_firewall
Conflicts: usr/local/www/firewall_nat_out.php usr/local/www/firewall_rules.php usr/local/www/firewall_rules_edit.php
Properly select the interfaces when displaying the edit page for floating rules that have multiple selected interfaces. Fixes #726
Don't use the association when duplicating firewall rules. Fixes #634
Corrections gettext implementation on firewall_rules_edit.php
Fixing gettext() calls on firewall_rules_edit.php
Fixing gettext calls on firewall_rules_edit.php
Revert "Implemment gettext() calls"
This reverts commit 7502ef0a698a49d9652cd3616447eb717cba707d.A lot of mistakes
Conflicts:
usr/local/www/firewall_nat.php
This reverts commit 49031495b501e4477941fa6248fe94cc698f9dcd.A lot of mistakes
Implemment gettext() calls
Implement gettext() calls
Add status/log links to Firewall rules
Allow the use of ">" in filter rule descriptions. Even whilst stripping the > before the comparison htmlentitieswill still trigger on the <. It is safe to assume here that creating any sort of html tag is unlikely. Ticket #465
Fix source input validation, saving, and the "View the NAT rule" link on linked filter rules. Ticket #586
It wasn't clear enough why source port should usually be any. Make it more clear.
check more closely for match here, to fix multiple items being marked as "selected", leading to the wrong interface being selected.
Use common function to return gateway array so consinstency is preserved around code.
Ticket #568. Programatically decide if to show an advanced button or the value if non default.
Implement tcp flags and sloppy state on the GUI.
Fix indent
Add a new alias type, urltable, which downloads a file of IP/CIDR addresses and loads them into a pf persist table instead of importing the addresses directly into a traditional alias. This allows for using huge tables of addresses that would otherwise break the GUI and/or fail to load into pf. Part of ticket #512
Block source edit on associated firewall rules
Initialise the correct array if empty.
Redo most of the ppp interface handling to be consistent with the other mpd5 configurations. This way there is no more special handling for ppp around.
Ticket #14. Implement an advanced option to allow disabling autogenerated reply-to. Submitted-by: Dan Swartzendruber
Ticket #136.
Fix associated nat rules.Now both the filter rules and the nat ones contain a associated-rule-id tag which helps link the items together.The API to use for this is in itemid.inc.
All the issues should be solved now.
add PPP support to dynamic gateways
shift this around a little, put the dynamic gateways beneath the static ones, not beneath the gateway groups. Also show the dynamic gateways correctly ($ifent not $if)
clean up text
fix reject rules to the same as in 1_2. return is valid on all rules
fixup text
Add missing PF 'max' tracking option , and clarify message for 'max-src-nodes'
Add patch from lietu (Janne Enberg). Ticket #136
1) Multiple NAT rules can be assigned the same filter rule-> Fixed, added assigned-nat-rule-id to filter rules to keep track of the assignment
2) when removing the link (i.e. switching to "pass" or "none", the linked rule isn't deleted (should it be? probably yes)...
Add listtopic and extra save button.
Ticket #146 Fix typos ansd copy/pasto errors.
Oops, unbreak td