sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:65593cc2: core: daemonize - proper chown for pgid file instead of pid file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 65593cc23bc89349fb42566cbd7eb2bbf8744db9 URL: https://github.com/kamailio/kamailio/commit/65593cc23bc89349fb42566cbd7eb2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-18T09:08:14+02:00 core: daemonize - proper chown for pgid file instead of pid file --- Modified: src/core/daemonize.c --- Diff: https://github.com/kamailio/kamailio/commit/65593cc23bc89349fb42566cbd7eb2b… Patch: https://github.com/kamailio/kamailio/commit/65593cc23bc89349fb42566cbd7eb2b… --- diff --git a/src/core/daemonize.c b/src/core/daemonize.c index bc51c9674b..98bf04dc78 100644 --- a/src/core/daemonize.c +++ b/src/core/daemonize.c @@ -384,7 +384,7 @@ int daemonize(char* name, int status_wait) }else{ fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); - if(chown(pid_file, pid_uid, pid_gid)<0) { + if(chown(pgid_file, pid_uid, pid_gid)<0) { LM_ERR("failed to chwon PGID file: %s\n", strerror(errno)); goto error; }

6 years, 12 months

git:master:3deee5be: core: cfg ctx - catch condition when there are no changes to be committed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3deee5be0fa9c68f35ddb273fd86e22af91ced99 URL: https://github.com/kamailio/kamailio/commit/3deee5be0fa9c68f35ddb273fd86e22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-18T09:07:18+02:00 core: cfg ctx - catch condition when there are no changes to be committed --- Modified: src/core/cfg/cfg_ctx.c --- Diff: https://github.com/kamailio/kamailio/commit/3deee5be0fa9c68f35ddb273fd86e22… Patch: https://github.com/kamailio/kamailio/commit/3deee5be0fa9c68f35ddb273fd86e22… --- diff --git a/src/core/cfg/cfg_ctx.c b/src/core/cfg/cfg_ctx.c index 02dd9145dd..6dc9a469c0 100644 --- a/src/core/cfg/cfg_ctx.c +++ b/src/core/cfg/cfg_ctx.c @@ -1044,17 +1044,15 @@ int cfg_commit(cfg_ctx_t *ctx) and replaced group arrays. Prepare the linked list of per-child process callbacks, that will be added to the global list. */ - for ( changed = ctx->changed_first, group = NULL; - changed; - changed = changed->next - ) { + for(changed = ctx->changed_first, group = NULL; changed; + changed = changed->next) { /* Each string/str potentially causes an old string to be freed * unless the variable of an additional group instance is set * which uses the default value. This case cannot be determined * without locking *cfg_global, hence, it is better to count these * strings as well even though the slot might not be used later. */ - if ((CFG_VAR_TYPE(changed->var) == CFG_VAR_STRING) - || (CFG_VAR_TYPE(changed->var) == CFG_VAR_STR)) + if((CFG_VAR_TYPE(changed->var) == CFG_VAR_STRING) + || (CFG_VAR_TYPE(changed->var) == CFG_VAR_STR)) replaced_num++; /* See the above comments for strings */ @@ -1090,6 +1088,10 @@ int cfg_commit(cfg_ctx_t *ctx) goto error0; } memset(replaced, 0 , size); + } else { + /* no replacement */ + LM_INFO("commit operation executed without having changes\n"); + return 0; } /* make sure that nobody else replaces the global config @@ -1104,11 +1106,9 @@ int cfg_commit(cfg_ctx_t *ctx) Note that the cycle relies on the order of the groups and group instances, i.e. the order is group + group_id + order of commits. */ replaced_num = 0; - for ( changed = ctx->changed_first, group = NULL; /* group points to the - last group array that has been cloned */ - changed; - changed = changed->next - ) { + for(changed = ctx->changed_first, group = NULL; /* group points to the + last group array that has been cloned */ + changed; changed = changed->next) { if (!changed->group_id_set) { p = CFG_GROUP_DATA(block, changed->group) + changed->var->offset;

6 years, 12 months

git:master:27186f1d: core: locking - rec lock init condition fixed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 27186f1d951c89c033bb02c6b446a630e1fce5d3 URL: https://github.com/kamailio/kamailio/commit/27186f1d951c89c033bb02c6b446a63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-18T08:24:15+02:00 core: locking - rec lock init condition fixed --- Modified: src/core/locking.c --- Diff: https://github.com/kamailio/kamailio/commit/27186f1d951c89c033bb02c6b446a63… Patch: https://github.com/kamailio/kamailio/commit/27186f1d951c89c033bb02c6b446a63… --- diff --git a/src/core/locking.c b/src/core/locking.c index a670f7e881..ebe4a9ab3c 100644 --- a/src/core/locking.c +++ b/src/core/locking.c @@ -39,7 +39,7 @@ rec_lock_t* rec_lock_alloc() rec_lock_t* rec_lock_init(rec_lock_t* rlock) { memset(rlock, 0, sizeof(rec_lock_t)); - if(lock_init(&rlock->lock)<0) { + if(lock_init(&rlock->lock)==0) { return NULL; } return rlock;

