Use the IANA-assigned ports for OpenFlow and OVSDB.

We've been warning about the change since 2.1, which was released a year
ago.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>

25 files changed, 92 insertions, 113 deletions

diff --git a/FAQ.md b/FAQ.md
index 03e522494..b2fc646ee 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -110,6 +110,15 @@ A: You can start by joining the mailing lists and helping to answer
 
    http://openvswitch.org/mlists/
 
+### Q: Why can I no longer connect to my OpenFlow controller or OVSDB
+manager?
+
+A: Starting in OVS 2.4, we switched the default ports to the
+   IANA-specified port numbers for OpenFlow (6633->6653) and OVSDB
+   (6632->6640).  We recommend using these port numbers, but if you
+   cannot, all the programs allow overriding the default port.  See the
+   appropriate man page.
+
 
 Releases
 --------
@@ -1188,7 +1197,7 @@ A: The configuration for VLANs in the Open vSwitch database (e.g. via
    tags, like this:
 
        ovs-vsctl add-br br0
-       ovs-vsctl set-controller br0 tcp:192.168.0.10:6633
+       ovs-vsctl set-controller br0 tcp:192.168.0.10:6653
        ovs-vsctl add-port br0 eth0
        ovs-vsctl add-port br0 tap0 tag=9
        ovs-vsctl add-port br0 tap1 tag=10
diff --git a/INSTALL.Windows.md b/INSTALL.Windows.md
index 08825017f..258e2fb79 100644
--- a/INSTALL.Windows.md
+++ b/INSTALL.Windows.md
@@ -148,11 +148,11 @@ Steps to run the user processes & configure VXLAN ports
 ovsdb\ovsdb-tool.exe create conf.db .\vswitchd\vswitch.ovsschema
 
 02> Run ovsdb-server
-ovsdb\ovsdb-server.exe -v --remote=ptcp:6632:127.0.0.1 conf.db
+ovsdb\ovsdb-server.exe -v --remote=ptcp:6640:127.0.0.1 conf.db
 
 03> Create integration bridge & pif bridge
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 add-br br-int
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 add-br br-pif
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 add-br br-int
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 add-br br-pif
 
 04> Dump the ports
 utilities\ovs-dpctl.exe show
@@ -176,24 +176,24 @@ system@ovs-system:
 
 
 05> Add the physical NIC and the internal port to br-pif
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 add-port br-pif <port name>
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 add-port br-pif <port name>
 
 Eg:
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 add-port br-pif external.1
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 add-port br-pif internal
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 add-port br-pif external.1
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 add-port br-pif internal
 
 06> Add the VIFs to br-int
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 add-port br-int <port name>
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 add-port br-int <port name>
 
 Eg:
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 add-port br-int vmNICEmu.1000048
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 add-port br-int vmNICSyn.1000049
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 add-port br-int vmNICEmu.1000048
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 add-port br-int vmNICSyn.1000049
 
 07> Verify the status
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 show
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 show
 
 Eg:
-$ utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 show
+$ utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 show
 4cd86499-74df-48bd-a64d-8d115b12a9f2
     Bridge br-pif
         Port internal
@@ -214,28 +214,28 @@ $ utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 show
 
 
 09> Run vswitchd
-vswitchd\ovs-vswitchd.exe -v tcp:127.0.0.1:6632
+vswitchd\ovs-vswitchd.exe -v tcp:127.0.0.1:6640
 
 10> You can figure out the port name to MAC address mapping now. (optional)
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 list interface
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 list interface
 
 //********** VXLAN PORT CONFIGURATION (Supports Multiple ports) ************//
 (Remove all patch ports added to create VLAN networks.)
 11> Add the vxlan port between 172.168.201.101 <-> 172.168.201.102
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 add-port br-int vxlan-1
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 set Interface vxlan-1 type=vxlan
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 set Interface vxlan-1 options:local_ip=172.168.201.101
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 set Interface vxlan-1 options:remote_ip=172.168.201.102
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 set Interface vxlan-1 options:in_key=flow
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 set Interface vxlan-1 options:out_key=flow
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 add-port br-int vxlan-1
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 set Interface vxlan-1 type=vxlan
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 set Interface vxlan-1 options:local_ip=172.168.201.101
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 set Interface vxlan-1 options:remote_ip=172.168.201.102
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 set Interface vxlan-1 options:in_key=flow
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 set Interface vxlan-1 options:out_key=flow
 
 12> Add the vxlan port between 172.168.201.101 <-> 172.168.201.105
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 add-port br-int vxlan-2
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 set Interface vxlan-2 type=vxlan
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 set Interface vxlan-2 options:local_ip=172.168.201.102
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 set Interface vxlan-2 options:remote_ip=172.168.201.105
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 set Interface vxlan-2 options:in_key=flow
-utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6632 set Interface vxlan-2 options:out_key=flow
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 add-port br-int vxlan-2
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 set Interface vxlan-2 type=vxlan
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 set Interface vxlan-2 options:local_ip=172.168.201.102
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 set Interface vxlan-2 options:remote_ip=172.168.201.105
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 set Interface vxlan-2 options:in_key=flow
+utilities\ovs-vsctl.exe --db=tcp:127.0.0.1:6640 set Interface vxlan-2 options:out_key=flow
 
 
 //********** VLAN CONFIGURATION (Using patch ports) ************//
diff --git a/NEWS b/NEWS
index d96be5345..9c7ba62bb 100644
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,8 @@ Post-v2.3.0
    - Initial support for the IETF Auto-Attach SPBM draft standard. This
      contains rudimentary support for the LLDP protocol as needed for
      Auto-Attach.
+   - The default OpenFlow and OVSDB ports are now the IANA-assigned
+     numbers.  OpenFlow is 6653 and OVSDB is 6640.
 
 
 v2.3.0 - 14 Aug 2014
diff --git a/debian/openvswitch-testcontroller.default b/debian/openvswitch-testcontroller.default
index 48b53f124..c6db59570 100644
--- a/debian/openvswitch-testcontroller.default
+++ b/debian/openvswitch-testcontroller.default
@@ -5,11 +5,11 @@
 # This is a space-delimited list of connection methods:
 #
 # * "pssl:[PORT]": Listen for SSL connections on the specified PORT
-#   (default: 6633).  The private key, certificate, and CA certificate
+#   (default: 6653).  The private key, certificate, and CA certificate
 #   must be specified below.
 #
 # * "ptcp:[PORT]": Listen for TCP connections on the specified PORT
-#   (default: 6633).  Not recommended for security reasons.
+#   (default: 6653).  Not recommended for security reasons.
 #
 LISTEN="pssl:"
 
diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c
index 3e4a91262..86531b822 100644
--- a/lib/jsonrpc.c
+++ b/lib/jsonrpc.c
@@ -63,8 +63,7 @@ static void jsonrpc_error(struct jsonrpc *, int error);
 int
 jsonrpc_stream_open(const char *name, struct stream **streamp, uint8_t dscp)
 {
-    return stream_open_with_default_port(name, OVSDB_OLD_PORT,
-                                         streamp, dscp);
+    return stream_open_with_default_port(name, OVSDB_PORT, streamp, dscp);
 }
 
 /* This is just the same as pstream_open() except that it uses the default
@@ -72,8 +71,7 @@ jsonrpc_stream_open(const char *name, struct stream **streamp, uint8_t dscp)
 int
 jsonrpc_pstream_open(const char *name, struct pstream **pstreamp, uint8_t dscp)
 {
-    return pstream_open_with_default_port(name, OVSDB_OLD_PORT,
-                                          pstreamp, dscp);
+    return pstream_open_with_default_port(name, OVSDB_PORT, pstreamp, dscp);
 }
 
 /* Returns a new JSON-RPC stream that uses 'stream' for input and output.  The
diff --git a/lib/jsonrpc.h b/lib/jsonrpc.h
index b711d1ab6..5f46e3b14 100644
--- a/lib/jsonrpc.h
+++ b/lib/jsonrpc.h
@@ -35,9 +35,7 @@ struct stream;
 /* Default port numbers.
  *
  * OVSDB_OLD_PORT defines the original port number used by OVS.
- * OVSDB_PORT defines the official port number assigned by IANA.  By
- * default, we still uses OVSDB_OLD_PORT, but we present a warning that
- * that will change. */
+ * OVSDB_PORT defines the official port number assigned by IANA. */
 #define OVSDB_OLD_PORT 6632
 #define OVSDB_PORT 6640
 
diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c
index 2ad794d83..156dd2f59 100644
--- a/lib/stream-ssl.c
+++ b/lib/stream-ssl.c
@@ -317,7 +317,7 @@ ssl_open(const char *name, char *suffix, struct stream **streamp, uint8_t dscp)
         return error;
     }
 
