Module: kamailio Branch: master Commit: 99f25469c5ce8070210769f9dfe2a16b7333c14d URL: https://github.com/kamailio/kamailio/commit/99f25469c5ce8070210769f9dfe2a16b...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2016-10-15T18:39:05+02:00

ctl: take in consideration runtime_dir when creation the ctl socket

---

Modified: modules/ctl/ctl.c

---

Diff: https://github.com/kamailio/kamailio/commit/99f25469c5ce8070210769f9dfe2a16b... Patch: https://github.com/kamailio/kamailio/commit/99f25469c5ce8070210769f9dfe2a16b...

---

diff --git a/modules/ctl/ctl.c b/modules/ctl/ctl.c index f630f8a..7e2e11f 100644 --- a/modules/ctl/ctl.c +++ b/modules/ctl/ctl.c @@ -211,11 +211,12 @@ static int fix_group(modparam_t type, void * val) return -1; }

- +#define CTL_SOCKET_PATH_SIZE 128

static int mod_init(void) { struct id_list* l; + char ctl_socket_path[CTL_SOCKET_PATH_SIZE];

binrpc_callbacks_init();

@@ -227,7 +228,21 @@ static int mod_init(void) binrpc_struct_max_body_size *= 1024;

if (listen_lst==0) { - add_binrpc_socket(PARAM_STRING, DEFAULT_CTL_SOCKET); + if(strcmp(runtime_dir, RUN_DIR)==0) { + add_binrpc_socket(PARAM_STRING, DEFAULT_CTL_SOCKET); + } else { + if(sizeof(DEFAULT_CTL_SOCKET_PROTO) + + sizeof(DEFAULT_CTL_SOCKET_NAME) + + strlen(runtime_dir) + 4 > CTL_SOCKET_PATH_SIZE) { + LM_ERR("ctl socket path is too big\n"); + return -1; + } + strcpy(ctl_socket_path, DEFAULT_CTL_SOCKET_PROTO); + strcat(ctl_socket_path, runtime_dir); + strcat(ctl_socket_path, "/"); + strcat(ctl_socket_path, DEFAULT_CTL_SOCKET_NAME); + add_binrpc_socket(PARAM_STRING, ctl_socket_path); + } } DBG("listening on:\n"); for (l=listen_lst; l; l=l->next){