Catalli's threaded switch

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

diff --git a/lib/jsonrpc.h b/lib/jsonrpc.h
index 5d47ac5..154c459 100644 (file)
--- a/lib/jsonrpc.h
+++ b/lib/jsonrpc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,21 @@
 
 struct json;
 struct jsonrpc_msg;
+struct pstream;
 struct stream;
 \f
 /* API for a JSON-RPC 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
+
+int jsonrpc_stream_open(const char *name, struct stream **);
+int jsonrpc_pstream_open(const char *name, struct pstream **);
+
 struct jsonrpc *jsonrpc_open(struct stream *);
 void jsonrpc_close(struct jsonrpc *);
 
@@ -67,7 +78,8 @@ struct jsonrpc_msg {
 };
 
 struct jsonrpc_msg *jsonrpc_create_request(const char *method,
-                                           struct json *params);
+                                           struct json *params,
+                                           struct json **idp);
 struct jsonrpc_msg *jsonrpc_create_notify(const char *method,
                                           struct json *params);
 struct jsonrpc_msg *jsonrpc_create_reply(struct json *result,
@@ -85,6 +97,7 @@ struct json *jsonrpc_msg_to_json(struct jsonrpc_msg *);
 /* A JSON-RPC session with reconnection. */
 
 struct jsonrpc_session *jsonrpc_session_open(const char *name);
+struct jsonrpc_session *jsonrpc_session_open_unreliably(struct jsonrpc *);
 void jsonrpc_session_close(struct jsonrpc_session *);
 
 void jsonrpc_session_run(struct jsonrpc_session *);
@@ -97,6 +110,7 @@ int jsonrpc_session_send(struct jsonrpc_session *, struct jsonrpc_msg *);
 struct jsonrpc_msg *jsonrpc_session_recv(struct jsonrpc_session *);
 void jsonrpc_session_recv_wait(struct jsonrpc_session *);
 
+bool jsonrpc_session_is_alive(const struct jsonrpc_session *);
 bool jsonrpc_session_is_connected(const struct jsonrpc_session *);
 unsigned int jsonrpc_session_get_seqno(const struct jsonrpc_session *);
 void jsonrpc_session_force_reconnect(struct jsonrpc_session *);