X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fvswitch.xml;h=aa9168d17e276edb04623d176bdd01f7f6e08eaa;hb=5767a79a40599e5e6e70662833b27ffdbdab7e37;hp=797f330f50c84b73482070d2815e73c545fda82b;hpb=dfe37e6abd276de01f686bbdf28cbf48e92cd1dc;p=sliver-openvswitch.git
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 797f330f5..aa9168d17 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -136,28 +136,6 @@
-
- List of OpenFlow protocols that may be used when negotiating a
- connection with a controller. A default value of
- OpenFlow10
will be used if this column is empty.
+
+ List of OpenFlow protocols that may be used when negotiating
+ a connection with a controller. OpenFlow 1.0, 1.1, 1.2, and
+ 1.3 are enabled by default if this column is empty.
+
+
+
+ The current implementation of OpenFlow 1.4 support is not safe:
+ ovs-vswitchd
will abort when certain unimplemented
+ features are tested. Thus, for now it is suitable only for
+ experimental use. For this reason, OpenFlow 1.4 is supported only
+ if, in addition to specifying OpenFlow14
in this field,
+ ovs-vswitchd
is invoked with the
+ --enable-of14
option. (When support becomes safe, this
+ option will be removed.)
+
@@ -2240,9 +2231,10 @@
@@ -2637,6 +2629,13 @@
one flow table. Currently this limit is 3.
+
+
@@ -3000,12 +2999,18 @@
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.
+
@@ -3015,29 +3020,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
@@ -3331,8 +3355,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
@@ -3343,13 +3369,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.
@@ -3366,12 +3395,15 @@
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