Signed-off-by: Justin Pettit <jpet...@nicira.com>
---
include/openflow/openflow-common.h | 3 ++-
lib/stream-ssl.c | 6 +++---
lib/vconn-stream.c | 4 ++--
lib/vconn.c | 8 ++++----
ofproto/connmgr.c | 2 +-
third-party/ofp-tcpdump.patch | 2 +-
6 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/include/openflow/openflow-common.h
b/include/openflow/openflow-common.h
index 5b0ccc5..45d03ef 100644
--- a/include/openflow/openflow-common.h
+++ b/include/openflow/openflow-common.h
@@ -104,7 +104,8 @@ enum ofp_version {
#define OFP_MAX_TABLE_NAME_LEN 32
#define OFP_MAX_PORT_NAME_LEN 16
-#define OFP_TCP_PORT 6633
+#define OFP_OLD_PORT 6633
+#define OFP_PORT 6653
#define OFP_ETH_ALEN 6 /* Bytes in an Ethernet address. */
diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c
index 1a77b79..1e748c0 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_TCP_PORT, &sin, &fd,
+ error = inet_open_active(SOCK_STREAM, suffix, OFP_OLD_PORT, &sin, &fd,
dscp);
if (fd >= 0) {
int state = error ? STATE_TCP_CONNECTING : STATE_SSL_CONNECTING;
@@ -797,7 +797,7 @@ pssl_open(const char *name OVS_UNUSED, char *suffix, struct
pstream **pstreamp,
return retval;
}
- fd = inet_open_passive(SOCK_STREAM, suffix, OFP_TCP_PORT, &sin, dscp);
+ fd = inet_open_passive(SOCK_STREAM, suffix, OFP_OLD_PORT, &sin, dscp);
if (fd < 0) {
return -fd;
}
@@ -846,7 +846,7 @@ pssl_accept(struct pstream *pstream, struct stream
**new_streamp)
}
sprintf(name, "ssl:"IP_FMT, IP_ARGS(sin.sin_addr.s_addr));
- if (sin.sin_port != htons(OFP_TCP_PORT)) {
+ if (sin.sin_port != htons(OFP_OLD_PORT)) {
sprintf(strchr(name, '\0'), ":%"PRIu16, ntohs(sin.sin_port));
}
return new_ssl_stream(name, new_fd, SERVER, STATE_SSL_CONNECTING, &sin,
diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c
index 23145ea..027f48f 100644
--- a/lib/vconn-stream.c
+++ b/lib/vconn-stream.c
@@ -82,7 +82,7 @@ vconn_stream_open(const char *name, uint32_t allowed_versions,
struct stream *stream;
int error;
- error = stream_open_with_default_port(name, OFP_TCP_PORT, &stream, dscp);
+ error = stream_open_with_default_port(name, OFP_OLD_PORT, &stream, dscp);
if (!error) {
error = stream_connect(stream);
if (!error || error == EAGAIN) {
@@ -315,7 +315,7 @@ pvconn_pstream_listen(const char *name, uint32_t
allowed_versions,
struct pstream *pstream;
int error;
- error = pstream_open_with_default_port(name, OFP_TCP_PORT,
+ error = pstream_open_with_default_port(name, OFP_OLD_PORT,
&pstream, dscp);
if (error) {
return error;
diff --git a/lib/vconn.c b/lib/vconn.c
index 8a06485..5708987 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_TCP_PORT);
+ "PORT (default: %d) at remote IP\n", OFP_OLD_PORT);
#ifdef HAVE_OPENSSL
printf(" ssl:IP[:PORT] "
- "SSL PORT (default: %d) at remote IP\n", OFP_TCP_PORT);
+ "SSL PORT (default: %d) at remote IP\n", OFP_OLD_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_TCP_PORT);
+ OFP_OLD_PORT);
#ifdef HAVE_OPENSSL
printf(" pssl:[PORT][:IP] "
"listen for SSL on PORT (default: %d) on IP\n",
- OFP_TCP_PORT);
+ OFP_OLD_PORT);
#endif
printf(" punix:FILE "
"listen on Unix domain socket FILE\n");
diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
index 2fd94e2..8a4195d 100644
--- a/ofproto/connmgr.c
+++ b/ofproto/connmgr.c
@@ -693,7 +693,7 @@ update_in_band_remotes(struct connmgr *mgr)
}
if (stream_parse_target_with_default_port(target,
- OFP_TCP_PORT,
+ OFP_OLD_PORT,
sin)) {
n_addrs++;
}
diff --git a/third-party/ofp-tcpdump.patch b/third-party/ofp-tcpdump.patch
index 5c47061..b1ac9a5 100644
--- a/third-party/ofp-tcpdump.patch
+++ b/third-party/ofp-tcpdump.patch
@@ -116,7 +116,7 @@
else if (length > 0 && (sport == LDP_PORT || dport == LDP_PORT)) {
ldp_print(bp, length);
- }
-+ } else if (sport == OFP_TCP_PORT || dport == OFP_TCP_PORT) {
++ } else if (sport == OFP_OLD_PORT || dport == OFP_OLD_PORT) {
+ openflow_print(bp, length);
+ }
--
1.7.5.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