6 years, 12 months

git:master:6090f7d9: core: tcp read - set own handling for ECONNRESET

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6090f7d9de0c71b25bd66c3525b25de7d02a5aa1 URL: https://github.com/kamailio/kamailio/commit/6090f7d9de0c71b25bd66c3525b25de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-17T16:08:45+02:00 core: tcp read - set own handling for ECONNRESET --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/6090f7d9de0c71b25bd66c3525b25de… Patch: https://github.com/kamailio/kamailio/commit/6090f7d9de0c71b25bd66c3525b25de… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 77c63449b6..db3707b39e 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -278,6 +278,12 @@ int tcp_read_data(int fd, struct tcp_connection *c, switch(errno){ case ECONNRESET: TCP_STATS_CON_RESET(); +#ifdef USE_DST_BLACKLIST + dst_blacklist_su(BLST_ERR_SEND, c->rcv.proto, + &c->rcv.src_su, + &c->send_flags, 0); +#endif /* USE_DST_BLACKLIST */ + break; case ETIMEDOUT: #ifdef USE_DST_BLACKLIST dst_blacklist_su(BLST_ERR_SEND, c->rcv.proto,

6 years, 12 months

git:master:de8cd078: core: added log messages in case of errors

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: de8cd078385fd29c6ed9d5645dad14f8c6a97a0e URL: https://github.com/kamailio/kamailio/commit/de8cd078385fd29c6ed9d5645dad14f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-17T15:55:38+02:00 core: added log messages in case of errors - safer null string termination for description buffers --- Modified: src/core/action.c Modified: src/core/cfg/cfg_script.c Modified: src/core/data_lump.c Modified: src/core/fmsg.c Modified: src/core/pt.c Modified: src/core/receive.c Modified: src/core/select_core.c Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/de8cd078385fd29c6ed9d5645dad14f… Patch: https://github.com/kamailio/kamailio/commit/de8cd078385fd29c6ed9d5645dad14f…

6 years, 12 months

git:master:882449e3: core: msg translator - unified error handling to simplify freeing allocated memory

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 882449e3c0b1ac44cf810d079f696187af007451 URL: https://github.com/kamailio/kamailio/commit/882449e3c0b1ac44cf810d079f69618… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-17T15:54:13+02:00 core: msg translator - unified error handling to simplify freeing allocated memory --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/882449e3c0b1ac44cf810d079f69618… Patch: https://github.com/kamailio/kamailio/commit/882449e3c0b1ac44cf810d079f69618… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 1a20d0d005..070c6d349d 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -1987,7 +1987,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, if ( received_test(msg) ) { if ((received_buf=received_builder(msg,&received_len))==0){ LM_ERR("received_builder failed\n"); - goto error01; /* free also line_buf */ + goto error00; /* free also line_buf */ } } @@ -2000,7 +2000,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)){ if ((rport_buf=rport_builder(msg, &rport_len))==0){ LM_ERR("rport_builder failed\n"); - goto error01; /* free everything */ + goto error00; /* free everything */ } } @@ -2031,10 +2031,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, via_insert_param=anchor_lump(msg, msg->via1->hdr.s-buf+size, 0, HDR_VIA_T); } - if (via_insert_param==0) goto error02; /* free received_buf */ + if (via_insert_param==0) goto error00; /* free received_buf */ if (insert_new_lump_after(via_insert_param, received_buf, received_len, HDR_VIA_T) ==0 ) { - goto error02; /* free received_buf */ + goto error00; /* free received_buf */ } received_buf = NULL; } @@ -2049,10 +2049,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, via_insert_param=anchor_lump(msg, msg->via1->hdr.s-buf+size, 0, HDR_VIA_T); } - if (via_insert_param==0) goto error03; /* free rport_buf */ + if (via_insert_param==0) goto error00; /* free rport_buf */ if (insert_new_lump_after(via_insert_param, rport_buf, rport_len, HDR_VIA_T) ==0 ) { - goto error03; /* free rport_buf */ + goto error00; /* free rport_buf */ } rport_buf = NULL; } @@ -2091,10 +2091,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, HDR_ROUTE_T); } if (unlikely(path_anchor==0)) - goto error05; + goto error00; if (unlikely((path_lump=insert_new_lump_after(path_anchor, path_buf.s, path_buf.len, HDR_ROUTE_T))==0)) { - goto error05; + goto error00; } path_buf.s = NULL; } @@ -2150,7 +2150,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, if(likely(line_buf)) { if ((via_lump=insert_new_lump_before(via_anchor, line_buf, via_len, HDR_VIA_T))==0) { - goto error04; + goto error00; } line_buf = 0; } @@ -2204,17 +2204,12 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, *returned_len=new_len; return new_buf; -error01: -error02: -error03: -error04: -error05: +error00: if (received_buf) pkg_free(received_buf); if (rport_buf) pkg_free(rport_buf); if (path_buf.s) pkg_free(path_buf.s); if (line_buf) pkg_free(line_buf); -error00: *returned_len=0; return 0; }

