summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
m---------docs/_include/vyos-1x0
-rw-r--r--docs/changelog/1.4.rst26
-rw-r--r--docs/configuration/firewall/general.rst7
-rw-r--r--docs/configuration/policy/route.rst16
4 files changed, 47 insertions, 2 deletions
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject d9ab07c3d7d988706cbdfc4fac16f7e2ca264f7
+Subproject a0d3c5702dfcf0ac0008039357a2e0e02c62523
diff --git a/docs/changelog/1.4.rst b/docs/changelog/1.4.rst
index 95dbd211..89d1b64e 100644
--- a/docs/changelog/1.4.rst
+++ b/docs/changelog/1.4.rst
@@ -8,6 +8,32 @@
_ext/releasenotes.py
+2022-12-25
+==========
+
+* :vytask:`T3579` (feature): Rewrite vyatta-conntrack in new XML and Python flavour
+
+
+2022-12-24
+==========
+
+* :vytask:`T4890` (bug): show conntrack table ipv4 fail
+* :vytask:`T4879` (bug): IPSec migration failed with missing remote-id
+* :vytask:`T4870` (feature): Containers switch to using overlay driver for podman storage
+
+
+2022-12-23
+==========
+
+* :vytask:`T4792` (feature): Add SSTP VPN client
+
+
+2022-12-21
+==========
+
+* :vytask:`T4887` (bug): Schema generation from op-mode functions should set default 'false' on boolean arguments
+
+
2022-12-18
==========
diff --git a/docs/configuration/firewall/general.rst b/docs/configuration/firewall/general.rst
index dc087018..f2e01e03 100644
--- a/docs/configuration/firewall/general.rst
+++ b/docs/configuration/firewall/general.rst
@@ -345,6 +345,13 @@ There are a lot of matching criteria against which the package can be tested.
Match criteria based on nat connection status.
+.. cfgcmd:: set firewall name <name> rule <1-999999> connection-mark
+ <1-2147483647>
+.. cfgcmd:: set firewall ipv6-name <name> rule <1-999999> connection-mark
+ <1-2147483647>
+
+ Match criteria based on connection mark.
+
.. cfgcmd:: set firewall name <name> rule <1-999999> source address
[address | addressrange | CIDR]
.. cfgcmd:: set firewall name <name> rule <1-999999> destination address
diff --git a/docs/configuration/policy/route.rst b/docs/configuration/policy/route.rst
index 6f60bc36..a6330c57 100644
--- a/docs/configuration/policy/route.rst
+++ b/docs/configuration/policy/route.rst
@@ -41,6 +41,11 @@ There are a lot of matching criteria options available, both for
``policy route`` and ``policy route6``. These options are listed
in this section.
+.. cfgcmd:: set policy route <name> rule <n> connection-mark <1-2147483647>
+.. cfgcmd:: set policy route6 <name> rule <n> connection-mark <1-2147483647>
+
+ Set match criteria based on connection mark.
+
.. cfgcmd:: set policy route <name> rule <n> source address
<match_criteria>
.. cfgcmd:: set policy route <name> rule <n> destination address
@@ -226,6 +231,13 @@ setting a different routing table.
Set rule action to drop.
+.. cfgcmd:: set policy route <name> rule <n> set connection-mark
+ <1-2147483647>
+.. cfgcmd:: set policy route6 <name> rule <n> set connection-mark
+ <1-2147483647>
+
+ Set a specific connection mark.
+
.. cfgcmd:: set policy route <name> rule <n> set dscp <0-63>
.. cfgcmd:: set policy route6 <name> rule <n> set dscp <0-63>
@@ -234,12 +246,12 @@ setting a different routing table.
.. cfgcmd:: set policy route <name> rule <n> set mark <1-2147483647>
.. cfgcmd:: set policy route6 <name> rule <n> set mark <1-2147483647>
- Set packet modifications: Packet marking
+ Set a specific packet mark.
.. cfgcmd:: set policy route <name> rule <n> set table <main | 1-200>
.. cfgcmd:: set policy route6 <name> rule <n> set table <main | 1-200>
- Set packet modifications: Routing table to forward packet with.
+ Set the routing table to forward packet with.
.. cfgcmd:: set policy route <name> rule <n> set tcp-mss <500-1460>
.. cfgcmd:: set policy route6 <name> rule <n> set tcp-mss <500-1460>