On Sep 24, 2013, at 2:11 PM, Ben Pfaff <b...@nicira.com> wrote:
> On Mon, Sep 23, 2013 at 02:36:39PM -0700, Justin Pettit wrote:
>> Signed-off-by: Justin Pettit <jpet...@nicira.com>
>
> Should the tcpdump patch check for the old and the new OpenFlow port?
>
> There are many remaining hits for 6633 in the tree. I'd suggest
> updating at least lib/vconn-active.man, lib/vconn-passive.man,
> utilities/ovs-controller.8.in, and vswitchd/vswitch.xml to mention
> that the default port number will change. (Please don't update
> lib/aes128.c despite the three hits ;-)
>
> Acked-by: Ben Pfaff <b...@nicira.com>
Okay, how about the incremental at the end of this message?
--Justin
diff --git a/lib/vconn-active.man b/lib/vconn-active.man
index be96ca8..bf7aaf7 100644
--- a/lib/vconn-active.man
+++ b/lib/vconn-active.man
@@ -1,13 +1,13 @@
.IP "\fBssl:\fIip\fR[\fB:\fIport\fR]"
-The specified SSL \fIport\fR (default: 6633) on the host at the given
-\fIip\fR, which must be expressed as an IP address (not a DNS name).
-The \fB\-\-private\-key\fR, \fB\-\-certificate\fR, and
-\fB\-\-ca\-cert\fR options are mandatory when this form is used.
-.
-.IP "\fBtcp:\fIip\fR[\fB:\fIport\fR]"
-The specified TCP \fIport\fR (default: 6633) on the host at the given
-\fIip\fR, which must be expressed as an IP address (not a DNS name).
-.
+.IQ "\fBtcp:\fIip\fR[\fB:\fIport\fR]"
+The specified \fIport\fR on the host at the given \fIip\fR, which must
+be expressed as an IP address (not a DNS name). For \fBssl\fR, the
+\fB\-\-private\-key\fR, \fB\-\-certificate\fR, and \fB\-\-ca\-cert\fR
+options are mandatory.
+.IP
+If \fIport\fR is not specified, it currently defaults to 6633. In the
+future, the default will change to 6653, which is the IANA-defined
+value.
.TP
\fBunix:\fIfile\fR
The Unix domain server socket named \fIfile\fR.
diff --git a/lib/vconn-passive.man b/lib/vconn-passive.man
index 1edd118..d425a45 100644
--- a/lib/vconn-passive.man
+++ b/lib/vconn-passive.man
@@ -1,16 +1,15 @@
.IP "\fBpssl:\fR[\fIport\fR][\fB:\fIip\fR]"
-Listens for OpenFlow SSL connections on \fIport\fR (default: 6633).
-The \fB\-\-private\-key\fR, \fB\-\-certificate\fR, and
-\fB\-\-ca\-cert\fR options are mandatory when this form is used. By
-default, connections are not bound to a particular local IP address,
-but \fIip\fR may be specified to listen only for connections to the
-given \fIip\fR.
-.
-.IP "\fBptcp:\fR[\fIport\fR][\fB:\fIip\fR]"
-Listens for OpenFlow TCP connections on \fIport\fR (default: 6633).
-By default, connections are not bound to a particular local IP
-address, but \fIip\fR may be specified to listen only for connections
-to the given \fIip\fR.
+.IQ "\fBptcp:\fR[\fIport\fR][\fB:\fIip\fR]"
+Listens for OpenFlow connections on \fIport\fR. By
+default, connections are not bound to a particular local IP address, but
+\fIip\fR may be specified to listen only for connections to the given
+\fIip\fR. For \fBssl\fR, the \fB\-\-private\-key\fR,
+\fB\-\-certificate\fR, and \fB\-\-ca\-cert\fR options are mandatory when
+this form is used.
+.IP
+If \fIport\fR is not specified, it currently defaults to 6633. In the
+future, the default will change to 6653, which is the IANA-defined
+value.
.
.IP "\fBpunix:\fIfile\fR"
Listens for OpenFlow connections on the Unix domain server socket
diff --git a/utilities/ovs-controller.8.in b/utilities/ovs-controller.8.in
index 162c585..f29de6a 100644
--- a/utilities/ovs-controller.8.in
+++ b/utilities/ovs-controller.8.in
@@ -148,6 +148,9 @@ To bind locally to port 6633 (the default) and wait for inco
connections from OpenFlow switches:
.IP
\fB% ovs\-controller ptcp:\fR
+.PP
+In the future, the default port number will change to 6653, which is the
+IANA-defined value.
.SH "BUGS"
.PP
Configuring a Citrix XenServer to connect to a particular controller
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 5fd5b3b..7daaa65 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -2816,18 +2816,27 @@
<dl>
<dt><code>ssl:<var>ip</var></code>[<code>:<var>port</var></code>]</dt
<dd>
- <p>The specified SSL <var>port</var> (default: 6633) on the host at
- the given <var>ip</var>, which must be expressed as an IP address
- (not a DNS name). The <ref table="Open_vSwitch" column="ssl"/>
- column in the <ref table="Open_vSwitch"/> table must point to a
- valid SSL configuration when this form is used.</p>
+ <p>The specified SSL <var>port</var> on the host at the
+ given <var>ip</var>, which must be expressed as an IP
+ address (not a DNS name). The <ref table="Open_vSwitch"
+ column="ssl"/> column in the <ref table="Open_vSwitch"/>
+ table must point to a valid SSL configuration when this form
+ is used.</p>
+ <p>If <var>port</var> is not specified, it currently
+ defaults to 6633. In the future, the default will change to
+ 6653, which is the IANA-defined value.</p>
<p>SSL support is an optional feature that is not always built as
part of Open vSwitch.</p>
</dd>
<dt><code>tcp:<var>ip</var></code>[<code>:<var>port</var></code>]</dt
- <dd>The specified TCP <var>port</var> (default: 6633) on the host at
- the given <var>ip</var>, which must be expressed as an IP address
- (not a DNS name).</dd>
+ <dd>
+ <p>The specified TCP <var>port</var> on the host at the
+ given <var>ip</var>, which must be expressed as an IP
+ address (not a DNS name).</p>
+ <p>If <var>port</var> is not specified, it currently
+ defaults to 6633. In the future, the default will change to
+ 6653, which is the IANA-defined value.</p>
+ </dd>
</dl>
<p>
The following connection methods are currently supported for service
@@ -2836,26 +2845,29 @@
<dl>
<dt><code>pssl:</code>[<var>port</var>][<code>:<var>ip</var></code>]<
<dd>
- <p>
- Listens for SSL connections on the specified TCP <var>port</var>
- (default: 6633). If <var>ip</var>, which must be expressed as an
- IP address (not a DNS name), is specified, then connections are
- restricted to the specified local IP address.
- </p>
- <p>
- The <ref table="Open_vSwitch" column="ssl"/> column in the <ref
- table="Open_vSwitch"/> table must point to a valid SSL
- configuration when this form is used.
- </p>
+ <p> Listens for SSL connections on the specified TCP
+ <var>port</var>. If <var>ip</var>, 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 <ref table="Open_vSwitch" column="ssl"/>
+ column in the <ref table="Open_vSwitch"/> table must point
+ to a valid SSL configuration when this form is used.</p>
+ <p>If <var>port</var> is not specified, it currently
+ defaults to 6633. In the future, the default will change to
+ 6653, which is the IANA-defined value.</p>
<p>SSL support is an optional feature that is not always built as
part of Open vSwitch.</p>
</dd>
<dt><code>ptcp:</code>[<var>port</var>][<code>:<var>ip</var></code>]<
<dd>
- Listens for connections on the specified TCP <var>port</var>
- (default: 6633). If <var>ip</var>, which must be expressed as an
- IP address (not a DNS name), is specified, then connections are
- restricted to the specified local IP address.
+ <p>Listens for connections on the specified TCP
+ <var>port</var>. If <var>ip</var>, which must be expressed
+ as an IP address (not a DNS name), is specified, then
+ connections are restricted to the specified local IP
+ address.</p>
+ <p>If <var>port</var> is not specified, it currently
+ defaults to 6633. In the future, the default will change to
+ 6653, which is the IANA-defined value.</p>
</dd>
</dl>
<p>When multiple controllers are configured for a single bridge, the
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