-    error = inet_open_active(SOCK_STREAM, suffix, OFP_OLD_PORT, NULL, &fd,
+    error = inet_open_active(SOCK_STREAM, suffix, OFP_PORT, NULL, &fd,
                              dscp);
     if (fd >= 0) {
         int state = error ? STATE_TCP_CONNECTING : STATE_SSL_CONNECTING;
@@ -800,7 +800,7 @@ pssl_open(const char *name OVS_UNUSED, char *suffix, struct pstream **pstreamp,
         return retval;
     }
 
-    fd = inet_open_passive(SOCK_STREAM, suffix, OFP_OLD_PORT, &ss, dscp, true);
+    fd = inet_open_passive(SOCK_STREAM, suffix, OFP_PORT, &ss, dscp, true);
     if (fd < 0) {
         return -fd;
     }
diff --git a/lib/stream.c b/lib/stream.c
index a7e07d09c..217191cab 100644
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -676,13 +676,13 @@ stream_open_with_default_port(const char *name_,
 
     if ((!strncmp(name_, "tcp:", 4) || !strncmp(name_, "ssl:", 4))
         && count_fields(name_) < 3) {
-        if (default_port == OFP_OLD_PORT) {
-            VLOG_WARN_ONCE("The default OpenFlow port number will change "
-                           "from %d to %d in a future release",
+        if (default_port == OFP_PORT) {
+            VLOG_WARN_ONCE("The default OpenFlow port number has changed "
+                           "from %d to %d",
                            OFP_OLD_PORT, OFP_PORT);
-        } else if (default_port == OVSDB_OLD_PORT) {
-            VLOG_WARN_ONCE("The default OVSDB port number will change "
-                           "from %d to %d in a future release",
+        } else if (default_port == OVSDB_PORT) {
+            VLOG_WARN_ONCE("The default OVSDB port number has changed "
+                           "from %d to %d",
                            OVSDB_OLD_PORT, OVSDB_PORT);
         }
         name = xasprintf("%s:%d", name_, default_port);
diff --git a/lib/vconn-active.man b/lib/vconn-active.man
index b0c4acea8..252438da7 100644
--- a/lib/vconn-active.man
+++ b/lib/vconn-active.man
@@ -3,12 +3,10 @@
 The specified \fIport\fR on the host at the given \fIip\fR, which must
 be expressed as an IP address (not a DNS name) in IPv4 or IPv6 address
 format.  Wrap IPv6 addresses in square brackets,
-e.g. \fBtcp:[::1]:6633\fR.  For \fBssl\fR, the \fB\-\-private\-key\fR,
+e.g. \fBtcp:[::1]:6653\fR.  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.
+If \fIport\fR is not specified, it defaults to 6653.
 .TP
 \fBunix:\fIfile\fR
 On POSIX, a Unix domain server socket named \fIfile\fR.
diff --git a/lib/vconn-passive.man b/lib/vconn-passive.man
index 0cf8fc1d6..9d9050b02 100644
--- a/lib/vconn-passive.man
+++ b/lib/vconn-passive.man
@@ -1,10 +1,9 @@
 .IP "\fBpssl:\fR[\fIport\fR][\fB:\fIip\fR]"
 .IQ "\fBptcp:\fR[\fIport\fR][\fB:\fIip\fR]"
 Listens for OpenFlow connections on \fIport\fR.  The default
-\fIport\fR is 6633, but a future version of Open vSwitch will change
-the default to the IANA-defined port 6653.  By default, connections
+\fIport\fR is 6653.  By default, connections
 are allowed from any IPv4 address.  Specify \fIip\fR as an IPv4
-address or a bracketed IPv6 address (e.g. \fBptcp:6633:[::1]\fR).  DNS
+address or a bracketed IPv6 address (e.g. \fBptcp:6653:[::1]\fR).  DNS
 names may not be used.  For \fBpssl\fR, the
 \fB\-\-private\-key\fR,\fB\-\-certificate\fR, and \fB\-\-ca\-cert\fR
 options are mandatory.
diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c
index 0ccc99fd4..23c0aaecd 100644
--- a/lib/vconn-stream.c
+++ b/lib/vconn-stream.c
@@ -78,7 +78,7 @@ vconn_stream_open(const char *name, uint32_t allowed_versions,
     struct stream *stream;
     int error;
 
-    error = stream_open_with_default_port(name, OFP_OLD_PORT, &stream, dscp);
+    error = stream_open_with_default_port(name, OFP_PORT, &stream, dscp);
     if (!error) {
         error = stream_connect(stream);
         if (!error || error == EAGAIN) {
@@ -311,8 +311,7 @@ pvconn_pstream_listen(const char *name, uint32_t allowed_versions,
     struct pstream *pstream;
     int error;
 
-    error = pstream_open_with_default_port(name, OFP_OLD_PORT,
-                                           &pstream, dscp);
+    error = pstream_open_with_default_port(name, OFP_PORT, &pstream, dscp);
     if (error) {
         return error;
     }
diff --git a/lib/vconn.c b/lib/vconn.c
index 5a2860304..a59829d52 100644
--- a/lib/vconn.c
+++ b/lib/vconn.c
@@ -138,10 +138,10 @@ vconn_usage(bool active, bool passive, bool bootstrap OVS_UNUSED)
     if (active) {
         printf("Active OpenFlow connection methods:\n");
         printf("  tcp:IP[:PORT]           "
-               "PORT (default: %d) at remote IP\n", OFP_OLD_PORT);
+               "PORT (default: %d) at remote IP\n", OFP_PORT);
 #ifdef HAVE_OPENSSL
         printf("  ssl:IP[:PORT]           "
-               "SSL PORT (default: %d) at remote IP\n", OFP_OLD_PORT);
+               "SSL PORT (default: %d) at remote IP\n", OFP_PORT);
 #endif
         printf("  unix:FILE               Unix domain socket named FILE\n");
     }
@@ -150,11 +150,11 @@ vconn_usage(bool active, bool passive, bool bootstrap OVS_UNUSED)
         printf("Passive OpenFlow connection methods:\n");
         printf("  ptcp:[PORT][:IP]        "
                "listen to TCP PORT (default: %d) on IP\n",
-               OFP_OLD_PORT);
+               OFP_PORT);
 #ifdef HAVE_OPENSSL
         printf("  pssl:[PORT][:IP]        "
                "listen for SSL on PORT (default: %d) on IP\n",
-               OFP_OLD_PORT);
+               OFP_PORT);
 #endif
         printf("  punix:FILE              "
                "listen on Unix domain socket FILE\n");
diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
index de3665a79..f34652bfa 100644
--- a/ofproto/connmgr.c
+++ b/ofproto/connmgr.c
@@ -740,8 +740,7 @@ update_in_band_remotes(struct connmgr *mgr)
         } sa;
 
         if (ofconn->band == OFPROTO_IN_BAND
-            && stream_parse_target_with_default_port(target, OFP_OLD_PORT,
-                                                     &sa.ss)
+            && stream_parse_target_with_default_port(target, OFP_PORT, &sa.ss)
             && sa.ss.ss_family == AF_INET) {
             addrs[n_addrs++] = sa.in;
         }
diff --git a/ovsdb/ovsdb-server.1.in b/ovsdb/ovsdb-server.1.in
index c713937c0..0fafc49a9 100644
--- a/ovsdb/ovsdb-server.1.in
+++ b/ovsdb/ovsdb-server.1.in
@@ -251,10 +251,6 @@ vSwitch 2.4 and later extend <condition> to allow the use of \fB<\fR,
 of 0 or 1 integer'' and ``set of 0 or 1 real''.  These conditions
 evaluate to false when the column is empty, and otherwise as described
 in RFC 7047 for integer and real types.
-.
-.IP "6. IANA Considerations"
-\fBovsdb\-server\fR currently defaults to its historical port number
-6632.  Future versions will adopt IANA-assigned port 6640 as default.
 
 .SH "SEE ALSO"
 .
diff --git a/ovsdb/remote-active.man b/ovsdb/remote-active.man
index 5facf0aea..22b350c1a 100644
--- a/ovsdb/remote-active.man
+++ b/ovsdb/remote-active.man
@@ -2,14 +2,14 @@
 The specified SSL \fIport\fR on the host at the given \fIip\fR, which
 must be expressed as an IP address (not a DNS name) in IPv4 or IPv6 address
 format.  If \fIip\fR is an IPv6 address, then wrap \fIip\fR with square
-brackets, e.g.: \fBssl:[::1]:6632\fR.
+brackets, e.g.: \fBssl:[::1]:6640\fR.
 The \fB\-\-private\-key\fR, \fB\-\-certificate\fR, and \fB\-\-ca\-cert\fR
 options are mandatory when this form is used.
 .
 .IP "\fBtcp:\fIip\fB:\fIport\fR"
 Connect to the given TCP \fIport\fR on \fIip\fR, where \fIip\fR can be IPv4
 or IPv6 address. If \fIip\fR is an IPv6 address, then wrap \fIip\fR with
-square brackets, e.g.: \fBtcp:[::1]:6632\fR.
+square brackets, e.g.: \fBtcp:[::1]:6640\fR.
 .
 .IP "\fBunix:\fIfile\fR"
 On POSIX, connect to the Unix domain server socket named \fIfile\fR.
diff --git a/ovsdb/remote-passive.man b/ovsdb/remote-passive.man
index e5e5c9886..a05f79695 100644
--- a/ovsdb/remote-passive.man
+++ b/ovsdb/remote-passive.man
@@ -5,7 +5,7 @@ it listens only on IPv4 (but not IPv6) addresses, but
 specifying \fIip\fR limits connections to those from the given
 \fIip\fR, either IPv4 or IPv6 address.  If \fIip\fR is
 an IPv6 address, then wrap \fIip\fR with square brackets, e.g.:
-\fBpssl:6632:[::1]\fR.  The \fB\-\-private\-key\fR,
+\fBpssl:6640:[::1]\fR.  The \fB\-\-private\-key\fR,
 \fB\-\-certificate\fR, and \fB\-\-ca\-cert\fR options are mandatory
 when this form is used.
 .
@@ -16,7 +16,7 @@ it listens only on IPv4 (but not IPv6) addresses, but
 \fIip\fR may be specified to listen only for connections to the given
 \fIip\fR, either IPv4 or IPv6 address.  If \fIip\fR is
 an IPv6 address, then wrap \fIip\fR with square brackets, e.g.:
-\fBptcp:6632:[::1]\fR.
+\fBptcp:6640:[::1]\fR.
 .
 .IP "\fBpunix:\fIfile\fR"
 On POSIX, listen on the Unix domain server socket named \fIfile\fR for a
diff --git a/tests/run-ryu b/tests/run-ryu
index 3a1fb50fa..c14d91e1b 100755
--- a/tests/run-ryu
+++ b/tests/run-ryu
@@ -77,7 +77,7 @@ do
                datapath-type=dummy fail-mode=secure \
                protocols='[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13]' \
                other-config:datapath-id=$dpid \
-        -- set-controller $bridge tcp:127.0.0.1:6633 \
+        -- set-controller $bridge tcp:127.0.0.1:6653 \
         -- set controller $bridge connection-mode=out-of-band \
                                   max-backoff=1000 \
         -- add-port $bridge $port1 \
diff --git a/third-party/README.md b/third-party/README.md
index e61d6c45e..d351d77e5 100644
--- a/third-party/README.md
+++ b/third-party/README.md
@@ -27,7 +27,7 @@ Clearly, tcpdump can only parse unencrypted packets, so you will need to
 connect the controller and datapath using plain TCP.  To look at the
 traffic, tcpdump will be started in a manner similar to the following:
 
-    sudo ./tcpdump -s0 -i eth0 port 6633
+    sudo ./tcpdump -s0 -i eth0 port 6653
 
 The "-s0" flag indicates that tcpdump should capture the entire packet.
 If the OpenFlow message is not received in its entirety, "[|openflow]" will 
diff --git a/third-party/ofp-tcpdump.patch b/third-party/ofp-tcpdump.patch
index bba4e90b6..72d33b877 100644
--- a/third-party/ofp-tcpdump.patch
+++ b/third-party/ofp-tcpdump.patch
@@ -125,7 +125,7 @@
          else if (length > 0 && (sport == LDP_PORT || dport == LDP_PORT)) {
                  ldp_print(bp, length);
 -        }
-+        } else if (sport == OFP_OLD_PORT || dport == OFP_OLD_PORT) {
++        } else if (sport == OFP_PORT || dport == OFP_PORT) {
 +                   openflow_print(bp, length);
 +        }
  
diff --git a/utilities/ovs-testcontroller.8.in b/utilities/ovs-testcontroller.8.in
index d05ca26e0..f88bcd0ed 100644
--- a/utilities/ovs-testcontroller.8.in
+++ b/utilities/ovs-testcontroller.8.in
@@ -147,13 +147,10 @@ Use this option more than once to add flows from multiple files.
 .
 .SH EXAMPLES
 .PP
-To bind locally to port 6633 (the default) and wait for incoming
+To bind locally to port 6653 (the default) and wait for incoming
 connections from OpenFlow switches:
 .IP
 \fB% ovs\-testcontroller 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/bridge.c b/vswitchd/bridge.c
index dd622dc00..85bbfa3f2 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -535,7 +535,7 @@ collect_in_band_managers(const struct ovsrec_open_vswitch *ovs_cfg,
                 struct sockaddr_in in;
             } sa;
 
-            if (stream_parse_target_with_default_port(target, OVSDB_OLD_PORT,
+            if (stream_parse_target_with_default_port(target, OVSDB_PORT,
                                                       &sa.ss)
                 && sa.ss.ss_family == AF_INET) {
                 managers[n_managers++] = sa.in;
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index f8caf2a74..1bd652217 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -3480,9 +3480,7 @@
             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>If <var>port</var> is not specified, it defaults to 6653.</p>
             <p>SSL support is an optional feature that is not always built as
             part of Open vSwitch.</p>
           </dd>
@@ -3493,12 +3491,10 @@
               <var>ip</var>, which must be expressed as an IP address (not a
               DNS name), where <var>ip</var> can be IPv4 or IPv6 address.  If
               <var>ip</var> is an IPv6 address, wrap it in square brackets,
-              e.g. <code>tcp:[::1]:6633</code>.
+              e.g. <code>tcp:[::1]:6653</code>.
             </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.
+              If <var>port</var> is not specified, it defaults to 6653.
             </p>
           </dd>
         </dl>
@@ -3515,20 +3511,18 @@
               DNS name), is specified, then connections are restricted to the
               specified local IP address (either IPv4 or IPv6).  If
               <var>ip</var> is an IPv6 address, wrap it in square brackets,
-              e.g. <code>pssl:6633:[::1]</code>.
+              e.g. <code>pssl:6653:[::1]</code>.
             </p>
             <p>
-              If <var>port</var> is not specified, it currently defaults to
-              6633.  If <var>ip</var> is not specified then it listens only on
+              If <var>port</var> is not specified, it defaults to
+              6653.  If <var>ip</var> is not specified then it listens only on
               IPv4 (but not IPv6) addresses.  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.
+              If <var>port</var> is not specified, it currently to 6653.
             </p>
             <p>
               SSL support is an optional feature that is not always built as
@@ -3543,13 +3537,11 @@
               DNS name), is specified, then connections are restricted to the
               specified local IP address (either IPv4 or IPv6).  If
               <var>ip</var> is an IPv6 address, wrap it in square brackets,
-              e.g. <code>ptcp:6633:[::1]</code>. If <var>ip</var> is not
+              e.g. <code>ptcp:6653:[::1]</code>. If <var>ip</var> is not
               specified then it listens only on IPv4 addresses.
             </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.
+              If <var>port</var> is not specified, it defaults to 6653.
             </p>
           </dd>
         </dl>
@@ -3894,9 +3886,7 @@
               form is used.
             </p>
             <p>
-              If <var>port</var> is not specified, it currently defaults
-              to 6632.  In the future, the default will change to 6640,
-              which is the IANA-defined value.
+              If <var>port</var> is not specified, it defaults to 6640.
             </p>
             <p>
               SSL support is an optional feature that is not always
@@ -3911,12 +3901,10 @@
               <var>ip</var>, which must be expressed as an IP address (not a
               DNS name), where <var>ip</var> can be IPv4 or IPv6 address.  If
               <var>ip</var> is an IPv6 address, wrap it in square brackets,
-              e.g. <code>tcp:[::1]:6632</code>.
+              e.g. <code>tcp:[::1]:6640</code>.
             </p>
             <p>
-              If <var>port</var> is not specified, it currently defaults
-              to 6632.  In the future, the default will change to 6640,
-              which is the IANA-defined value.
+              If <var>port</var> is not specified, it defaults to 6640.
             </p>
           </dd>
           <dt><code>pssl:</code>[<var>port</var>][<code>:<var>ip</var></code>]</dt>
@@ -3929,16 +3917,14 @@
               connections are restricted to the specified local IP address
               (either IPv4 or IPv6 address).  If <var>ip</var> is an IPv6
               address, wrap in square brackets,
-              e.g. <code>pssl:6632:[::1]</code>.  If <var>ip</var> is not
+              e.g. <code>pssl:6640:[::1]</code>.  If <var>ip</var> is not
               specified then it listens only on IPv4 (but not IPv6) addresses.
               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 6632.  In the future, the default will change to 6640,
-              which is the IANA-defined value.
+              If <var>port</var> is not specified, it defaults to 6640.
             </p>
             <p>
               SSL support is an optional feature that is not always built as
@@ -3955,13 +3941,11 @@
               connections are restricted to the specified local IP address
               (either IPv4 or IPv6 address).  If <var>ip</var> is an IPv6
               address, wrap it in square brackets,
-              e.g. <code>ptcp:6632:[::1]</code>.  If <var>ip</var> is not
+              e.g. <code>ptcp:6640:[::1]</code>.  If <var>ip</var> is not
               specified then it listens only on IPv4 addresses.
             </p>
             <p>
-              If <var>port</var> is not specified, it currently defaults
-              to 6632.  In the future, the default will change to 6640,
-              which is the IANA-defined value.
+              If <var>port</var> is not specified, it defaults to 6640.
             </p>
           </dd>
         </dl>
diff --git a/vtep/README.ovs-vtep.md b/vtep/README.ovs-vtep.md
index dcc4e861a..e5ba0caef 100644
--- a/vtep/README.ovs-vtep.md
+++ b/vtep/README.ovs-vtep.md
@@ -140,7 +140,7 @@ vtep-ctl set Physical_Switch br0 tunnel_ips=10.2.2.1
 7. Configure the VTEP database's manager to point at an NVC:
 
       ```
-vtep-ctl set-manager tcp:<CONTROLLER IP>:6632
+vtep-ctl set-manager tcp:<CONTROLLER IP>:6640
       ```
 
    Where CONTROLLER IP is your controller's IP address that is accessible
diff --git a/vtep/vtep.xml b/vtep/vtep.xml
index 619905570..ff8d0fe54 100644
--- a/vtep/vtep.xml
+++ b/vtep/vtep.xml
@@ -90,7 +90,7 @@
           <dt><code>ssl:<var>ip</var></code>[<code>:<var>port</var></code>]</dt>
           <dd>
             <p>
-              The specified SSL <var>port</var> (default: 6632) on the host at
+              The specified SSL <var>port</var> (default: 6640) on the host at
               the given <var>ip</var>, which must be expressed as an IP address
               (not a DNS name).
             </p>
@@ -102,7 +102,7 @@
 
           <dt><code>tcp:<var>ip</var></code>[<code>:<var>port</var></code>]</dt>
           <dd>
-            The specified TCP <var>port</var> (default: 6632) on the host at
+            The specified TCP <var>port</var> (default: 6640) on the host at
             the given <var>ip</var>, which must be expressed as an IP address
             (not a DNS name).
           </dd>
@@ -110,7 +110,7 @@
           <dd>
             <p>
               Listens for SSL connections on the specified TCP <var>port</var>
-              (default: 6632).  If <var>ip</var>, which must be expressed as an
+              (default: 6640).  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>
@@ -118,7 +118,7 @@
           <dt><code>ptcp:</code>[<var>port</var>][<code>:<var>ip</var></code>]</dt>
           <dd>
             Listens for connections on the specified TCP <var>port</var>
-            (default: 6632).  If <var>ip</var>, which must be expressed as an
+            (default: 6640).  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.
           </dd>
diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
index be8b6069f..5375f22f5 100755
--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
@@ -224,7 +224,7 @@ def setControllerCfg(controller):
                    '/etc/xensource/xapi-ssl.pem',
                    '/etc/xensource/xapi-ssl.pem',
                    cacert_filename,
-                   '--', 'set-manager', 'ssl:' + controller + ':6632'])
+                   '--', 'set-manager', 'ssl:' + controller + ':6640'])
 
 
 def vswitchCfgQuery(action_args):