6 years, 12 months

git:master:2654fbb0: core: handle error case also for socket fd 0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2654fbb0c02fd8df82ecd6b8514e031952997104 URL: https://github.com/kamailio/kamailio/commit/2654fbb0c02fd8df82ecd6b8514e031… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-17T07:55:36+02:00 core: handle error case also for socket fd 0 - avoid fd leak warnings by code analyzer --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/2654fbb0c02fd8df82ecd6b8514e031… Patch: https://github.com/kamailio/kamailio/commit/2654fbb0c02fd8df82ecd6b8514e031… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 1544ec4cbd..dd5a13bc60 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -882,7 +882,7 @@ int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, static int nl_bound_sock(void) { - int sock; + int sock = -1; struct sockaddr_nl la; sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); @@ -904,7 +904,7 @@ static int nl_bound_sock(void) return sock; error: - if(sock > 0) close(sock); + if(sock >= 0) close(sock); return -1; } @@ -930,7 +930,7 @@ static int get_flags(int family){ char buf[8192]; char *p = buf; int nll = 0; - int nl_sock = 0; + int nl_sock = -1; fill_nl_req(req, RTM_GETLINK, AF_INET); @@ -977,11 +977,11 @@ static int get_flags(int family){ ifaces[ifi->ifi_index].flags = ifi->ifi_flags; } - if(nl_sock>0) close(nl_sock); + if(nl_sock>=0) close(nl_sock); return 0; error: - if(nl_sock>0) close(nl_sock); + if(nl_sock>=0) close(nl_sock); return -1; } @@ -1004,9 +1004,9 @@ static int build_iface_list(void) int index, i; struct idx* entry; struct idx* tmp; - int nl_sock = 0; - int families[] = {AF_INET, AF_INET6}; - char name[MAX_IF_LEN]; + int nl_sock = -1; + int families[] = {AF_INET, AF_INET6}; + char name[MAX_IF_LEN]; int is_link_local = 0; if(ifaces == NULL){ @@ -1137,7 +1137,7 @@ static int build_iface_list(void) return 0; error: - if(nl_sock>0) close(nl_sock); + if(nl_sock>=0) close(nl_sock); return -1; }

6 years, 12 months

