X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fvswitch.xml;h=b640a0f5fcf84faa8ad4c513709fdee0df5bfa98;hb=dbcfd2fd1b2def1a2e4b0638f67174759b53a1bb;hp=5fd82fcb8a0ca257974608bdd239683d2d55d9da;hpb=e79a6c833e0d72370951d6f8841098103cbb0b2d;p=sliver-openvswitch.git diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 5fd82fcb8..b640a0f5f 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -136,28 +136,6 @@
-- Specifies userspace behaviour for handling flow misses. This takes - precedence over flow-eviction-threshold. -
--
auto
with-facets
without-facets
@@ -2004,6 +1982,16 @@
expected as destination for received BFD packets. The default is
00:23:20:00:00:01
.
169.254.1.0
.
+ 169.254.1.1
.
+ tcp:ip
[:port
]The specified TCP port on the host at the - given ip, which must be expressed as an IP - address (not a DNS name).
-If port is not specified, it currently - defaults to 6633. In the future, the default will change to - 6653, which is the IANA-defined value.
+
+ The specified TCP port on the host at the given
+ ip, which must be expressed as an IP address (not a
+ DNS name), where ip can be IPv4 or IPv6 address. If
+ ip is an IPv6 address, wrap it in square brackets,
+ e.g. tcp:[::1]:6632
.
+
+ If port is not specified, it currently defaults to + 6633. In the future, the default will change to 6653, which is + the IANA-defined value. +
@@ -3005,29 +2999,48 @@
pssl:
[port][:ip
]Listens for SSL connections on the specified TCP - port. If ip, which must be expressed - as an IP address (not a DNS name), is specified, then - connections are restricted to the specified local IP - address. The - column in the table must point - to a valid SSL configuration when this form is used.
-If port is not specified, it currently - defaults to 6633. In the future, the default will change to - 6653, which is the IANA-defined value.
-SSL support is an optional feature that is not always built as - part of Open vSwitch.
+
+ Listens for SSL connections on the specified TCP port.
+ If ip, which must be expressed as an IP address (not a
+ DNS name), is specified, then connections are restricted to the
+ specified local IP address (either IPv4 or IPv6). If
+ ip is an IPv6 address, wrap it in square brackets,
+ e.g. pssl:6632:[::1]
.
+
+ If port is not specified, it currently defaults to + 6633. If ip is not specified then it listens only on + IPv4 (but not IPv6) addresses. The + + column in the table must point to a + valid SSL configuration when this form is used. +
++ If port is not specified, it currently defaults to + 6633. In the future, the default will change to 6653, which is + the IANA-defined value. +
++ SSL support is an optional feature that is not always built as + part of Open vSwitch. +
ptcp:
[port][:ip
]Listens for connections on the specified TCP - port. If ip, which must be expressed - as an IP address (not a DNS name), is specified, then - connections are restricted to the specified local IP - address.
-If port is not specified, it currently - defaults to 6633. In the future, the default will change to - 6653, which is the IANA-defined value.
+
+ Listens for connections on the specified TCP port. If
+ ip, which must be expressed as an IP address (not a
+ DNS name), is specified, then connections are restricted to the
+ specified local IP address (either IPv4 or IPv6). If
+ ip is an IPv6 address, wrap it in square brackets,
+ e.g. ptcp:6632:[::1]
. If ip is not
+ specified then it listens only on IPv4 addresses.
+
+ If port is not specified, it currently defaults to + 6633. In the future, the default will change to 6653, which is + the IANA-defined value. +
When multiple controllers are configured for a single bridge, the @@ -3321,8 +3334,10 @@
The specified TCP port on the host at the given
- ip, which must be expressed as an IP address
- (not a DNS name).
+ ip, which must be expressed as an IP address (not a
+ DNS name), where ip can be IPv4 or IPv6 address. If
+ ip is an IPv6 address, wrap it in square brackets,
+ e.g. tcp:[::1]:6632
.
If port is not specified, it currently defaults @@ -3333,13 +3348,16 @@
pssl:
[port][:ip
]
- Listens for SSL connections on the specified TCP
- port. Specify 0 for port to have
- the kernel automatically choose an available port. If
- ip, which must be expressed as an IP address
- (not a DNS name), is specified, then connections are
- restricted to the specified local IP address. The column in the port.
+ Specify 0 for port to have the kernel automatically
+ choose an available port. If ip, which must be
+ expressed as an IP address (not a DNS name), is specified, then
+ connections are restricted to the specified local IP address
+ (either IPv4 or IPv6 address). If ip is an IPv6
+ address, wrap in square brackets,
+ e.g. pssl:6632:[::1]
. If ip is not
+ specified then it listens only on IPv4 (but not IPv6) addresses.
+ The column in the table must point to a valid SSL
configuration when this form is used.
ptcp:
[port][:ip
]
- Listens for connections on the specified TCP
- port. Specify 0 for port to have
- the kernel automatically choose an available port. If
- ip, which must be expressed as an IP address
- (not a DNS name), is specified, then connections are
- restricted to the specified local IP address.
+ Listens for connections on the specified TCP port.
+ Specify 0 for port to have the kernel automatically
+ choose an available port. If ip, which must be
+ expressed as an IP address (not a DNS name), is specified, then
+ connections are restricted to the specified local IP address
+ (either IPv4 or IPv6 address). If ip is an IPv6
+ address, wrap it in square brackets,
+ e.g. ptcp:6632:[::1]
. If ip is not
+ specified then it listens only on IPv4 addresses.
If port is not specified, it currently defaults