From 401374e437e5339cf97a84fac74a25b808693251 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Thu, 28 Jan 2016 19:15:58 +1100 Subject: [PATCH] Overwrite EOL with bkey message in process_client_msg --- src/connector.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/connector.c b/src/connector.c index a758fd6d..5faa0621 100644 --- a/src/connector.c +++ b/src/connector.c @@ -931,7 +931,7 @@ static void send_client(cdata_t *cdata, const int64_t id, char *buf, int slen, i } json_append_bkeys(val, bkey, blen); free(buf); - buf = json_dumps(val, JSON_COMPACT | JSON_EOL); + buf = json_dumps(val, JSON_COMPACT); json_decref(val); } LOGDEBUG("Message for node: %s", buf); @@ -984,7 +984,7 @@ static void send_client(cdata_t *cdata, const int64_t id, char *buf, int slen, i json_object_set_new_nocheck(val, "server", json_integer(client->server)); if (bkey) json_append_bkeys(val, bkey, blen); - msg = json_dumps(val, JSON_COMPACT | JSON_EOL); + msg = json_dumps(val, JSON_COMPACT); json_decref(val); send_proc(ckp->stratifier, msg); free(msg); @@ -1280,9 +1280,9 @@ static void process_client_msg(cdata_t *cdata, char *buf, uint32_t msglen) msg = json_dumps(json_msg, JSON_EOL | JSON_COMPACT); slen = strlen(msg); if (blen) { - msglen = slen + 1 + blen; + msglen = slen + blen; msg = realloc(msg, msglen); - memcpy(msg + slen, bkey, blen); + memcpy(msg + slen - 1, bkey, blen); send_client(cdata, client_id, msg, slen, msglen); } else send_client(cdata, client_id, msg, slen, slen);