git:master:5250fa33: app_python: proper condition to free srcbuf in exception handling

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5250fa3302a4cb9bf9572ded6fb65fa9c067f08d URL: https://github.com/kamailio/kamailio/commit/5250fa3302a4cb9bf9572ded6fb65fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-16T11:40:16+02:00 app_python: proper condition to free srcbuf in exception handling --- Modified: src/modules/app_python/python_support.c --- Diff: https://github.com/kamailio/kamailio/commit/5250fa3302a4cb9bf9572ded6fb65fa… Patch: https://github.com/kamailio/kamailio/commit/5250fa3302a4cb9bf9572ded6fb65fa… --- diff --git a/src/modules/app_python/python_support.c b/src/modules/app_python/python_support.c index cb96eba407..57a14d0b08 100644 --- a/src/modules/app_python/python_support.c +++ b/src/modules/app_python/python_support.c @@ -60,7 +60,7 @@ void python_handle_exception(const char *fmt, ...) PyErr_NormalizeException(&exception, &v, &tb); if (exception == NULL) { LM_ERR("Can't get traceback, PyErr_NormalizeException() has failed.\n"); - if (buf) pkg_free(srcbuf); + if (srcbuf) pkg_free(srcbuf); return; } @@ -71,7 +71,7 @@ void python_handle_exception(const char *fmt, ...) Py_XDECREF(tb); if (args == NULL) { LM_ERR("Can't get traceback, PyTuple_Pack() has failed.\n"); - if (buf) pkg_free(srcbuf); + if (srcbuf) pkg_free(srcbuf); return; } @@ -79,7 +79,7 @@ void python_handle_exception(const char *fmt, ...) Py_DECREF(args); if (pResult == NULL) { LM_ERR("Can't get traceback, traceback.format_exception() has failed.\n"); - if (buf) pkg_free(srcbuf); + if (srcbuf) pkg_free(srcbuf); return; } @@ -89,7 +89,7 @@ void python_handle_exception(const char *fmt, ...) { LM_ERR("Can't allocate memory (%lu bytes), pkg_realloc() has failed." " Not enough memory.\n", (unsigned long)(buflen * sizeof(char *))); - if (buf) pkg_free(srcbuf); + if (srcbuf) pkg_free(srcbuf); return; } memset(buf, 0, buflen * sizeof(char)); @@ -101,7 +101,7 @@ void python_handle_exception(const char *fmt, ...) Py_DECREF(pResult); if (buf) pkg_free(buf); - if (buf) pkg_free(srcbuf); + if (srcbuf) pkg_free(srcbuf); return; } @@ -113,7 +113,7 @@ void python_handle_exception(const char *fmt, ...) Py_DECREF(pResult); if (buf) pkg_free(buf); - if (buf) pkg_free(srcbuf); + if (srcbuf) pkg_free(srcbuf); return; } @@ -127,7 +127,7 @@ void python_handle_exception(const char *fmt, ...) " Not enough memory.\n", (unsigned long)(buflen * sizeof(char *))); Py_DECREF(line); Py_DECREF(pResult); - if (buf) pkg_free(srcbuf); + if (srcbuf) pkg_free(srcbuf); return; }

7 years

git:master:5ea16d8d: avpops: few more pkg free in case of errors in fixup functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5ea16d8de71324e2eeb3c833cde76c52bdc8ac67 URL: https://github.com/kamailio/kamailio/commit/5ea16d8de71324e2eeb3c833cde76c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-16T11:29:36+02:00 avpops: few more pkg free in case of errors in fixup functions --- Modified: src/modules/avpops/avpops.c --- Diff: https://github.com/kamailio/kamailio/commit/5ea16d8de71324e2eeb3c833cde76c5… Patch: https://github.com/kamailio/kamailio/commit/5ea16d8de71324e2eeb3c833cde76c5… --- diff --git a/src/modules/avpops/avpops.c b/src/modules/avpops/avpops.c index 0a21418c19..c40edbf3a6 100644 --- a/src/modules/avpops/avpops.c +++ b/src/modules/avpops/avpops.c @@ -487,6 +487,7 @@ static int fixup_copy_avp(void** param, int param_no) if (ap->u.sval->type!=PVT_AVP) { LM_ERR("you must specify only AVP as parameter\n"); + pkg_free(ap); return E_UNSPEC; } @@ -686,9 +687,9 @@ static int fixup_check_avp(void** param, int param_no) LM_DBG("compiling regexp <%.*s>\n", ap->u.s.len, ap->u.s.s); if (regcomp(re, ap->u.s.s,REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { + LM_ERR("bad re <%.*s>\n", ap->u.s.len, ap->u.s.s); pkg_free(re); pkg_free(ap); - LM_ERR("bad re <%.*s>\n", ap->u.s.len, ap->u.s.s); return E_BAD_RE; } ap->u.s.s = (char*)re; @@ -897,6 +898,7 @@ static int fixup_op_avp(void** param, int param_no) if (ap->u.sval->type!=PVT_AVP) { LM_ERR("bad attribute name/alias <%s>!\n", s); + pkg_free(ap); pkg_free(av[0]); pkg_free(av); return E_UNSPEC;

7 years

git:master:51009ab4: avpops: several pkg free in case of errors in fixup functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 51009ab4f4aa6a229fab5abb94d4340f1178868b URL: https://github.com/kamailio/kamailio/commit/51009ab4f4aa6a229fab5abb94d4340… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-16T10:09:17+02:00 avpops: several pkg free in case of errors in fixup functions - cleaner pkg usage summary in case of errors at start up --- Modified: src/modules/avpops/avpops.c Modified: src/modules/avpops/avpops_db.c Modified: src/modules/avpops/avpops_parse.c --- Diff: https://github.com/kamailio/kamailio/commit/51009ab4f4aa6a229fab5abb94d4340… Patch: https://github.com/kamailio/kamailio/commit/51009ab4f4aa6a229fab5abb94d4340…

7 years

← Newer
1
...
23
24
25
26
27
28
29
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017