[sr-dev] git:master:b87ac344: kazoo : add consumer key if appropriate

Module: kamailio Branch: master Commit: b87ac3440ae38526cca15dd26625e481e331d51e URL: https://github.com/kamailio/kamailio/commit/b87ac3440ae38526cca15dd26625e48… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-10-11T06:21:23+01:00 kazoo : add consumer key if appropriate --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/b87ac3440ae38526cca15dd26625e48… Patch: https://github.com/kamailio/kamailio/commit/b87ac3440ae38526cca15dd26625e48… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index af6223d693..fbf2e9a8a9 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2848,9 +2848,13 @@ char* maybe_add_consumer_key(int server_id, amqp_bytes_t body) } char buffer[100]; const char* server_id_str = json_object_get_string(server_id_obj); - sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); - json_object_object_del(json_obj, BLF_JSON_SERVERID); - json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + if(server_id_str && strlen(server_id_str) > 0) { + sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); + json_object_object_del(json_obj, BLF_JSON_SERVERID); + json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + } else { + json_object_object_del(json_obj, BLF_JSON_SERVERID); + } shm_free(payload); payload = kz_amqp_bytes_dup(amqp_cstring_bytes((char*)json_object_to_json_string(json_obj))); json_object_put(json_obj); @@ -2894,9 +2898,13 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) JObj = kz_json_get_object(json_obj, BLF_JSON_SERVERID); if(JObj != NULL) { server_id_str = (char*) json_object_get_string(JObj); - sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); - json_object_object_del(json_obj, BLF_JSON_SERVERID); - json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + if(server_id_str && strlen(server_id_str) > 0) { + sprintf(buffer, "consumer://%d/%s", server_id, server_id_str); + json_object_object_del(json_obj, BLF_JSON_SERVERID); + json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + } else { + json_object_object_del(json_obj, BLF_JSON_SERVERID); + } } cmd->return_payload = kz_amqp_string_dup((char*)json_object_to_json_string(json_obj)); @@ -2957,9 +2965,13 @@ void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* e JObj = kz_json_get_object(json_obj, BLF_JSON_SERVERID); if(JObj != NULL) { const char* _kz_server_id_str = json_object_get_string(JObj); - sprintf(buffer, "consumer://%d/%s", _kz_server_id, _kz_server_id_str); - json_object_object_del(json_obj, BLF_JSON_SERVERID); - json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + if(_kz_server_id_str && strlen(_kz_server_id_str) > 0) { + sprintf(buffer, "consumer://%d/%s", _kz_server_id, _kz_server_id_str); + json_object_object_del(json_obj, BLF_JSON_SERVERID); + json_object_object_add(json_obj, BLF_JSON_SERVERID, json_object_new_string(buffer)); + } else { + json_object_object_del(json_obj, BLF_JSON_SERVERID); + } } json_object_object_add(json_obj, BLF_JSON_BROKER_ZONE, json_object_new_string(server_ptr->zone->zone));