git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some regressions from the merge from master.
[sliver-openvswitch.git]
/
lib
/
jsonrpc.c
diff --git
a/lib/jsonrpc.c
b/lib/jsonrpc.c
index
f42035e
..
5c7dfca
100644
(file)
--- a/
lib/jsonrpc.c
+++ b/
lib/jsonrpc.c
@@
-152,19
+152,19
@@
jsonrpc_log_msg(const struct jsonrpc *rpc, const char *title,
}
if (msg->params) {
ds_put_cstr(&s, ", params=");
}
if (msg->params) {
ds_put_cstr(&s, ", params=");
-
ds_put_and_free_cstr(&s, json_to_string(msg->params, 0)
);
+
json_to_ds(msg->params, 0, &s
);
}
if (msg->result) {
ds_put_cstr(&s, ", result=");
}
if (msg->result) {
ds_put_cstr(&s, ", result=");
-
ds_put_and_free_cstr(&s, json_to_string(msg->result, 0)
);
+
json_to_ds(msg->result, 0, &s
);
}
if (msg->error) {
ds_put_cstr(&s, ", error=");
}
if (msg->error) {
ds_put_cstr(&s, ", error=");
-
ds_put_and_free_cstr(&s, json_to_string(msg->error, 0)
);
+
json_to_ds(msg->error, 0, &s
);
}
if (msg->id) {
ds_put_cstr(&s, ", id=");
}
if (msg->id) {
ds_put_cstr(&s, ", id=");
-
ds_put_and_free_cstr(&s, json_to_string(msg->id, 0)
);
+
json_to_ds(msg->id, 0, &s
);
}
VLOG_DBG("%s: %s %s%s", rpc->name, title,
jsonrpc_msg_type_to_string(msg->type), ds_cstr(&s));
}
VLOG_DBG("%s: %s %s%s", rpc->name, title,
jsonrpc_msg_type_to_string(msg->type), ds_cstr(&s));
@@
-172,6
+172,7
@@
jsonrpc_log_msg(const struct jsonrpc *rpc, const char *title,
}
}
}
}
+/* Always takes ownership of 'msg', regardless of success. */
int
jsonrpc_send(struct jsonrpc *rpc, struct jsonrpc_msg *msg)
{
int
jsonrpc_send(struct jsonrpc *rpc, struct jsonrpc_msg *msg)
{
@@
-268,6
+269,7
@@
jsonrpc_recv_wait(struct jsonrpc *rpc)
}
}
}
}
+/* Always takes ownership of 'msg', regardless of success. */
int
jsonrpc_send_block(struct jsonrpc *rpc, struct jsonrpc_msg *msg)
{
int
jsonrpc_send_block(struct jsonrpc *rpc, struct jsonrpc_msg *msg)
{
@@
-278,12
+280,14
@@
jsonrpc_send_block(struct jsonrpc *rpc, struct jsonrpc_msg *msg)
return error;
}
return error;
}
-
while (!queue_is_empty(&rpc->output) && !rpc->status
) {
+
for (;;
) {
jsonrpc_run(rpc);
jsonrpc_run(rpc);
+ if (queue_is_empty(&rpc->output) || rpc->status) {
+ return rpc->status;
+ }
jsonrpc_wait(rpc);
poll_block();
}
jsonrpc_wait(rpc);
poll_block();
}
- return rpc->status;
}
int
}
int
@@
-302,6
+306,7
@@
jsonrpc_recv_block(struct jsonrpc *rpc, struct jsonrpc_msg **msgp)
}
}
}
}
+/* Always takes ownership of 'request', regardless of success. */
int
jsonrpc_transact_block(struct jsonrpc *rpc, struct jsonrpc_msg *request,
struct jsonrpc_msg **replyp)
int
jsonrpc_transact_block(struct jsonrpc *rpc, struct jsonrpc_msg *request,
struct jsonrpc_msg **replyp)
@@
-686,7
+691,6
@@
jsonrpc_session_close(struct jsonrpc_session *s)
static void
jsonrpc_session_disconnect(struct jsonrpc_session *s)
{
static void
jsonrpc_session_disconnect(struct jsonrpc_session *s)
{
- reconnect_disconnected(s->reconnect, time_msec(), 0);
if (s->rpc) {
jsonrpc_error(s->rpc, EOF);
jsonrpc_close(s->rpc);
if (s->rpc) {
jsonrpc_error(s->rpc, EOF);
jsonrpc_close(s->rpc);
@@
-723,6
+727,7
@@
jsonrpc_session_run(struct jsonrpc_session *s)
jsonrpc_run(s->rpc);
error = jsonrpc_get_status(s->rpc);
if (error) {
jsonrpc_run(s->rpc);
error = jsonrpc_get_status(s->rpc);
if (error) {
+ reconnect_disconnected(s->reconnect, time_msec(), 0);
jsonrpc_session_disconnect(s);
}
} else if (s->stream) {
jsonrpc_session_disconnect(s);
}
} else if (s->stream) {
@@
-747,6
+752,7
@@
jsonrpc_session_run(struct jsonrpc_session *s)
break;
case RECONNECT_DISCONNECT:
break;
case RECONNECT_DISCONNECT:
+ reconnect_disconnected(s->reconnect, time_msec(), 0);
jsonrpc_session_disconnect(s);
break;
jsonrpc_session_disconnect(s);
break;
@@
-789,10
+795,16
@@
jsonrpc_session_get_name(const struct jsonrpc_session *s)
return reconnect_get_name(s->reconnect);
}
return reconnect_get_name(s->reconnect);
}
+/* Always takes ownership of 'msg', regardless of success. */
int
jsonrpc_session_send(struct jsonrpc_session *s, struct jsonrpc_msg *msg)
{
int
jsonrpc_session_send(struct jsonrpc_session *s, struct jsonrpc_msg *msg)
{
- return s->rpc ? jsonrpc_send(s->rpc, msg) : ENOTCONN;
+ if (s->rpc) {
+ return jsonrpc_send(s->rpc, msg);
+ } else {
+ jsonrpc_msg_destroy(msg);
+ return ENOTCONN;
+ }
}
struct jsonrpc_msg *
}
struct jsonrpc_msg *