diff options
| author | Justin Pettit <jpettit@nicira.com> | 2013-09-23 14:33:09 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2013-10-01 16:18:45 -0700 |
| commit | ca843648e3b4181a52a398b902e5e69221976476 (patch) | |
| tree | 88eb2b8f9a6c3d69a131db8923e1d30f00d5e0ec /lib/jsonrpc.c | |
| parent | 2a10d620dc1680cb62c014afee3af730c3412c3b (diff) | |
Don't differentiate between TCP and SSL ports for OpenFlow and OVSDB.
The OVS code has always made a distinction between the unencrypted (TCP)
and SSL port numbers for the OpenFlow and OVSDB protocols. The default
port numbers for both protocols has changed, and there continues to be
no distinction between the unencrypted and SSL versions. This
commit removes the distinction in port numbers. A future patch will
recognize the change in default port number.
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/jsonrpc.c')
| -rw-r--r-- | lib/jsonrpc.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c index e02f0357..b43b0442 100644 --- a/lib/jsonrpc.c +++ b/lib/jsonrpc.c @@ -59,22 +59,21 @@ static void jsonrpc_cleanup(struct jsonrpc *); static void jsonrpc_error(struct jsonrpc *, int error); /* This is just the same as stream_open() except that it uses the default - * JSONRPC ports if none is specified. */ + * JSONRPC port if none is specified. */ int jsonrpc_stream_open(const char *name, struct stream **streamp, uint8_t dscp) { - return stream_open_with_default_ports(name, JSONRPC_TCP_PORT, - JSONRPC_SSL_PORT, streamp, - dscp); + return stream_open_with_default_port(name, JSONRPC_TCP_PORT, + streamp, dscp); } /* This is just the same as pstream_open() except that it uses the default - * JSONRPC ports if none is specified. */ + * JSONRPC port if none is specified. */ int jsonrpc_pstream_open(const char *name, struct pstream **pstreamp, uint8_t dscp) { - return pstream_open_with_default_ports(name, JSONRPC_TCP_PORT, - JSONRPC_SSL_PORT, pstreamp, dscp); + return pstream_open_with_default_port(name, JSONRPC_TCP_PORT, + pstreamp, dscp); } /* Returns a new JSON-RPC stream that uses 'stream' for input and output. The |