extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-22 22:30:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.6.6'

Browse Source
This commit is contained in:
Tom Eastep 2015-01-20 08:11:07 -08:00
commit 50a0103e89
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/Perl/Shorewall/Tc.pm
View File

@ -564,7 +564,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) {
RESTORE => { RESTORE => {
defaultchain => 0, defaultchain => 0,
allowedchains => PREROUTING | FORWARD | OUTPUT | POSTROUTING, allowedchains => PREROUTING | INPUT | FORWARD | OUTPUT | POSTROUTING,
minparams => 0, minparams => 0,
maxparams => 1, maxparams => 1,
function => sub () { function => sub () {
@ -593,7 +593,7 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) {
SAVE => { SAVE => {
defaultchain => 0, defaultchain => 0,
allowedchains => PREROUTING | FORWARD | OUTPUT | POSTROUTING, allowedchains => PREROUTING | INPUT | FORWARD | OUTPUT | POSTROUTING,
minparams => 0, minparams => 0,
maxparams => 1, maxparams => 1,
function => sub () { function => sub () {

5
Shorewall/manpages/shorewall-mangle.xml
View File

@ -499,7 +499,7 @@ INLINE eth0 - ; -p tcp -j MARK --set-mark
<varlistentry> <varlistentry>
<term><emphasis <term><emphasis
role="bold">RESTORE</emphasis>[(/<emphasis>mask</emphasis>)]</term> role="bold">RESTORE</emphasis>[(<emphasis>mask</emphasis>)]</term>
<listitem> <listitem>
<para>Restore the packet's mark from the connection's mark <para>Restore the packet's mark from the connection's mark
@ -543,7 +543,8 @@ SAME $FW 0.0.0.0/0 tcp 80,443</programlisting>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><emphasis role="bold">SAVE[(/<emphasis>mask)</emphasis>] <term><emphasis
role="bold">SAVE[(<emphasis><replaceable>mask</replaceable>)</emphasis>]
</emphasis></term> </emphasis></term>
<listitem> <listitem>

5
Shorewall6/manpages/shorewall6-mangle.xml
View File

@ -500,7 +500,7 @@ INLINE eth0 - ; -p tcp -j MARK --set-mark
<varlistentry> <varlistentry>
<term><emphasis <term><emphasis
role="bold">RESTORE</emphasis>[(/<emphasis>mask</emphasis>)]</term> role="bold">RESTORE</emphasis>[(<emphasis>mask</emphasis>)]</term>
<listitem> <listitem>
<para>Restore the packet's mark from the connection's mark <para>Restore the packet's mark from the connection's mark
@ -544,7 +544,8 @@ SAME $FW 0.0.0.0/0 tcp 80,443</programlisting>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><emphasis role="bold">SAVE[(/<emphasis>mask)</emphasis>] <term><emphasis role="bold">SAVE[(<emphasis
role="bold"><replaceable>mask</replaceable>)</emphasis>]
</emphasis></term> </emphasis></term>
<listitem> <listitem>