ofproto: Inline trivial functions.

[sliver-openvswitch.git] / lib / jsonrpc.h

diff --git a/lib/jsonrpc.h b/lib/jsonrpc.h
index 0ae205d..b711d1a 100644 (file)
--- a/lib/jsonrpc.h
+++ b/lib/jsonrpc.h
@@ -34,10 +34,12 @@ struct stream;
 
 /* Default port numbers.
  *
- * There is nothing standard about these port numbers.  They are simply what
- * we have chosen. */
-#define JSONRPC_TCP_PORT 6632
-#define JSONRPC_SSL_PORT 6632
+ * 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. */
+#define OVSDB_OLD_PORT 6632
+#define OVSDB_PORT 6640
 
 int jsonrpc_stream_open(const char *name, struct stream **, uint8_t dscp);
 int jsonrpc_pstream_open(const char *name, struct pstream **, uint8_t dscp);
@@ -121,6 +123,7 @@ int jsonrpc_session_get_last_error(const struct jsonrpc_session *);
 void jsonrpc_session_get_reconnect_stats(const struct jsonrpc_session *,
                                          struct reconnect_stats *);
 
+void jsonrpc_session_enable_reconnect(struct jsonrpc_session *);
 void jsonrpc_session_force_reconnect(struct jsonrpc_session *);
 
 void jsonrpc_session_set_max_backoff(struct jsonrpc_session *,