diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-12-01 16:32:03 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-12-02 11:19:08 -0800 |
| commit | 20bed8be2508ca7275b1167077f1aedfbcaa13fd (patch) | |
| tree | 81ef4aafea1028ad3a1cc9aec7cf881875eae430 /ovsdb | |
| parent | dcbb691b0046f0d4421afbe8901d85c186929f7e (diff) | |
jsonrpc: Make it easy to get a new JSON-RPC request's id.
Diffstat (limited to 'ovsdb')
| -rw-r--r-- | ovsdb/jsonrpc-server.c | 2 | ||||
| -rw-r--r-- | ovsdb/ovsdb-client.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index 4644970d..897f9ae5 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -330,7 +330,7 @@ ovsdb_jsonrpc_session_run(struct ovsdb_jsonrpc_session *s) struct jsonrpc_msg *request; params = json_array_create_empty(); - request = jsonrpc_create_request("echo", params); + request = jsonrpc_create_request("echo", params, NULL); json_destroy(request->id); request->id = json_string_create("echo"); jsonrpc_send(s->rpc, request); diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index 6e006812..65d6d81d 100644 --- a/ovsdb/ovsdb-client.c +++ b/ovsdb/ovsdb-client.c @@ -236,7 +236,8 @@ fetch_schema_from_rpc(struct jsonrpc *rpc) struct ovsdb_schema *schema; int error; - request = jsonrpc_create_request("get_schema", json_array_create_empty()); + request = jsonrpc_create_request("get_schema", json_array_create_empty(), + NULL); error = jsonrpc_transact_block(rpc, request, &reply); if (error) { ovs_fatal(error, "transaction failed"); @@ -629,7 +630,7 @@ do_transact(int argc UNUSED, char *argv[]) transaction = parse_json(argv[2]); rpc = open_jsonrpc(argv[1]); - request = jsonrpc_create_request("transact", transaction); + request = jsonrpc_create_request("transact", transaction, NULL); error = jsonrpc_transact_block(rpc, request, &reply); if (error) { ovs_fatal(error, "transaction failed"); @@ -795,7 +796,7 @@ do_monitor(int argc, char *argv[]) json_object_put(monitor_requests, argv[2], monitor_request); monitor = json_array_create_2(json_null_create(), monitor_requests); - request = jsonrpc_create_request("monitor", monitor); + request = jsonrpc_create_request("monitor", monitor, NULL); request_id = json_clone(request->id); jsonrpc_send(rpc, request); for (;;) { |