Both OpenFlow and OVSDB have new IANA-assigned port numbers. We still
default to the original values (6633 and 6632, respectively), but this
commit logs a warning. In the future, we will switch to the official
values (6653 and 6640, respectively).
Signed-off-by: Justin Pettit <jpet...@nicira.com>
---
NEWS | 3 +++
lib/stream.c | 10 ++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/NEWS b/NEWS
index eae1146..5fb3703 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
Post-v2.0.0
---------------------
+ - Log a warning message that the default OpenFlow (6633->6653) and
+ OVSDB (6632->6640) TCP port numbers will change to their
+ IANA-assigned numbers in a future release.
v2.0.0 - xx xxx xxxx
diff --git a/lib/stream.c b/lib/stream.c
index 7cb0421..0442d84 100644
--- a/lib/stream.c
+++ b/lib/stream.c
@@ -26,6 +26,7 @@
#include "dynamic-string.h"
#include "fatal-signal.h"
#include "flow.h"
+#include "jsonrpc.h"
#include "ofp-print.h"
#include "ofpbuf.h"
#include "openflow/nicira-ext.h"
@@ -730,6 +731,15 @@ 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",
+ 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",
+ OVSDB_OLD_PORT, OVSDB_PORT);
+ }
name = xasprintf("%s:%d", name_, default_port);
} else {
name = xstrdup(name_);
--
1.7.5.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
