- sr-dev - kamailio.org

git:master:25f21809: textops: Fix 'offset exceeds message size' crash.
by codyherzog 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 25f2180999dafb807068313c4a329a163dd99f92 URL: https://github.com/kamailio/kamailio/commit/25f2180999dafb807068313c4a329a1… Author: codyherzog <cherzog(a)intouchhealth.com> Committer: codyherzog <cherzog(a)intouchhealth.com> Date: 2017-08-07T12:46:27-07:00 textops: Fix 'offset exceeds message size' crash. Ensure that buffer is null terminated when subst_run() function is used. --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/25f2180999dafb807068313c4a329a1… Patch: https://github.com/kamailio/kamailio/commit/25f2180999dafb807068313c4a329a1… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 5048fbae5d..655f638154 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -682,12 +682,19 @@ static int subst_helper_f(sip_msg_t* msg, struct subst_expr* se) int off; int ret; int nmatches; + char c; begin=get_header(msg); /* start after first line to avoid replacing * the uri */ off=begin-msg->buf; ret=-1; - if ((lst=subst_run(se, begin, msg, &nmatches))==0) + + c = msg->buf[msg->len]; + msg->buf[msg->len] = '\0'; + lst=subst_run(se, begin, msg, &nmatches); + msg->buf[msg->len] = c; + + if (lst==0) goto error; /* not found */ for (rpl=lst; rpl; rpl=rpl->next){ LM_DBG("%s: replacing at offset %d [%.*s] with [%.*s]\n", @@ -826,6 +833,7 @@ static int subst_body_helper_f(struct sip_msg* msg, struct subst_expr* se) int ret; int nmatches; str body; + char c; body.s = get_body(msg); if (body.s==0) { @@ -842,7 +850,13 @@ static int subst_body_helper_f(struct sip_msg* msg, struct subst_expr* se) off=begin-msg->buf; ret=-1; - if ((lst=subst_run(se, begin, msg, &nmatches))==0) + + c = body.s[body.len]; + body.s[body.len] = '\0'; + lst=subst_run(se, begin, msg, &nmatches); + body.s[body.len] = c; + + if (lst==0) goto error; /* not found */ for (rpl=lst; rpl; rpl=rpl->next){ LM_DBG("%s replacing at offset %d [%.*s] with [%.*s]\n",

1 0

git:master:9ce38204: http_client: proper free for curl params in case of failover connection
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 9ce38204d8a59e5d83cc50a2c809d1306346f9b7 URL: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T14:54:00+02:00 http_client: proper free for curl params in case of failover connection --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… Patch: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 1bdae25df7..ca26998606 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -464,12 +464,15 @@ int curl_get_redirect(struct sip_msg* _m, const str *connection, str* result) /*! Run a query based on a connection definition */ -int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* url, str* result, const char *contenttype, const str* post, int failover) +int curl_con_query_url_f(struct sip_msg* _m, const str *connection, + const str* url, str* result, const char *contenttype, + const str* post, int failover) { curl_con_t *conn = NULL; curl_con_pkg_t *pconn = NULL; char *urlbuf = NULL; char *postdata = NULL; + char *failovercon = NULL; curl_query_t query_params; unsigned int maxdatasize = default_maxdatasize; @@ -495,7 +498,6 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u LM_DBG("******** CURL Connection found %.*s\n", connection->len, connection->s); maxdatasize = conn->maxdatasize; - if (url && (url->len > 0) && (url->s != NULL)) { int url_len = conn->schema.len + 3 + conn->url.len + 1 + url->len + 1; urlbuf = pkg_malloc(url_len); @@ -552,7 +554,10 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u query_params.oneline = 0; query_params.maxdatasize = maxdatasize; query_params.http_proxy_port = conn->http_proxy_port; - query_params.failovercon = conn->failover.s ? as_asciiz(&conn->failover) : NULL; + if(conn->failover.s) { + failovercon = as_asciiz(&conn->failover); + } + query_params.failovercon = failovercon; query_params.pconn = pconn; if (conn->http_proxy) { query_params.http_proxy = conn->http_proxy; @@ -567,14 +572,19 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u int counter = failover + 1; if (counter >= 2) { LM_DBG("**** No more failovers - returning failure\n"); - return (res - 1000); + res = (res - 1000); + goto error; } /* Time for failover */ - return curl_con_query_url_f(_m, &conn->failover, url, result, contenttype, post, counter); + res = curl_con_query_url_f(_m, &conn->failover, url, result, + contenttype, post, counter); } - LM_DBG("***** #### ***** CURL DONE : %s \n", urlbuf); + LM_DBG("***** #### ***** CURL DONE: %s (%d)\n", urlbuf, res); error: + if (failovercon != NULL) { + pkg_free(failovercon); + } if (urlbuf != NULL) { pkg_free(urlbuf); }

1 0

git:master:1948fa53: kamailio.cfg: filter out sip scanner even when anti-flood is not enabled
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 1948fa5312b8ab836ace4ab76a383ed29b049ae6 URL: https://github.com/kamailio/kamailio/commit/1948fa5312b8ab836ace4ab76a383ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T14:21:08+02:00 kamailio.cfg: filter out sip scanner even when anti-flood is not enabled - better protection with default installation --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/1948fa5312b8ab836ace4ab76a383ed… Patch: https://github.com/kamailio/kamailio/commit/1948fa5312b8ab836ace4ab76a383ed… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index bce9d41a7e..067f0f680e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -562,12 +562,12 @@ route[REQINIT] { exit; } } - if($ua =~ "friendly-scanner|sipcli") { +#!endif + if($ua =~ "friendly-scanner|sipcli|VaxSIPUserAgent") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit; } -#!endif if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops");

1 0

git:master:37830f53: topos: use branch attributes to handle PRACK
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 37830f53b1f21fba5beef5d8e22913c431dcd708 URL: https://github.com/kamailio/kamailio/commit/37830f53b1f21fba5beef5d8e22913c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T13:52:45+02:00 topos: use branch attributes to handle PRACK --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/37830f53b1f21fba5beef5d8e22913c… Patch: https://github.com/kamailio/kamailio/commit/37830f53b1f21fba5beef5d8e22913c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 37b075ae94..23cfb07412 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -735,6 +735,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) str nuri; uint32_t direction = TPS_DIR_DOWNSTREAM; int ret; + int use_branch = 0; LM_DBG("handling incoming request\n"); @@ -761,8 +762,15 @@ int tps_request_received(sip_msg_t *msg, int dialog) tps_storage_lock_get(&lkey); - if(tps_storage_load_dialog(msg, &mtsd, &stsd)<0) { - goto error; + if((get_cseq(msg)->method_id)&(METHOD_PRACK)) { + if(tps_storage_load_branch(msg, &mtsd, &stsd)<0) { + goto error; + } + use_branch = 1; + } else { + if(tps_storage_load_dialog(msg, &mtsd, &stsd)<0) { + goto error; + } } /* detect direction - via from-tag */ @@ -791,14 +799,28 @@ int tps_request_received(sip_msg_t *msg, int dialog) return -1; } if(direction == TPS_DIR_UPSTREAM) { - if(tps_reappend_route(msg, &stsd, &stsd.a_rr, 0)<0) { - LM_ERR("failed to reappend a-route\n"); - return -1; + if(use_branch) { + if(tps_reappend_route(msg, &stsd, &stsd.x_rr, 0)<0) { + LM_ERR("failed to reappend x-route\n"); + return -1; + } + } else { + if(tps_reappend_route(msg, &stsd, &stsd.a_rr, 0)<0) { + LM_ERR("failed to reappend a-route\n"); + return -1; + } } } else { - if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { - LM_ERR("failed to reappend b-route\n"); - return -1; + if(use_branch) { + if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1)<0) { + LM_ERR("failed to reappend b-route\n"); + return -1; + } + } else { + if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { + LM_ERR("failed to reappend b-route\n"); + return -1; + } } } if(dialog!=0) {

1 0

git:master:8be0f000: tm: cleaner handling of dynamic regex param for t_check_status()
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 8be0f000f74cf08e0be6bc7d0a72cae948483416 URL: https://github.com/kamailio/kamailio/commit/8be0f000f74cf08e0be6bc7d0a72cae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T13:39:38+02:00 tm: cleaner handling of dynamic regex param for t_check_status() --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/8be0f000f74cf08e0be6bc7d0a72cae… Patch: https://github.com/kamailio/kamailio/commit/8be0f000f74cf08e0be6bc7d0a72cae… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 5adef0f02f..68071c3fe4 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -862,6 +862,7 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) char backup; int lowest_status, n, ret; fparam_t* fp; + regex_t* re0 = NULL; regex_t* re = NULL; str tmp; @@ -892,17 +893,18 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) memcpy(s, tmp.s, tmp.len); s[tmp.len] = '\0'; - if ((re = pkg_malloc(sizeof(regex_t))) == 0) { + if ((re0 = pkg_malloc(sizeof(regex_t))) == 0) { LM_ERR("No memory left\n"); goto error; } - if (regcomp(re, s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { + if (regcomp(re0, s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { LM_ERR("Bad regular expression '%s'\n", s); - pkg_free(re); - re = NULL; + pkg_free(re0); + re0 = NULL; goto error; } + re = re0; break; } @@ -953,9 +955,9 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) if (backup) status[msg->first_line.u.reply.status.len] = backup; if (s) pkg_free(s); - if (fp->type != FPARAM_REGEX) { - regfree(re); - pkg_free(re); + if (re0) { + regfree(re0); + pkg_free(re0); } if (unlikely(t && is_route_type(CORE_ONREPLY_ROUTE))){ @@ -975,9 +977,9 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) set_t(T_UNDEFINED, T_BR_UNDEFINED); } if (s) pkg_free(s); - if ((fp->type != FPARAM_REGEX) && re) { - regfree(re); - pkg_free(re); + if (re0) { + regfree(re0); + pkg_free(re0); } return -1; }

1 0

git:master:72e0ebcd: ctl: proper handling of realloc failure to avoid leak
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 72e0ebcdcbc5ffcd7ea475334437e56b22e143d4 URL: https://github.com/kamailio/kamailio/commit/72e0ebcdcbc5ffcd7ea475334437e56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T13:33:46+02:00 ctl: proper handling of realloc failure to avoid leak --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/72e0ebcdcbc5ffcd7ea475334437e56… Patch: https://github.com/kamailio/kamailio/commit/72e0ebcdcbc5ffcd7ea475334437e56… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index a84073a802..18122bfcef 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -1277,6 +1277,7 @@ static int rpc_rpl_printf(rpc_ctx_t* ctx, char* fmt, ...) { int n, buf_size; char* buf; + char* buf0; va_list ap; str s; struct text_chunk* l; @@ -1287,7 +1288,7 @@ static int rpc_rpl_printf(rpc_ctx_t* ctx, char* fmt, ...) ERR("No memory left\n"); return -1; } - + buf_size = RPC_BUF_SIZE; while (1) { /* Try to print in the allocated space. */ @@ -1314,11 +1315,12 @@ static int rpc_rpl_printf(rpc_ctx_t* ctx, char* fmt, ...) } else { /* glibc 2.0 */ buf_size *= 2; /* twice the old size */ } - if ((buf = ctl_realloc(buf, buf_size)) == 0) { + if ((buf0 = ctl_realloc(buf, buf_size)) == 0) { rpc_fault(ctx, 500, "Internal Server Error (No memory left)"); ERR("No memory left\n"); goto err; } + buf = buf0; } return 0; err:

1 0

git:master:91ebd257: path: fix for handling received parameter, issue added by format support
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 91ebd25726c7f4b8870e8934d60cdc7cb90d1970 URL: https://github.com/kamailio/kamailio/commit/91ebd25726c7f4b8870e8934d60cdc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T12:23:18+02:00 path: fix for handling received parameter, issue added by format support - reported by GH #1205 --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/91ebd25726c7f4b8870e8934d60cdc7… Patch: https://github.com/kamailio/kamailio/commit/91ebd25726c7f4b8870e8934d60cdc7…

1 0

git:master:5f0792e7: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 5f0792e7ee985b80601e6f952269bc48031e6356 URL: https://github.com/kamailio/kamailio/commit/5f0792e7ee985b80601e6f952269bc4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-07T11:31:22+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/5f0792e7ee985b80601e6f952269bc4… Patch: https://github.com/kamailio/kamailio/commit/5f0792e7ee985b80601e6f952269bc4… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 3e42389014..cf4bce61f6 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -32,6 +32,11 @@ Daniel-Constantin Mierla 3.5. branch_expire (int) 3.6. dialog_expire (int) 3.7. clean_interval (int) + 3.8. event_callback (str) + + 4. Event Routes + + 4.1. event_route[topos:msg-outgoing] List of Examples @@ -42,6 +47,8 @@ Daniel-Constantin Mierla 1.5. Set branch_expire parameter 1.6. Set dialog_expire parameter 1.7. Set clean_interval parameter + 1.8. Set event_callback parameter + 1.9. Usage of event_route[topos:msg-outgoing] Chapter 1. Admin Guide @@ -62,6 +69,11 @@ Chapter 1. Admin Guide 3.5. branch_expire (int) 3.6. dialog_expire (int) 3.7. clean_interval (int) + 3.8. event_callback (str) + + 4. Event Routes + + 4.1. event_route[topos:msg-outgoing] 1. Overview @@ -102,6 +114,7 @@ Chapter 1. Admin Guide 3.5. branch_expire (int) 3.6. dialog_expire (int) 3.7. clean_interval (int) + 3.8. event_callback (str) 3.1. storage (str) @@ -188,3 +201,49 @@ modparam("topos", "dialog_expire", 3600) ... modparam("topos", "clean_interval", 30) ... + +3.8. event_callback (str) + + The name of the function in the KEMI configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead of + event_route[...] blocks. + + The function receives a string parameter with the name of the event. + + Default value is 'empty' (no function is executed for events). + + Example 1.8. Set event_callback parameter +... +modparam("topos", "event_callback", "ksr_topos_event") +... +-- event callback function implemented in Lua +function ksr_topos_event(evname) + KSR.info("===== topos module triggered event: " .. evname .. "\n"); + return 1; +end +... + +4. Event Routes + + 4.1. event_route[topos:msg-outgoing] + +4.1. event_route[topos:msg-outgoing] + + It is executed before doing topology stripping processing for an + outgoing SIP message. If 'drop' is executed inside the event route, + then the module skips doing the topology hiding. + + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is not the one + to be sent out, but an internally generated one at startup, to avoid + reparsing the outgoing SIP message for the cases when topology hiding + is not wanted. + + Example 1.9. Usage of event_route[topos:msg-outgoing] +... +event_route[topos:msg-outgoing] { + if($sndto(ip)=="10.1.1.10") { + drop; + } +} +...

1 0

git:master:f6dc8715: topos: docs for event_callback param and event_route[topos:msg-outgoing]
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: f6dc87151138e600d593a345109ba2028d2dc16f URL: https://github.com/kamailio/kamailio/commit/f6dc87151138e600d593a345109ba20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T11:23:53+02:00 topos: docs for event_callback param and event_route[topos:msg-outgoing] --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f6dc87151138e600d593a345109ba20… Patch: https://github.com/kamailio/kamailio/commit/f6dc87151138e600d593a345109ba20… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 77de4b8cbd..bda8ab766d 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -223,7 +223,66 @@ modparam("topos", "clean_interval", 30) </programlisting> </example> </section> - + <section id="topos.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the KEMI configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[...] blocks. + </para> + <para> + The function receives a string parameter with the name of the event. + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topos", "event_callback", "ksr_topos_event") +... +-- event callback function implemented in Lua +function ksr_topos_event(evname) + KSR.info("===== topos module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> + </section> + <section> + <title>Event Routes</title> + <section> + <title>event_route[topos:msg-outgoing]</title> + <para> + It is executed before doing topology stripping processing for an outgoing + SIP message. If 'drop' is executed inside the event route, then the + module skips doing the topology hiding. + </para> + <para> + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is not the one + to be sent out, but an internally generated one at startup, to avoid + reparsing the outgoing SIP message for the cases when topology hiding + is not wanted. + </para> + <example> + <title>Usage of event_route[topos:msg-outgoing]</title> + <programlisting format="linespecific"> +... +event_route[topos:msg-outgoing] { + if($sndto(ip)=="10.1.1.10") { + drop; + } +} +... +</programlisting> + </example> + </section> </section> </chapter>

1 0

git:master:f16c0433: topos: added support for event_route[topos:msg-outgoing]
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: f16c0433e0190736b16d8346d1521e3c32b2e219 URL: https://github.com/kamailio/kamailio/commit/f16c0433e0190736b16d8346d1521e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T11:15:33+02:00 topos: added support for event_route[topos:msg-outgoing] - executed when a request is sent out - if drop() is used inside the event_route, then the request is no longer handled with topos --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f16c0433e0190736b16d8346d1521e3… Patch: https://github.com/kamailio/kamailio/commit/f16c0433e0190736b16d8346d1521e3… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 0141c0f2c3..4ed2628291 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -50,6 +50,9 @@ #include "../../core/parser/parse_to.h" #include "../../core/parser/parse_from.h" #include "../../core/timer_proc.h" +#include "../../core/fmsg.h" +#include "../../core/onsend.h" +#include "../../core/kemi.h" #include "../../lib/srdb1/db.h" #include "../../lib/srutils/sruid.h" @@ -81,11 +84,17 @@ extern int _tps_dialog_expire; int _tps_clean_interval = 60; +static int _tps_eventrt_outgoing = -1; +static str _tps_eventrt_callback = STR_NULL; +static str _tps_eventrt_name = str_init("topos:msg-outgoing"); + sanity_api_t scb; int tps_msg_received(sr_event_param_t *evp); int tps_msg_sent(sr_event_param_t *evp); +static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp); + /** module functions */ /* Module init function prototype */ static int mod_init(void); @@ -111,6 +120,7 @@ static param_export_t params[]={ {"branch_expire", PARAM_INT, &_tps_branch_expire}, {"dialog_expire", PARAM_INT, &_tps_dialog_expire}, {"clean_interval", PARAM_INT, &_tps_clean_interval}, + {"event_callback", PARAM_STR, &_tps_eventrt_callback}, {0,0,0} }; @@ -136,6 +146,17 @@ struct module_exports exports= { */ static int mod_init(void) { + _tps_eventrt_outgoing = route_lookup(&event_rt, _tps_eventrt_name.s); + if(_tps_eventrt_outgoing<0 + || event_rt.rlist[_tps_eventrt_outgoing]==NULL) { + _tps_eventrt_outgoing = -1; + } + + if(faked_msg_init()<0) { + LM_ERR("failed to init fmsg\n"); + return -1; + } + if(_tps_storage.len==2 && strncmp(_tps_storage.s, "db", 2)==0) { /* Find a database module */ if (db_bind_mod(&_tps_db_url, &_tpsdbf)) { @@ -352,6 +373,11 @@ int tps_msg_sent(sr_event_param_t *evp) int local; obuf = (str*)evp->data; + + if(tps_execute_event_route(NULL, evp)==1) { + return 0; + } + memset(&msg, 0, sizeof(sip_msg_t)); msg.buf = obuf->s; msg.len = obuf->len; @@ -408,6 +434,76 @@ int tps_get_branch_expire(void) /** * */ +static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) +{ + struct sip_msg *fmsg; + struct run_act_ctx ctx; + int rtb; + sr_kemi_eng_t *keng = NULL; + struct onsend_info onsnd_info = {0}; + + if(_tps_eventrt_outgoing<0) { + if(_tps_eventrt_callback.s!=NULL || _tps_eventrt_callback.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + _tps_eventrt_callback.s); + goto done; + } + } + } + + if(_tps_eventrt_outgoing<0 && keng==NULL) { + return 0; + } + + LM_DBG("executing event_route[topos:...] (%d)\n", + _tps_eventrt_outgoing); + fmsg = faked_msg_next(); + + onsnd_info.to = &evp->dst->to; + onsnd_info.send_sock = evp->dst->send_sock; + if(msg!=NULL) { + onsnd_info.buf = msg->buf; + onsnd_info.len = msg->len; + onsnd_info.msg = msg; + } else { + onsnd_info.buf = fmsg->buf; + onsnd_info.len = fmsg->len; + onsnd_info.msg = fmsg; + } + p_onsend = &onsnd_info; + + rtb = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + if(_tps_eventrt_outgoing>=0) { + run_top_route(event_rt.rlist[_tps_eventrt_outgoing], fmsg, &ctx); + } else { + if(keng!=NULL) { + if(keng->froute(fmsg, EVENT_ROUTE, + &_tps_eventrt_callback, &_tps_eventrt_name)<0) { + LM_ERR("error running event route kemi callback\n"); + p_onsend=NULL; + return -1; + } + } + } + set_route_type(rtb); + if(ctx.run_flags&DROP_R_F) { + LM_DBG("exit due to 'drop' in event route\n"); + p_onsend=NULL; + return 1; + } + +done: + p_onsend=NULL; + return 0; +} + +/** + * + */ int bind_topos(topos_api_t *api) { if (!api) { @@ -420,4 +516,4 @@ int bind_topos(topos_api_t *api) api->get_branch_expire = tps_get_branch_expire; return 0; -} +} \ No newline at end of file

1 0

git:master:f6b8bd17: core: parser - converted old log macros
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: f6b8bd17f167c0527fb240a9de71539e29b85f07 URL: https://github.com/kamailio/kamailio/commit/f6b8bd17f167c0527fb240a9de71539… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T09:16:15+02:00 core: parser - converted old log macros - indentation adjustments --- Modified: src/core/parser/hf.c Modified: src/core/parser/parse_allow.c Modified: src/core/parser/parse_content.c Modified: src/core/parser/parse_date.c Modified: src/core/parser/parse_event.c Modified: src/core/parser/parse_expires.c Modified: src/core/parser/parse_identity.c Modified: src/core/parser/parse_identityinfo.c Modified: src/core/parser/parse_methods.c Modified: src/core/parser/parse_refer_to.c Modified: src/core/parser/parse_retry_after.c Modified: src/core/parser/parse_rr.c Modified: src/core/parser/parse_sipifmatch.c Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/f6b8bd17f167c0527fb240a9de71539… Patch: https://github.com/kamailio/kamailio/commit/f6b8bd17f167c0527fb240a9de71539…

1 0

TOPOS on Edge-Proxy / Proxy-CSCF
by Carsten Bock 07 Aug '17

07 Aug '17

Hi, I think, I found one issue with Daniel's new (great) TOPOS module: I've configured it on my Edge-Proxy (aka. Proxy-CSCF) as a replacement for an SBC and I ran into a strange issue. Everything works fine, except in one Scenario: Both A and B Party are registered using the same Proxy, so TOPOS is triggered twice: On the originating Leg and on the terminating Leg. It works properly, if I'm just having one Leg on the Proxy (either because it's going to/coming from the Breakout Gateway or because the B-Party registered using a different Proxy). It appears to happen only, if the B-Party has a public IP, if no NAT involved (Wtf?!?), it actually happened initially when I called my mother. I've looked through the source-code but couldn't find a proper solution. Anyone an idea? Thanks, Carsten P.S: Please find attached a full trace of such call and the according database entries -- Carsten Bock CEO (Geschäftsführer) ng-voice GmbH Millerntorplatz 1 20359 Hamburg / Germany http://www.ng-voice.com mailto:carsten@ng-voice.com Office +49 40 5247593-40 Fax +49 40 5247593-99 Sitz der Gesellschaft: Hamburg Registergericht: Amtsgericht Hamburg, HRB 120189 Geschäftsführer: Carsten Bock Ust-ID: DE279344284 Hier finden Sie unsere handelsrechtlichen Pflichtangaben: http://www.ng-voice.com/imprint/

2 1

git:master:31726783: core: parse uri - converted log macros
by Daniel-Constantin Mierla 06 Aug '17

06 Aug '17

Module: kamailio Branch: master Commit: 31726783dfba54c7c84b680ddd0bae879c0ee9d3 URL: https://github.com/kamailio/kamailio/commit/31726783dfba54c7c84b680ddd0bae8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-06T09:06:08+02:00 core: parse uri - converted log macros --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/31726783dfba54c7c84b680ddd0bae8… Patch: https://github.com/kamailio/kamailio/commit/31726783dfba54c7c84b680ddd0bae8…

1 0

git:master:475ef89d: tls: updated log macros for config code
by Daniel-Constantin Mierla 05 Aug '17

05 Aug '17

Module: kamailio Branch: master Commit: 475ef89d6fc5780673c7e0091a78036e74f819db URL: https://github.com/kamailio/kamailio/commit/475ef89d6fc5780673c7e0091a78036… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-05T09:45:18+02:00 tls: updated log macros for config code --- Modified: src/modules/tls/tls_config.c --- Diff: https://github.com/kamailio/kamailio/commit/475ef89d6fc5780673c7e0091a78036… Patch: https://github.com/kamailio/kamailio/commit/475ef89d6fc5780673c7e0091a78036…

1 0

git:master:20af8da0: modules: readme files regenerated - websocket ... [skip ci]
by Kamailio Dev 04 Aug '17

04 Aug '17

Module: kamailio Branch: master Commit: 20af8da05513345ccb3d372e097c71a115ebe5a7 URL: https://github.com/kamailio/kamailio/commit/20af8da05513345ccb3d372e097c71a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-04T15:16:23+02:00 modules: readme files regenerated - websocket ... [skip ci] --- Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/20af8da05513345ccb3d372e097c71a… Patch: https://github.com/kamailio/kamailio/commit/20af8da05513345ccb3d372e097c71a… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 3541db94fb..158248654a 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -33,6 +33,7 @@ Peter Dunkley 4.6. sub_protocols (integer) 4.7. cors_mode (integer) 4.8. verbose_list (int) + 4.9. event_callback (str) 5. Functions @@ -68,10 +69,11 @@ Peter Dunkley 1.8. Set sub_protocols parameter 1.9. Set cors_mode parameter 1.10. Set verbose_list parameter - 1.11. ws_handle_handshake usage - 1.12. ws_close usage - 1.13. event_route[websocket:closed] usage - 1.14. $ws_conid usage + 1.11. Set event_callback parameter + 1.12. ws_handle_handshake usage + 1.13. ws_close usage + 1.14. event_route[websocket:closed] usage + 1.15. $ws_conid usage Chapter 1. Admin Guide @@ -99,6 +101,7 @@ Chapter 1. Admin Guide 4.6. sub_protocols (integer) 4.7. cors_mode (integer) 4.8. verbose_list (int) + 4.9. event_callback (str) 5. Functions @@ -341,6 +344,7 @@ onreply_route[WS_REPLY] { 4.6. sub_protocols (integer) 4.7. cors_mode (integer) 4.8. verbose_list (int) + 4.9. event_callback (str) 4.1. keepalive_mechanism (integer) @@ -457,6 +461,28 @@ modparam("websocket", "cors_mode", 2) modparam("websocket", "verbose_list", 1) ... +4.9. event_callback (str) + + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead of + event_route[...] blocks specific for websocket module. + + The function has one string parameter, the value is the name of the + event_route block, respectively "websocket:closed". + + Default value is 'empty' (no function is executed for events). + + Example 1.11. Set event_callback parameter +... +modparam("websocket", "event_callback", "ksr_websocket_event") +... +-- event callback function implemented in Lua +function ksr_websocket_event(evname) + KSR.info("===== websocket module triggered event: " .. evname .. "\n"); + return 1; +end +... + 5. Functions 5.1. ws_handle_handshake() @@ -476,7 +502,7 @@ Note This function returns 0, stopping all further processing of the request, when there is a problem. - Example 1.11. ws_handle_handshake usage + Example 1.12. ws_handle_handshake usage ... ws_handle_handshake(); ... @@ -501,7 +527,7 @@ Note This function can be used from ANY_ROUTE. - Example 1.12. ws_close usage + Example 1.13. ws_close usage ... ws_close(4000, "Because I say so"); ... @@ -615,7 +641,7 @@ kamcmd ws.enable connection closes. The connection may be identified using the the $si and $sp pseudo-variables. - Example 1.13. event_route[websocket:closed] usage + Example 1.14. event_route[websocket:closed] usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection from $si:$sp has closed\n"); @@ -631,7 +657,7 @@ event_route[websocket:closed] { Connection id of closed websocket connection. Can only be used in websocket:closed event route. - Example 1.14. $ws_conid usage + Example 1.15. $ws_conid usage ... event_route[websocket:closed] { xlog("L_INFO", "WebSocket connection with id $ws_conid has closed\n");

1 0

git:master:921c2f6a: websocket: documentation for event_callback parameter
by Daniel-Constantin Mierla 04 Aug '17

04 Aug '17

Module: kamailio Branch: master Commit: 921c2f6a53108ac4ddc3e262a479a46650412bce URL: https://github.com/kamailio/kamailio/commit/921c2f6a53108ac4ddc3e262a479a46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T15:10:50+02:00 websocket: documentation for event_callback parameter --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/921c2f6a53108ac4ddc3e262a479a46… Patch: https://github.com/kamailio/kamailio/commit/921c2f6a53108ac4ddc3e262a479a46… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index c887c05158..055498862e 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -445,6 +445,37 @@ modparam("websocket", "verbose_list", 1) </programlisting> </example> </section> + <section id="websocket.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[...] blocks specific for websocket module. + </para> + <para> + The function has one string parameter, the value is the name of + the event_route block, respectively "websocket:closed". + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("websocket", "event_callback", "ksr_websocket_event") +... +-- event callback function implemented in Lua +function ksr_websocket_event(evname) + KSR.info("===== websocket module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> </section>

1 0

git:master:e15f8d34: websocket: new parameter event_callback
by Daniel-Constantin Mierla 04 Aug '17

04 Aug '17

Module: kamailio Branch: master Commit: e15f8d34c5cdf83e0b3560873cd5909de99d3f97 URL: https://github.com/kamailio/kamailio/commit/e15f8d34c5cdf83e0b3560873cd5909… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T15:06:09+02:00 websocket: new parameter event_callback - allow setting the name of kemi function to be executed for event_route --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/e15f8d34c5cdf83e0b3560873cd5909… Patch: https://github.com/kamailio/kamailio/commit/e15f8d34c5cdf83e0b3560873cd5909… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index ec2833d839..b7c6e5e1fb 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -70,6 +70,8 @@ static int ws_keepalive_processes = DEFAULT_KEEPALIVE_PROCESSES; int ws_verbose_list = 0; +str ws_event_callback = STR_NULL; + static cmd_export_t cmds[] = { /* ws_frame.c */ { "ws_close", (cmd_function)w_ws_close0, @@ -105,6 +107,8 @@ static param_export_t params[] = { { "keepalive_processes", INT_PARAM, &ws_keepalive_processes }, { "verbose_list", PARAM_INT, &ws_verbose_list }, + { "event_callback", PARAM_STR, &ws_event_callback}, + { 0, 0, 0 } }; diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 3fd9207dcf..9fedf33f7b 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -29,6 +29,7 @@ #include "../../core/tcp_conn.h" #include "../../core/fmsg.h" #include "../../core/counters.h" +#include "../../core/kemi.h" #include "../../core/mem/mem.h" #include "ws_conn.h" #include "websocket.h" @@ -37,6 +38,7 @@ #define MAX_WS_CONNS_DUMP 50 extern int ws_verbose_list; +extern str ws_event_callback; ws_connection_t **wsconn_id_hash = NULL; #define wsconn_listadd tcpconn_listadd @@ -276,14 +278,25 @@ static void wsconn_run_route(ws_connection_t *wsc) int rt, backup_rt; struct run_act_ctx ctx; sip_msg_t *fmsg; + sr_kemi_eng_t *keng = NULL; + str evrtname = str_init("websocket:closed"); LM_DBG("wsconn_run_route event_route[websocket:closed]\n"); - rt = route_lookup(&event_rt, "websocket:closed"); + rt = route_lookup(&event_rt, evrtname.s); if (rt < 0 || event_rt.rlist[rt] == NULL) { - LM_DBG("route does not exist"); - return; + if(ws_event_callback.len<=0 || ws_event_callback.s==NULL) { + LM_DBG("event route does not exist"); + return; + } + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_DBG("event route callback engine does not exist"); + return; + } else { + rt = -1; + } } if (faked_msg_init() < 0) @@ -297,9 +310,18 @@ static void wsconn_run_route(ws_connection_t *wsc) fmsg->rcv = wsc->rcv; backup_rt = get_route_type(); - set_route_type(REQUEST_ROUTE); + set_route_type(EVENT_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); + if(rt<0) { + /* kemi script event route callback */ + if(keng && keng->froute(fmsg, EVENT_ROUTE, + &ws_event_callback, &evrtname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } else { + /* native cfg event route */ + run_top_route(event_rt.rlist[rt], fmsg, 0); + } set_route_type(backup_rt); }

1 0

git:master:6752351b: websocket: use route_lookup() instead of route_get()
by Daniel-Constantin Mierla 04 Aug '17

04 Aug '17

Module: kamailio Branch: master Commit: 6752351b69cd991cd11f389f80cf73bd68ff5bb9 URL: https://github.com/kamailio/kamailio/commit/6752351b69cd991cd11f389f80cf73b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T14:36:42+02:00 websocket: use route_lookup() instead of route_get() - avoid creating an empty route block structure if not defined in cfg --- Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/6752351b69cd991cd11f389f80cf73b… Patch: https://github.com/kamailio/kamailio/commit/6752351b69cd991cd11f389f80cf73b… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index ad3d216a83..3fd9207dcf 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -279,7 +279,7 @@ static void wsconn_run_route(ws_connection_t *wsc) LM_DBG("wsconn_run_route event_route[websocket:closed]\n"); - rt = route_get(&event_rt, "websocket:closed"); + rt = route_lookup(&event_rt, "websocket:closed"); if (rt < 0 || event_rt.rlist[rt] == NULL) { LM_DBG("route does not exist"); @@ -291,7 +291,7 @@ static void wsconn_run_route(ws_connection_t *wsc) LM_ERR("faked_msg_init() failed\n"); return; } - + fmsg = faked_msg_next(); wsc->rcv.proto_reserved1 = wsc->id; fmsg->rcv = wsc->rcv;

1 0

git:master:1c7fc2fe: misc/examples/kemi: fixed setting the failure route callback
by Daniel-Constantin Mierla 04 Aug '17

04 Aug '17

Module: kamailio Branch: master Commit: 1c7fc2feccba9ae1ad1f97e6fdd296f83dd5b097 URL: https://github.com/kamailio/kamailio/commit/1c7fc2feccba9ae1ad1f97e6fdd296f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-04T13:50:32+02:00 misc/examples/kemi: fixed setting the failure route callback --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua Modified: misc/examples/kemi/kamailio-basic-kemi-python.py Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/1c7fc2feccba9ae1ad1f97e6fdd296f… Patch: https://github.com/kamailio/kamailio/commit/1c7fc2feccba9ae1ad1f97e6fdd296f… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index 3d434893b4..5a051ad19f 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -102,7 +102,7 @@ function ksr_route_relay() if (METHOD=="INVITE") { if (KSR.tm.t_is_set("failure_route")<0) { - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); } } diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index 6a1b8d1f44..e92f4ec995 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -104,7 +104,7 @@ function ksr_route_relay() if KSR.pv.get("$rm")=="INVITE" then if KSR.tm.t_is_set("failure_route")<0 then - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); end end diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index 00b9bfa9f9..fa3c4707d6 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -131,7 +131,7 @@ def ksr_route_relay(self, msg): if KSR.pv.get("$rm")=="INVITE" : if KSR.tm.t_is_set("failure_route")<0 : - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); if KSR.tm.t_relay()<0 : KSR.sl.sl_reply_error(); diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index 2e4d44f4fc..9bf6c81f7a 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -105,7 +105,7 @@ function ksr_route_relay() if (METHOD=="INVITE") { if (KSR.tm.t_is_set("failure_route")<0) { - KSR.tm.t_on_failure("MANAGE_FAILURE"); + KSR.tm.t_on_failure("ksr_failure_manage"); } }

1 0

git:master:61d72c90: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 61d72c90a1a3fe34aad3cedb87a3e68529be34ac URL: https://github.com/kamailio/kamailio/commit/61d72c90a1a3fe34aad3cedb87a3e68… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-03T21:31:22+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/61d72c90a1a3fe34aad3cedb87a3e68… Patch: https://github.com/kamailio/kamailio/commit/61d72c90a1a3fe34aad3cedb87a3e68… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 4be5d66028..6c35f29858 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -911,6 +911,10 @@ end For example, 100 calls in 3-hosts group with rweight params 1/2/1 will be distributed as 25/50/25. After third host failing distribution will be changed to 33/67/0. + + “12” - dispatch to all destination in setid at once (parallel + forking). Note that the AVPs are no longer set with the values + of the destination records, no re-routing making sense in this + case. + “X” - if the algorithm is not implemented, the first entry in set is chosen. * limit - the maximum number of items to be stored in AVP list for

1 0

git:master:e84ee3be: dispatcher: documentation for parallel dispatching algorithm
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: e84ee3becbf59a5afc63510596cd62bae36d1962 URL: https://github.com/kamailio/kamailio/commit/e84ee3becbf59a5afc63510596cd62b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T19:05:59+02:00 dispatcher: documentation for parallel dispatching algorithm --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e84ee3becbf59a5afc63510596cd62b… Patch: https://github.com/kamailio/kamailio/commit/e84ee3becbf59a5afc63510596cd62b… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index b5315acc2d..a0d35eec8a 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1040,6 +1040,14 @@ end </listitem> <listitem> <para> + <quote>12</quote> - dispatch to all destination in setid at + once (parallel forking). Note that the AVPs are no longer set + with the values of the destination records, no re-routing + making sense in this case. + </para> + </listitem> + <listitem> + <para> <quote>X</quote> - if the algorithm is not implemented, the first entry in set is chosen. </para>

1 0

git:master:2ce57c44: dispatcher: new algorithm - parallel dispatching (12)
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 2ce57c44fee4eef112163e5dd6c712a0c68c79af URL: https://github.com/kamailio/kamailio/commit/2ce57c44fee4eef112163e5dd6c712a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T19:05:59+02:00 dispatcher: new algorithm - parallel dispatching (12) - send the request to all destinations from the setid at once - aka parallel forking to all address, so the AVPs are no longer set, not being needed for a re-routing --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/2ce57c44fee4eef112163e5dd6c712a… Patch: https://github.com/kamailio/kamailio/commit/2ce57c44fee4eef112163e5dd6c712a… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 90d670d8b7..0acf264618 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -75,6 +75,7 @@ #define DS_ALG_WEIGHT 9 #define DS_ALG_CALLLOAD 10 #define DS_ALG_RELWEIGHT 11 +#define DS_ALG_PARALLEL 12 static int _ds_table_version = DS_TABLE_VERSION; @@ -1693,6 +1694,86 @@ static inline int ds_update_dst( /** * */ +int ds_add_branches(sip_msg_t *msg, ds_set_t *idx, unsigned int hash, int mode) +{ + unsigned int i = 0; + str ruri = STR_NULL; + sip_uri_t *puri = NULL; + char buri[MAX_URI_SIZE]; + + if(hash+1>=idx->nr) { + /* nothing to add */ + return 0; + } + + if(mode==1) { + /* ruri updates */ + LM_DBG("adding branches with ruri\n"); + if(parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse sip msg uri\n"); + return -1; + } + puri = &msg->parsed_uri; + } else { + /* duri updates */ + LM_DBG("adding branches with duri\n"); + } + for(i=hash+1; i<idx->nr; i++) { + if(mode==1) { + /* ruri updates */ + if(puri->user.len<=0) { + /* no username to preserve */ + if(append_branch(msg, &idx->dlist[i].uri, NULL, NULL, + Q_UNSPECIFIED, 0, idx->dlist[i].sock, NULL, 0, + NULL, NULL)<0) { + LM_ERR("failed to add branch with ruri\n"); + return -1; + } + } else { + /* new uri from ruri username and dispatcher uri */ + if(idx->dlist[i].uri.len<6) { + LM_WARN("invalid dispatcher uri - skipping (%u)\n", i); + continue; + } + if(strncmp(idx->dlist[i].uri.s, "sips:", 5)==0) { + ruri.len = snprintf(buri, MAX_URI_SIZE, "sips:%.*s@%.*s", + puri->user.len, puri->user.s, + idx->dlist[i].uri.len-5, idx->dlist[i].uri.s+5); + } else { + if(strncmp(idx->dlist[i].uri.s, "sip:", 4)==0) { + ruri.len = snprintf(buri, MAX_URI_SIZE, "sip:%.*s@%.*s", + puri->user.len, puri->user.s, + idx->dlist[i].uri.len-4, idx->dlist[i].uri.s+4); + } else { + LM_WARN("unsupported protocol schema - ignoring\n"); + continue; + } + } + ruri.s = buri; + if(append_branch(msg, &ruri, NULL, NULL, + Q_UNSPECIFIED, 0, idx->dlist[i].sock, NULL, 0, + NULL, NULL)<0) { + LM_ERR("failed to add branch with user ruri\n"); + return -1; + } + } + } else { + /* duri updates */ + if(append_branch(msg, GET_RURI(msg), &idx->dlist[i].uri, NULL, + Q_UNSPECIFIED, 0, idx->dlist[i].sock, NULL, 0, + NULL, NULL)<0) { + LM_ERR("failed to add branch with duri\n"); + return -1; + } + } + + } + return 0; +} + +/** + * + */ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) { return ds_select_dst_limit(msg, set, alg, 0, mode); @@ -1839,6 +1920,9 @@ int ds_select_dst_limit( hash = idx->rwlist[idx->rwlast]; idx->rwlast = (idx->rwlast + 1) % 100; break; + case DS_ALG_PARALLEL: /* 12 - parallel dispatching */ + hash = 0; + break; default: LM_WARN("algo %d not implemented - using first entry...\n", alg); hash = 0; @@ -1887,6 +1971,15 @@ int ds_select_dst_limit( LM_DBG("selected [%d-%d/%d] <%.*s>\n", alg, set, hash, idx->dlist[hash].uri.len, idx->dlist[hash].uri.s); + if(alg == DS_ALG_PARALLEL) { + if(ds_add_branches(msg, idx, hash, mode)<0) { + LM_ERR("failed to add additional branches\n"); + /* one destination was already set - return success anyhow */ + return 2; + } + return 1; + } + if(!(ds_flags & DS_FAILOVER_ON)) return 1;

1 0

git:master:d58fdb7c: p_usrloc: fix dereference before null check in code path
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: d58fdb7c4e2e96a1bb2c64a47cc2b17e4bd03b4e URL: https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: fix dereference before null check in code path --- Modified: src/modules/p_usrloc/ul_db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17… Patch: https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17… --- diff --git a/src/modules/p_usrloc/ul_db_query.c b/src/modules/p_usrloc/ul_db_query.c index 6185e35d2f..eff45a07e1 100644 --- a/src/modules/p_usrloc/ul_db_query.c +++ b/src/modules/p_usrloc/ul_db_query.c @@ -37,13 +37,15 @@ int db_query(ul_db_handle_t * handle, db1_con_t *** _r_h, db_func_t ** _r_f, int i; int err[DB_NUM]; int ret = -1; - order_dbs(handle, order); - memset(err, 0 , sizeof(int) * DB_NUM); if(!handle || !table || !table->s || !_r_h) { LM_ERR("NULL pointer in parameter.\n"); return -1; } + + order_dbs(handle, order); + memset(err, 0 , sizeof(int) * DB_NUM); + i = 0; do { LM_DBG("now trying id %i, db %i.\n", handle->id, handle->db[order[i]].no);

1 0

git:master:f567695d: p_usrloc: remove unnecessary increment
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: f567695de9ecbb5a5bffe4e212a294df2753a519 URL: https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294d… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: remove unnecessary increment --- Modified: src/modules/p_usrloc/ul_db_watch.c --- Diff: https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294d… Patch: https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294d… --- diff --git a/src/modules/p_usrloc/ul_db_watch.c b/src/modules/p_usrloc/ul_db_watch.c index 903abb0b39..d736f942c9 100644 --- a/src/modules/p_usrloc/ul_db_watch.c +++ b/src/modules/p_usrloc/ul_db_watch.c @@ -145,7 +145,6 @@ void check_dbs(unsigned int ticks, void *param){ ul_db_check(handles->handle); } tmp = tmp->next; - i++; } lock_release(list_lock); }

1 0

git:master:3c9b1d30: p_usrloc: eliminate unused code
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 3c9b1d30f5350973bb6063ca207a3f0145f73ec5 URL: https://github.com/kamailio/kamailio/commit/3c9b1d30f5350973bb6063ca207a3f0… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: eliminate unused code --- Modified: src/modules/p_usrloc/ul_db_handle.c Modified: src/modules/p_usrloc/ul_db_handle.h --- Diff: https://github.com/kamailio/kamailio/commit/3c9b1d30f5350973bb6063ca207a3f0… Patch: https://github.com/kamailio/kamailio/commit/3c9b1d30f5350973bb6063ca207a3f0… --- diff --git a/src/modules/p_usrloc/ul_db_handle.c b/src/modules/p_usrloc/ul_db_handle.c index cf0dabdfa7..d827450916 100644 --- a/src/modules/p_usrloc/ul_db_handle.c +++ b/src/modules/p_usrloc/ul_db_handle.c @@ -301,80 +301,6 @@ int load_location_number(db_func_t * dbf, db1_con_t* dbh, int *loc_nr){ return 0; } -int load_handles(db_func_t * dbf, db1_con_t * dbh) { - static char query[UL_DB_QUERY_LEN]; - db1_res_t * res; - db_row_t * row; - ul_db_handle_list_t * element; - int i, id, query_len; - str tmp; - - if(!dbf || !dbh){ - LM_ERR("NULL parameter passed \n"); - return -1; - } - - query_len = 25 + id_col.len + reg_table.len; - - if(query_len > UL_DB_QUERY_LEN) { - LM_ERR("weird: query larger than %i bytes.\n", UL_DB_QUERY_LEN); - return -1; - } - - memset(query, 0, UL_DB_QUERY_LEN); - - if (sprintf(query, - "SELECT DISTINCT " - "%.*s " - "FROM " - "%.*s", - id_col.len, id_col.s, - reg_table.len, reg_table.s) < 0) { - LM_ERR("could not print query\n"); - return -1; - } - tmp.s = query; - tmp.len = strlen(query); - - if (dbf->raw_query (dbh, &tmp, &res) < 0) { - LM_ERR("in database query.\n"); - return -1; - } - - if (RES_ROW_N (res) == 0) { - dbf->free_result (dbh, res); - LM_DBG ("no data found\n"); - return 1; - } - - for (i = 0; i < RES_ROW_N (res); ++i) { - row = RES_ROWS (res) + i; - - if((element = allocate_handle_list()) == NULL) { - LM_ERR("couldnt allocate handle.\n"); - goto errout; - } - - if (VAL_NULL (ROW_VALUES(row) + 0)) { - LM_ERR("Weird: Empty ID-Field\n"); - goto errout; - } - - id = VAL_INT (ROW_VALUES(row) + 0); - if(load_data(dbf, dbh, element->handle, id) < 0){ - LM_ERR("couldn't load handle data.\n"); - goto errout; - } - element->next = db_handles; - db_handles = element; - } - dbf->free_result (dbh, res); - return 0; -errout: - dbf->free_result (dbh, res); - return -1; -} - int refresh_handles(db_func_t * dbf, db1_con_t * dbh) { ul_db_handle_list_t * element; int i; diff --git a/src/modules/p_usrloc/ul_db_handle.h b/src/modules/p_usrloc/ul_db_handle.h index b9b5ade276..9916dc56ac 100644 --- a/src/modules/p_usrloc/ul_db_handle.h +++ b/src/modules/p_usrloc/ul_db_handle.h @@ -71,7 +71,6 @@ void destroy_handles(void); int refresh_handles(db_func_t * dbf, db1_con_t * dbh); int load_location_number(db_func_t * dbf, db1_con_t * dbh, int*); -int load_handles(db_func_t * dbf, db1_con_t * dbh); ul_db_handle_t * get_handle(db_func_t * dbf, db1_con_t * dbh, str * first, str * second);

1 0

git:master:a72abf8b: p_usrloc: fix out-of-bounds read
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: a72abf8b1db2ecd8fabfd3e051d1bd61fd205a07 URL: https://github.com/kamailio/kamailio/commit/a72abf8b1db2ecd8fabfd3e051d1bd6… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: fix out-of-bounds read --- Modified: src/modules/p_usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/a72abf8b1db2ecd8fabfd3e051d1bd6… Patch: https://github.com/kamailio/kamailio/commit/a72abf8b1db2ecd8fabfd3e051d1bd6… --- diff --git a/src/modules/p_usrloc/udomain.c b/src/modules/p_usrloc/udomain.c index 11f0a131d6..227c0c4696 100644 --- a/src/modules/p_usrloc/udomain.c +++ b/src/modules/p_usrloc/udomain.c @@ -508,7 +508,7 @@ urecord_t* db_load_urecord_by_ruid(udomain_t* _d, str *_ruid) else order = &q_col; - if (ul_db_layer_query(_d, &vals[0].val.str_val, &vals[1].val.str_val, keys, 0, vals, columns, 1, 18, order, + if (ul_db_layer_query(_d, &vals[0].val.str_val, NULL, keys, 0, vals, columns, 1, 18, order, &res) < 0) { LM_ERR("db_query failed\n"); return 0;

1 0

git:master:2a67f799: p_usrloc: fix resource leak
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 2a67f79945475cfbe8d033b4df39018a73346db1 URL: https://github.com/kamailio/kamailio/commit/2a67f79945475cfbe8d033b4df39018… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: fix resource leak --- Modified: src/modules/p_usrloc/ul_db_layer.c --- Diff: https://github.com/kamailio/kamailio/commit/2a67f79945475cfbe8d033b4df39018… Patch: https://github.com/kamailio/kamailio/commit/2a67f79945475cfbe8d033b4df39018… --- diff --git a/src/modules/p_usrloc/ul_db_layer.c b/src/modules/p_usrloc/ul_db_layer.c index 36f02d5437..036adf23bb 100644 --- a/src/modules/p_usrloc/ul_db_layer.c +++ b/src/modules/p_usrloc/ul_db_layer.c @@ -218,27 +218,26 @@ int ul_add_domain_db(str * d, int t, str * url) { return -1; } memset(new_d, 0, sizeof(ul_domain_db_list_t)); - if(!d){ - return -1; - } - if(!d->s){ - return -1; - } + + if(!d || !d->s) goto error; + if((new_d->domain.name.s = pkg_malloc(d->len + 1)) == NULL) { - return -1; + goto error; } + if(t == DB_TYPE_SINGLE) { if(url) { LM_DBG("url: %.*s", url->len, url->s); if((new_d->domain.url.s = pkg_malloc(url->len + 1)) == NULL) { - return -1; + goto error; } + strncpy(new_d->domain.url.s, url->s, url->len); new_d->domain.url.s[url->len] = '\0'; new_d->domain.url.len = url->len; } else { if((new_d->domain.url.s = pkg_malloc(default_db_url.len + 1)) == NULL) { - return -1; + goto error; } strcpy(new_d->domain.url.s, default_db_url.s); new_d->domain.url.len = default_db_url.len; @@ -250,6 +249,9 @@ int ul_add_domain_db(str * d, int t, str * url) { new_d->next = domain_db_list; domain_db_list = new_d; return 1; +error: + pkg_free(new_d); + return -1; } ul_domain_db_t * ul_find_domain(const char * s) {

1 0

git:master:92f66e05: dispatcher: define values for dispatching algorithms
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 92f66e05b3b93c67acdaadfd2374cb91d01413f1 URL: https://github.com/kamailio/kamailio/commit/92f66e05b3b93c67acdaadfd2374cb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T07:29:57+02:00 dispatcher: define values for dispatching algorithms --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/92f66e05b3b93c67acdaadfd2374cb9… Patch: https://github.com/kamailio/kamailio/commit/92f66e05b3b93c67acdaadfd2374cb9…

1 0

git:master:b5bccd0f: db_text: missing breaks in checking db types compatibility
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: b5bccd0f4e14909b4a0ba2ab3957b2ea9b28ed0c URL: https://github.com/kamailio/kamailio/commit/b5bccd0f4e14909b4a0ba2ab3957b2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T05:03:24+02:00 db_text: missing breaks in checking db types compatibility --- Modified: src/modules/db_text/dbt_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/b5bccd0f4e14909b4a0ba2ab3957b2e… Patch: https://github.com/kamailio/kamailio/commit/b5bccd0f4e14909b4a0ba2ab3957b2e… --- diff --git a/src/modules/db_text/dbt_lib.c b/src/modules/db_text/dbt_lib.c index 3a1ec79eb8..0735c04c2e 100644 --- a/src/modules/db_text/dbt_lib.c +++ b/src/modules/db_text/dbt_lib.c @@ -442,30 +442,34 @@ int dbt_is_neq_type(db_type_t _t0, db_type_t _t1) case DB1_INT: if(_t0==DB1_DATETIME || _t0==DB1_BITMAP) return 0; - + break; case DB1_BIGINT: LM_ERR("BIGINT not supported\n"); return 0; - case DB1_DATETIME: if(_t0==DB1_INT) return 0; if(_t0==DB1_BITMAP) return 0; + break; case DB1_DOUBLE: break; case DB1_STRING: if(_t0==DB1_STR || _t0==DB1_BLOB) return 0; + break; case DB1_STR: if(_t0==DB1_STRING || _t0==DB1_BLOB) return 0; + break; case DB1_BLOB: if(_t0==DB1_STR || _t0==DB1_STRING) return 0; + break; case DB1_BITMAP: if (_t0==DB1_INT) return 0; + break; default: LM_ERR("invalid datatype %d\n", _t1); return 1; @@ -483,7 +487,6 @@ dbt_table_p dbt_db_get_temp_table(dbt_cache_p _dc) int hash; int hashidx; - if(!_dbt_cachetbl || !_dc) { LM_ERR("invalid parameter\n"); return NULL; @@ -500,8 +503,6 @@ dbt_table_p dbt_db_get_temp_table(dbt_cache_p _dc) _tbc = _dbt_cachetbl[hashidx].dtp; - - _tbc = dbt_table_new(&_s, &(_dc->name), NULL); _tbc->hash = hash; @@ -513,7 +514,6 @@ dbt_table_p dbt_db_get_temp_table(dbt_cache_p _dc) dbt_table_update_flags(_tbc, DBT_TBFL_TEMP, DBT_FL_SET, 0); - lock_release(&_dbt_cachetbl[hashidx].sem); return _tbc; }

1 0

git:master:b05f3637: cplc: safety checks for parameters
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: b05f3637f9cc829470d04037f6f5b88e37819706 URL: https://github.com/kamailio/kamailio/commit/b05f3637f9cc829470d04037f6f5b88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T05:02:41+02:00 cplc: safety checks for parameters --- Modified: src/modules/cplc/cpl_nonsig.c Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/b05f3637f9cc829470d04037f6f5b88… Patch: https://github.com/kamailio/kamailio/commit/b05f3637f9cc829470d04037f6f5b88… --- diff --git a/src/modules/cplc/cpl_nonsig.c b/src/modules/cplc/cpl_nonsig.c index d87c02d18f..ba53ee0ab6 100644 --- a/src/modules/cplc/cpl_nonsig.c +++ b/src/modules/cplc/cpl_nonsig.c @@ -230,11 +230,18 @@ void cpl_aux_process( int cmd_out, char *log_dir) LM_ERR("cannot set to IGNORE SIGCHLD signal\n"); } + file[0] = '\0'; + file_ptr = file; /* set the path for logging */ if (log_dir) { - strcpy( file, log_dir); - file_ptr = file + strlen(log_dir); - *(file_ptr++) = '/'; + if(strlen(log_dir)>=MAX_LOG_DIR_SIZE) { + /* fallback */ + LM_ERR("log dir path is too long, ignoring - check workdir\n"); + } else { + strcpy(file, log_dir); + file_ptr = file + strlen(log_dir); + *(file_ptr++) = '/'; + } } while(1) { diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index 4a99b2cbe4..2accfd21b9 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -873,6 +873,12 @@ inline static int is_lang_tag_matching(str *range,str *cpl_tag,str *cpl_subtag) str tag = {0,0}; str subtag = {0,0}; + if(range==NULL || cpl_tag==NULL || cpl_subtag==NULL) { + return -1; + } + if(range->s==NULL || cpl_tag->s==NULL || cpl_subtag->s==NULL) { + return -1; + } c = range->s; end = range->s + range->len;

1 0

[kamailio/kamailio] Unable to capture the SIP DATA (#1202)
by bharathg65 02 Aug '17

02 Aug '17

Dear Team, Any one pls help me , i have been struck with this more than 2 months , i have keep on changing the kamailio.cfg but nothing has worked . Initially i had plan to user captagent but unfortunately i couldn't run in CentOS since its failing in init procedure , because document which is provided in github is only for other OS . so planned to use kamailio as capture server . When ever i tried to run sipgrep , its showing data running on my server . And when i used command kamailio -c , i can see below interface is listening , but its not capturing any data and sending to mysql . root@localhost kamailio]# kamailio -c 0(6624) WARNING: <core> [ppcfg.c:221]: pp_ifdef_level_check(): different number of preprocessor directives: N(#!IF[N]DEF) - N(#!ENDIF) = 1 Listening on udp: 172.16.5.158:9060 Aliases: udp: localhost.localdom:9060 udp: localhost.localdomain:9060 And My sql is running fine without any issue . Any one can pls audit my configuration and advise me . because am New to Centos and homer . Thanks in advance -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1202

2 5

[kamailio/kamailio] Incorret code example in pipelimit documentation (#1201)
by Evgeniy 02 Aug '17

02 Aug '17

### Description In the documentation documentation for module pipelimit https://www.kamailio.org/docs/modules/4.2.x/modules/ratelimit.html has an error in example: ```# perform pipe match for authenticated user $var(limit) = 20; if (!pl_check("$au", "traildrop", "$var(limit)")) { pl_drop(); exit; } ``` If write algorithm "traildrop" in function pl_check, you every execution will get return code -2 and pipe not will be created. ### Possible Solutions Change string "traildrop" on "TAILDROP" ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 4.2.3 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1201

2 2

git:master:7bb4b7dc: pipelimit: match algorithm name case insensitive
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: master Commit: 7bb4b7dcc23c582ec666c71c9475e46e4ca12709 URL: https://github.com/kamailio/kamailio/commit/7bb4b7dcc23c582ec666c71c9475e46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T16:30:24+02:00 pipelimit: match algorithm name case insensitive --- Modified: src/modules/pipelimit/pl_ht.h --- Diff: https://github.com/kamailio/kamailio/commit/7bb4b7dcc23c582ec666c71c9475e46… Patch: https://github.com/kamailio/kamailio/commit/7bb4b7dcc23c582ec666c71c9475e46… --- diff --git a/src/modules/pipelimit/pl_ht.h b/src/modules/pipelimit/pl_ht.h index cb5b9822f5..d2feaf40d5 100644 --- a/src/modules/pipelimit/pl_ht.h +++ b/src/modules/pipelimit/pl_ht.h @@ -112,11 +112,11 @@ static inline int str_i_cmp(const str * a, const str * b) static inline int str_map_str(const str_map_t * map, const str * key, int * ret) { for (; map->str.s; map++) - if (! str_cmp(&map->str, key)) { + if (! str_i_cmp(&map->str, key)) { *ret = map->id; return 0; } - LM_DBG("str_map_str() failed map=%p key=%.*s\n", map, key->len, key->s); + LM_DBG("failed to match - map=%p key=%.*s\n", map, key->len, key->s); return -1; } @@ -131,7 +131,7 @@ static inline int str_map_int(const str_map_t * map, int key, str * ret) *ret = map->str; return 0; } - LM_DBG("str_map_str() failed map=%p key=%d\n", map, key); + LM_DBG("failed to match - failed map=%p key=%d\n", map, key); return -1; } @@ -144,7 +144,7 @@ static inline int str_cpy(str * dest, str * src) dest->len = src->len; dest->s = shm_malloc(src->len); if (! dest->s) { - LM_ERR("oom: '%.*s'\n", src->len, src->s); + LM_ERR("out of shared memory: '%.*s'\n", src->len, src->s); return -1; } memcpy(dest->s, src->s, src->len);

1 0

git:master:d3024229: tsilo: added section ids in docs
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: master Commit: d302422982aab79ec9af9b9d54d33dbf98dc7b63 URL: https://github.com/kamailio/kamailio/commit/d302422982aab79ec9af9b9d54d33db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T10:00:53+02:00 tsilo: added section ids in docs --- Modified: src/modules/tsilo/doc/tsilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d302422982aab79ec9af9b9d54d33db… Patch: https://github.com/kamailio/kamailio/commit/d302422982aab79ec9af9b9d54d33db… --- diff --git a/src/modules/tsilo/doc/tsilo_admin.xml b/src/modules/tsilo/doc/tsilo_admin.xml index 457aa7a219..e6cfe9b155 100644 --- a/src/modules/tsilo/doc/tsilo_admin.xml +++ b/src/modules/tsilo/doc/tsilo_admin.xml @@ -74,7 +74,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="tsilo.p.hash_size"> <title><varname>hash_size</varname> (integer)</title> <para> The size of the hash table internally used to keep the transaction. A @@ -97,7 +97,7 @@ modparam("tsilo", "hash_size", 1024) </example> </section> - <section> + <section id="tsilo.p.use_domain"> <title><varname>use_domain</varname> (integer)</title> <para> Specify if the domain part of the URI should be also saved and used for @@ -122,7 +122,7 @@ modparam("tsilo", "use_domain", 1) <section> <title>Functions</title> - <section> + <section id="tsilo.f.ts_store"> <title><function moreinfo="none">ts_store([uri])</function></title> <para> The method stores uri, tindex and tlabel of the current transaction. If @@ -146,7 +146,7 @@ if (is_method("INVITE")) { </programlisting> </example> </section> - <section> + <section id="tsilo.f.ts_append"> <title><function moreinfo="none">ts_append(domain, ruri)</function></title> <para> The method add branches to all the stored transactions for the &sip; @@ -184,7 +184,7 @@ if (is_method("REGISTER")) { </programlisting> </example> </section> - <section> + <section id="tsilo.f.ts_append_to"> <title><function moreinfo="none">ts_append_to(tindex, tlabel, domain, [uri])</function></title> <para> The method add branches to the transaction identified by tindex and tlabel, @@ -238,7 +238,7 @@ if (is_method("REGISTER")) { <section> <title>RPC Commands</title> - <section> + <section id="tsilo.rpc.ts.dump"> <title><varname>ts.dump</varname></title> <para>Dumps the content of the TSILO table</para> <para>Name: <emphasis>ts.dump</emphasis></para> @@ -247,7 +247,7 @@ if (is_method("REGISTER")) { kamcmd ts.dump </programlisting> </section> - <section> + <section id="tsilo.rpc.ts.lookup"> <title><varname>ts.lookup</varname></title> <para>Dumps the transactions stored for the given RURI</para> <para>Name: <emphasis>ts.lookup</emphasis></para> @@ -259,31 +259,31 @@ if (is_method("REGISTER")) { </section> <section> <title>Statistics</title> - <section> + <section id="tsilo.stat.stored_ruris"> <title><varname>stored_ruris</varname></title> <para> Number of ruris currently stored in the TSILO table. </para> </section> - <section> + <section id="tsilo.stat.stored_transactions"> <title><varname>stored_transactions</varname></title> <para> Number of transactions currently stored in the TSILO table. </para> </section> - <section> + <section id="tsilo.stat.added_branches"> <title><varname>added_branches</varname></title> <para> Total number of added branches from the startup. </para> </section> - <section> + <section id="tsilo.stat.total_ruris"> <title><varname>total_ruris</varname></title> <para> Total number of stored ruris from the startup. </para> </section> - <section> + <section id="tsilo.stat.total_transactions"> <title><varname>total_transactions</varname></title> <para> Total number of stored transactions from the startup.

1 0

git:4.4:c5657b73: tls: explicit libssl v1.1+ cleanup when module is destroyed
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: 4.4 Commit: c5657b7386f8be722e3d87c70b9e049d2b843c0d URL: https://github.com/kamailio/kamailio/commit/c5657b7386f8be722e3d87c70b9e049… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T12:56:03+02:00 tls: explicit libssl v1.1+ cleanup when module is destroyed - OPENSSL_cleanup() explicitely executed for libssl v1.1+ when tls module is destroyed, to avoid being executed again on final exit (due to atexit() callback), because at that moment shared memory is already destroyed and attempts to access the locals will result in cored dump - retported by Victor Seva, GH #1189 (cherry picked from commit 00eb71da83347c9d2ea74feacec9c955f7b2a2e6) (cherry picked from commit 071b85f66cabaa3a705a014b26b7c1eb31029b26) --- Modified: modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/c5657b7386f8be722e3d87c70b9e049… Patch: https://github.com/kamailio/kamailio/commit/c5657b7386f8be722e3d87c70b9e049… --- diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index 133bc7fc83..1ce9d716a5 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -778,4 +778,10 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); +#if OPENSSL_VERSION_NUMBER >= 0x010100000L + /* explicit execution of libssl cleanup to avoid being executed again + * by atexit(), when shm is gone */ + DBG("executing openssl v1.1+ cleanup\n"); + OPENSSL_cleanup(); +#endif }

1 0

git:5.0:071b85f6: tls: explicit libssl v1.1+ cleanup when module is destroyed
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: 5.0 Commit: 071b85f66cabaa3a705a014b26b7c1eb31029b26 URL: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T10:02:45+02:00 tls: explicit libssl v1.1+ cleanup when module is destroyed - OPENSSL_cleanup() explicitely executed for libssl v1.1+ when tls module is destroyed, to avoid being executed again on final exit (due to atexit() callback), because at that moment shared memory is already destroyed and attempts to access the locals will result in cored dump - retported by Victor Seva, GH #1189 (cherry picked from commit 00eb71da83347c9d2ea74feacec9c955f7b2a2e6) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1e… Patch: https://github.com/kamailio/kamailio/commit/071b85f66cabaa3a705a014b26b7c1e… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 5d977fc810..b12209a0cd 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -778,4 +778,10 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); +#if OPENSSL_VERSION_NUMBER >= 0x010100000L + /* explicit execution of libssl cleanup to avoid being executed again + * by atexit(), when shm is gone */ + DBG("executing openssl v1.1+ cleanup\n"); + OPENSSL_cleanup(); +#endif }

1 0

git:master:00eb71da: tls: explicit libssl v1.1+ cleanup when module is destroyed
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: master Commit: 00eb71da83347c9d2ea74feacec9c955f7b2a2e6 URL: https://github.com/kamailio/kamailio/commit/00eb71da83347c9d2ea74feacec9c95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T09:54:18+02:00 tls: explicit libssl v1.1+ cleanup when module is destroyed - OPENSSL_cleanup() explicitely executed for libssl v1.1+ when tls module is destroyed, to avoid being executed again on final exit (due to atexit() callback), because at that moment shared memory is already destroyed and attempts to access the locals will result in cored dump - retported by Victor Seva, GH #1189 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/00eb71da83347c9d2ea74feacec9c95… Patch: https://github.com/kamailio/kamailio/commit/00eb71da83347c9d2ea74feacec9c95… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 6d78c37551..054d687e9c 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -847,4 +847,10 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); +#if OPENSSL_VERSION_NUMBER >= 0x010100000L + /* explicit execution of libssl cleanup to avoid being executed again + * by atexit(), when shm is gone */ + DBG("executing openssl v1.1+ cleanup\n"); + OPENSSL_cleanup(); +#endif }

1 0

git:master:62f573d4: kamctl: fix dangerous 'rm -rf' code in case if variables are not defined
by Daniel-Constantin Mierla 02 Aug '17

02 Aug '17

Module: kamailio Branch: master Commit: 62f573d4ecbbebe5f0f2d3b39be7ad4c2b460e65 URL: https://github.com/kamailio/kamailio/commit/62f573d4ecbbebe5f0f2d3b39be7ad4… Author: Alexander Lutay <alutay(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-02T09:06:05+02:00 kamctl: fix dangerous 'rm -rf' code in case if variables are not defined --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/62f573d4ecbbebe5f0f2d3b39be7ad4… Patch: https://github.com/kamailio/kamailio/commit/62f573d4ecbbebe5f0f2d3b39be7ad4… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 30d5878482..3aaecbd15a 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2614,7 +2614,7 @@ tls_ca() { merr "Failed to create root directory $CA_PATH" exit 1 fi - rm -fr $CA_PATH/* + rm -fr "${CA_PATH:?}"/* mkdir $CA_PATH/private mkdir $CA_PATH/certs touch $CA_PATH/index.txt @@ -2685,7 +2685,7 @@ tls_ca() { merr "Failed to create user directory $USER_DIR " exit 1 fi - rm -fr $USER_DIR/* + rm -fr "${USER_DIR:?}"/* mecho "Creating user certificate request" openssl req -config $USER_CFG -out $USER_DIR/$USER-cert_req.pem \

1 0

[kamailio/kamailio] kamctl: fix dangerous 'rm -rf' code in case if variables are not defined (#1200)
by Alex Lutay 02 Aug '17

02 Aug '17

Hi, kamctl has a historical bomb which can be new https://github.com/MrMEEE/bumblebee-Old-and-abbandoned/issues/123 in case if variables are undefined for some reason. Have fun! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1200 -- Commit Summary -- * kamctl: fix dangerous 'rm -rf' code in case if variables are not defined -- File Changes -- M utils/kamctl/kamctl (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1200.patch https://github.com/kamailio/kamailio/pull/1200.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1200

2 2

git:master:e39dd796: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: e39dd796a40fb01881858ccf4415fdcfa8529778 URL: https://github.com/kamailio/kamailio/commit/e39dd796a40fb01881858ccf4415fdc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-01T13:31:30+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/e39dd796a40fb01881858ccf4415fdc… Patch: https://github.com/kamailio/kamailio/commit/e39dd796a40fb01881858ccf4415fdc… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index d4d8701859..848279a2c2 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -380,9 +380,8 @@ modparam("uac","credential","username:domain:password") This can be used if the realm upstream will be using is not known in advance. - If you define it, you also need to define “auth_username_avp” - (Section 3.10, “auth_username_avp (string)”) and “auth_username_avp” - (Section 3.11, “auth_password_avp (string)”). + If you define it, you also need to define “auth_username_avp” (???) and + “auth_username_avp” (???). Example 1.9. Set auth_realm_avp parameter ... @@ -394,9 +393,8 @@ modparam("uac","auth_realm_avp","$avp(i:10)") The definition of an AVP that might contain the username to be used to perform authentication. - If you define it, you also need to define “auth_realm_avp” - (Section 3.9, “auth_realm_avp (string)”) and “auth_username_avp” - (Section 3.11, “auth_password_avp (string)”). + If you define it, you also need to define “auth_realm_avp” (???) and + “auth_username_avp” (???). Example 1.10. Set auth_username_avp parameter ... @@ -408,9 +406,8 @@ modparam("uac","auth_username_avp","$avp(i:11)") The definition of an AVP that might contain the password to be used to perform authentication. - If you define it, you also need to define “auth_password_avp” - (Section 3.11, “auth_password_avp (string)”) and “auth_username_avp” - (Section 3.11, “auth_password_avp (string)”). + If you define it, you also need to define “auth_password_avp” (???) and + “auth_username_avp” (???). Example 1.11. Set auth_password_avp parameter ...

1 0

git:master:d1d2dda4: uac: fixes for section ids in docs
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: d1d2dda40e1ac787a021c4ea9f9e179870dea99a URL: https://github.com/kamailio/kamailio/commit/d1d2dda40e1ac787a021c4ea9f9e179… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T13:30:26+02:00 uac: fixes for section ids in docs --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d1d2dda40e1ac787a021c4ea9f9e179… Patch: https://github.com/kamailio/kamailio/commit/d1d2dda40e1ac787a021c4ea9f9e179…

1 0

[kamailio/kamailio] pkg/kamailio: Fixed systemd unit failure on server boot (#1148)
by sergey-safarov 01 Aug '17

01 Aug '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1148 -- Commit Summary -- * pkg/kamailio: Fixed systemd unit failure on server boot -- File Changes -- M pkg/kamailio/centos/7/kamailio.service (4) M pkg/kamailio/fedora/17/kamailio.service (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1148.patch https://github.com/kamailio/kamailio/pull/1148.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1148

2 3

git:4.4:910f3c6d: pkg/kamailio: Fixed systemd unit failure on server boot
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: 4.4 Commit: 910f3c6da1cf0a3b154357a549a5f687cf4ba6ee URL: https://github.com/kamailio/kamailio/commit/910f3c6da1cf0a3b154357a549a5f68… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:58:25+02:00 pkg/kamailio: Fixed systemd unit failure on server boot --- Modified: pkg/kamailio/centos/7/kamailio.service Modified: pkg/kamailio/fedora/17/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/910f3c6da1cf0a3b154357a549a5f68… Patch: https://github.com/kamailio/kamailio/commit/910f3c6da1cf0a3b154357a549a5f68… --- diff --git a/pkg/kamailio/centos/7/kamailio.service b/pkg/kamailio/centos/7/kamailio.service index 9de06c43b0..6332a5301d 100644 --- a/pkg/kamailio/centos/7/kamailio.service +++ b/pkg/kamailio/centos/7/kamailio.service @@ -1,6 +1,8 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Documentation=man:kamailio(8) https://www.kamailio.org/ +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/fedora/17/kamailio.service b/pkg/kamailio/fedora/17/kamailio.service index 2f4ac95df5..61457e5fd6 100644 --- a/pkg/kamailio/fedora/17/kamailio.service +++ b/pkg/kamailio/fedora/17/kamailio.service @@ -1,6 +1,8 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=syslog.target network.target +Documentation=man:kamailio(8) https://www.kamailio.org/ +Wants=network-online.target +After=syslog.target network-online.target [Service] Type=forking

1 0

git:4.4:d447aca2: pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: 4.4 Commit: d447aca24fef404f0ad5449542c3da615498cb2c URL: https://github.com/kamailio/kamailio/commit/d447aca24fef404f0ad5449542c3da6… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:56:29+02:00 pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 --- Modified: pkg/kamailio/centos/7/kamailio.service Modified: pkg/kamailio/fedora/17/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/d447aca24fef404f0ad5449542c3da6… Patch: https://github.com/kamailio/kamailio/commit/d447aca24fef404f0ad5449542c3da6… --- diff --git a/pkg/kamailio/centos/7/kamailio.service b/pkg/kamailio/centos/7/kamailio.service index 5e4e67a660..9de06c43b0 100644 --- a/pkg/kamailio/centos/7/kamailio.service +++ b/pkg/kamailio/centos/7/kamailio.service @@ -14,7 +14,7 @@ PIDFile=/run/kamailio/kamailio.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY ExecStopPost=/usr/bin/rm -f /var/run/kamailio.pid -Restart=on-abort +Restart=on-failure User=kamailio Group=daemon ; For each TCP or TLS endpoint connection is requred file descriptor diff --git a/pkg/kamailio/fedora/17/kamailio.service b/pkg/kamailio/fedora/17/kamailio.service index a8d59b0c0c..2f4ac95df5 100644 --- a/pkg/kamailio/fedora/17/kamailio.service +++ b/pkg/kamailio/fedora/17/kamailio.service @@ -8,7 +8,7 @@ EnvironmentFile=/etc/sysconfig/kamailio PIDFile=/var/run/kamailio.pid ExecStart=/usr/sbin/kamailio -P /var/run/kamailio.pid $OPTIONS ExecStopPost=/usr/bin/rm -f /var/run/kamailio.pid -Restart=on-abort +Restart=on-failure [Install] WantedBy=multi-user.target

1 0

[kamailio/kamailio] pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 (#1198)
by sergey-safarov 01 Aug '17

01 Aug '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1198 -- Commit Summary -- * pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 -- File Changes -- M pkg/kamailio/centos/7/kamailio.service (2) M pkg/kamailio/fedora/17/kamailio.service (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1198.patch https://github.com/kamailio/kamailio/pull/1198.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1198

2 1

git:master:af30ab2d: pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: af30ab2dcd6d67bc86f9ce86be0abf9014cbfd8d URL: https://github.com/kamailio/kamailio/commit/af30ab2dcd6d67bc86f9ce86be0abf9… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:55:25+02:00 pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 --- Modified: pkg/kamailio/centos/7/kamailio.service Modified: pkg/kamailio/fedora/17/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/af30ab2dcd6d67bc86f9ce86be0abf9… Patch: https://github.com/kamailio/kamailio/commit/af30ab2dcd6d67bc86f9ce86be0abf9… --- diff --git a/pkg/kamailio/centos/7/kamailio.service b/pkg/kamailio/centos/7/kamailio.service index bde8608137..1117e41608 100644 --- a/pkg/kamailio/centos/7/kamailio.service +++ b/pkg/kamailio/centos/7/kamailio.service @@ -16,7 +16,7 @@ PIDFile=/run/kamailio/kamailio.pid # ExecStart requires a full absolute path ExecStart=/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY ExecStopPost=/usr/bin/rm -f /run/kamailio/kamailio.pid -Restart=on-abort +Restart=on-failure User=kamailio Group=daemon ; For each TCP or TLS endpoint connection is requred file descriptor diff --git a/pkg/kamailio/fedora/17/kamailio.service b/pkg/kamailio/fedora/17/kamailio.service index 4b2039b818..61457e5fd6 100644 --- a/pkg/kamailio/fedora/17/kamailio.service +++ b/pkg/kamailio/fedora/17/kamailio.service @@ -10,7 +10,7 @@ EnvironmentFile=/etc/sysconfig/kamailio PIDFile=/var/run/kamailio.pid ExecStart=/usr/sbin/kamailio -P /var/run/kamailio.pid $OPTIONS ExecStopPost=/usr/bin/rm -f /var/run/kamailio.pid -Restart=on-abort +Restart=on-failure [Install] WantedBy=multi-user.target

1 0

[kamailio/kamailio] pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 (#1197)
by sergey-safarov 01 Aug '17

01 Aug '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1197 -- Commit Summary -- * pkg/kamailio: Added systemd unit relanch after non null exit code. Fix of ticket 1085 -- File Changes -- M pkg/kamailio/centos/7/kamailio.service (2) M pkg/kamailio/fedora/17/kamailio.service (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1197.patch https://github.com/kamailio/kamailio/pull/1197.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1197

2 1

git:master:5e098077: carrierroute: avoid ovverruning a fixed sized buffer
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: 5e098077525b2d06834a03f69ea246835af6f11c URL: https://github.com/kamailio/kamailio/commit/5e098077525b2d06834a03f69ea2468… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrierroute: avoid ovverruning a fixed sized buffer --- Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/5e098077525b2d06834a03f69ea2468… Patch: https://github.com/kamailio/kamailio/commit/5e098077525b2d06834a03f69ea2468… --- diff --git a/src/modules/carrierroute/cr_fifo.c b/src/modules/carrierroute/cr_fifo.c index bab8bab41f..ff183e85f5 100644 --- a/src/modules/carrierroute/cr_fifo.c +++ b/src/modules/carrierroute/cr_fifo.c @@ -1074,14 +1074,19 @@ static int cr_rpc_dump_tree_recursor (rpc_t* rpc, void* ctx, void *gh, char s[256]; char rbuf[1024]; char *p; - int i; + int i,len; struct route_flags *rf; struct route_rule *rr; struct route_rule_p_list * rl; double prob; + len=strlen(prefix); + if (len > 254) { + LM_ERR("prefix too large"); + return -1; + } strcpy (s, prefix); - p = s + strlen (s); + p = s + len; p[1] = '\0'; for (i = 0; i < cr_match_mode; ++i) { if (node->child[i] != NULL) { @@ -1101,7 +1106,7 @@ static int cr_rpc_dump_tree_recursor (rpc_t* rpc, void* ctx, void *gh, } snprintf(rbuf, 1024, "%10s: %0.3f %%, '%.*s': %s, '%i', '%.*s', '%.*s', '%.*s'", - strlen(prefix) > 0 ? prefix : "NULL", prob * 100, + len > 0 ? prefix : "NULL", prob * 100, rr->host.len, rr->host.s, (rr->status ? "ON" : "OFF"), rr->strip, rr->local_prefix.len, rr->local_prefix.s,

1 0

git:master:9c793833: carrierroute: avoid truncating value returned by fgetc
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: 9c793833f4b56f02cf692533ad515d87d6341bf4 URL: https://github.com/kamailio/kamailio/commit/9c793833f4b56f02cf692533ad515d8… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrierroute: avoid truncating value returned by fgetc --- Modified: src/modules/carrierroute/cr_config.c --- Diff: https://github.com/kamailio/kamailio/commit/9c793833f4b56f02cf692533ad515d8… Patch: https://github.com/kamailio/kamailio/commit/9c793833f4b56f02cf692533ad515d8… --- diff --git a/src/modules/carrierroute/cr_config.c b/src/modules/carrierroute/cr_config.c index 2d1af1ecfe..40523d9544 100644 --- a/src/modules/carrierroute/cr_config.c +++ b/src/modules/carrierroute/cr_config.c @@ -111,7 +111,8 @@ static int init_prefix_opts(){ static int backup_config(void) { FILE * from, * to; - char * backup_file, ch; + char * backup_file; + int ch; LM_INFO("start configuration backup\n"); if((backup_file = pkg_malloc(strlen(config_file) + strlen (".bak") + 1)) == NULL){ PKG_MEM_ERROR;

1 0

git:master:f152fc45: carrierroute: check return value for fseek
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: f152fc4586b42fb8a26b01d0c40e41e143972b9a URL: https://github.com/kamailio/kamailio/commit/f152fc4586b42fb8a26b01d0c40e41e… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrierroute: check return value for fseek --- Modified: src/modules/carrierroute/parser_carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/f152fc4586b42fb8a26b01d0c40e41e… Patch: https://github.com/kamailio/kamailio/commit/f152fc4586b42fb8a26b01d0c40e41e… --- diff --git a/src/modules/carrierroute/parser_carrierroute.c b/src/modules/carrierroute/parser_carrierroute.c index 535e1f9f19..c6fbf933f9 100644 --- a/src/modules/carrierroute/parser_carrierroute.c +++ b/src/modules/carrierroute/parser_carrierroute.c @@ -236,7 +236,10 @@ int parse_options(FILE* file, option_description* opts, int no_options, char* en /* parsing stops when end_str is reached: e.g: }, target */ if ( strncmp(data.s, end_str, strlen(end_str)) == 0){ LM_DBG("End of options list received \n"); - fseek(file, -full_line_len, SEEK_CUR); + if (fseek(file, -full_line_len, SEEK_CUR) != 0){ + LM_ERR("fseek failed: %s",strerror(errno)); + break; + } ret = SUCCESSFUL_PARSING; break; } @@ -385,9 +388,11 @@ int parse_struct_header(FILE* file, char* expected_struct_type, str* struct_name memcpy(struct_name->s, name, struct_name->len); struct_name->s[struct_name->len]='\0'; } - else - fseek(file, -full_line_len, SEEK_CUR); - + else{ + if (fseek(file, -full_line_len, SEEK_CUR) != 0){ + LM_ERR("fseek failed: %s",strerror(errno)); + } + } return ret; }

1 0

git:master:40615aaa: carrierroute: avoid comparing size_t types with negative values
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: 40615aaa64a6a2b3affa112502bec58eda47d9a0 URL: https://github.com/kamailio/kamailio/commit/40615aaa64a6a2b3affa112502bec58… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrierroute: avoid comparing size_t types with negative values --- Modified: src/modules/carrierroute/cr_db.c --- Diff: https://github.com/kamailio/kamailio/commit/40615aaa64a6a2b3affa112502bec58… Patch: https://github.com/kamailio/kamailio/commit/40615aaa64a6a2b3affa112502bec58… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 1668cdda55..d651db1b49 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -280,15 +280,17 @@ int load_route_data_db(struct route_data_t * rd) { return -1; } - if((rd->carrier_num = load_carrier_map(rd)) <= 0){ + if((ret = load_carrier_map(rd)) <= 0){ LM_ERR("error while retrieving carriers\n"); goto errout; } + rd->carrier_num = (size_t)ret; - if((rd->domain_num = load_domain_map(rd)) <= 0){ + if((ret = load_domain_map(rd)) <= 0){ LM_ERR("error while retrieving domains\n"); goto errout; } + rd->domain_num = (size_t)ret; if ((rd->carriers = shm_malloc(sizeof(struct carrier_data_t *) * rd->carrier_num)) == NULL) { SHM_MEM_ERROR;

1 0

git:master:f7f5b95f: carrieroute: remove logically dead code
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: f7f5b95f402e3bc3a5caa4e096a1ebdb165b20eb URL: https://github.com/kamailio/kamailio/commit/f7f5b95f402e3bc3a5caa4e096a1ebd… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrieroute: remove logically dead code --- Modified: src/modules/carrierroute/cr_func.c --- Diff: https://github.com/kamailio/kamailio/commit/f7f5b95f402e3bc3a5caa4e096a1ebd… Patch: https://github.com/kamailio/kamailio/commit/f7f5b95f402e3bc3a5caa4e096a1ebd… --- diff --git a/src/modules/carrierroute/cr_func.c b/src/modules/carrierroute/cr_func.c index cfa614645c..6b6db1387b 100644 --- a/src/modules/carrierroute/cr_func.c +++ b/src/modules/carrierroute/cr_func.c @@ -673,12 +673,7 @@ int cr_do_route(struct sip_msg * _msg, gparam_t *_carrier, } carrier_data=NULL; - if (carrier_id < 0) { - if (cfg_get(carrierroute, carrierroute_cfg, fallback_default)) { - LM_NOTICE("invalid tree id %i specified, using default tree\n", carrier_id); - carrier_data = get_carrier_data(rd, rd->default_carrier_id); - } - } else if (carrier_id == 0) { + if (carrier_id == 0) { carrier_data = get_carrier_data(rd, rd->default_carrier_id); } else { carrier_data = get_carrier_data(rd, carrier_id); @@ -889,12 +884,7 @@ int cr_load_next_domain(struct sip_msg * _msg, gparam_t *_carrier, } carrier_data=NULL; - if (carrier_id < 0) { - if (cfg_get(carrierroute, carrierroute_cfg, fallback_default)) { - LM_NOTICE("invalid tree id %i specified, using default tree\n", carrier_id); - carrier_data = get_carrier_data(rd, rd->default_carrier_id); - } - } else if (carrier_id == 0) { + if (carrier_id == 0) { carrier_data = get_carrier_data(rd, rd->default_carrier_id); } else { carrier_data = get_carrier_data(rd, carrier_id);

1 0

git:master:57503311: carrierroute: check pointer before dereferencing it
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: 57503311555f5ffcda1c4e3b05df4248558ef50b URL: https://github.com/kamailio/kamailio/commit/57503311555f5ffcda1c4e3b05df424… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrierroute: check pointer before dereferencing it --- Modified: src/modules/carrierroute/cr_config.c --- Diff: https://github.com/kamailio/kamailio/commit/57503311555f5ffcda1c4e3b05df424… Patch: https://github.com/kamailio/kamailio/commit/57503311555f5ffcda1c4e3b05df424… --- diff --git a/src/modules/carrierroute/cr_config.c b/src/modules/carrierroute/cr_config.c index ba55eb8fba..2d1af1ecfe 100644 --- a/src/modules/carrierroute/cr_config.c +++ b/src/modules/carrierroute/cr_config.c @@ -250,14 +250,14 @@ int load_config(struct route_data_t * rd) { /* Create and insert carrier data structure */ tmp_carrier_data = create_carrier_data(1, &rd->carrier_map[0].name, allocated_domain_num); - tmp_carrier_data->domain_num = 0; - tmp_carrier_data->id = 1; - tmp_carrier_data->name = &(rd->carrier_map[0].name); - if (tmp_carrier_data == NULL) { LM_ERR("can't create new carrier\n"); goto errclose; } + tmp_carrier_data->domain_num = 0; + tmp_carrier_data->id = 1; + tmp_carrier_data->name = &(rd->carrier_map[0].name); + if (add_carrier_data(rd, tmp_carrier_data) < 0) { LM_ERR("couldn't add carrier data\n"); destroy_carrier_data(tmp_carrier_data);

1 0

git:master:2fa71d29: carrierroute: avoid out-of-bounds access when resetting opts
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: 2fa71d29d988cd396607fc20c6271703b3eb656f URL: https://github.com/kamailio/kamailio/commit/2fa71d29d988cd396607fc20c627170… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T10:36:01+02:00 carrierroute: avoid out-of-bounds access when resetting opts --- Modified: src/modules/carrierroute/cr_config.c --- Diff: https://github.com/kamailio/kamailio/commit/2fa71d29d988cd396607fc20c627170… Patch: https://github.com/kamailio/kamailio/commit/2fa71d29d988cd396607fc20c627170…

1 0

[kamailio/kamailio] Fix coverity issues in carrierroute module (#1199)
by Paul Claudiu Boriga 01 Aug '17

01 Aug '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fix the following issues found by Coverity: 3c86d68 fixes defect [85605](https://scan8.coverity.com/reports.htm#v32382/p10993/fileInstanceId=… 7f603ec fixes defect [86015](https://scan8.coverity.com/reports.htm#v32382/p10993/fileInstanceId=… 2772f09 fixes defects [85807](https://scan8.coverity.com/reports.htm#v32382/p10993/fileInstanceId=… and [85651](https://scan8.coverity.com/reports.htm#v32382/p10993/fileInstanceId=… d8fdcb3 fixes defects [153773](https://scan8.coverity.com/reports.htm#v32382/p10993/fileInstanceId…, [85749](https://scan8.coverity.com/reports.htm#v32382/p10993/fileInstanceId=… and [85702](https://scan8.coverity.com/reports.htm#v32382/p10993/fileInstanceId=… 3a9365f fixes defects [85541](https://scan8.coverity.com/reports.htm#v32382/p10993/fileInstanceId=… and [85543](https://scan8.coverity.com/reports.htm#v32382/p10993/fileInstanceId=… dbafb5a fixes defect [85484](https://scan8.coverity.com/reports.htm#v32382/p10993/fileInstanceId=… 535eb88 fixes defect [155203](https://scan8.coverity.com/reports.htm#v32382/p10993/fileInstanceId… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1199 -- Commit Summary -- * carrierroute: avoid out-of-bounds access when resetting opts * carrierroute: check pointer before dereferencing it * carrieroute: remove logically dead code * carrierroute: avoid comparing size_t types with negative values * carrierroute: check return value for fseek * carrierroute: avoid truncating value returned by fgetc * carrierroute: avoid ovverruning a fixed sized buffer -- File Changes -- M src/modules/carrierroute/cr_config.c (125) M src/modules/carrierroute/cr_db.c (6) M src/modules/carrierroute/cr_fifo.c (11) M src/modules/carrierroute/cr_func.c (14) M src/modules/carrierroute/parser_carrierroute.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1199.patch https://github.com/kamailio/kamailio/pull/1199.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1199

2 2

[kamailio/kamailio] pkg/kamailio: Fix of ticket 1085 (#1087)
by sergey-safarov 01 Aug '17

01 Aug '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1087 -- Commit Summary -- * pkg/kamailio: Fix of ticket 1085 -- File Changes -- M pkg/kamailio/centos/7/kamailio.service (2) M pkg/kamailio/deb/debian/kamailio.service (2) M pkg/kamailio/deb/jessie/kamailio.service (2) M pkg/kamailio/deb/sid/kamailio.service (2) M pkg/kamailio/deb/stretch/kamailio.service (2) M pkg/kamailio/deb/xenial/kamailio.service (2) M pkg/kamailio/fedora/17/kamailio.service (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1087.patch https://github.com/kamailio/kamailio/pull/1087.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1087

2 4

git:master:e5b8066e: pua_xmpp: init printbuf_len and detect when no uri is provided
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: e5b8066e1e0f4a69a5d1161dd75aea67014314b5 URL: https://github.com/kamailio/kamailio/commit/e5b8066e1e0f4a69a5d1161dd75aea6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T08:51:57+02:00 pua_xmpp: init printbuf_len and detect when no uri is provided --- Modified: src/modules/pua_xmpp/request_winfo.c --- Diff: https://github.com/kamailio/kamailio/commit/e5b8066e1e0f4a69a5d1161dd75aea6… Patch: https://github.com/kamailio/kamailio/commit/e5b8066e1e0f4a69a5d1161dd75aea6… --- diff --git a/src/modules/pua_xmpp/request_winfo.c b/src/modules/pua_xmpp/request_winfo.c index 65964350ae..a79bf1b79f 100644 --- a/src/modules/pua_xmpp/request_winfo.c +++ b/src/modules/pua_xmpp/request_winfo.c @@ -38,7 +38,7 @@ int request_winfo(struct sip_msg* msg, char* uri, char* expires) { subs_info_t subs; struct sip_uri puri; - int printbuf_len; + int printbuf_len = 0; char buffer[PRINTBUF_SIZE]; str uri_str; @@ -55,13 +55,12 @@ int request_winfo(struct sip_msg* msg, char* uri, char* expires) { LM_ERR("bad owner SIP address!\n"); goto error; - } else - { + } else { LM_DBG("using user id [%.*s]\n", printbuf_len, buffer); } } - if(puri.user.len<=0 || puri.user.s==NULL + if(printbuf_len == 0 || puri.user.len<=0 || puri.user.s==NULL || puri.host.len<=0 || puri.host.s==NULL) { LM_ERR("bad owner URI!\n");

1 0

git:master:f359625b: pua_reginfo: init vars to avoid accessing invalid value on error
by Daniel-Constantin Mierla 01 Aug '17

01 Aug '17

Module: kamailio Branch: master Commit: f359625bf671a38ec0aa967e2632a4bbdbfe59af URL: https://github.com/kamailio/kamailio/commit/f359625bf671a38ec0aa967e2632a4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-01T08:51:57+02:00 pua_reginfo: init vars to avoid accessing invalid value on error --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/f359625bf671a38ec0aa967e2632a4b… Patch: https://github.com/kamailio/kamailio/commit/f359625bf671a38ec0aa967e2632a4b… --- diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c index 853dbcc878..754a2ed099 100644 --- a/src/modules/pua_reginfo/notify.c +++ b/src/modules/pua_reginfo/notify.c @@ -232,8 +232,8 @@ int process_body(str notify_body, udomain_t * domain) { char * expires_char, * cseq_char; int cseq = 0; int len; - urecord_t * ul_record; - ucontact_t * ul_contact; + urecord_t * ul_record = NULL; + ucontact_t * ul_contact = NULL; struct sip_uri parsed_aor; /* Temporary */

1 0

git:master:07ade6c2: modules: readme files regenerated - keepalive ... [skip ci]
by Kamailio Dev 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 07ade6c2bb1826ef797ba941213a617adad9190a URL: https://github.com/kamailio/kamailio/commit/07ade6c2bb1826ef797ba941213a617… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-31T22:31:24+02:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/07ade6c2bb1826ef797ba941213a617… Patch: https://github.com/kamailio/kamailio/commit/07ade6c2bb1826ef797ba941213a617…

1 0

[kamailio/kamailio] keepalive: improve documentation (#1196)
by Guillaume Bour 31 Jul '17

31 Jul '17

- provides documentation for internal API - GH #1082 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1196 -- Commit Summary -- * keepalive: improve documentation -- File Changes -- M src/modules/keepalive/doc/keepalive.xml (1) M src/modules/keepalive/doc/keepalive_admin.xml (21) A src/modules/keepalive/doc/keepalive_devel.xml (146) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1196.patch https://github.com/kamailio/kamailio/pull/1196.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1196

1 1

git:master:183efe3a: Merge pull request #1196 from gbour/doc-module-keepalive
by GitHub 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 183efe3a3955a0457129a9801e8721035eb435ea URL: https://github.com/kamailio/kamailio/commit/183efe3a3955a0457129a9801e87210… Author: Guillaume Bour <guillaume(a)bour.cc> Committer: GitHub <noreply(a)github.com> Date: 2017-07-31T22:20:43+02:00 Merge pull request #1196 from gbour/doc-module-keepalive keepalive: improve documentation --- Added: src/modules/keepalive/doc/keepalive_devel.xml Modified: src/modules/keepalive/doc/keepalive.xml Modified: src/modules/keepalive/doc/keepalive_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/183efe3a3955a0457129a9801e87210… Patch: https://github.com/kamailio/kamailio/commit/183efe3a3955a0457129a9801e87210…

1 0

git:master:2d4d66ac: keepalive: improve documentation
by Guillaume Bour 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 2d4d66acd5a99ae7b931b7f7e4e7d500d6b9ae96 URL: https://github.com/kamailio/kamailio/commit/2d4d66acd5a99ae7b931b7f7e4e7d50… Author: Guillaume Bour <guillaume(a)bour.cc> Committer: Guillaume Bour <guillaume(a)bour.cc> Date: 2017-07-31T21:59:50+02:00 keepalive: improve documentation - documents internal API - GH #1082 --- Added: src/modules/keepalive/doc/keepalive_devel.xml Modified: src/modules/keepalive/doc/keepalive.xml Modified: src/modules/keepalive/doc/keepalive_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2d4d66acd5a99ae7b931b7f7e4e7d50… Patch: https://github.com/kamailio/kamailio/commit/2d4d66acd5a99ae7b931b7f7e4e7d50…

1 0

git:master:48c942ac: db_text: free order by fields in case of early stage error in dbt_query()
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 48c942ac4d20e45f8fdf04aaab9779cab51d1813 URL: https://github.com/kamailio/kamailio/commit/48c942ac4d20e45f8fdf04aaab9779c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T20:24:32+02:00 db_text: free order by fields in case of early stage error in dbt_query() --- Modified: src/modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/48c942ac4d20e45f8fdf04aaab9779c… Patch: https://github.com/kamailio/kamailio/commit/48c942ac4d20e45f8fdf04aaab9779c… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index 860d16e358..e32f0d88ec 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -197,6 +197,7 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, if(!_tbc_temp) { LM_ERR("unable to allocate temp table\n"); + if(_o_op) pkg_free(_o_op); return -1; } @@ -206,6 +207,7 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, { LM_ERR("table %.*s does not exist!\n", CON_TABLE(_h)->len, CON_TABLE(_h)->s); dbt_db_del_table(DBT_CON_CONNECTION(_h), &_tbc_temp->name, 0); + if(_o_op) pkg_free(_o_op); return -1; }

1 0

git:master:676c96ed: modules/sipt: fix bug in setting NAI of called party
by Torrey Searle 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 676c96ed860be183bd69ad55c8062523afcc5248 URL: https://github.com/kamailio/kamailio/commit/676c96ed860be183bd69ad55c806252… Author: Torrey Searle <torrey(a)voxbone.com> Committer: Torrey Searle <torrey(a)voxbone.com> Date: 2017-07-31T17:03:52+02:00 modules/sipt: fix bug in setting NAI of called party --- Modified: src/modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/676c96ed860be183bd69ad55c806252… Patch: https://github.com/kamailio/kamailio/commit/676c96ed860be183bd69ad55c806252… --- diff --git a/src/modules/sipt/ss7_parser.c b/src/modules/sipt/ss7_parser.c index 465919440a..2230594a8d 100644 --- a/src/modules/sipt/ss7_parser.c +++ b/src/modules/sipt/ss7_parser.c @@ -110,7 +110,7 @@ static int encode_called_party(char * number, unsigned char * flags, int nai, un if(nai) { buf[0] &= 0x80; - buf[0] = (unsigned char)(nai&0x7F); + buf[0] |= (unsigned char)(nai&0x7F); } return numlen + 2;

1 0

git:master:32c5d9dd: pkg/kamailio/centos/7: Add rabbitmq module
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 32c5d9dd9f7a5e02ab428e5c16bf7406e4ff7856 URL: https://github.com/kamailio/kamailio/commit/32c5d9dd9f7a5e02ab428e5c16bf740… Author: Stefan Mititelu <stefan.mititelu(a)onem.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T16:02:47+02:00 pkg/kamailio/centos/7: Add rabbitmq module --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/32c5d9dd9f7a5e02ab428e5c16bf740… Patch: https://github.com/kamailio/kamailio/commit/32c5d9dd9f7a5e02ab428e5c16bf740… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 89d887428d..d6410c7e99 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -23,6 +23,7 @@ Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver +Conflicts: kamailio-rabbitmq < %ver Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver @@ -235,6 +236,16 @@ BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel Kazoo module for Kamailio. +%package rabbitmq +Summary: RabbitMQ related modules +Group: System Environment/Daemons +Requires: uuid, librabbitmq, kamailio = %ver +BuildRequires: librabbitmq-devel, uuid-devel + +%description rabbitmq +RabbitMQ module for Kamailio. + + %package lcr Summary: Least cost routing for Kamailio. Group: System Environment/Daemons @@ -573,7 +584,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ - kkazoo kldap klua kmemcached \ + kkazoo krabbitmq kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -593,7 +604,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ - kkazoo kldap klua kmemcached \ + kkazoo krabbitmq kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -1088,6 +1099,12 @@ fi %{_libdir}/kamailio/modules/kazoo.so +%files rabbitmq +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.rabbitmq +%{_libdir}/kamailio/modules/rabbitmq.so + + %files lcr %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.lcr @@ -1352,6 +1369,8 @@ fi %{_libdir}/kamailio/modules/app_sqlang.so %changelog +* Mon Jul 31 2017 Mititelu Stefan <stefan.mititelu92(a)gmail.com> + - added rabbitmq module * Wed Apr 26 2017 Carsten Bock <carsten(a)ng-voice.co,> - added ims_diameter_server module - added topos_redis module

1 0

[kamailio/kamailio] Centos 7 specfile updates (#1194)
by Stefan Mititelu 31 Jul '17

31 Jul '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Update the specfile for centos 7 to: - build rabbitmq module package - exclude kamailio-ims package dependency when installing main kamailio package You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1194 -- Commit Summary -- * centos7 specfile: Add rabbitmq module * centos7 specfile: Remove kamailio-ims module dependency -- File Changes -- M pkg/kamailio/centos/7/kamailio.spec (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1194.patch https://github.com/kamailio/kamailio/pull/1194.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1194

2 2

git:master:9ee303d9: Revert "pkg/kamailio/centos/7: Add rabbitmq module"
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 9ee303d91ee9167759b4a01c2d94fbd646ee41f9 URL: https://github.com/kamailio/kamailio/commit/9ee303d91ee9167759b4a01c2d94fbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:58:01+02:00 Revert "pkg/kamailio/centos/7: Add rabbitmq module" This reverts commit f7666ef2ab5ce5e1088728458d76c7e816fbc25c. --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9ee303d91ee9167759b4a01c2d94fbd… Patch: https://github.com/kamailio/kamailio/commit/9ee303d91ee9167759b4a01c2d94fbd… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index d6410c7e99..89d887428d 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -23,7 +23,6 @@ Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver -Conflicts: kamailio-rabbitmq < %ver Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver @@ -236,16 +235,6 @@ BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel Kazoo module for Kamailio. -%package rabbitmq -Summary: RabbitMQ related modules -Group: System Environment/Daemons -Requires: uuid, librabbitmq, kamailio = %ver -BuildRequires: librabbitmq-devel, uuid-devel - -%description rabbitmq -RabbitMQ module for Kamailio. - - %package lcr Summary: Least cost routing for Kamailio. Group: System Environment/Daemons @@ -584,7 +573,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ - kkazoo krabbitmq kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -604,7 +593,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ - kkazoo krabbitmq kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -1099,12 +1088,6 @@ fi %{_libdir}/kamailio/modules/kazoo.so -%files rabbitmq -%defattr(-,root,root) -%doc %{_docdir}/kamailio/modules/README.rabbitmq -%{_libdir}/kamailio/modules/rabbitmq.so - - %files lcr %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.lcr @@ -1369,8 +1352,6 @@ fi %{_libdir}/kamailio/modules/app_sqlang.so %changelog -* Mon Jul 31 2017 Mititelu Stefan <stefan.mititelu92(a)gmail.com> - - added rabbitmq module * Wed Apr 26 2017 Carsten Bock <carsten(a)ng-voice.co,> - added ims_diameter_server module - added topos_redis module

1 0

git:master:98c4f5e8: Revert "pkg/kamailio/centos/7: Remove kamailio-ims module dependency"
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 98c4f5e8c26f41db6b09547312a049293158cd53 URL: https://github.com/kamailio/kamailio/commit/98c4f5e8c26f41db6b09547312a0492… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:58:01+02:00 Revert "pkg/kamailio/centos/7: Remove kamailio-ims module dependency" This reverts commit bc4591f54844b7d7a28fa278fe9ee9ff421ba206. --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/98c4f5e8c26f41db6b09547312a0492… Patch: https://github.com/kamailio/kamailio/commit/98c4f5e8c26f41db6b09547312a0492… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 17af5e71c8..d6410c7e99 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -807,10 +807,6 @@ fi %{_libdir}/kamailio/libtrie.so %{_libdir}/kamailio/libtrie.so.1 %{_libdir}/kamailio/libtrie.so.1.0 -%{_libdir}/kamailio/libkamailio_ims.so -%{_libdir}/kamailio/libkamailio_ims.so.0 -%{_libdir}/kamailio/libkamailio_ims.so.0.1 - %dir %{_libdir}/kamailio/modules %{_libdir}/kamailio/modules/acc.so @@ -1038,6 +1034,10 @@ fi %files ims %defattr(-,root,root) +%{_libdir}/kamailio/libkamailio_ims.so +%{_libdir}/kamailio/libkamailio_ims.so.0 +%{_libdir}/kamailio/libkamailio_ims.so.0.1 + %doc %{_docdir}/kamailio/modules/README.cdp %doc %{_docdir}/kamailio/modules/README.cdp_avp %doc %{_docdir}/kamailio/modules/README.cfgt

1 0

[kamailio/kamailio] Revert "Centos 7 specfile updates" (#1195)
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Reverts kamailio/kamailio#1194 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1195 -- Commit Summary -- * Revert "pkg/kamailio/centos/7: Remove kamailio-ims module dependency" * Revert "pkg/kamailio/centos/7: Add rabbitmq module" -- File Changes -- M pkg/kamailio/centos/7/kamailio.spec (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1195.patch https://github.com/kamailio/kamailio/pull/1195.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1195

1 1

git:master:bc4591f5: pkg/kamailio/centos/7: Remove kamailio-ims module dependency
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: bc4591f54844b7d7a28fa278fe9ee9ff421ba206 URL: https://github.com/kamailio/kamailio/commit/bc4591f54844b7d7a28fa278fe9ee9f… Author: Stefan Mititelu <stefan.mititelu(a)onem.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:56:28+02:00 pkg/kamailio/centos/7: Remove kamailio-ims module dependency --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/bc4591f54844b7d7a28fa278fe9ee9f… Patch: https://github.com/kamailio/kamailio/commit/bc4591f54844b7d7a28fa278fe9ee9f… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index d6410c7e99..17af5e71c8 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -807,6 +807,10 @@ fi %{_libdir}/kamailio/libtrie.so %{_libdir}/kamailio/libtrie.so.1 %{_libdir}/kamailio/libtrie.so.1.0 +%{_libdir}/kamailio/libkamailio_ims.so +%{_libdir}/kamailio/libkamailio_ims.so.0 +%{_libdir}/kamailio/libkamailio_ims.so.0.1 + %dir %{_libdir}/kamailio/modules %{_libdir}/kamailio/modules/acc.so @@ -1034,10 +1038,6 @@ fi %files ims %defattr(-,root,root) -%{_libdir}/kamailio/libkamailio_ims.so -%{_libdir}/kamailio/libkamailio_ims.so.0 -%{_libdir}/kamailio/libkamailio_ims.so.0.1 - %doc %{_docdir}/kamailio/modules/README.cdp %doc %{_docdir}/kamailio/modules/README.cdp_avp %doc %{_docdir}/kamailio/modules/README.cfgt

1 0

git:master:f7666ef2: pkg/kamailio/centos/7: Add rabbitmq module
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: f7666ef2ab5ce5e1088728458d76c7e816fbc25c URL: https://github.com/kamailio/kamailio/commit/f7666ef2ab5ce5e1088728458d76c7e… Author: Stefan Mititelu <stefan.mititelu(a)onem.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:56:28+02:00 pkg/kamailio/centos/7: Add rabbitmq module --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/f7666ef2ab5ce5e1088728458d76c7e… Patch: https://github.com/kamailio/kamailio/commit/f7666ef2ab5ce5e1088728458d76c7e… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 89d887428d..d6410c7e99 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -23,6 +23,7 @@ Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver +Conflicts: kamailio-rabbitmq < %ver Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver @@ -235,6 +236,16 @@ BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel Kazoo module for Kamailio. +%package rabbitmq +Summary: RabbitMQ related modules +Group: System Environment/Daemons +Requires: uuid, librabbitmq, kamailio = %ver +BuildRequires: librabbitmq-devel, uuid-devel + +%description rabbitmq +RabbitMQ module for Kamailio. + + %package lcr Summary: Least cost routing for Kamailio. Group: System Environment/Daemons @@ -573,7 +584,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ - kkazoo kldap klua kmemcached \ + kkazoo krabbitmq kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -593,7 +604,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kdnssec \ %endif kgeoip kgzcompress khttp_async kims kjansson kjson kjsonrpcs \ - kkazoo kldap klua kmemcached \ + kkazoo krabbitmq kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -1088,6 +1099,12 @@ fi %{_libdir}/kamailio/modules/kazoo.so +%files rabbitmq +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.rabbitmq +%{_libdir}/kamailio/modules/rabbitmq.so + + %files lcr %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.lcr @@ -1352,6 +1369,8 @@ fi %{_libdir}/kamailio/modules/app_sqlang.so %changelog +* Mon Jul 31 2017 Mititelu Stefan <stefan.mititelu92(a)gmail.com> + - added rabbitmq module * Wed Apr 26 2017 Carsten Bock <carsten(a)ng-voice.co,> - added ims_diameter_server module - added topos_redis module

1 0

git:master:5238fe0a: rtpengine: free rtpl if error inside fixup_set_id()
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 5238fe0a5c66cf559bc099bf5e2e0ced42390625 URL: https://github.com/kamailio/kamailio/commit/5238fe0a5c66cf559bc099bf5e2e0ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 rtpengine: free rtpl if error inside fixup_set_id() --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/5238fe0a5c66cf559bc099bf5e2e0ce… Patch: https://github.com/kamailio/kamailio/commit/5238fe0a5c66cf559bc099bf5e2e0ce… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index d4f45bf7c0..83c56ab826 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1046,6 +1046,7 @@ static int fixup_set_id(void ** param, int param_no) int_val = pv_locate_name(&s); if(int_val<0 || int_val!=s.len) { LM_ERR("invalid parameter %s\n", s.s); + pkg_free(rtpl); return -1; } rtpl->rpv = pv_cache_get(&s);

1 0

git:master:d2fa6939: pua: free in case of errors
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: d2fa6939e3ba075beb82d173c5d1a7330341c7d0 URL: https://github.com/kamailio/kamailio/commit/d2fa6939e3ba075beb82d173c5d1a73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 pua: free in case of errors --- Modified: src/modules/pua/add_events.c Modified: src/modules/pua/send_publish.c Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/d2fa6939e3ba075beb82d173c5d1a73… Patch: https://github.com/kamailio/kamailio/commit/d2fa6939e3ba075beb82d173c5d1a73… --- diff --git a/src/modules/pua/add_events.c b/src/modules/pua/add_events.c index f4a9c8ebed..ce94d5a842 100644 --- a/src/modules/pua/add_events.c +++ b/src/modules/pua/add_events.c @@ -150,6 +150,7 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa LM_ERR("No more memory\n"); goto error; } + alloc_tuple = 1; tuple->s= (char*)pkg_malloc(tuple_id_len* sizeof(char)); if(tuple->s== NULL) { @@ -160,7 +161,6 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa tuple->len= tuple_id_len; *tuple_param= tuple; - alloc_tuple= 1; LM_DBG("allocated tuple_id\n\n"); } @@ -252,12 +252,10 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa xmlFreeDoc(doc); if(body) pkg_free(body); - if(tuple && alloc_tuple) - { + if(tuple && alloc_tuple) { if(tuple->s) pkg_free(tuple->s); pkg_free(tuple); - tuple= NULL; } return -1; diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index fc5f2f1918..5bd13e0b59 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -457,7 +457,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) return; error: - if(*ps->param) + if(ps->param && *ps->param) { shm_free(*ps->param); *ps->param= NULL; diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index ff1f5bad23..89b597a77a 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -980,6 +980,7 @@ int send_subscribe(subs_info_t* subs) if(str_hdr== NULL || str_hdr->s== NULL) { LM_ERR("while building extra headers\n"); + if(str_hdr) pkg_free(str_hdr); return -1; }

1 0

git:master:30166790: presence_xml: do not allocate memory before getting presence node
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 30166790b1b8addef006c7a933ac2c009a3998e2 URL: https://github.com/kamailio/kamailio/commit/30166790b1b8addef006c7a933ac2c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 presence_xml: do not allocate memory before getting presence node - useless operation in case of error --- Modified: src/modules/presence_xml/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/30166790b1b8addef006c7a933ac2c0… Patch: https://github.com/kamailio/kamailio/commit/30166790b1b8addef006c7a933ac2c0… --- diff --git a/src/modules/presence_xml/notify_body.c b/src/modules/presence_xml/notify_body.c index 82b4a4d96e..8872c1dccc 100644 --- a/src/modules/presence_xml/notify_body.c +++ b/src/modules/presence_xml/notify_body.c @@ -233,17 +233,6 @@ str* get_final_notify_body( subs_t *subs, str* notify_body, xmlNodePtr rule_node char* content = NULL; char all_name[KSR_FNB_NAME_SIZE+8]; - strcpy(all_name, "all-"); - - new_body = (str*)pkg_malloc(sizeof(str)); - if(new_body == NULL) - { - LM_ERR("while allocating memory\n"); - return NULL; - } - - memset(new_body, 0, sizeof(str)); - doc = xmlParseMemory(notify_body->s, notify_body->len); if(doc== NULL) { @@ -257,6 +246,16 @@ str* get_final_notify_body( subs_t *subs, str* notify_body, xmlNodePtr rule_node goto error; } + strcpy(all_name, "all-"); + + new_body = (str*)pkg_malloc(sizeof(str)); + if(new_body == NULL) + { + LM_ERR("while allocating memory\n"); + return NULL; + } + memset(new_body, 0, sizeof(str)); + transf_node = xmlNodeGetChildByName(rule_node, "transformations"); if(transf_node == NULL) { @@ -502,34 +501,21 @@ str* get_final_notify_body( subs_t *subs, str* notify_body, xmlNodePtr rule_node LM_DBG("body = \n%.*s\n", new_body->len, new_body->s); - xmlFreeDoc(doc); + xmlFreeDoc(doc); xmlFree(class_cont); xmlFree(occurence_ID); xmlFree(deviceID); xmlFree(service_uri); - xmlCleanupParser(); - xmlMemoryDump(); + xmlCleanupParser(); + xmlMemoryDump(); + + return new_body; - return new_body; error: - if(doc) + if(doc) { xmlFreeDoc(doc); - if(new_body) - { - if(new_body->s) - xmlFree(new_body->s); - pkg_free(new_body); - } - if(class_cont) - xmlFree(class_cont); - if(occurence_ID) - xmlFree(occurence_ID); - if(deviceID) - xmlFree(deviceID); - if(service_uri) - xmlFree(service_uri); - + } return NULL; }

1 0

git:master:30014025: presence_dialoginfo: safety checks to avoid accessing null values
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 30014025157f9ac79c98f1361a86974858ef8022 URL: https://github.com/kamailio/kamailio/commit/30014025157f9ac79c98f1361a86974… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 presence_dialoginfo: safety checks to avoid accessing null values --- Modified: src/modules/presence_dialoginfo/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/30014025157f9ac79c98f1361a86974… Patch: https://github.com/kamailio/kamailio/commit/30014025157f9ac79c98f1361a86974…

1 0

git:master:44db76ac: cplc: init time switch structures
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 44db76acb7523b3cd6816c77de45b71857b1a3c1 URL: https://github.com/kamailio/kamailio/commit/44db76acb7523b3cd6816c77de45b71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 cplc: init time switch structures --- Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/44db76acb7523b3cd6816c77de45b71… Patch: https://github.com/kamailio/kamailio/commit/44db76acb7523b3cd6816c77de45b71… --- diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index 03e9a48ae9..4a99b2cbe4 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -686,6 +686,9 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) ac_tm_t att; tmrec_t trt; + memset(&att, 0, sizeof(ac_tm_t)); + memset(&trt, 0, sizeof(tmrec_t)); + LM_DBG("checking recv. time stamp <%d>\n", intr->recv_time); switch (NR_OF_ATTR(intr->ip)) {

1 0

git:master:fda8de91: ctl: skip condition on already set name variable
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: fda8de91d80a2aee7a3ec5e44e6fc1d918541254 URL: https://github.com/kamailio/kamailio/commit/fda8de91d80a2aee7a3ec5e44e6fc1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 ctl: skip condition on already set name variable --- Modified: src/modules/ctl/ctrl_socks.c --- Diff: https://github.com/kamailio/kamailio/commit/fda8de91d80a2aee7a3ec5e44e6fc1d… Patch: https://github.com/kamailio/kamailio/commit/fda8de91d80a2aee7a3ec5e44e6fc1d… --- diff --git a/src/modules/ctl/ctrl_socks.c b/src/modules/ctl/ctrl_socks.c index 9e800a907b..f9d559564b 100644 --- a/src/modules/ctl/ctrl_socks.c +++ b/src/modules/ctl/ctrl_socks.c @@ -145,7 +145,7 @@ struct id_list* parse_listen_id(char* l, int len, enum socket_protos def) proto=UDP_SOCK; DBG("guess:%s is a tcp socket\n", name); } - }else if (name && strchr(name, '/')){ + }else if (strchr(name, '/')){ switch(def){ case TCP_SOCK: case UDP_SOCK:

1 0

git:master:3f96ede6: cplc: init structures, fix parameter number in fixup
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 3f96ede632ce9ef945086a1f384677151209fcc6 URL: https://github.com/kamailio/kamailio/commit/3f96ede632ce9ef945086a1f3846771… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 cplc: init structures, fix parameter number in fixup --- Modified: src/modules/cplc/cplc.c --- Diff: https://github.com/kamailio/kamailio/commit/3f96ede632ce9ef945086a1f3846771… Patch: https://github.com/kamailio/kamailio/commit/3f96ede632ce9ef945086a1f3846771… --- diff --git a/src/modules/cplc/cplc.c b/src/modules/cplc/cplc.c index cb47ffc4e0..95cf946a83 100644 --- a/src/modules/cplc/cplc.c +++ b/src/modules/cplc/cplc.c @@ -203,7 +203,7 @@ static int fixup_cpl_run_script3(void** param, int param_no) { if (param_no==1 || param_no==2) { return fixup_cpl_run_script(param, param_no); - } else if (param_no==2) { + } else if (param_no==3) { return fixup_spve_null(param, 1); } return 0;

1 0

git:master:9a7fee2d: cfgt: check error case for mkdir()
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 9a7fee2dac2f59c277d2634937c7449b9659a20d URL: https://github.com/kamailio/kamailio/commit/9a7fee2dac2f59c277d2634937c7449… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 cfgt: check error case for mkdir() --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/9a7fee2dac2f59c277d2634937c7449… Patch: https://github.com/kamailio/kamailio/commit/9a7fee2dac2f59c277d2634937c7449… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 56292fb1a2..20fcfb0fb8 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -362,7 +362,10 @@ void cfgt_save_node(cfgt_node_p node) return; } LM_DBG("dir [%s]\n", dest.s); - mkdir(dest.s, S_IRWXO|S_IXGRP|S_IRWXU); + if(mkdir(dest.s, S_IRWXO|S_IXGRP|S_IRWXU)<0) { + LM_ERR("failed to make directory (%d)\n", errno); + return; + } dest.s[dir] = '/'; fp = fopen(dest.s, "w"); LM_DBG("file [%s]\n", dest.s);

1 0

git:master:2f29115d: auth_identity: code clarity adjustments
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 2f29115d8280ccf04ea823d5cf8f6621b8624edc URL: https://github.com/kamailio/kamailio/commit/2f29115d8280ccf04ea823d5cf8f662… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T15:54:27+02:00 auth_identity: code clarity adjustments --- Modified: src/modules/auth_identity/auth_hdrs.c --- Diff: https://github.com/kamailio/kamailio/commit/2f29115d8280ccf04ea823d5cf8f662… Patch: https://github.com/kamailio/kamailio/commit/2f29115d8280ccf04ea823d5cf8f662… --- diff --git a/src/modules/auth_identity/auth_hdrs.c b/src/modules/auth_identity/auth_hdrs.c index 0947f5e9a1..24d2ab395f 100644 --- a/src/modules/auth_identity/auth_hdrs.c +++ b/src/modules/auth_identity/auth_hdrs.c @@ -471,7 +471,11 @@ int digeststr_asm(dynstr *sout, struct sip_msg *msg, str *sdate, int iflags) LOG(L_ERR, "AUTH_IDENTITY:digeststr_asm: DATE header is not found\n"); return -9; } + break; } + if (app2dynstr(sout,&sact)) + return -10; + break; default: if (iRes==AUTH_NOTFOUND) break; @@ -514,13 +518,14 @@ int append_hf(struct sip_msg* msg, char *str1, enum _hdr_types_t type) len=strlen(str1); - s = (char*)pkg_malloc(len); + s = (char*)pkg_malloc(len+1); if (!s) { LOG(L_ERR, "AUTH_IDENTITY:append_hf: No memory left\n"); return -1; } memcpy(s, str1, len); + s[len] = '\0'; if (insert_new_lump_before(anchor, s, len, type) == 0) { LOG(L_ERR, "AUTH_IDENTITY:append_hf: Can't insert lump\n"); @@ -643,6 +648,8 @@ static char *auth_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) p += 4; goto dc_end; } + *type = HDR_OTHER_T; + break; default: /* compact headers */ switch(LOWER_BYTE(*p)) { @@ -656,6 +663,8 @@ static char *auth_get_hf_name(char *begin, char *end, enum _hdr_types_t *type) *type = HDR_CONTACT_T; return (p + 2); } + *type = HDR_OTHER_T; + break; default: *type = HDR_OTHER_T; break;

1 0

git:master:2140d014: sipcapture: keep hep buffer unmodified while getting PV $hep(NNN)
by Mikko Lehto 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 2140d0141b5a7551ebbd072d801ce2339020dac0 URL: https://github.com/kamailio/kamailio/commit/2140d0141b5a7551ebbd072d801ce23… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-31T14:42:24+03:00 sipcapture: keep hep buffer unmodified while getting PV $hep(NNN) - addition to GH PR #1191 --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/2140d0141b5a7551ebbd072d801ce23… Patch: https://github.com/kamailio/kamailio/commit/2140d0141b5a7551ebbd072d801ce23… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index 8040b6680c..1653d905fe 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -973,8 +973,7 @@ int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_ch goto done; case 9: hg->time_sec = (hep_chunk_uint32_t *) (tmp); - hg->time_sec->data = ntohl(hg->time_sec->data); - ret = pv_get_uintval(msg, param, res, hg->time_sec->data); + ret = pv_get_uintval(msg, param, res, ntohl(hg->time_sec->data)); goto done; case 10:

1 0

Re: [sr-dev] [kamailio/kamailio] sipcapture: keep hep buffer unmodified while getting PV $hep(NNN) (9f838d4)
by Alexandr Dubovikov 31 Jul '17

31 Jul '17

thanks! :) -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/9f838d4faf940bd2a6a5e6f778a34dd…

1 0

[kamailio/kamailio] sipcapture: byteorder fixes (#1191)
by Mikko Lehto 31 Jul '17

31 Jul '17

Without commit 6e43bf8, using $hep() in script gives inconsistent results due to multiple byte order conversions. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1191 -- Commit Summary -- * sipcapture: remove excess byte order conversion * sipcapture: add missing or invalid byte order conversion -- File Changes -- M src/modules/sipcapture/hep.c (49) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1191.patch https://github.com/kamailio/kamailio/pull/1191.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1191

2 5

git:master:4068ddd3: rls: avoid access to item after free
by Daniel-Constantin Mierla 31 Jul '17

31 Jul '17

Module: kamailio Branch: master Commit: 4068ddd3ca01795e5378a738756b2735508f5864 URL: https://github.com/kamailio/kamailio/commit/4068ddd3ca01795e5378a738756b273… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-31T08:20:08+02:00 rls: avoid access to item after free --- Modified: src/modules/rls/list.h --- Diff: https://github.com/kamailio/kamailio/commit/4068ddd3ca01795e5378a738756b273… Patch: https://github.com/kamailio/kamailio/commit/4068ddd3ca01795e5378a738756b273… --- diff --git a/src/modules/rls/list.h b/src/modules/rls/list.h index 6958ad6d9b..d2ed3f2c9e 100644 --- a/src/modules/rls/list.h +++ b/src/modules/rls/list.h @@ -105,14 +105,13 @@ static inline list_entry_t *list_remove(str strng, list_entry_t *list) { if (strncmp(p->strng->s, strng.s, strng.len) == 0) { + list = list->next; pkg_free(p->strng->s); pkg_free(p->strng); pkg_free(p); - return list->next; - } - else - { - list_entry_t *p = list, *q; + return list; + } else { + list_entry_t *q; while (p->next != NULL && (cmp = strncmp(p->next->strng->s, strng.s, strng.len)) < 0) p = p->next;

1 0

git:master:24c4f357: ctl: safety check for closing fd
by Daniel-Constantin Mierla 30 Jul '17

30 Jul '17

Module: kamailio Branch: master Commit: 24c4f357ecc83ded4c8890ed4440a0252191b0a9 URL: https://github.com/kamailio/kamailio/commit/24c4f357ecc83ded4c8890ed4440a02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T18:33:55+02:00 ctl: safety check for closing fd --- Modified: src/modules/ctl/ctl.c Modified: src/modules/ctl/ctrl_socks.c --- Diff: https://github.com/kamailio/kamailio/commit/24c4f357ecc83ded4c8890ed4440a02… Patch: https://github.com/kamailio/kamailio/commit/24c4f357ecc83ded4c8890ed4440a02… --- diff --git a/src/modules/ctl/ctl.c b/src/modules/ctl/ctl.c index 2126a00ac7..6f627dcb64 100644 --- a/src/modules/ctl/ctl.c +++ b/src/modules/ctl/ctl.c @@ -376,7 +376,7 @@ static void mod_destroy(void) switch(cs->transport){ case UNIXS_SOCK: case UNIXD_SOCK: - close(cs->fd); + if(cs->fd>=0) close(cs->fd); cs->fd=-1; if (cs->write_fd!=-1){ close(cs->write_fd); diff --git a/src/modules/ctl/ctrl_socks.c b/src/modules/ctl/ctrl_socks.c index 1538346206..9e800a907b 100644 --- a/src/modules/ctl/ctrl_socks.c +++ b/src/modules/ctl/ctrl_socks.c @@ -133,7 +133,6 @@ struct id_list* parse_listen_id(char* l, int len, enum socket_protos def) end: /* fix all the stuff */ - if (name==0) goto error; if (proto==UNKNOWN_SOCK){ /* try to guess */ if (port_str){

1 0

git:master:950a9fa4: mangler: free on errors inside sdp_mangle_port()
by Daniel-Constantin Mierla 30 Jul '17

30 Jul '17

Module: kamailio Branch: master Commit: 950a9fa428e24242671e83980192db48819d5da6 URL: https://github.com/kamailio/kamailio/commit/950a9fa428e24242671e83980192db4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T11:16:01+02:00 mangler: free on errors inside sdp_mangle_port() --- Modified: src/modules/mangler/sdp_mangler.c --- Diff: https://github.com/kamailio/kamailio/commit/950a9fa428e24242671e83980192db4… Patch: https://github.com/kamailio/kamailio/commit/950a9fa428e24242671e83980192db4…

1 0

git:master:649b789c: call_control: check return values and free in case of errors in fixup
by Daniel-Constantin Mierla 30 Jul '17

30 Jul '17

Module: kamailio Branch: master Commit: 649b789ccde40778543f2a973a1c01495a2cba8b URL: https://github.com/kamailio/kamailio/commit/649b789ccde40778543f2a973a1c014… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T18:18:24+02:00 call_control: check return values and free in case of errors in fixup --- Modified: src/modules/call_control/call_control.c --- Diff: https://github.com/kamailio/kamailio/commit/649b789ccde40778543f2a973a1c014… Patch: https://github.com/kamailio/kamailio/commit/649b789ccde40778543f2a973a1c014… --- diff --git a/src/modules/call_control/call_control.c b/src/modules/call_control/call_control.c index e1776de61a..689a16d1fd 100644 --- a/src/modules/call_control/call_control.c +++ b/src/modules/call_control/call_control.c @@ -245,6 +245,7 @@ int cc_parse_param(void *val, AVP_List** avps) { char *p = NULL; + char *p0 = NULL; str s, content; AVP_List *mp = NULL; @@ -258,13 +259,13 @@ cc_parse_param(void *val, AVP_List** avps) { return -1; } - p = (char*) pkg_malloc (content.len + 1); - CHECK_ALLOC(p); + p0 = (char*) pkg_malloc (content.len + 1); + CHECK_ALLOC(p0); + p = p0; p[content.len] = '\0'; memcpy(p, content.s, content.len); - for (;*p != '\0';) { mp = (AVP_List*) pkg_malloc (sizeof(AVP_List)); @@ -296,8 +297,13 @@ cc_parse_param(void *val, AVP_List** avps) { s.len = strlen(p); p = pv_parse_spec(&s, mp->pv); + if(p==NULL) { + LM_ERR("failed to parse pv spec\n"); + goto error; + } for (; isspace(*p); p++); + *avps = mp; } @@ -310,6 +316,7 @@ cc_parse_param(void *val, AVP_List** avps) { } pkg_free(mp); } + if(p0) pkg_free(p0); return -1; } @@ -581,6 +588,7 @@ make_custom_request(struct sip_msg *msg, CallInfo *call) { static char request[8192]; int len = 0; + int len0 = 0; AVP_List *al; pv_value_t pt; @@ -601,21 +609,26 @@ make_custom_request(struct sip_msg *msg, CallInfo *call) } for (; al; al = al->next) { - pv_get_spec_value(msg, al->pv, &pt); + if(pv_get_spec_value(msg, al->pv, &pt)<0) { + LM_ERR("failed to get pv value\n"); + return NULL; + } if (pt.flags & PV_VAL_INT) { - len += snprintf(request + len, sizeof(request), + len += snprintf(request + len0, sizeof(request)-len0, "%.*s = %d ", al->name.len, al->name.s, pt.ri); } else if (pt.flags & PV_VAL_STR) { - len += snprintf(request + len, sizeof(request), + len += snprintf(request + len0, sizeof(request)-len0, "%.*s = %.*s ", al->name.len, al->name.s, pt.rs.len, pt.rs.s); } - if (len >= sizeof(request)) { - LM_ERR("callcontrol request is longer than %ld bytes\n", (unsigned long)sizeof(request)); + if (len >= sizeof(request)-len0) { + LM_ERR("callcontrol request is longer than %ld bytes\n", + (unsigned long)sizeof(request)); return NULL; - } + } + len0 = len; }

1 0

git:master:c6464e27: rtpproxy: safety checks for return codes, free on fixup errors
by Daniel-Constantin Mierla 30 Jul '17

30 Jul '17

Module: kamailio Branch: master Commit: c6464e2752f7cdaee95aee4d1b0da9317535ddd3 URL: https://github.com/kamailio/kamailio/commit/c6464e2752f7cdaee95aee4d1b0da93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T10:45:58+02:00 rtpproxy: safety checks for return codes, free on fixup errors --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/c6464e2752f7cdaee95aee4d1b0da93… Patch: https://github.com/kamailio/kamailio/commit/c6464e2752f7cdaee95aee4d1b0da93…

1 0

git:master:590c8d9d: tls: removed useless checks
by Daniel-Constantin Mierla 30 Jul '17

30 Jul '17

Module: kamailio Branch: master Commit: 590c8d9d23e578df38d332ebcfa64421bbedb604 URL: https://github.com/kamailio/kamailio/commit/590c8d9d23e578df38d332ebcfa6442… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T10:30:59+02:00 tls: removed useless checks --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/590c8d9d23e578df38d332ebcfa6442… Patch: https://github.com/kamailio/kamailio/commit/590c8d9d23e578df38d332ebcfa6442… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index a56c76e2b3..d515402cc9 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1086,12 +1086,12 @@ static int fix_domain(tls_domain_t* d, tls_domain_t* def) */ static int passwd_cb(char *buf, int size, int rwflag, void *filename) { -#if OPENSSL_VERSION_NUMBER >= 0x00907000L - UI *ui; - const char *prompt; - +#if OPENSSL_VERSION_NUMBER >= 0x00907000L + UI *ui; + const char *prompt; + ui = UI_new(); - if (ui == NULL) + if(ui == NULL) goto err; prompt = UI_construct_prompt(ui, "passphrase", filename); @@ -1099,16 +1099,13 @@ static int passwd_cb(char *buf, int size, int rwflag, void *filename) UI_process(ui); UI_free(ui); return strlen(buf); - - err: + +err: ERR("passwd_cb: Error in passwd_cb\n"); - if (ui) { - UI_free(ui); - } return 0; - + #else - if (des_read_pw_string(buf, size-1, "Enter Private Key password:", 0)) { + if(des_read_pw_string(buf, size - 1, "Enter Private Key password:", 0)) { ERR("Error in passwd_cb\n"); return 0; } diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index fd84506a36..c1c44c3763 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -461,7 +461,6 @@ static int check_cert(str* res, int* ires, int local, int err, sip_msg_t* msg) return 0; error: - if (cert) X509_free(cert); if (c) tcpconn_put(c); return -1; }

1 0

git:master:8b063975: xhttp_pi: several compiler warning fixes
by Daniel-Constantin Mierla 30 Jul '17

30 Jul '17

Module: kamailio Branch: master Commit: 8b06397523c440fc20e509889c5fad01ed477d26 URL: https://github.com/kamailio/kamailio/commit/8b06397523c440fc20e509889c5fad0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T10:18:24+02:00 xhttp_pi: several compiler warning fixes --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/8b06397523c440fc20e509889c5fad0… Patch: https://github.com/kamailio/kamailio/commit/8b06397523c440fc20e509889c5fad0…

1 0

git:master:5c58ac72: websocket: use NAME in log message, removed unreachable code
by Daniel-Constantin Mierla 30 Jul '17

30 Jul '17

Module: kamailio Branch: master Commit: 5c58ac726c1f96b6666cfd05e13a66328d46d020 URL: https://github.com/kamailio/kamailio/commit/5c58ac726c1f96b6666cfd05e13a663… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-30T10:30:19+02:00 websocket: use NAME in log message, removed unreachable code --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/5c58ac726c1f96b6666cfd05e13a663… Patch: https://github.com/kamailio/kamailio/commit/5c58ac726c1f96b6666cfd05e13a663… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 6af2bb039e..8e632892f6 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -199,11 +199,11 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) if (frame->payload_len < 126) extended_length = 0; else if (frame->payload_len <= USHRT_MAX ) extended_length = 2; - else if (frame->payload_len <= UINT_MAX) extended_length = 4; + else if (frame->payload_len < UINT_MAX) extended_length = 4; else { - LM_ERR("Kamailio only supports WebSocket frames with payload " - "<= %u\n", UINT_MAX); + LM_ERR(NAME " only supports WebSocket frames with payload " + "< %u\n", UINT_MAX); return -1; } @@ -759,11 +759,6 @@ int ws_frame_receive(sr_event_param_t *evp) wsconn_put(frame.wsc); return -1; } - - /* how can we get here ? */ - wsconn_put(frame.wsc); - - return 0; } int ws_frame_transmit(sr_event_param_t *evp)

1 0

[kamailio/kamailio] Hello, kamailio v4.1 would not start after installation. Throws the following error even when mysql is running: (#1193)
by uchepercynnoch 28 Jul '17

28 Jul '17

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1193

2 2

git:master:f06e09b3: db_text: safety checks before memsets inside dbt_build_where()
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: f06e09b3a83f88678318f4aabeb6afdbf5a46ff0 URL: https://github.com/kamailio/kamailio/commit/f06e09b3a83f88678318f4aabeb6afd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:45:07+02:00 db_text: safety checks before memsets inside dbt_build_where() --- Modified: src/modules/db_text/dbt_raw_util.c --- Diff: https://github.com/kamailio/kamailio/commit/f06e09b3a83f88678318f4aabeb6afd… Patch: https://github.com/kamailio/kamailio/commit/f06e09b3a83f88678318f4aabeb6afd… --- diff --git a/src/modules/db_text/dbt_raw_util.c b/src/modules/db_text/dbt_raw_util.c index 92b60287d6..f5cf756e25 100644 --- a/src/modules/db_text/dbt_raw_util.c +++ b/src/modules/db_text/dbt_raw_util.c @@ -183,13 +183,12 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) int offset = 0; int idx = -1; char int_buf[50]; + int res; *_k = NULL; *_o = NULL; *_v = NULL; - int res; - len = strlen(where); res = regcomp(&preg, _regexp, REG_EXTENDED); @@ -199,21 +198,21 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) } _k1 = pkg_malloc(sizeof(db_key_t) * MAX_CLAUSES); - memset(_k1, 0, sizeof(db_key_t) * MAX_CLAUSES); _o1 = pkg_malloc(sizeof(char*) * MAX_CLAUSES); - memset(_o1, 0, sizeof(db_op_t) * MAX_CLAUSES); _v1 = pkg_malloc(sizeof(db_val_t) * MAX_CLAUSES); - memset(_v1, 0, sizeof(db_val_t) * MAX_CLAUSES); - matches = (regmatch_t*)pkg_malloc(sizeof(regmatch_t) * MAX_MATCH); - if(matches==NULL || _k1==NULL || _o1==NULL || _v1==NULL) { + + if(_k1==NULL || _o1==NULL || _v1==NULL || matches==NULL) { LM_ERR("error getting pkg memory\n"); - pkg_free(_k1); - pkg_free(_o1); - pkg_free(_v1); - pkg_free(matches); + if(_k1) pkg_free(_k1); + if(_o1) pkg_free(_o1); + if(_v1) pkg_free(_v1); + if(matches) pkg_free(matches); return -1; } + memset(_k1, 0, sizeof(db_key_t) * MAX_CLAUSES); + memset(_o1, 0, sizeof(char*) * MAX_CLAUSES); + memset(_v1, 0, sizeof(db_val_t) * MAX_CLAUSES); while(offset < len) { char* buffer = where + offset;

1 0

git:master:2ea19b82: sipt: free pkg memory on error
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 2ea19b82b5e21d4499929cb56964ed43035c6122 URL: https://github.com/kamailio/kamailio/commit/2ea19b82b5e21d4499929cb56964ed4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:39:23+02:00 sipt: free pkg memory on error --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/2ea19b82b5e21d4499929cb56964ed4… Patch: https://github.com/kamailio/kamailio/commit/2ea19b82b5e21d4499929cb56964ed4… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index d583ca0101..f48de8d5ab 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -440,7 +440,7 @@ int sipt_parse_pv_name(pv_spec_p sp, str *in) if(spv->sub_type == 0) { LM_ERR("Unknown SIPT subtype [%.*s]\n", pvsubtype.len, pvsubtype.s); - return -1; + goto error; } break; } @@ -450,7 +450,7 @@ int sipt_parse_pv_name(pv_spec_p sp, str *in) if(spv->type == 0) { LM_ERR("Unknown SIPT type [%.*s]\n",pvtype.len, pvtype.s); - return -1; + goto error; } sp->pvp.pvn.u.dname = (void*)spv; @@ -458,8 +458,9 @@ int sipt_parse_pv_name(pv_spec_p sp, str *in) return 0; error: - LM_ERR("error at PV sipt name: %.*s\n", in->len, in->s); - return -1; + LM_ERR("error at PV sipt name: %.*s\n", in->len, in->s); + pkg_free(spv); + return -1; }

1 0

git:master:ecf1ad77: sipcapture: free allocated process memory before return
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: ecf1ad77a2b9f69d5ae4f68fdc71cb1b10ebe729 URL: https://github.com/kamailio/kamailio/commit/ecf1ad77a2b9f69d5ae4f68fdc71cb1… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:39:23+02:00 sipcapture: free allocated process memory before return --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/ecf1ad77a2b9f69d5ae4f68fdc71cb1… Patch: https://github.com/kamailio/kamailio/commit/ecf1ad77a2b9f69d5ae4f68fdc71cb1… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 0132090dca..8fb9deb16b 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -446,6 +446,7 @@ int parse_table_names (str table_name, str ** table_names){ names = (str*)pkg_malloc(sizeof(str) * no_tables); if(names == NULL) { LM_ERR("no more pkg memory left\n"); + pkg_free(table_name_cpy); return -1; } p = strtok (table_name_cpy,"| \t");

1 0

git:master:3afd4acf: db_text: free pkg memory before return on error
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 3afd4acfea655cd3ae2758a4713d977305a296f4 URL: https://github.com/kamailio/kamailio/commit/3afd4acfea655cd3ae2758a4713d977… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:39:23+02:00 db_text: free pkg memory before return on error --- Modified: src/modules/db_text/dbt_raw_util.c --- Diff: https://github.com/kamailio/kamailio/commit/3afd4acfea655cd3ae2758a4713d977… Patch: https://github.com/kamailio/kamailio/commit/3afd4acfea655cd3ae2758a4713d977… --- diff --git a/src/modules/db_text/dbt_raw_util.c b/src/modules/db_text/dbt_raw_util.c index 89fcc803a4..92b60287d6 100644 --- a/src/modules/db_text/dbt_raw_util.c +++ b/src/modules/db_text/dbt_raw_util.c @@ -206,8 +206,12 @@ int dbt_build_where(char* where, db_key_t** _k, db_op_t** _o, db_val_t** _v) memset(_v1, 0, sizeof(db_val_t) * MAX_CLAUSES); matches = (regmatch_t*)pkg_malloc(sizeof(regmatch_t) * MAX_MATCH); - if(matches==NULL) { + if(matches==NULL || _k1==NULL || _o1==NULL || _v1==NULL) { LM_ERR("error getting pkg memory\n"); + pkg_free(_k1); + pkg_free(_o1); + pkg_free(_v1); + pkg_free(matches); return -1; }

1 0

git:master:c8a804f5: sipcapture: fix custom field variable naming
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: c8a804f5e3c3b12b64871d3989a87d79d8627afe URL: https://github.com/kamailio/kamailio/commit/c8a804f5e3c3b12b64871d3989a87d7… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:39:23+02:00 sipcapture: fix custom field variable naming --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/c8a804f5e3c3b12b64871d3989a87d7… Patch: https://github.com/kamailio/kamailio/commit/c8a804f5e3c3b12b64871d3989a87d7… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 1c365f8168..0132090dca 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -1887,7 +1887,7 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * else { EMPTY_STR(sco.custom1); } /* Custom - field2 */ - if(custom_field3_header.len > 0 && (tmphdr[5] = get_hdr_by_name(msg,custom_field2_header.s, custom_field2_header.len)) != NULL) { + if(custom_field2_header.len > 0 && (tmphdr[5] = get_hdr_by_name(msg,custom_field2_header.s, custom_field2_header.len)) != NULL) { sco.custom2 = tmphdr[5]->body; } else { EMPTY_STR(sco.custom2); }

1 0

[kamailio/kamailio] suggestions from static analyzer (#1192)
by Mikko Lehto 28 Jul '17

28 Jul '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1192 -- Commit Summary -- * siptrace: check auth_key_str.s before dereference * sipcapture: fix custom field variable naming * sipcapture: free allocated process memory before return * db_text: free pkg memory before return on error * sipt: free pkg memory on error -- File Changes -- M src/modules/db_text/dbt_raw_util.c (6) M src/modules/sipcapture/sipcapture.c (3) M src/modules/sipt/sipt.c (9) M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1192.patch https://github.com/kamailio/kamailio/pull/1192.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1192

2 2

git:master:e8cd7643: siptrace: check auth_key_str.s before dereference
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: e8cd7643bbdf4b8f187a35bb0e707f4d6eda09b7 URL: https://github.com/kamailio/kamailio/commit/e8cd7643bbdf4b8f187a35bb0e707f4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:39:23+02:00 siptrace: check auth_key_str.s before dereference --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/e8cd7643bbdf4b8f187a35bb0e707f4… Patch: https://github.com/kamailio/kamailio/commit/e8cd7643bbdf4b8f187a35bb0e707f4… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 987a20aed7..1969384d41 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1774,7 +1774,7 @@ static int trace_send_hep3_duplicate(str *body, str *from, str *to, struct dest_ HEP3_PACK_CHUNK_DATA (0, 0x0011, correlation_id_str->s, correlation_id_str->len); } } - if (auth_key_str.len) { + if (auth_key_str.s && auth_key_str.len > 0) { HEP3_PACK_CHUNK_DATA(0, 0x000e, auth_key_str.s, auth_key_str.len); } HEP3_PACK_CHUNK_DATA (0, 0x000f, body->s, body->len); @@ -2393,7 +2393,7 @@ static int hlog(struct sip_msg *msg, str *correlationid, str *message) { HEP3_PACK_CHUNK_UINT8 (0, 0x000b, 0x64); /* protocol type: log */ HEP3_PACK_CHUNK_UINT32(0, 0x000c, hep_capture_id); HEP3_PACK_CHUNK_DATA (0, 0x0011, correlationid->s, correlationid->len); - if (auth_key_str.len) { + if (auth_key_str.s && auth_key_str.len > 0) { HEP3_PACK_CHUNK_DATA(0, 0x000e, auth_key_str.s, auth_key_str.len); } HEP3_PACK_CHUNK_DATA (0, 0x000f, message->s, message->len);

1 0

git:master:5ef8d7a9: registrar: restructured condition for clarity
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 5ef8d7a9f8e1120ea245084d91c00c64e836f97a URL: https://github.com/kamailio/kamailio/commit/5ef8d7a9f8e1120ea245084d91c00c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:30:19+02:00 registrar: restructured condition for clarity --- Modified: src/modules/registrar/lookup.c Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/5ef8d7a9f8e1120ea245084d91c00c6… Patch: https://github.com/kamailio/kamailio/commit/5ef8d7a9f8e1120ea245084d91c00c6… --- diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index 03be9482e5..b18fe993aa 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -277,10 +277,15 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) return -1; } aor = *ptr->aor; - /* test if un-expired and suported contact */ - if( (ptr) && !(VALID_CONTACT(ptr,act_time) - && (ret=-2) && allowed_method(_m,ptr))) - goto done; + /* test if not expired and contact with suported method */ + if(ptr) { + if(!(VALID_CONTACT(ptr,act_time))) { + goto done; + } else if(!allowed_method(_m,ptr)) { + ret=-2; + goto done; + } + } LM_DBG("contact for [%.*s] found by temp gruu [%.*s / %u]\n", aor.len, ZSW(aor.s), inst.len, inst.s, ahash); } diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index ad82262a04..e90625cdc4 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -538,6 +538,7 @@ int pv_fetch_contacts_helper(sip_msg_t* msg, udomain_t* dt, str* uri, c0->instance.len = ptr->instance.len; p += c0->instance.len; } + LM_DBG("memory block between %p - %p\n", c0, p); if ((ptr->sock) && (ptr->sock->proto == PROTO_TCP || ptr->sock->proto == PROTO_TLS || ptr->sock->proto == PROTO_WS || ptr->sock->proto == PROTO_WSS))

1 0

git:master:4572a7b1: mangler: pkg free in case of errors
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 4572a7b100f2eaddb2eb4dbe4aa81a4833f8467e URL: https://github.com/kamailio/kamailio/commit/4572a7b100f2eaddb2eb4dbe4aa81a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:30:19+02:00 mangler: pkg free in case of errors --- Modified: src/modules/mangler/contact_ops.c Modified: src/modules/mangler/ip_helper.c Modified: src/modules/mangler/sdp_mangler.c --- Diff: https://github.com/kamailio/kamailio/commit/4572a7b100f2eaddb2eb4dbe4aa81a4… Patch: https://github.com/kamailio/kamailio/commit/4572a7b100f2eaddb2eb4dbe4aa81a4…

1 0

git:master:f0939447: rabbitmq: removed unreachable code
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: f0939447e0099f8e5ef87cfbda6ea21ed7af9800 URL: https://github.com/kamailio/kamailio/commit/f0939447e0099f8e5ef87cfbda6ea21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:30:19+02:00 rabbitmq: removed unreachable code --- Modified: src/modules/rabbitmq/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/f0939447e0099f8e5ef87cfbda6ea21… Patch: https://github.com/kamailio/kamailio/commit/f0939447e0099f8e5ef87cfbda6ea21… --- diff --git a/src/modules/rabbitmq/utils.c b/src/modules/rabbitmq/utils.c index 251ace13ed..f047262a82 100644 --- a/src/modules/rabbitmq/utils.c +++ b/src/modules/rabbitmq/utils.c @@ -102,9 +102,6 @@ int log_on_amqp_error(amqp_rpc_reply_t x, char const *context) LM_ERR("%s: unknown reply type 0x%08X\n", context, x.reply_type); return x.reply_type; } - - LM_ERR("%s: unknown reply type, method id 0x%08X - should not reach here!\n", context, x.reply_type); - return x.reply_type; } static void dump_row(long count, int numinrow, int *chs)

1 0

git:master:73a288e1: janssonrpcc: couple of pkg free in case of errors
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 73a288e14ec8f7a67662842140d5eb02819b7738 URL: https://github.com/kamailio/kamailio/commit/73a288e14ec8f7a67662842140d5eb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:30:19+02:00 janssonrpcc: couple of pkg free in case of errors --- Modified: src/modules/janssonrpcc/janssonrpc_connect.c Modified: src/modules/janssonrpcc/janssonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/73a288e14ec8f7a67662842140d5eb0… Patch: https://github.com/kamailio/kamailio/commit/73a288e14ec8f7a67662842140d5eb0… --- diff --git a/src/modules/janssonrpcc/janssonrpc_connect.c b/src/modules/janssonrpcc/janssonrpc_connect.c index a65323d30a..83fd4530e8 100644 --- a/src/modules/janssonrpcc/janssonrpc_connect.c +++ b/src/modules/janssonrpcc/janssonrpc_connect.c @@ -111,14 +111,15 @@ typedef struct server_backoff_args { void server_backoff_cb(int fd, short event, void *arg) { + unsigned int timeout; + server_backoff_args_t* a; + if(!arg) return; - server_backoff_args_t* a = (server_backoff_args_t*)arg; - if(!a) - return; + a = (server_backoff_args_t*)arg; - unsigned int timeout = a->timeout; + timeout = a->timeout; /* exponential backoff */ if(timeout < 1) { diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c index 018f03e977..4708a75a87 100644 --- a/src/modules/janssonrpcc/janssonrpc_io.c +++ b/src/modules/janssonrpcc/janssonrpc_io.c @@ -231,8 +231,10 @@ void fail_request(int code, jsonrpc_request_t* req, char* err_str) end: if(freeme) free(freeme); - free_req_cmd(req->cmd); - free_request(req); + if(req) { + if(req->cmd) free_req_cmd(req->cmd); + free_request(req); + } } void timeout_cb(int fd, short event, void *arg) @@ -354,13 +356,18 @@ void loadbalance_by_weight(jsonrpc_server_t** s, int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) { - char* json = (char*)json_dumps(req->payload, JSON_COMPACT); - - char* ns; + char* json = NULL; + bool sent = false; + char* ns = NULL; size_t bytes; + + json = (char*)json_dumps(req->payload, JSON_COMPACT); + if(json==NULL) { + LM_ERR("failed to do json dump for request payload\n"); + return -1; + } bytes = netstring_encode_new(&ns, json, (size_t)strlen(json)); - bool sent = false; jsonrpc_server_group_t* c_grp = NULL; if(global_server_group != NULL) c_grp = *global_server_group; @@ -426,7 +433,7 @@ int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) free_server_list(tried_servers); if(ns) pkg_free(ns); - if(json) free(json); + free(json); if (sent) { if (notify_only == true) { // free the request if using janssonrpc_notification function @@ -520,6 +527,7 @@ void cmd_pipe_cb(int fd, short event, void *arg) if(freeme) free(freeme); if(error) json_decref(error); free_req_cmd(req_cmd); + if(req) pkg_free(req); goto end; } @@ -740,9 +748,6 @@ void bev_read_cb(struct bufferevent* bev, void* arg) case NETSTRING_ERROR_NO_LENGTH: msg = "missing length field"; break; - case NETSTRING_INCOMPLETE: - msg = "incomplete"; - break; default: ERR("bad netstring: unknown error (%d)\n", retval); goto reconnect;

1 0

git:master:9fe84d4a: http_client: use strcpy() instead of strncpy() with sizeof dest buffer
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 9fe84d4ad1ec1eae6bcf44b4067b948d9a16e4dc URL: https://github.com/kamailio/kamailio/commit/9fe84d4ad1ec1eae6bcf44b4067b948… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:30:19+02:00 http_client: use strcpy() instead of strncpy() with sizeof dest buffer - padding the rest of dest buffer with 0 is inneficient --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/9fe84d4ad1ec1eae6bcf44b4067b948… Patch: https://github.com/kamailio/kamailio/commit/9fe84d4ad1ec1eae6bcf44b4067b948… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index c4fc39d6a4..1bdae25df7 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -344,16 +344,14 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, LM_DBG("We received Content-Type: %s\n", ct); if (params->pconn && strlen(ct)<sizeof(params->pconn->result_content_type)-1) { - strncpy(params->pconn->result_content_type, ct, - sizeof(params->pconn->result_content_type)); + strcpy(params->pconn->result_content_type, ct); } } if(url) { LM_DBG("We visited URL: %s\n", url); if (params->pconn && strlen(url)<sizeof(params->pconn->redirecturl)-1) { - strncpy(params->pconn->redirecturl, url , - sizeof(params->pconn->redirecturl)); + strcpy(params->pconn->redirecturl, url); } } }

1 0

git:master:b6c6da62: h350: coherent indentation, removed dead code and init lenght for str
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: b6c6da62fe9879a43a322ce7f9adac3eef5674e7 URL: https://github.com/kamailio/kamailio/commit/b6c6da62fe9879a43a322ce7f9adac3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T10:30:19+02:00 h350: coherent indentation, removed dead code and init lenght for str --- Modified: src/modules/h350/h350_exp_fn.c Modified: src/modules/h350/h350_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b6c6da62fe9879a43a322ce7f9adac3… Patch: https://github.com/kamailio/kamailio/commit/b6c6da62fe9879a43a322ce7f9adac3…

1 0

git:master:49362355: modules: readme files regenerated - avpops ... [skip ci]
by Kamailio Dev 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 49362355065d8f2aa5a58cf0b44aebf485015418 URL: https://github.com/kamailio/kamailio/commit/49362355065d8f2aa5a58cf0b44aebf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-28T10:16:22+02:00 modules: readme files regenerated - avpops ... [skip ci] --- Modified: src/modules/avpops/README Modified: src/modules/kex/README Modified: src/modules/pv/README Modified: src/modules/rtpproxy/README Modified: src/modules/xlog/README --- Diff: https://github.com/kamailio/kamailio/commit/49362355065d8f2aa5a58cf0b44aebf… Patch: https://github.com/kamailio/kamailio/commit/49362355065d8f2aa5a58cf0b44aebf…

1 0

git:master:cbe051d7: sctp: remove svn tags and history notes
by Mikko Lehto 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: cbe051d7cd02b31c385b93284251d0a8daeeacc7 URL: https://github.com/kamailio/kamailio/commit/cbe051d7cd02b31c385b93284251d0a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-28T10:50:57+03:00 sctp: remove svn tags and history notes --- Modified: src/modules/sctp/sctp_ev.h Modified: src/modules/sctp/sctp_mod.c Modified: src/modules/sctp/sctp_options.c Modified: src/modules/sctp/sctp_options.h Modified: src/modules/sctp/sctp_rpc.c Modified: src/modules/sctp/sctp_rpc.h Modified: src/modules/sctp/sctp_server.c Modified: src/modules/sctp/sctp_server.h Modified: src/modules/sctp/sctp_sockopts.h Modified: src/modules/sctp/sctp_stats.c Modified: src/modules/sctp/sctp_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/cbe051d7cd02b31c385b93284251d0a… Patch: https://github.com/kamailio/kamailio/commit/cbe051d7cd02b31c385b93284251d0a…

1 0

git:master:25b4d2be: (core|modules/kex): improve RPC method listing
by Mikko Lehto 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 25b4d2be8121cfff67013810f3dd0c124713c9de URL: https://github.com/kamailio/kamailio/commit/25b4d2be8121cfff67013810f3dd0c1… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-28T10:50:57+03:00 (core|modules/kex): improve RPC method listing --- Modified: src/core/core_cmd.c Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/25b4d2be8121cfff67013810f3dd0c1… Patch: https://github.com/kamailio/kamailio/commit/25b4d2be8121cfff67013810f3dd0c1…

1 0

git:master:aabba814: modules: use Docbook tag for Kamailio wiki URL
by Mikko Lehto 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: aabba8141410a25a19667a3aa750f88081a04bd9 URL: https://github.com/kamailio/kamailio/commit/aabba8141410a25a19667a3aa750f88… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-28T10:50:57+03:00 modules: use Docbook tag for Kamailio wiki URL --- Modified: src/modules/avpops/doc/avpops_admin.xml Modified: src/modules/pv/doc/pv_admin.xml Modified: src/modules/xlog/doc/xlog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aabba8141410a25a19667a3aa750f88… Patch: https://github.com/kamailio/kamailio/commit/aabba8141410a25a19667a3aa750f88… --- diff --git a/src/modules/avpops/doc/avpops_admin.xml b/src/modules/avpops/doc/avpops_admin.xml index 343ffa6796..f2c0175601 100644 --- a/src/modules/avpops/doc/avpops_admin.xml +++ b/src/modules/avpops/doc/avpops_admin.xml @@ -856,9 +856,7 @@ avp_copy("$avp(old)","$avp(new)/gd"); Prints the formatted string 'format' in the AVP 'dest'. The 'format' parameter can include any pseudo-variable defined in &kamailio;. The list with all pseudo-variables in &kamailio; can - be found at: - <ulink url="http://kamailio.org/dokuwiki/"> - http://kamailio.org/dokuwiki/</ulink>. + be found at: &kamwikilink; </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 08e8ff8794..e370f5eba3 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -17,8 +17,7 @@ <title>Overview</title> <para> This module collects the core pseudo-variables that can be used in - configuration file. They are listed in Dokuwiki: - <ulink url="http://www.kamailio.org/wiki/">http://www.kamailio.org/wiki/</ulink>, + configuration file. They are listed in wiki: &kamwikilink; in Pseudo-Variables section </para> </section> diff --git a/src/modules/xlog/doc/xlog_admin.xml b/src/modules/xlog/doc/xlog_admin.xml index b03b8ecd58..225b5a80c4 100644 --- a/src/modules/xlog/doc/xlog_admin.xml +++ b/src/modules/xlog/doc/xlog_admin.xml @@ -54,9 +54,7 @@ </itemizedlist> <para> The full list of available pseudo-variables in &kamailio; is - available at: - <ulink url="http://kamailio.org/wiki/"> - http://kamailio.org/wiki/</ulink> + available at: &kamwikilink; </para> </section> <section>

1 0

git:master:436899e7: rtpproxy: fix docbook tags
by Mikko Lehto 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 436899e723c01ed5a86d5188fafc7225df690abf URL: https://github.com/kamailio/kamailio/commit/436899e723c01ed5a86d5188fafc722… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-28T10:50:57+03:00 rtpproxy: fix docbook tags --- Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/436899e723c01ed5a86d5188fafc722… Patch: https://github.com/kamailio/kamailio/commit/436899e723c01ed5a86d5188fafc722… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml index e06ae8dab2..7f5d941d2f 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -618,8 +618,8 @@ onreply_route[2] <listitem><para> <emphasis>b</emphasis> - append branch specific variable to Call-ID when sending command to rtpproxy. See rtpproxy_offer() for details. - <listitem><para> </para></listitem> + <listitem><para> <emphasis>t</emphasis> - do not include To tag to <quote>delete</quote> command to rtpproxy thus causing full call to be deleted. Useful for deleting unused rtpproxy call when 200 OK is received on a branch, where rtpproxy is not needed. </para></listitem> </itemizedlist>

1 0

git:master:97db3ee6: db_mysql: safer conditions inside sb_add() for db api v2
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 97db3ee61079de6cc2466628dae0f5e489819e98 URL: https://github.com/kamailio/kamailio/commit/97db3ee61079de6cc2466628dae0f5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T09:19:06+02:00 db_mysql: safer conditions inside sb_add() for db api v2 --- Modified: src/modules/db_mysql/my_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/97db3ee61079de6cc2466628dae0f5e… Patch: https://github.com/kamailio/kamailio/commit/97db3ee61079de6cc2466628dae0f5e… --- diff --git a/src/modules/db_mysql/my_cmd.c b/src/modules/db_mysql/my_cmd.c index 7872568b29..8502e6d323 100644 --- a/src/modules/db_mysql/my_cmd.c +++ b/src/modules/db_mysql/my_cmd.c @@ -372,8 +372,10 @@ static inline int sb_add(struct string_buffer *sb, str *nstr) int rsize = sb->len + nstr->len; int asize; char *newp; - - if ( rsize > sb->size ) { + + if(nstr->len==0) return 0; + + if ( sb->s==NULL || rsize > sb->size ) { asize = rsize - sb->size; new_size = sb->size + (asize / sb->increment + (asize % sb->increment > 0)) * sb->increment; newp = pkg_malloc(new_size); @@ -423,6 +425,9 @@ static int build_update_cmd(str* sql_cmd, db_cmd_t* cmd) rv = sb_add(&sql_buf, &strings[STR_UPDATE]); /* "UPDATE " */ rv |= sb_add(&sql_buf, &cmd->table); /* table name */ rv |= sb_add(&sql_buf, &strings[STR_SET]); /* " SET " */ + if (rv) { + goto err; + } /* column name-value pairs */ for(i = 0, fld = cmd->vals; !DB_FLD_LAST(fld[i]); i++) {

1 0

git:master:22fc924a: avp: clear code for unsupported parameter format
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: 22fc924aa928fe126156290a10c4be8048ba4f8b URL: https://github.com/kamailio/kamailio/commit/22fc924aa928fe126156290a10c4be8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T09:19:06+02:00 avp: clear code for unsupported parameter format --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/22fc924aa928fe126156290a10c4be8… Patch: https://github.com/kamailio/kamailio/commit/22fc924aa928fe126156290a10c4be8… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index d6c8b3323d..1b13dd492b 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1385,39 +1385,9 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) if(param_no == 1) { c = *param; if(*c == '#') { - c++; - n = strtol(c, &params, 10); - switch(*params) { - case PARAM_DELIM: - break; - case 0: - params = 0; - break; - default: - LOG(L_ERR, "attr_hdr_body2attrs_fixup: bad AVP value\n"); - return E_CFG; - } - switch(n) { - // case HDR_xxx: - // case HDR_xxx: - // break; - default: - LOG(L_ERR, "attr_hdr_body2attrs_fixup: header name is not " - "valid and supported HDR_xxx id '%s' resolved " - "as %d\n", - c, n); - return E_CFG; - } - h = pkg_malloc(sizeof(hdr_name_t)); - if(!h) { - LOG(L_ERR, "attr_hdr_body2attrs_fixup: out of memory\n"); - return E_OUT_OF_MEM; - } - - h->kind = HDR_ID; - h->name.n = n; - pkg_free(*param); - + LOG(L_ERR, "attr_hdr_body2attrs_fixup: header name is not " + "valid '%s'\n", c); + return E_CFG; } else { params = strchr(c, PARAM_DELIM); if(params)

1 0

git:master:afe6d712: app_python: removed condition on classname, it cannot be null
by Daniel-Constantin Mierla 28 Jul '17

28 Jul '17

Module: kamailio Branch: master Commit: afe6d712d5ef52ac6f3fe8e6f69406779e3a740e URL: https://github.com/kamailio/kamailio/commit/afe6d712d5ef52ac6f3fe8e6f694067… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-28T09:19:06+02:00 app_python: removed condition on classname, it cannot be null --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/afe6d712d5ef52ac6f3fe8e6f694067… Patch: https://github.com/kamailio/kamailio/commit/afe6d712d5ef52ac6f3fe8e6f694067… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 73651ba8cf..64f59fcc07 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -410,7 +410,7 @@ static int child_init(int rank) if (!PyErr_Occurred()) PyErr_Format(PyExc_TypeError, "method '%s' of class '%s' should return 'int' type", - child_init_mname.s, !classname ? "None" : classname); + child_init_mname.s, classname); python_handle_exception("child_init"); Py_DECREF(format_exc_obj); Py_XDECREF(pResult);

1 0

git:master:9219b211: db_postgres: fix typo and whitespace
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 9219b2116fc2887c0c8c2ad39465087e324784fb URL: https://github.com/kamailio/kamailio/commit/9219b2116fc2887c0c8c2ad39465087… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T23:18:20+02:00 db_postgres: fix typo and whitespace --- Modified: src/modules/db_postgres/pg_con.c --- Diff: https://github.com/kamailio/kamailio/commit/9219b2116fc2887c0c8c2ad39465087… Patch: https://github.com/kamailio/kamailio/commit/9219b2116fc2887c0c8c2ad39465087… --- diff --git a/src/modules/db_postgres/pg_con.c b/src/modules/db_postgres/pg_con.c index 851685d353..c03ce3bd3c 100644 --- a/src/modules/db_postgres/pg_con.c +++ b/src/modules/db_postgres/pg_con.c @@ -1,4 +1,4 @@ -/* +/* * PostgreSQL Database Driver for Kamailio * * Portions Copyright (C) 2001-2003 FhG FOKUS @@ -23,10 +23,10 @@ */ /** \addtogroup postgres - * @{ + * @{ */ -/** \file +/** \file * Functions related to connections to PostgreSQL servers. */ @@ -46,7 +46,7 @@ #include <time.h> -/* Override the default notice processor to output the messages +/* Override the default notice processor to output the messages * using SER's output subsystem. */ static void notice_processor(void* arg, const char* message) @@ -55,7 +55,7 @@ static void notice_processor(void* arg, const char* message) } -/** Determine the format of timestamps used by the server. +/** Determine the format of timestamps used by the server. * A PostgresSQL server can be configured to store timestamps either as 8-byte * integers or floating point numbers with double precision. This functions * sends a simple SQL query to the server and tries to determine the format of @@ -97,9 +97,9 @@ static int timestamp_format(PGconn* con) } val = PQgetvalue(res, 0, 0); - offset = ((unsigned long long)ntohl(((unsigned int*)val)[0]) << 32) + offset = ((unsigned long long)ntohl(((unsigned int*)val)[0]) << 32) + ntohl(((unsigned int*)val)[1]); - + PQclear(res); /* Server using int8 timestamps would return 1000000, because it stores @@ -117,7 +117,7 @@ static int timestamp_format(PGconn* con) DBG("postgres: Server uses double format for timestamps.\n"); return 0; } - + error: PQclear(res); return -1; @@ -166,12 +166,12 @@ static int get_oids(db_con_t* con) static void pg_con_free(db_con_t* con, struct pg_con* payload) { if (!payload) return; - + /* Delete the structure only if there are no more references * to it in the connection pool */ if (db_pool_remove((db_pool_entry_t*)payload) == 0) return; - + db_pool_entry_free(&payload->gen); pg_destroy_oid_table(payload->oid); if (payload->con) PQfinish(payload->con); @@ -236,10 +236,10 @@ int pg_con_connect(db_con_t* con) int ret, i = 0; const char *keywords[10], *values[10]; char to[16]; - + pcon = DB_GET_PAYLOAD(con); puri = DB_GET_PAYLOAD(con->uri); - + /* Do not reconnect already connected connections */ if (pcon->flags & PG_CONNECTED) return 0; @@ -277,25 +277,25 @@ int pg_con_connect(db_con_t* con) keywords[i] = values[i] = NULL; pcon->con = PQconnectdbParams(keywords, values, 1); - + if (pcon->con == NULL) { ERR("postgres: PQconnectdbParams ran out of memory\n"); goto error; } - + if (PQstatus(pcon->con) != CONNECTION_OK) { ERR("postgres: %s\n", PQerrorMessage(pcon->con)); goto error; } - + /* Override default notice processor */ PQsetNoticeProcessor(pcon->con, notice_processor, 0); - + #ifdef HAVE_PGSERVERVERSION - DBG("postgres: Connected. Protocol version=%d, Server version=%d\n", + DBG("postgres: Connected. Protocol version=%d, Server version=%d\n", PQprotocolVersion(pcon->con), PQserverVersion(pcon->con)); #else - DBG("postgres: Connected. Protocol version=%d, Server version=%d\n", + DBG("postgres: Connected. Protocol version=%d, Server version=%d\n", PQprotocolVersion(pcon->con), 0 ); #endif @@ -308,7 +308,7 @@ int pg_con_connect(db_con_t* con) } if(setsockopt(PQsocket(pcon->con), IPPROTO_TCP, TCP_KEEPIDLE, &pg_keepalive, sizeof(pg_keepalive))<0) { - M_WARN("failed to set socket option keepidle\n"); + LM_WARN("failed to set socket option keepidle\n"); } } #endif

1 0

[kamailio/kamailio] db_postgres: fix typo and whitespace (#1190)
by Emmanuel Schmidbauer 27 Jul '17

27 Jul '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1190 -- Commit Summary -- * db_postgres: fix typo and whitespace -- File Changes -- M src/modules/db_postgres/pg_con.c (38) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1190.patch https://github.com/kamailio/kamailio/pull/1190.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1190

2 2

git:master:dac238ac: sipcapture: add missing or invalid byte order conversion
by Mikko Lehto 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: dac238ac3fdf2d0f47d6915508160b8160e9ab11 URL: https://github.com/kamailio/kamailio/commit/dac238ac3fdf2d0f47d6915508160b8… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-27T22:43:04+03:00 sipcapture: add missing or invalid byte order conversion --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/dac238ac3fdf2d0f47d6915508160b8… Patch: https://github.com/kamailio/kamailio/commit/dac238ac3fdf2d0f47d6915508160b8… --- diff --git a/src/modules/sipcapture/hep.c b/src/modules/sipcapture/hep.c index c05180ecd8..8040b6680c 100644 --- a/src/modules/sipcapture/hep.c +++ b/src/modules/sipcapture/hep.c @@ -989,13 +989,14 @@ int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_ch case 12: hg->capt_id = (hep_chunk_uint32_t *) (tmp); - ret = pv_get_uintval(msg, param, res, ntohs(hg->capt_id->data)); + ret = pv_get_uintval(msg, param, res, ntohl(hg->capt_id->data)); goto done; case 13: hg->keep_tm = (hep_chunk_uint16_t *) (tmp); - ret = pv_get_uintval(msg, param, res, hg->keep_tm->data); + ret = pv_get_uintval(msg, param, res, ntohs(hg->keep_tm->data)); goto done; + case 14: tmpstr.s = (char *) tmp + sizeof(hep_chunk_t); tmpstr.len = chunk_length - sizeof(hep_chunk_t);

1 0

git:master:34d0c5df: Merge pull request #1191 from mslehto/sipcapture-byteorder
by GitHub 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 34d0c5df45a6281847dddb9d67e42dac50150fbe URL: https://github.com/kamailio/kamailio/commit/34d0c5df45a6281847dddb9d67e42da… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-07-27T22:03:16+02:00 Merge pull request #1191 from mslehto/sipcapture-byteorder sipcapture: byteorder fixes --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/34d0c5df45a6281847dddb9d67e42da… Patch: https://github.com/kamailio/kamailio/commit/34d0c5df45a6281847dddb9d67e42da…

1 0

git:master:6e43bf84: sipcapture: remove excess byte order conversion
by Mikko Lehto 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 6e43bf84a2afc4e83ce33b7a416d7b81f7dd5658 URL: https://github.com/kamailio/kamailio/commit/6e43bf84a2afc4e83ce33b7a416d7b8… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-27T22:41:12+03:00 sipcapture: remove excess byte order conversion - buffer pointer `tmp` in hepv3_get_chunk() was assigned to hg->time_(Âµ)sec - therefore everytime route script calls pseudovariables, part of original `buf` was byte converted --- Modified: src/modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/6e43bf84a2afc4e83ce33b7a416d7b8… Patch: https://github.com/kamailio/kamailio/commit/6e43bf84a2afc4e83ce33b7a416d7b8…

1 0

git:master:59234b8f: core: dns cache - safety check for out of bounds index
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 59234b8fae1295455e347e27519813e63bf8ffb0 URL: https://github.com/kamailio/kamailio/commit/59234b8fae1295455e347e27519813e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T18:20:12+02:00 core: dns cache - safety check for out of bounds index --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/59234b8fae1295455e347e27519813e… Patch: https://github.com/kamailio/kamailio/commit/59234b8fae1295455e347e27519813e… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index e8bfd7f5e6..8c054e0e54 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2333,19 +2333,30 @@ inline static struct dns_rr* dns_srv_get_nxt_rr(struct dns_hash_entry* e, * extra checks */ for (i=0; (i<idx) && (r_sums[i].r_sum<rand_w); i++); found: + if(i<MAX_SRV_GRP_IDX) { #ifdef DNS_CACHE_DEBUG - LM_DBG("(%p, %lx, %d, %u): selected %d/%d in grp. %d" - " (rand_w=%d, rr=%p rd=%p p=%d w=%d rsum=%d)\n", - e, (unsigned long)*tried, *no, now, i, idx, n, rand_w, r_sums[i].rr, - (r_sums[i].rr)?r_sums[i].rr->rdata:0, - (r_sums[i].rr&&r_sums[i].rr->rdata)?((struct srv_rdata*)r_sums[i].rr->rdata)->priority:0, - (r_sums[i].rr&&r_sums[i].rr->rdata)?((struct srv_rdata*)r_sums[i].rr->rdata)->weight:0, - r_sums[i].r_sum); + LM_DBG("(%p, %lx, %d, %u): selected %d/%d in grp. %d" + " (rand_w=%d, rr=%p rd=%p p=%d w=%d rsum=%d)\n", + e, (unsigned long)*tried, *no, now, i, idx, n, rand_w, + r_sums[i].rr, (r_sums[i].rr) ? r_sums[i].rr->rdata : 0, + (r_sums[i].rr && r_sums[i].rr->rdata) + ? ((struct srv_rdata *)r_sums[i].rr->rdata)->priority + : 0, + (r_sums[i].rr && r_sums[i].rr->rdata) + ? ((struct srv_rdata *)r_sums[i].rr->rdata)->weight + : 0, + r_sums[i].r_sum); #endif - /* i is the winner */ - *no=n; /* grp. start */ - if(i<8*sizeof(*tried)) srv_mark_tried(tried, i); /* mark it */ - return r_sums[i].rr; + /* i is the winner */ + *no = n; /* grp. start */ + if(i < 8 * sizeof(*tried)) + srv_mark_tried(tried, i); /* mark it */ + return r_sums[i].rr; + } else { + LM_WARN("index out of bounds\n"); + *no=n; + return 0; + } no_more_rrs: *no=n; return 0;

1 0

git:master:6ddca2e0: ctl: remove useless assignment
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 6ddca2e08bc8159ed00c80f6857df58c81cbd97d URL: https://github.com/kamailio/kamailio/commit/6ddca2e08bc8159ed00c80f6857df58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T18:20:12+02:00 ctl: remove useless assignment --- Modified: src/modules/ctl/ctrl_socks.c --- Diff: https://github.com/kamailio/kamailio/commit/6ddca2e08bc8159ed00c80f6857df58… Patch: https://github.com/kamailio/kamailio/commit/6ddca2e08bc8159ed00c80f6857df58… --- diff --git a/src/modules/ctl/ctrl_socks.c b/src/modules/ctl/ctrl_socks.c index 4449ff7c76..1538346206 100644 --- a/src/modules/ctl/ctrl_socks.c +++ b/src/modules/ctl/ctrl_socks.c @@ -271,7 +271,6 @@ int init_ctrl_sockets(struct ctrl_socket** c_lst, struct id_list* lst, cs->transport=l->proto; cs->p_proto=l->data_proto; cs->fd=s; - s = -1; cs->write_fd=extra_fd; /* needed for fifo write */ cs->name=l->name; cs->port=l->port;

1 0

git:master:15f226ae: rtpengine: fix issues reported by Coverity
by Richard Fuchs 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 15f226ae5317db747da1e7b6aca23ad7ba29fb59 URL: https://github.com/kamailio/kamailio/commit/15f226ae5317db747da1e7b6aca23ad… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2017-07-27T12:10:05-04:00 rtpengine: fix issues reported by Coverity --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/15f226ae5317db747da1e7b6aca23ad… Patch: https://github.com/kamailio/kamailio/commit/15f226ae5317db747da1e7b6aca23ad…

1 0

git:master:1f50cd26: pv: remove useless condition
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 1f50cd26ba0db88fd5f2c33e2b44a461f471e760 URL: https://github.com/kamailio/kamailio/commit/1f50cd26ba0db88fd5f2c33e2b44a46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T13:13:21+02:00 pv: remove useless condition --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/1f50cd26ba0db88fd5f2c33e2b44a46… Patch: https://github.com/kamailio/kamailio/commit/1f50cd26ba0db88fd5f2c33e2b44a46… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 3012126ff6..62574c46f5 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -2534,11 +2534,10 @@ char* tr_parse_uri(str* in, trans_t *t) LM_ERR("unknown transformation: %.*s/%.*s!\n", in->len, in->s, name.len, name.s); error: - if(tp) - tr_param_free(tp); if(spec) pv_spec_free(spec); return NULL; + done: t->name = name; return p;

1 0

git:master:2d68418a: msrp: use formated string instead of complex sequence of concatenation
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 2d68418a6df8d814e60f992b3ae1d74fbb13a2f3 URL: https://github.com/kamailio/kamailio/commit/2d68418a6df8d814e60f992b3ae1d74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T13:09:02+02:00 msrp: use formated string instead of complex sequence of concatenation --- Modified: src/modules/msrp/msrp_cmap.c --- Diff: https://github.com/kamailio/kamailio/commit/2d68418a6df8d814e60f992b3ae1d74… Patch: https://github.com/kamailio/kamailio/commit/2d68418a6df8d814e60f992b3ae1d74… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index 3648df41b9..bdcccbd6fe 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -210,20 +210,16 @@ int msrp_cmap_save(msrp_frame_t *mf) hid = msrp_get_hashid(&_msrp_sruid.uid); idx = msrp_get_slot(hid, _msrp_cmap_head->mapsize); - srcaddr.s = sbuf; - if (msrp_tls_module_loaded) - { - memcpy(srcaddr.s, "msrps://", 8); - srcaddr.s+=8; - } else { - memcpy(srcaddr.s, "msrp://", 7); - srcaddr.s+=7; + srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "msrp%s://%s:%d", + (msrp_tls_module_loaded)?"s":"", + ip_addr2a(&mf->tcpinfo->rcv->src_ip), + (int)mf->tcpinfo->rcv->src_port); + if(srcaddr.len<0 || srcaddr.len>=MSRP_SBUF_SIZE) { + LM_ERR("failure or address lenght too big (%d)\n", srcaddr.len); + return -1; } - strcpy(srcaddr.s, ip_addr2a(&mf->tcpinfo->rcv->src_ip)); - strcat(srcaddr.s, ":"); - strcat(srcaddr.s, int2str(mf->tcpinfo->rcv->src_port, NULL)); srcaddr.s = sbuf; - srcaddr.len = strlen(srcaddr.s); + srcsock = mf->tcpinfo->rcv->bind_address->sock_str; LM_DBG("saving connection info for [%.*s] [%.*s] (%u/%u)\n", fpeer.len, fpeer.s, _msrp_sruid.uid.len, _msrp_sruid.uid.s,

1 0

git:master:67bd0803: lcr: check return for rewrite_uri() and do memset with size of alloc
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 67bd080310c5b8371d9943fa964e81154c916356 URL: https://github.com/kamailio/kamailio/commit/67bd080310c5b8371d9943fa964e811… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T12:42:42+02:00 lcr: check return for rewrite_uri() and do memset with size of alloc --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/67bd080310c5b8371d9943fa964e811… Patch: https://github.com/kamailio/kamailio/commit/67bd080310c5b8371d9943fa964e811… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 1313d65aff..02bad0bb5e 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -709,8 +709,7 @@ static int mod_init(void) LM_ERR("no memory for gw table\n"); goto err; } - memset(gw_pt[i], 0, sizeof(struct gw_info *) * - (lcr_gw_count_param + 1)); + memset(gw_pt[i], 0, sizeof(struct gw_info) * (lcr_gw_count_param + 1)); } /* Allocate and initialize locks */ @@ -2750,7 +2749,10 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) /* Rewrite Request URI */ uri_str.s = r_uri; uri_str.len = r_uri_len; - rewrite_uri(_m, &uri_str); + if(rewrite_uri(_m, &uri_str)<0) { + LM_ERR("failed to rewrite uri\n"); + return -1; + } /* Set Destination URI if not empty */ if (dst_uri_len > 0) { @@ -2759,7 +2761,7 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) LM_DBG("setting du to <%.*s>\n", uri_str.len, uri_str.s); rval = set_dst_uri(_m, &uri_str); if (rval != 0) { - LM_ERR("calling do_action failed with return value <%d>\n", rval); + LM_ERR("calling set dst uri failed with return value <%d>\n", rval); return -1; }

1 0

git:master:6d3a97d1: ldap: free in case of error cases
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 6d3a97d1c3e62f876bbb7a17927b2a40243ec268 URL: https://github.com/kamailio/kamailio/commit/6d3a97d1c3e62f876bbb7a17927b2a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T13:08:19+02:00 ldap: free in case of error cases --- Modified: src/modules/ldap/ld_session.c Modified: src/modules/ldap/ldap_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6d3a97d1c3e62f876bbb7a17927b2a4… Patch: https://github.com/kamailio/kamailio/commit/6d3a97d1c3e62f876bbb7a17927b2a4… --- diff --git a/src/modules/ldap/ld_session.c b/src/modules/ldap/ld_session.c index 25ad429c42..8a27d08004 100644 --- a/src/modules/ldap/ld_session.c +++ b/src/modules/ldap/ld_session.c @@ -62,6 +62,7 @@ int add_ld_session(char* _name, LDAP* _ldh, dictionary* _d) new_lds->host_name = (char*)pkg_malloc(strlen(host_name)+1); if (new_lds->host_name == NULL) { LM_ERR("no memory\n"); + pkg_free(new_lds); return -1; } strcpy(new_lds->host_name, host_name); @@ -117,6 +118,8 @@ int add_ld_session(char* _name, LDAP* _ldh, dictionary* _d) new_lds->bind_dn = (char*)pkg_malloc(strlen(bind_dn)+1); if (new_lds->bind_dn == NULL) { LM_ERR("no memory\n"); + pkg_free(new_lds->host_name); + pkg_free(new_lds); return -1; } strcpy(new_lds->bind_dn, bind_dn); @@ -129,6 +132,9 @@ int add_ld_session(char* _name, LDAP* _ldh, dictionary* _d) new_lds->bind_pwd = (char*)pkg_malloc(strlen(bind_pwd)+1); if (new_lds->bind_pwd == NULL) { LM_ERR("no memory\n"); + pkg_free(new_lds->bind_dn); + pkg_free(new_lds->host_name); + pkg_free(new_lds); return -1; } strcpy(new_lds->bind_pwd, bind_pwd); diff --git a/src/modules/ldap/ldap_mod.c b/src/modules/ldap/ldap_mod.c index 89eb89cb99..59367a83c8 100644 --- a/src/modules/ldap/ldap_mod.c +++ b/src/modules/ldap/ldap_mod.c @@ -447,6 +447,7 @@ static int ldap_result_check_fixup(void** param, int param_no) if (pv_parse_format(&s, &(lp->check_str_elem_p)) < 0) { LM_ERR("pv_parse_format failed\n"); + pkg_free(lp); return E_OUT_OF_MEM; } }

1 0

git:master:0fd33d76: imc: better check for buffer size limit
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 0fd33d766c471e0f0710bd6f84898462420bfbaa URL: https://github.com/kamailio/kamailio/commit/0fd33d766c471e0f0710bd6f8489846… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T11:34:35+02:00 imc: better check for buffer size limit --- Modified: src/modules/imc/imc.c Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/0fd33d766c471e0f0710bd6f8489846… Patch: https://github.com/kamailio/kamailio/commit/0fd33d766c471e0f0710bd6f8489846… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index 8876b248a1..2ae31c997c 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -304,11 +304,6 @@ int add_from_db(void) imc_dbf.free_result(imc_db, r_res); r_res = NULL; } - if(m_res) - { - imc_dbf.free_result(imc_db, m_res); - m_res = NULL; - } return 0; diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 781bf57cfe..1514e2c956 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -467,8 +467,7 @@ int imc_handle_invite(struct sip_msg* msg, imc_cmd_t *cmd, } body.len = 13 + member->uri.len - 4/* sip: */ + 28; - if(body.len>=IMC_BUF_SIZE || member->uri.len>=IMC_BUF_SIZE - || room->uri.len>=IMC_BUF_SIZE) + if(body.len>=IMC_BUF_SIZE-1) { LM_ERR("buffer size overflow\n"); goto error;

1 0

git:master:00f2cfd1: http_async_client: safety check for cell value
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 00f2cfd1efb81030c705cf4b4f6aa3ac582d3059 URL: https://github.com/kamailio/kamailio/commit/00f2cfd1efb81030c705cf4b4f6aa3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T11:32:56+02:00 http_async_client: safety check for cell value --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/00f2cfd1efb81030c705cf4b4f6aa3a… Patch: https://github.com/kamailio/kamailio/commit/00f2cfd1efb81030c705cf4b4f6aa3a… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index 5d07a9d29a..7e086e4b03 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -314,7 +314,9 @@ void reply_error(struct http_m_cell *cell) reply->error[0] = '\0'; } - cell->cb(reply, cell->param); + if (cell) { + cell->cb(reply, cell->param); + } pkg_free(reply);

1 0

git:master:eb6c9462: http_client: safety check for lenght of retrieved headers
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: eb6c94626d02e5a6fc2c93328591c140853535da URL: https://github.com/kamailio/kamailio/commit/eb6c94626d02e5a6fc2c93328591c14… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T11:33:44+02:00 http_client: safety check for lenght of retrieved headers --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/eb6c94626d02e5a6fc2c93328591c14… Patch: https://github.com/kamailio/kamailio/commit/eb6c94626d02e5a6fc2c93328591c14… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index ea194250ed..c4fc39d6a4 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -333,8 +333,8 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, /* HTTP_CODE CHANGED TO CURLINFO_RESPONSE_CODE in curl > 7.10.7 */ curl_easy_getinfo(curl, CURLINFO_HTTP_CODE, &stat); if(res == CURLE_OK) { - char *ct; - char *url; + char *ct = NULL; + char *url = NULL; /* ask for the content-type of the response */ res = curl_easy_getinfo(curl, CURLINFO_CONTENT_TYPE, &ct); @@ -342,14 +342,16 @@ static int curL_query_url(struct sip_msg* _m, const char* _url, str* _dst, if(ct) { LM_DBG("We received Content-Type: %s\n", ct); - if (params->pconn) { + if (params->pconn && + strlen(ct)<sizeof(params->pconn->result_content_type)-1) { strncpy(params->pconn->result_content_type, ct, sizeof(params->pconn->result_content_type)); } } if(url) { LM_DBG("We visited URL: %s\n", url); - if (params->pconn) { + if (params->pconn + && strlen(url)<sizeof(params->pconn->redirecturl)-1) { strncpy(params->pconn->redirecturl, url , sizeof(params->pconn->redirecturl)); }

1 0

git:master:36202503: drouting: handle errors in fixup function
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 36202503c531e5e6e865da018a59a494da6d9dc3 URL: https://github.com/kamailio/kamailio/commit/36202503c531e5e6e865da018a59a49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T11:30:22+02:00 drouting: handle errors in fixup function --- Modified: src/modules/drouting/drouting.c Modified: src/modules/drouting/prefix_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/36202503c531e5e6e865da018a59a49… Patch: https://github.com/kamailio/kamailio/commit/36202503c531e5e6e865da018a59a49… --- diff --git a/src/modules/drouting/drouting.c b/src/modules/drouting/drouting.c index e18ce7f76d..d642716a3d 100644 --- a/src/modules/drouting/drouting.c +++ b/src/modules/drouting/drouting.c @@ -979,6 +979,11 @@ static int fixup_do_routing(void** param, int param_no) if (param_no==1) { + if ( s==NULL || s[0]==0 ) { + LM_CRIT("empty group id definition"); + return E_CFG; + } + drg = (dr_group_t*)pkg_malloc(sizeof(dr_group_t)); if(drg==NULL) { @@ -987,33 +992,31 @@ static int fixup_do_routing(void** param, int param_no) } memset(drg, 0, sizeof(dr_group_t)); - if ( s==NULL || s[0]==0 ) { - LM_CRIT("empty group id definition"); - return E_CFG; - } - if (s[0]=='$') { /* param is a PV (AVP only supported) */ r.s = s; r.len = strlen(s); if (pv_parse_spec( &r, &avp_spec)==0 - || avp_spec.type!=PVT_AVP) { + || avp_spec.type!=PVT_AVP) { LM_ERR("malformed or non AVP %s AVP definition\n", s); + pkg_free(drg); return E_CFG; } if( pv_get_avp_name(0, &(avp_spec.pvp), &(drg->u.avp_id.name), - &(drg->u.avp_id.type) )!=0) { + &(drg->u.avp_id.type) )!=0) { LM_ERR("[%s]- invalid AVP definition\n", s); + pkg_free(drg); return E_CFG; } drg->type = 1; - /* do not free the param as the AVP spec may point inside - this string*/ + /* do not free the param as the AVP spec may point inside + * this string*/ } else { while(s && *s) { if(*s<'0' || *s>'9') { - LM_ERR( "bad number\n"); + LM_ERR("bad number\n"); + pkg_free(drg); return E_UNSPEC; } drg->u.grp_id = (drg->u.grp_id)*10+(*s-'0'); diff --git a/src/modules/drouting/prefix_tree.c b/src/modules/drouting/prefix_tree.c index 7eddab600d..cfb2cb15d7 100644 --- a/src/modules/drouting/prefix_tree.c +++ b/src/modules/drouting/prefix_tree.c @@ -78,7 +78,8 @@ internal_check_rt( rt_info_wrp_t* rtlw=NULL; if((NULL==ptn) || (NULL==ptn->rg)) - goto err_exit; + return NULL; + rg_pos = ptn->rg_pos; rg=ptn->rg; for(i=0;(i<rg_pos) && (rg[i].rgid!=rgid);i++); @@ -88,15 +89,12 @@ internal_check_rt( rtlw=rg[i].rtlw; while(rtlw!=NULL) { if(check_time(rtlw->rtl->time_rec)) - goto ok_exit; + return rtlw->rtl; rtlw=rtlw->next; } } -err_exit: - return NULL; -ok_exit: - return rtlw?rtlw->rtl:0; + return NULL; } @@ -129,8 +127,6 @@ get_prefix( /* go the tree down to the last digit in the * prefix string or down to a leaf */ while(tmp< (prefix->s+prefix->len)) { - if(NULL == tmp) - goto err_exit; idx = get_node_index(*tmp); if (idx == -1){ /* unknown character in the prefix string */ @@ -147,11 +143,8 @@ get_prefix( ptree = ptree->ptnode[idx].next; tmp++; } - /* go in the tree up to the root trying to match the - * prefix */ + /* go in the tree up to the root trying to match the prefix */ while(ptree !=NULL ) { - if(NULL == tmp) - goto err_exit; /* is it a real node or an intermediate one */ idx = get_node_index(*tmp); if(idx!=-1 && NULL != ptree->ptnode[idx].rg) {

1 0

git:master:e238567d: domainpolicy: check if set dst uri fails
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: e238567daa77f68df05cce68051792c3d7559ab7 URL: https://github.com/kamailio/kamailio/commit/e238567daa77f68df05cce68051792c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T11:11:36+02:00 domainpolicy: check if set dst uri fails --- Modified: src/modules/domainpolicy/domainpolicy.c --- Diff: https://github.com/kamailio/kamailio/commit/e238567daa77f68df05cce68051792c… Patch: https://github.com/kamailio/kamailio/commit/e238567daa77f68df05cce68051792c… --- diff --git a/src/modules/domainpolicy/domainpolicy.c b/src/modules/domainpolicy/domainpolicy.c index 003a757671..7cf7ac2d55 100644 --- a/src/modules/domainpolicy/domainpolicy.c +++ b/src/modules/domainpolicy/domainpolicy.c @@ -1018,7 +1018,10 @@ int dp_apply_policy(struct sip_msg* _msg, char* _s1, char* _s2) { duri_str.s = (char *)&(duri[0]); duri_str.len = at - duri_str.s; LM_DBG("new DURI is '%.*s'\n",duri_str.len, ZSW(duri_str.s)); - set_dst_uri(_msg, &duri_str); + if(set_dst_uri(_msg, &duri_str)<0) { + LM_ERR("failed to se dst uri\n"); + return -1; + } /* dst_uri changes, so it makes sense to re-use the current uri for forking */ ruri_mark_new(); /* re-use uri for serial forking */

1 0

git:master:bda4f0a8: dmq_usrloc: remove useless condition
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: bda4f0a8f8c7f65360fa73f51fb4fac289a8d334 URL: https://github.com/kamailio/kamailio/commit/bda4f0a8f8c7f65360fa73f51fb4fac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T11:10:56+02:00 dmq_usrloc: remove useless condition --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/bda4f0a8f8c7f65360fa73f51fb4fac… Patch: https://github.com/kamailio/kamailio/commit/bda4f0a8f8c7f65360fa73f51fb4fac… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 9260bb28ab..de01bc2062 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -198,8 +198,6 @@ void usrloc_get_all_ucontact(dmq_node_t* node) goto done; } if (rval > 0) { - if (buf != NULL) - dmq_usrloc_free(buf); len = rval * 2; buf = dmq_usrloc_malloc(len); if (buf == NULL) {

1 0

git:master:220f2e3a: dialog: extra headers for dlg_bridge() built with memcpy
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 220f2e3a36a7d7f00c77ef6f8cc495b3ff995b01 URL: https://github.com/kamailio/kamailio/commit/220f2e3a36a7d7f00c77ef6f8cc495b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T11:10:01+02:00 dialog: extra headers for dlg_bridge() built with memcpy --- Modified: src/modules/dialog/dlg_transfer.c --- Diff: https://github.com/kamailio/kamailio/commit/220f2e3a36a7d7f00c77ef6f8cc495b… Patch: https://github.com/kamailio/kamailio/commit/220f2e3a36a7d7f00c77ef6f8cc495b… --- diff --git a/src/modules/dialog/dlg_transfer.c b/src/modules/dialog/dlg_transfer.c index c7da054da0..74d43726ad 100644 --- a/src/modules/dialog/dlg_transfer.c +++ b/src/modules/dialog/dlg_transfer.c @@ -68,11 +68,11 @@ int dlg_bridge_init_hdrs(void) LM_ERR("no more pkg memory\n"); return -1; } - strncpy(dlg_bridge_hdrs_buf, + memcpy(dlg_bridge_hdrs_buf, "Contact: <", 10); - strncpy(dlg_bridge_hdrs_buf + 10, + memcpy(dlg_bridge_hdrs_buf + 10, dlg_bridge_contact.s, dlg_bridge_contact.len); - strncpy(dlg_bridge_hdrs_buf + 10 + dlg_bridge_contact.len, + memcpy(dlg_bridge_hdrs_buf + 10 + dlg_bridge_contact.len, ">\r\nContent-Type: application/sdp\r\n", 34); dlg_bridge_hdrs_buf[dlg_bridge_contact.len+44] = '\0'; dlg_bridge_inv_hdrs.s = dlg_bridge_hdrs_buf;

1 0

git:master:b81204e2: call_obj: fix convertion from uint32 to uint64
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: b81204e213a7ca14b95dda8a9191e622f78661dd URL: https://github.com/kamailio/kamailio/commit/b81204e213a7ca14b95dda8a9191e62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:13:42+02:00 call_obj: fix convertion from uint32 to uint64 --- Modified: src/modules/call_obj/call_obj_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b81204e213a7ca14b95dda8a9191e62… Patch: https://github.com/kamailio/kamailio/commit/b81204e213a7ca14b95dda8a9191e62… --- diff --git a/src/modules/call_obj/call_obj_mod.c b/src/modules/call_obj/call_obj_mod.c index 31bc1dade6..3e27245917 100644 --- a/src/modules/call_obj/call_obj_mod.c +++ b/src/modules/call_obj/call_obj_mod.c @@ -121,7 +121,8 @@ static void rpc_call_obj_list(rpc_t *rpc, void *ctx) } uint64_t current_ts; - uint64_t dur_ms = duration*1000; /* duration in milliseconds */ + uint64_t dur_ms = duration; + dur_ms *= 1000; /* duration in milliseconds */ if (get_timestamp(&current_ts)) { LM_ERR("error getting timestamp"); rpc->fault(ctx, 500, "error getting timestamp");

1 0

git:master:a81a8098: ctl: close opened sockets in case of errors
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: a81a809897ff381526db38e71af38dfcdfa74f04 URL: https://github.com/kamailio/kamailio/commit/a81a809897ff381526db38e71af38df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:15:00+02:00 ctl: close opened sockets in case of errors --- Modified: src/modules/ctl/binrpc.h Modified: src/modules/ctl/binrpc_run.c Modified: src/modules/ctl/ctl.c Modified: src/modules/ctl/ctrl_socks.c Modified: src/modules/ctl/fifo_server.c Modified: src/modules/ctl/init_socks.c Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/a81a809897ff381526db38e71af38df… Patch: https://github.com/kamailio/kamailio/commit/a81a809897ff381526db38e71af38df…

1 0

git:master:a3d32398: avp: typedef hdr name struct to simplify memory allocation
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: a3d3239833a8ca91566a28de2217ec166601e64f URL: https://github.com/kamailio/kamailio/commit/a3d3239833a8ca91566a28de2217ec1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:12:46+02:00 avp: typedef hdr name struct to simplify memory allocation --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/a3d3239833a8ca91566a28de2217ec1… Patch: https://github.com/kamailio/kamailio/commit/a3d3239833a8ca91566a28de2217ec1… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index 84ecf4d6dd..d6c8b3323d 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -60,7 +60,7 @@ MODULE_VERSION #define VAL_TYPE_INT (1<<0) #define VAL_TYPE_STR (1<<1) -struct hdr_name { +typedef struct hdr_name { enum {hdrId, hdrStr} kind; union { int n; @@ -69,7 +69,7 @@ struct hdr_name { char field_delimiter; char array_delimiter; int val_types; -}; +} hdr_name_t; static int xlbuf_size=256; static char* xlbuf=NULL; @@ -1379,7 +1379,7 @@ static int attr_hdr_body2attrs2(struct sip_msg* msg, char* header_, char* prefix static int attr_hdr_body2attrs_fixup(void **param, int param_no) { char *c, *params; - struct hdr_name *h; + hdr_name_t *h; int n; str *s; if(param_no == 1) { @@ -1408,7 +1408,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) c, n); return E_CFG; } - h = pkg_malloc(sizeof(*h)); + h = pkg_malloc(sizeof(hdr_name_t)); if(!h) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: out of memory\n"); return E_OUT_OF_MEM; @@ -1428,14 +1428,14 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) LOG(L_ERR, "attr_hdr_body2attrs_fixup: header name is empty\n"); return E_CFG; } - h = pkg_malloc(sizeof(*h) + n + 1); + h = pkg_malloc(sizeof(hdr_name_t) + n + 1); if(!h) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: out of memory\n"); return E_OUT_OF_MEM; } h->kind = HDR_STR; h->name.s.len = n; - h->name.s.s = (char *)h + sizeof(*h); + h->name.s.s = (char *)h + sizeof(hdr_name_t); memcpy(h->name.s.s, c, n + 1); } if(params) { @@ -1478,13 +1478,13 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) if(n == 0) { s = NULL; } else { - s = pkg_malloc(sizeof(*s) + n + 1); + s = pkg_malloc(sizeof(str) + n + 1); if(!s) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: out of memory\n"); return E_OUT_OF_MEM; } s->len = n; - s->s = (char *)s + sizeof(*s); + s->s = (char *)s + sizeof(str); memcpy(s->s, *param, n + 1); } pkg_free(*param); @@ -1506,7 +1506,6 @@ static int attr_hdr_body2attrs2_fixup(void** param, int param_no) } - static int avpgroup_fixup(void** param, int param_no) { unsigned long flags; @@ -1581,7 +1580,6 @@ static int avpgroup_fixup(void** param, int param_no) } - static int select_attr_fixup(str* res, select_t* s, struct sip_msg* msg) { avp_ident_t *avp_ident;

1 0

git:master:67e87eb1: auth_diameter: avoid passing large structs as params and better error handling
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 67e87eb16059351f174fc6f4d740eed33b5ace6b URL: https://github.com/kamailio/kamailio/commit/67e87eb16059351f174fc6f4d740eed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:11:17+02:00 auth_diameter: avoid passing large structs as params and better error handling --- Modified: src/modules/auth_diameter/authorize.c Modified: src/modules/auth_diameter/authorize.h Modified: src/modules/auth_diameter/avp.c Modified: src/modules/auth_diameter/message.c Modified: src/modules/auth_diameter/tcp_comm.c Modified: src/modules/auth_diameter/user_in.c --- Diff: https://github.com/kamailio/kamailio/commit/67e87eb16059351f174fc6f4d740eed… Patch: https://github.com/kamailio/kamailio/commit/67e87eb16059351f174fc6f4d740eed…

1 0

git:master:ec4d74ad: app_python: remove condition on classname, being set to non-null
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: ec4d74ad7c1d1b14a4f33f995845ac7b299540cf URL: https://github.com/kamailio/kamailio/commit/ec4d74ad7c1d1b14a4f33f995845ac7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:09:26+02:00 app_python: remove condition on classname, being set to non-null --- Modified: src/modules/app_python/app_python_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec4d74ad7c1d1b14a4f33f995845ac7… Patch: https://github.com/kamailio/kamailio/commit/ec4d74ad7c1d1b14a4f33f995845ac7… --- diff --git a/src/modules/app_python/app_python_mod.c b/src/modules/app_python/app_python_mod.c index 1b7b490190..73651ba8cf 100644 --- a/src/modules/app_python/app_python_mod.c +++ b/src/modules/app_python/app_python_mod.c @@ -353,7 +353,7 @@ static int child_init(int rank) if (!PyErr_Occurred()) PyErr_Format(PyExc_AttributeError, "class object '%s' has is not callable attribute '%s'", - !classname ? "None" : classname, mod_init_fname.s); + classname, mod_init_fname.s); python_handle_exception("child_init"); Py_DECREF(format_exc_obj); Py_XDECREF(pFunc); @@ -389,9 +389,6 @@ static int child_init(int rank) Py_DECREF(pFunc); Py_DECREF(pArgs); - - - if (PyErr_Occurred()) { python_handle_exception("child_init"); Py_DECREF(format_exc_obj); @@ -422,7 +419,6 @@ static int child_init(int rank) return -1; } - rval = PyInt_AsLong(pResult); Py_DECREF(pResult); PyThreadState_Swap(NULL);

1 0

git:master:e19c1ec5: core: pvapi - remove useless condition
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: e19c1ec58c8c51defd91f3e2581544bea224c0bf URL: https://github.com/kamailio/kamailio/commit/e19c1ec58c8c51defd91f3e2581544b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:08:24+02:00 core: pvapi - remove useless condition --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/e19c1ec58c8c51defd91f3e2581544b… Patch: https://github.com/kamailio/kamailio/commit/e19c1ec58c8c51defd91f3e2581544b… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 2f85783ea4..7e3d7b9b4b 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -1096,8 +1096,6 @@ int pv_parse_format(str *in, pv_elem_p *el) goto error; p0 = p + len; - if(p0==NULL) - goto error; if(*p0 == '\0') break; p = p0;

1 0

git:master:0cb33abe: core: mem/f_malloc - explicit set to 0 for bit shifting greater than size
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 0cb33abe8b2196fb26baf459f66d9d7b9e920013 URL: https://github.com/kamailio/kamailio/commit/0cb33abe8b2196fb26baf459f66d9d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:07:09+02:00 core: mem/f_malloc - explicit set to 0 for bit shifting greater than size --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/0cb33abe8b2196fb26baf459f66d9d7… Patch: https://github.com/kamailio/kamailio/commit/0cb33abe8b2196fb26baf459f66d9d7… --- diff --git a/src/core/mem/f_malloc.c b/src/core/mem/f_malloc.c index 89985a4c72..184037814e 100644 --- a/src/core/mem/f_malloc.c +++ b/src/core/mem/f_malloc.c @@ -122,7 +122,8 @@ inline static int fm_bmp_first_set(struct fm_block* qm, int start) return (start-bit+r); } #endif - v=qm->free_bitmap[bmp_idx]>>(bit+1); + if((bit+1) < 8*sizeof(v)) v=qm->free_bitmap[bmp_idx]>>(bit+1); + else v = 0; return start+1+bit_scan_forward((unsigned long)v); } for (r=bmp_idx+1;r<FM_HASH_BMP_SIZE; r++){

1 0

git:master:107dc767: core: dns cache - avoid bitshifting with more than the size
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 107dc767391902d5d3b000deecafb804c1c68c1b URL: https://github.com/kamailio/kamailio/commit/107dc767391902d5d3b000deecafb80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:05:16+02:00 core: dns cache - avoid bitshifting with more than the size - avoid undefined behaviour as per C specs --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/107dc767391902d5d3b000deecafb80… Patch: https://github.com/kamailio/kamailio/commit/107dc767391902d5d3b000deecafb80… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 7f3e33875d..e8bfd7f5e6 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2344,7 +2344,7 @@ inline static struct dns_rr* dns_srv_get_nxt_rr(struct dns_hash_entry* e, #endif /* i is the winner */ *no=n; /* grp. start */ - srv_mark_tried(tried, i); /* mark it */ + if(i<8*sizeof(*tried)) srv_mark_tried(tried, i); /* mark it */ return r_sums[i].rr; no_more_rrs: *no=n;

1 0

git:master:2dc6e470: auth_diameter: removed svn id, history
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 2dc6e4700012336ac15dc9b6190f6750648854aa URL: https://github.com/kamailio/kamailio/commit/2dc6e4700012336ac15dc9b6190f675… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T22:32:39+02:00 auth_diameter: removed svn id, history --- Modified: src/modules/auth_diameter/auth_diameter.c Modified: src/modules/auth_diameter/auth_diameter.h Modified: src/modules/auth_diameter/authorize.c Modified: src/modules/auth_diameter/authorize.h Modified: src/modules/auth_diameter/avp.c Modified: src/modules/auth_diameter/defs.h Modified: src/modules/auth_diameter/diameter_msg.h Modified: src/modules/auth_diameter/message.c Modified: src/modules/auth_diameter/tcp_comm.c Modified: src/modules/auth_diameter/tcp_comm.h Modified: src/modules/auth_diameter/user_in.c --- Diff: https://github.com/kamailio/kamailio/commit/2dc6e4700012336ac15dc9b6190f675… Patch: https://github.com/kamailio/kamailio/commit/2dc6e4700012336ac15dc9b6190f675…

1 0

git:master:f3c68a50: core: cfg - removed unreachable code
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: f3c68a5013b5a33937dbf735453da29df75ae09e URL: https://github.com/kamailio/kamailio/commit/f3c68a5013b5a33937dbf735453da29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:03:26+02:00 core: cfg - removed unreachable code --- Modified: src/core/cfg/cfg_select.c Modified: src/core/cfg/cfg_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/f3c68a5013b5a33937dbf735453da29… Patch: https://github.com/kamailio/kamailio/commit/f3c68a5013b5a33937dbf735453da29… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index ae8b0c8852..19b815332d 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -205,10 +205,6 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) /* use the module's handle to access the variable, so the variables are read from the local config */ p = *(group->handle) + var->offset; - if (p == NULL) - return -1; /* The group is not yet ready. - * (Trying to read the value from the - * main process that has no local configuration) */ switch (CFG_VAR_TYPE(var)) { case CFG_VAR_INT: @@ -308,10 +304,6 @@ unsigned int read_cfg_var(struct cfg_read_handle *read_handle, void **val) /* use the module's handle to access the variable, so the variables are read from the local config */ p = *(group->handle) + var->offset; - if (p == NULL) - return 0; /* The group is not yet ready. - * (Trying to read the value from the - * main process that has no local configuration) */ switch (CFG_VAR_TYPE(var)) { case CFG_VAR_INT: diff --git a/src/core/cfg/cfg_struct.c b/src/core/cfg/cfg_struct.c index 8bfe4295a3..350d49c216 100644 --- a/src/core/cfg/cfg_struct.c +++ b/src/core/cfg/cfg_struct.c @@ -1250,8 +1250,7 @@ int cfg_select_next(cfg_group_t *group) return -1; } - if (!(meta = CFG_GROUP_META(cfg_local, group))) - return -1; + meta = CFG_GROUP_META(cfg_local, group); if (!(old_ginst = CFG_HANDLE_TO_GINST(*(group->handle)) /* the active group instance */)) { LOG(L_ERR, "ERROR: cfg_select_next(): No group instance is set currently. Forgot to call cfg_select_first()?\n");

1 0

git:master:3fad937b: lib/ims: proper check of the pointer returned by pkg_malloc; indentation fixes
by Daniel-Constantin Mierla 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: 3fad937b03ee7ba9d229344a6d88592602e25e32 URL: https://github.com/kamailio/kamailio/commit/3fad937b03ee7ba9d229344a6d88592… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T18:53:14+02:00 lib/ims: proper check of the pointer returned by pkg_malloc; indentation fixes --- Modified: src/lib/ims/ims_getters.c --- Diff: https://github.com/kamailio/kamailio/commit/3fad937b03ee7ba9d229344a6d88592… Patch: https://github.com/kamailio/kamailio/commit/3fad937b03ee7ba9d229344a6d88592…

1 0

git:master:a2b1f269: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: a2b1f2692603a952a56bf513c68871d172139ca6 URL: https://github.com/kamailio/kamailio/commit/a2b1f2692603a952a56bf513c68871d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-26T17:46:20+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/a2b1f2692603a952a56bf513c68871d… Patch: https://github.com/kamailio/kamailio/commit/a2b1f2692603a952a56bf513c68871d… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 9623b2c256..d4d8701859 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -419,7 +419,10 @@ modparam("uac","auth_password_avp","$avp(i:12)") 3.12. reg_db_url (string) - DB URL to fetch account profiles for registration. + DB URL to fetch account profiles for registration. This parameter must + be set in order to enable remote registrations feature. + + The default value is "" (no value). Example 1.12. Set reg_db_url parameter ...

1 0

git:master:7d414352: uac: added note about default value for reg_db_url
by Daniel-Constantin Mierla 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: 7d414352e0544cfe1739f3e36cec2c23379ae902 URL: https://github.com/kamailio/kamailio/commit/7d414352e0544cfe1739f3e36cec2c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T17:37:28+02:00 uac: added note about default value for reg_db_url --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d414352e0544cfe1739f3e36cec2c2… Patch: https://github.com/kamailio/kamailio/commit/7d414352e0544cfe1739f3e36cec2c2… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index e6ba5a2b63..020df01eab 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -10,7 +10,7 @@  <chapter> - + <title>&adminguide;</title> @@ -358,10 +358,10 @@ modparam("uac","auth_username_avp","$avp(i:11)") to perform authentication. </para> <para><emphasis> - If you define it, you also need to define - <quote>auth_password_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>) and - <quote>auth_username_avp</quote> + If you define it, you also need to define + <quote>auth_password_avp</quote> + (<xref linkend="uac.p.auth-password-avp-id"/>) and + <quote>auth_username_avp</quote> (<xref linkend="uac.p.auth-password-avp-id"/>). </emphasis></para> <example> @@ -376,8 +376,10 @@ modparam("uac","auth_password_avp","$avp(i:12)") <section id="uac.p.reg-db-url-id"> <title><varname>reg_db_url</varname> (string)</title> <para> - DB URL to fetch account profiles for registration. + DB URL to fetch account profiles for registration. This parameter + must be set in order to enable remote registrations feature. </para> + <para>The default value is "" (no value).</para> <example> <title>Set <varname>reg_db_url</varname> parameter</title> <programlisting format="linespecific"> @@ -392,14 +394,14 @@ modparam("uac", "reg_db_url", <section id="uac.p.reg-timer-interval-id"> <title><varname>reg_timer_interval</varname> (string)</title> <para> - Timer interval (in seconds) at which registrations are managed, e.g. renewed as needed. + Timer interval (in seconds) at which registrations are managed, e.g. renewed as needed. </para> <para> <emphasis> The default value is 90 seconds. </emphasis> </para> - + <example> <title>Set <varname>reg_timer_interval</varname> parameter</title> <programlisting format="linespecific">

1 0

[kamailio] PID file permissions (#231)
by Arsen 26 Jul '17

26 Jul '17

ENV: Debian 8 So on most Linux systems the /var/run folder is a tmpfs and after which clears after each reboot As I try to start up kamailio after a reboot through kamctl I get the following error. "ERROR: PID file /var/run/kamailio.pid does not exist -- Kamailio start failed" Because kamailio does not have the permission to write to the /var/run folder as the kamailio user. Would it be possible to add in the "kamctl" code a section where the SPECIFIED PID LOCATION (/var/run/kamailio) is checked and if it does not exist create it as the root user and chown it to the SPECIFIED USER (kamailio)? The way I have patched it for now is to create a init script that creates a /var/run/kamailio folder and chmods it to kamailio:kamailio Thanks everyone! --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/231

6 13

git:master:16006cd9: dialplan: exported dp_match() and dp_replace() to kemi framework
by Daniel-Constantin Mierla 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: 16006cd97c4eccb4b45c459a8585649450bf5772 URL: https://github.com/kamailio/kamailio/commit/16006cd97c4eccb4b45c459a8585649… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T12:18:15+02:00 dialplan: exported dp_match() and dp_replace() to kemi framework --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/16006cd97c4eccb4b45c459a8585649… Patch: https://github.com/kamailio/kamailio/commit/16006cd97c4eccb4b45c459a8585649… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 5a94e8c21c..85dc0d652b 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -55,6 +55,7 @@ #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" #include "../../core/lvalue.h" +#include "../../core/kemi.h" #include "dialplan.h" #include "dp_db.h" @@ -256,17 +257,21 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * dest, memset(&val, 0, sizeof(pv_value_t)); val.flags = PV_VAL_STR; - no_change = (dest==NULL) || (dest->type == PVT_NONE) || (!repl->s) || (!repl->len); + no_change = (dest==NULL) || (dest->type == PVT_NONE) + || (!repl->s) || (!repl->len); if (no_change) goto set_attr_pvar; val.rs = *repl; - if(dest->setf(msg, &dest->pvp, (int)EQ_T, &val)<0) - { - LM_ERR("setting dst pseudo-variable failed\n"); - return -1; + if(dest->setf) { + if(dest->setf(msg, &dest->pvp, (int)EQ_T, &val)<0) { + LM_ERR("setting dst pseudo-variable failed\n"); + return -1; + } + } else { + LM_WARN("target variable is read only - skipping setting its value\n"); } if(dp_append_branch!=0) { @@ -506,6 +511,19 @@ static int w_dp_replace(sip_msg_t* msg, char* pid, char* psrc, char* pdst) return dp_replace_helper(msg, dpid, &src, pvd); } +static int ki_dp_replace(sip_msg_t* msg, int dpid, str* src, str* dst) +{ + pv_spec_t *pvd = NULL; + + pvd = pv_cache_get(dst); + if(pvd==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", dst->len, dst->s); + return -1; + } + + return dp_replace_helper(msg, dpid, src, pvd); +} + static int w_dp_match(sip_msg_t* msg, char* pid, char* psrc) { int dpid = 1; @@ -523,6 +541,11 @@ static int w_dp_match(sip_msg_t* msg, char* pid, char* psrc) return dp_replace_helper(msg, dpid, &src, NULL); } +static int ki_dp_match(sip_msg_t* msg, int dpid, str* src) +{ + return dp_replace_helper(msg, dpid, src, NULL); +} + int dp_replace_fixup(void** param, int param_no) { if (param_no == 1) @@ -776,3 +799,32 @@ static int dialplan_init_rpc(void) } return 0; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_dialplan_exports[] = { + { str_init("dialplan"), str_init("dp_match"), + SR_KEMIP_INT, ki_dp_match, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dialplan"), str_init("dp_replace"), + SR_KEMIP_INT, ki_dp_replace, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_dialplan_exports); + return 0; +} \ No newline at end of file

1 0

git:master:35219960: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: 35219960e2960359d4d8b17f1566da611554a152 URL: https://github.com/kamailio/kamailio/commit/35219960e2960359d4d8b17f1566da6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-26T12:01:25+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/35219960e2960359d4d8b17f1566da6… Patch: https://github.com/kamailio/kamailio/commit/35219960e2960359d4d8b17f1566da6… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index 428a27c958..9c082b8fc2 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -74,7 +74,7 @@ Daniel-Constantin Mierla 1.15. pv_xavp_to_var() usage 1.16. pv_xavp_to_var() usage 1.17. pv.shvSet usage - 1.18. pv.shvSet usage + 1.18. pv.shvGet usage Chapter 1. Admin Guide @@ -461,7 +461,7 @@ $ kamcmd pv.shvSet debug int 3 If no name is given, all shared variables are listed. - Example 1.18. pv.shvSet usage + Example 1.18. pv.shvGet usage ... $ kamcmd pv.shvGet debug ...

1 0

git:master:e9509170: pv: added section ids in the docs
by Daniel-Constantin Mierla 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: e95091700857ff96d9e7c6508104a5ba5d5487ff URL: https://github.com/kamailio/kamailio/commit/e95091700857ff96d9e7c6508104a5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T12:00:38+02:00 pv: added section ids in the docs --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e95091700857ff96d9e7c6508104a5b… Patch: https://github.com/kamailio/kamailio/commit/e95091700857ff96d9e7c6508104a5b…

1 0

git:master:ab1d3a33: modules: readme files regenerated - dialplan ... [skip ci]
by Kamailio Dev 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: ab1d3a3302760713722b2fd3ef41615c53b597dc URL: https://github.com/kamailio/kamailio/commit/ab1d3a3302760713722b2fd3ef41615… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-26T09:31:32+02:00 modules: readme files regenerated - dialplan ... [skip ci] --- Modified: src/modules/dialplan/README --- Diff: https://github.com/kamailio/kamailio/commit/ab1d3a3302760713722b2fd3ef41615… Patch: https://github.com/kamailio/kamailio/commit/ab1d3a3302760713722b2fd3ef41615… --- diff --git a/src/modules/dialplan/README b/src/modules/dialplan/README index f073564db1..cde96e214d 100644 --- a/src/modules/dialplan/README +++ b/src/modules/dialplan/README @@ -54,6 +54,7 @@ Luis Martin 5.11. attrs_pvar (string) 5.12. fetch_rows (int) 5.13. match_dynamic (int) + 5.14. append_branch (int) 6. Functions @@ -87,11 +88,12 @@ Luis Martin 1.11. Set attrs_pvar parameter 1.12. Set fetch_rows parameter 1.13. Set match_dynamic parameter - 1.14. dp_replace usage - 1.15. dp_match usage - 1.16. dp_translate usage + 1.14. Set append_branch parameter + 1.15. dp_replace usage + 1.16. dp_match usage 1.17. dp_translate usage - 1.18. Example of rules + 1.18. dp_translate usage + 1.19. Example of rules Chapter 1. Admin Guide @@ -120,6 +122,7 @@ Chapter 1. Admin Guide 5.11. attrs_pvar (string) 5.12. fetch_rows (int) 5.13. match_dynamic (int) + 5.14. append_branch (int) 6. Functions @@ -219,6 +222,7 @@ Chapter 1. Admin Guide 5.11. attrs_pvar (string) 5.12. fetch_rows (int) 5.13. match_dynamic (int) + 5.14. append_branch (int) 5.1. db_url (string) @@ -375,6 +379,20 @@ modparam("dialplan", "fetch_rows", 4000) modparam("dialplan", "match_dynamic", 1) ... +5.14. append_branch (int) + + If set to 1, the module appends a new outgoing branch when request URI + (r-uri) or its user part are changed by dp_translate() or dp_replace() + inside a failure_route block. Set it to 0 if the branch should not be + added. + + Default value is “1”. + + Example 1.14. Set append_branch parameter +... +modparam("dialplan", "append_branch", 0) +... + 6. Functions 6.1. dp_replace(dpid, inval, outvar) @@ -405,7 +423,7 @@ modparam("dialplan", "match_dynamic", 1) This function can be used from ANY_ROUTE. - Example 1.14. dp_replace usage + Example 1.15. dp_replace usage ... dp_replace("240", "$rU", "$var(newru)"); xlog("'$rU' was translated to '$var(newru)'\n"); @@ -432,7 +450,7 @@ dp_replace("240", "+49$rU", "$var(newval)"); This function can be used from ANY_ROUTE. - Example 1.15. dp_match usage + Example 1.16. dp_match usage ... dp_match("240", "+49$rU"); xlog("the attributes associated with '+49$rU' are '$var(attrs)'\n"); @@ -473,13 +491,13 @@ xlog("the attributes associated with '+49$rU' are '$var(attrs)'\n"); This function can be used from ANY_ROUTE. - Example 1.16. dp_translate usage + Example 1.17. dp_translate usage ... dp_translate("240", "$ruri.user/$avp(s:dest)"); xlog("translated to var $avp(s:dest) \n"); ... - Example 1.17. dp_translate usage + Example 1.18. dp_translate usage ... $avp(s:src) = $ruri.user; dp_translate("$var(x)", "$avp(s:src)/$var(y)"); @@ -549,7 +567,7 @@ xlog("translated to var $var(y) \n"); Some sample records from a dialplan table are presented in the next figure. - Example 1.18. Example of rules + Example 1.19. Example of rules ... dpid: 1 pr: 1

1 0

git:master:55a98c84: dialplan: documentation for append_branch parameter
by Daniel-Constantin Mierla 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: 55a98c84112fcca6b917f1efd08e8da3b1a9ab69 URL: https://github.com/kamailio/kamailio/commit/55a98c84112fcca6b917f1efd08e8da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T09:24:59+02:00 dialplan: documentation for append_branch parameter --- Modified: src/modules/dialplan/doc/dialplan_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/55a98c84112fcca6b917f1efd08e8da… Patch: https://github.com/kamailio/kamailio/commit/55a98c84112fcca6b917f1efd08e8da… --- diff --git a/src/modules/dialplan/doc/dialplan_admin.xml b/src/modules/dialplan/doc/dialplan_admin.xml index 073c2b24ed..e9f8f95350 100644 --- a/src/modules/dialplan/doc/dialplan_admin.xml +++ b/src/modules/dialplan/doc/dialplan_admin.xml @@ -387,6 +387,28 @@ modparam("dialplan", "match_dynamic", 1) </programlisting> </example> </section> + <section id="dialplan.p.append_branch"> + <title><varname>append_branch</varname> (int)</title> + <para> + If set to 1, the module appends a new outgoing branch when request + URI (r-uri) or its user part are changed by dp_translate() or + dp_replace() inside a failure_route block. Set it to 0 if the branch + should not be added. + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>append_branch</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialplan", "append_branch", 0) +... + </programlisting> + </example> + </section> </section>

1 0

git:master:4c65f4fd: dialplan: added append_branch parameter
by Daniel-Constantin Mierla 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: 4c65f4fd4dda697e48757e06e011fa58a2000588 URL: https://github.com/kamailio/kamailio/commit/4c65f4fd4dda697e48757e06e011fa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T09:21:59+02:00 dialplan: added append_branch parameter - control if the module should do append branch if r-uri or r-uri username are changed inside failure route - default value is 1 (append branch - preserves compatibility) --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/4c65f4fd4dda697e48757e06e011fa5… Patch: https://github.com/kamailio/kamailio/commit/4c65f4fd4dda697e48757e06e011fa5… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index cac1df7124..5a94e8c21c 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -85,6 +85,7 @@ dp_param_p default_par2 = NULL; int dp_fetch_rows = 1000; int dp_match_dynamic = 0; +int dp_append_branch = 1; static param_export_t mod_params[]={ { "db_url", PARAM_STR, &dp_db_url }, @@ -100,6 +101,7 @@ static param_export_t mod_params[]={ { "attrs_pvar", PARAM_STR, &attr_pvar_s }, { "fetch_rows", PARAM_INT, &dp_fetch_rows }, { "match_dynamic", PARAM_INT, &dp_match_dynamic }, + { "append_branch", PARAM_INT, &dp_append_branch }, {0,0,0} }; @@ -267,11 +269,15 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * dest, return -1; } - if(is_route_type(FAILURE_ROUTE) - && (dest->type==PVT_RURI || dest->type==PVT_RURI_USERNAME)) { - if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0) != 1) { - LM_ERR("append_branch action failed\n"); - return -1; + if(dp_append_branch!=0) { + if(is_route_type(FAILURE_ROUTE) + && (dest->type == PVT_RURI + || dest->type == PVT_RURI_USERNAME)) { + if(append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, 0, 0, 0, 0, 0) + != 1) { + LM_ERR("append branch action failed\n"); + return -1; + } } }

1 0

git:master:b59771bb: modules/sipcapture: fix (param_export_t).name typo
by Mikko Lehto 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: b59771bb81bbe240b98113252df10377a75da700 URL: https://github.com/kamailio/kamailio/commit/b59771bb81bbe240b98113252df1037… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-25T15:54:57+03:00 modules/sipcapture: fix (param_export_t).name typo --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/b59771bb81bbe240b98113252df1037… Patch: https://github.com/kamailio/kamailio/commit/b59771bb81bbe240b98113252df1037… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index beaff682d3..1c365f8168 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -367,7 +367,7 @@ static param_export_t params[] = { {"insert_retries", INT_PARAM, &insert_retries }, {"insert_retry_timeout", INT_PARAM, &insert_retry_timeout }, {"table_time_sufix", PARAM_STR, &table_time_sufix }, - {"topoh_unamsk", PARAM_INT, &sc_topoh_unmask }, + {"topoh_unmask", PARAM_INT, &sc_topoh_unmask }, {"nonsip_hook", PARAM_INT, &nonsip_hook }, {0, 0, 0} };

2 3

git:5.0:605feb78: modules/sipcapture: fix (param_export_t).name typo
by Mikko Lehto 25 Jul '17

25 Jul '17

Module: kamailio Branch: 5.0 Commit: 605feb7876c4a4a70b3c336b477a597182a8e60a URL: https://github.com/kamailio/kamailio/commit/605feb7876c4a4a70b3c336b477a597… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-25T22:36:51+03:00 modules/sipcapture: fix (param_export_t).name typo (cherry picked from commit b59771bb81bbe240b98113252df10377a75da700) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/605feb7876c4a4a70b3c336b477a597… Patch: https://github.com/kamailio/kamailio/commit/605feb7876c4a4a70b3c336b477a597… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index efc53d1054..7167cf3053 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -367,7 +367,7 @@ static param_export_t params[] = { {"insert_retries", INT_PARAM, &insert_retries }, {"insert_retry_timeout", INT_PARAM, &insert_retry_timeout }, {"table_time_sufix", PARAM_STR, &table_time_sufix }, - {"topoh_unamsk", PARAM_INT, &sc_topoh_unmask }, + {"topoh_unmask", PARAM_INT, &sc_topoh_unmask }, {"nonsip_hook", PARAM_INT, &nonsip_hook }, {0, 0, 0} };

1 0

git:master:f3a96c82: modules: readme files regenerated - dialplan ... [skip ci]
by Kamailio Dev 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: f3a96c82dae858da68d586a2ded97d7ae3c11a2e URL: https://github.com/kamailio/kamailio/commit/f3a96c82dae858da68d586a2ded97d7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-25T19:46:22+02:00 modules: readme files regenerated - dialplan ... [skip ci] --- Modified: src/modules/dialplan/README --- Diff: https://github.com/kamailio/kamailio/commit/f3a96c82dae858da68d586a2ded97d7… Patch: https://github.com/kamailio/kamailio/commit/f3a96c82dae858da68d586a2ded97d7…

1 0

git:master:2cae9f8a: dialplan: added documentation for dp_match() and dp_translate()
by Daniel-Constantin Mierla 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: 2cae9f8a301befb0a00f1831c9d5773924e35c10 URL: https://github.com/kamailio/kamailio/commit/2cae9f8a301befb0a00f1831c9d5773… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T19:41:05+02:00 dialplan: added documentation for dp_match() and dp_translate() --- Modified: src/modules/dialplan/doc/dialplan_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2cae9f8a301befb0a00f1831c9d5773… Patch: https://github.com/kamailio/kamailio/commit/2cae9f8a301befb0a00f1831c9d5773… --- diff --git a/src/modules/dialplan/doc/dialplan_admin.xml b/src/modules/dialplan/doc/dialplan_admin.xml index 8153974401..073c2b24ed 100644 --- a/src/modules/dialplan/doc/dialplan_admin.xml +++ b/src/modules/dialplan/doc/dialplan_admin.xml @@ -394,6 +394,103 @@ modparam("dialplan", "match_dynamic", 1) <section> <title>Functions</title> + <section id="dialplan.p.dp_replace"> + <title> + <function moreinfo="none">dp_replace(dpid, inval, outvar)</function> + </title> + <para> + The function translates the input value 'inval' using the rules with dialplan + id 'dpid', storing the value in the variable 'outvar'. If the rule that was + applied has attributes, they are stored in the variable provided via the + module parameter 'attrs_pvar'. + </para> + <para> + The behavior is same as dp_translate("dpid", "inval/outvar"), but the + parameters have a more flexible format. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>dpid</emphasis> - the dialplan id to match the rules and apply + the transformations. It can be a static string or a config variable + holding an integer value. + </para> + </listitem> + <listitem> + <para> + <emphasis>inval</emphasis> - input value. It can be a static or a + dynamic string. The dynamic string can contain config variables, + combined or not with static strings, that are evaluated at runtime. + </para> + </listitem> + <listitem> + <para> + <emphasis>outvar</emphasis> - output variable name. The value resulted + after applying the matching rule is stored in this variable. The name + must refer to a writable variable. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>dp_replace</function> usage</title> + <programlisting format="linespecific"> +... +dp_replace("240", "$rU", "$var(newru)"); +xlog("'$rU' was translated to '$var(newru)'\n"); +dp_replace("240", "+49$rU", "$var(newval)"); +... + </programlisting> + </example> + </section> + + <section id="dialplan.p.dp_match"> + <title> + <function moreinfo="none">dp_match(dpid, inval)</function> + </title> + <para> + The function matches the input value 'inval' using the rules with dialplan + id 'dpid'. If the rule that was applied has attributes, they are stored in + the variable provided via the module parameter 'attrs_pvar'. + </para> + <para> + The behavior is same as dp_translate("dpid", "inval"), but the + parameters have a more flexible format. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>dpid</emphasis> - the dialplan id to match the rules and apply + the transformations. It can be a static string or a config variable + holding an integer value. + </para> + </listitem> + <listitem> + <para> + <emphasis>inval</emphasis> - input value. It can be a static or a + dynamic string. The dynamic string can contain config variables, + combined or not with static strings, that are evaluated at runtime. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>dp_match</function> usage</title> + <programlisting format="linespecific"> +... +dp_match("240", "+49$rU"); +xlog("the attributes associated with '+49$rU' are '$var(attrs)'\n"); +... + </programlisting> + </example> + </section> + <section id="dialplan.p.dp_translate"> <title> <function moreinfo="none">dp_translate(id, [src[/dest]])</function>

1 0

git:master:e049d6db: core: added helper fixup for int and str dynamic parameters
by Daniel-Constantin Mierla 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: e049d6db78d9a86049f88acc27188d726974054f URL: https://github.com/kamailio/kamailio/commit/e049d6db78d9a86049f88acc27188d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T19:41:05+02:00 core: added helper fixup for int and str dynamic parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/e049d6db78d9a86049f88acc27188d7… Patch: https://github.com/kamailio/kamailio/commit/e049d6db78d9a86049f88acc27188d7… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index d817b75565..3e8562add6 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -461,7 +461,6 @@ int fixup_igp_pvar(void** param, int param_no) } - int fixup_free_igp_pvar(void** param, int param_no) { if (param_no == 1) @@ -472,7 +471,6 @@ int fixup_free_igp_pvar(void** param, int param_no) } - int fixup_igp_pvar_pvar(void** param, int param_no) { if (param_no == 1) @@ -483,7 +481,6 @@ int fixup_igp_pvar_pvar(void** param, int param_no) } - int fixup_free_igp_pvar_pvar(void** param, int param_no) { if (param_no == 1) @@ -494,6 +491,25 @@ int fixup_free_igp_pvar_pvar(void** param, int param_no) } +int fixup_igp_spve(void** param, int param_no) +{ + if (param_no == 1) + return fixup_igp_null(param, param_no); + else if (param_no == 2) + return fixup_spve_all(param, param_no); + return E_UNSPEC; +} + + +int fixup_free_igp_spve(void** param, int param_no) +{ + if (param_no == 1) + return fixup_free_igp_null(param, param_no); + else if (param_no == 2) + return fixup_free_spve_all(param, param_no); + return E_UNSPEC; +} + /** macro for declaring a spve fixup and the corresponding free_fixup * for a function expecting first no1 params as fparam converted spve diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index 835342ab86..869dd78527 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -122,6 +122,12 @@ int fixup_free_igp_pvar(void** param, int param_no); int fixup_igp_pvar_pvar(void** param, int param_no); int fixup_free_igp_pvar_pvar(void** param, int param_no); +int fixup_igp_spve(void** param, int param_no); +int fixup_free_igp_spve(void** param, int param_no); + +int fixup_pvar_all(void** param, int param_no); +int fixup_free_pvar_all(void** param, int param_no); + int fixup_spve_spve(void** param, int param_no); int fixup_free_spve_spve(void** param, int param_no); int fixup_spve_null(void** param, int param_no);

1 0

git:master:2c105fa6: dialplan: added dp_match() and dp_replace() functions
by Daniel-Constantin Mierla 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: 2c105fa6a66e24a6d9e24f96b0f4c04b60ce0da9 URL: https://github.com/kamailio/kamailio/commit/2c105fa6a66e24a6d9e24f96b0f4c04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T19:41:05+02:00 dialplan: added dp_match() and dp_replace() functions - alternatives to dp_translate() with dedicated required parameters (avoiding second parameter of two variables separated by '/') - dp_match(dpid, inval) - dp_replace(dpid, inval, outvar) - dpid can be interger or variable - inval can be a static or dynamic (with vars) string - outvar has to be a writable variable --- Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/dialplan.h Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/2c105fa6a66e24a6d9e24f96b0f4c04… Patch: https://github.com/kamailio/kamailio/commit/2c105fa6a66e24a6d9e24f96b0f4c04…

1 0

git:master:36b8c1a1: dialplan: increased the size for dialplan attributes to 256
by Daniel-Constantin Mierla 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: 36b8c1a138548ea3689cac77e18ac304ec2ee0e5 URL: https://github.com/kamailio/kamailio/commit/36b8c1a138548ea3689cac77e18ac30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T19:41:05+02:00 dialplan: increased the size for dialplan attributes to 256 --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/36b8c1a138548ea3689cac77e18ac30… Patch: https://github.com/kamailio/kamailio/commit/36b8c1a138548ea3689cac77e18ac30… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 85741677df..28d555bbdd 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -571,7 +571,7 @@ int rule_translate(sip_msg_t *msg, str string, dpl_node_t * rule, return -1; } -#define DP_MAX_ATTRS_LEN 128 +#define DP_MAX_ATTRS_LEN 255 static char dp_attrs_buf[DP_MAX_ATTRS_LEN+1]; int translate(sip_msg_t *msg, str input, str *output, dpl_id_p idp, str *attrs)

1 0

git:master:c9ff171b: modules: readme files regenerated - sipcapture ... [skip ci]
by Kamailio Dev 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: c9ff171b4ce90671eebbef914e12e8d59521e621 URL: https://github.com/kamailio/kamailio/commit/c9ff171b4ce90671eebbef914e12e8d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-25T15:01:20+02:00 modules: readme files regenerated - sipcapture ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/c9ff171b4ce90671eebbef914e12e8d… Patch: https://github.com/kamailio/kamailio/commit/c9ff171b4ce90671eebbef914e12e8d… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index 451628d8b3..bc7bc6694f 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -49,6 +49,7 @@ Alexandr Dubovikov 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 4. Functions @@ -84,8 +85,9 @@ Alexandr Dubovikov 1.18. Set insert_retry_timeout parameter 1.19. Set callid_aleg_header parameter 1.20. Set topoh_unmask parameter - 1.21. sip_capture() usage - 1.22. report_capture() usage + 1.21. Set nonsip_hook parameter + 1.22. sip_capture() usage + 1.23. report_capture() usage Chapter 1. Admin Guide @@ -119,6 +121,7 @@ Chapter 1. Admin Guide 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 4. Functions @@ -186,6 +189,7 @@ Chapter 1. Admin Guide 3.18. insert_retry_timeout (integer) 3.19. callid_aleg_header (str) 3.20. topoh_unmask (int) + 3.21. nonsip_hook (int) 3.1. db_url (str) @@ -456,6 +460,18 @@ modparam("sipcapture", "callid_aleg_header", "X-CallIDALeg") modparam("sipcapture", "topoh_unmask", 1) ... +3.21. nonsip_hook (int) + + If set to 1, event route sipcapture:siprequest is run when HEP message + is received. + + Default value is 0. + + Example 1.21. Set nonsip_hook parameter +... +modparam("sipcapture", "nonsip_hook", 1) +... + 4. Functions 4.1. sip_capture([table]) @@ -477,7 +493,7 @@ modparam("sipcapture", "topoh_unmask", 1) ONREPLY_ROUTE, BRANCH_ROUTE. Default value is "NULL". - Example 1.21. sip_capture() usage + Example 1.22. sip_capture() usage ... sip_capture(); ... @@ -496,7 +512,7 @@ sip_capture("sip_capture_call_20160124"); ONREPLY_ROUTE, BRANCH_ROUTE. Default value is "NULL". - Example 1.22. report_capture() usage + Example 1.23. report_capture() usage ... report_capture(); ...

1 0

git:master:2f872dcc: modules/sipcapture: improve nonsip_hook documentation
by Mikko Lehto 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: 2f872dcc684a345cff09a437ae4a3767613b5529 URL: https://github.com/kamailio/kamailio/commit/2f872dcc684a345cff09a437ae4a376… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-07-25T15:54:57+03:00 modules/sipcapture: improve nonsip_hook documentation --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml Modified: src/modules/sipcapture/examples/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/2f872dcc684a345cff09a437ae4a376… Patch: https://github.com/kamailio/kamailio/commit/2f872dcc684a345cff09a437ae4a376… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 8916317cb0..d9d47cceda 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -493,6 +493,26 @@ modparam("sipcapture", "topoh_unmask", 1) </programlisting> </example> </section> + + <section id="sipcapture.p.nonsip_hook"> + <title><varname>nonsip_hook</varname> (int)</title> + <para> + If set to 1, event route <emphasis>sipcapture:siprequest</emphasis> is + run when HEP message is received. + </para> + <para> + Default value is <emphasis>0</emphasis>. + </para> + <example> + <title>Set <varname>nonsip_hook</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sipcapture", "nonsip_hook", 1) +... + </programlisting> + </example> + </section> + </section> <section> <title>Functions</title> diff --git a/src/modules/sipcapture/examples/kamailio.cfg b/src/modules/sipcapture/examples/kamailio.cfg index 3d42a78f47..14a5641a1c 100644 --- a/src/modules/sipcapture/examples/kamailio.cfg +++ b/src/modules/sipcapture/examples/kamailio.cfg @@ -861,10 +861,6 @@ route[STORE] { sip_capture("$var(a)"); } -event_route[sipcapture:request] { - xlog("received sipcapture request from $si:$sp\r\n"); -} - #!ifdef WITH_HOMER_CUSTOM_STATS event_route[xhttp:request] { set_reply_close(); @@ -908,12 +904,14 @@ event_route[xhttp:request] { event_route[sipcapture:request] { - xlog("HEP Request!\n"); - xlog("received sipcapture request from $si:$sp\r\n"); - xlog("HEP VERSION $hep(version) request from $si:$sp\r\n"); - xlog("HEP CHUNK Source IP $hep(0x002) request from $si:$sp\r\n"); + xlog("HEP Request!\n"); + xlog("received sipcapture request from $si:$sp\n"); + xlog("HEP VERSION $hep(version) request from $si:$sp\n"); + xlog("HEP CHUNK Source IP $hep(0x002) request from $si:$sp\n"); + #Is it SIP ? - if($hep(0x00b) == 1){ + if($hep(0x00b) == 1) + { #Do parsing internal return 1; @@ -921,8 +919,8 @@ event_route[sipcapture:request] { else { #If report lets proceed here with payload - xlog("HEP CHUNK PAYLOAD $hep(0x00f) request from $si:$sp\r\n"); - return 0; + xlog("HEP CHUNK PAYLOAD $hep(0x00f) request from $si:$sp\n"); + return 0; } }

1 0

git:master:1632bb7c: pv: xavp related functions exported to kemi framework
by Daniel-Constantin Mierla 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: 1632bb7ced8aab774cc3c77abba1246c1a848a5b URL: https://github.com/kamailio/kamailio/commit/1632bb7ced8aab774cc3c77abba1246… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T14:05:47+02:00 pv: xavp related functions exported to kemi framework --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/1632bb7ced8aab774cc3c77abba1246… Patch: https://github.com/kamailio/kamailio/commit/1632bb7ced8aab774cc3c77abba1246… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index ad33d3b899..8dccdb3a0b 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -26,6 +26,7 @@ #include "../../core/pvar.h" #include "../../core/lvalue.h" #include "../../core/mod_fix.h" +#include "../../core/xavp.h" #include "../../core/kemi.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" @@ -741,6 +742,11 @@ static int w_var_to_xavp(sip_msg_t *msg, char *s1, char *s2) return pv_var_to_xavp(&varname, &xname); } +static int ki_var_to_xavp(sip_msg_t *msg, str *varname, str *xname) +{ + return pv_var_to_xavp(varname, xname); +} + /** * xavp to script variable */ @@ -756,6 +762,17 @@ static int w_xavp_to_var(sip_msg_t *msg, char *s1) return pv_xavp_to_var(&xname); } +static int ki_xavp_to_var(sip_msg_t *msg, str *xname) +{ + return pv_xavp_to_var(xname); +} + +static int ki_xavp_print(sip_msg_t* msg) +{ + xavp_print_list(NULL); + return 1; +} + /** * */ @@ -782,6 +799,17 @@ static int w_xavp_params_explode(sip_msg_t *msg, char *pparams, char *pxname) /** * */ +static int ki_xavp_params_explode(sip_msg_t *msg, str *sparams, str *sxname) +{ + if(xavp_params_explode(sparams, sxname)<0) + return -1; + + return 1; +} + +/** + * + */ static int w_sbranch_set_ruri(sip_msg_t *msg, char p1, char *p2) { if(sbranch_set_ruri(msg)<0) @@ -962,6 +990,26 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("pv_var_to_xavp"), + SR_KEMIP_INT, ki_var_to_xavp, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("pv_xavp_to_var"), + SR_KEMIP_INT, ki_xavp_to_var, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("pv_xavp_print"), + SR_KEMIP_INT, ki_xavp_print, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("xavp_params_explode"), + SR_KEMIP_INT, ki_xavp_params_explode, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; @@ -979,4 +1027,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return -1; } return register_trans_mod(path, mod_trans); -} +} \ No newline at end of file diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index d556dda99f..c36a6c6f1f 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -555,7 +555,7 @@ int pv_parse_xavp_name(pv_spec_p sp, str *in) return -1; } -int pv_xavp_print(struct sip_msg* msg, char* s1, char *s2) +int pv_xavp_print(sip_msg_t* msg, char* s1, char *s2) { xavp_print_list(NULL); return 1;

1 0

git:master:8db85222: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: 8db85222c3f82e8af1fbeb38eaabb9aec99ecab2 URL: https://github.com/kamailio/kamailio/commit/8db85222c3f82e8af1fbeb38eaabb9a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-25T14:01:22+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/8db85222c3f82e8af1fbeb38eaabb9a… Patch: https://github.com/kamailio/kamailio/commit/8db85222c3f82e8af1fbeb38eaabb9a… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index d30fea9c67..428a27c958 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -371,12 +371,14 @@ pv_xavp_print(); 4.11. pv_var_to_xavp(varname, xname) - Copy script variables values to a xavp. + Copy the script variable value into an xavp. First parameter can be '*' in order to copy all script variables. Second parameter is the name of the destination xavp. If xavp already exists it will be reset first. + Both parameters can contain variables that are evaluated at runtime. + Function can be used from ANY_ROUTE. Example 1.14. pv_var_to_xavp() usage @@ -395,7 +397,9 @@ $xavp("ok[0]=>foo") now is "foo indeed" 4.12. pv_xavp_to_var(xname) - Copy xavp values to vars. Reverse of pv_var_to_xavp(). + Copy xavp values into vars. Reverse of pv_var_to_xavp(). + + Both parameters can contain variables that are evaluated at runtime. Function can be used from ANY_ROUTE.

1 0

git:master:e9a132af: pv: notes about dynamic parameters for xavp to var funtions
by Daniel-Constantin Mierla 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: e9a132afc0fa4b02a7030c2c20ade65a1d693006 URL: https://github.com/kamailio/kamailio/commit/e9a132afc0fa4b02a7030c2c20ade65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T13:49:05+02:00 pv: notes about dynamic parameters for xavp to var funtions --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e9a132afc0fa4b02a7030c2c20ade65… Patch: https://github.com/kamailio/kamailio/commit/e9a132afc0fa4b02a7030c2c20ade65… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 31929efa7f..bd5a7ab6f4 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -400,10 +400,16 @@ pv_xavp_print(); <function moreinfo="none">pv_var_to_xavp(varname, xname)</function> </title> <para> - Copy script variables values to a xavp. + Copy the script variable value into an xavp. </para> <para> - First parameter can be '*' in order to copy all script variables. Second parameter is the name of the destination xavp. If xavp already exists it will be reset first. + First parameter can be '*' in order to copy all script variables. + Second parameter is the name of the destination xavp. + If xavp already exists it will be reset first. + </para> + <para> + Both parameters can contain variables that are evaluated at + runtime. </para> <para> Function can be used from ANY_ROUTE. @@ -431,7 +437,11 @@ $xavp("ok[0]=>foo") now is "foo indeed" <function moreinfo="none">pv_xavp_to_var(xname)</function> </title> <para> - Copy xavp values to vars. Reverse of pv_var_to_xavp(). + Copy xavp values into vars. Reverse of pv_var_to_xavp(). + </para> + <para> + Both parameters can contain variables that are evaluated at + runtime. </para> <para> Function can be used from ANY_ROUTE.

1 0

git:master:45506c43: pv: support for dynamic params for var to xavp functions
by Daniel-Constantin Mierla 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: 45506c4343ae03450e33a04b9f2e9a3196d57306 URL: https://github.com/kamailio/kamailio/commit/45506c4343ae03450e33a04b9f2e9a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T13:45:28+02:00 pv: support for dynamic params for var to xavp functions --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/45506c4343ae03450e33a04b9f2e9a3… Patch: https://github.com/kamailio/kamailio/commit/45506c4343ae03450e33a04b9f2e9a3… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index c85d2015eb..ad33d3b899 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -538,10 +538,10 @@ static cmd_export_t cmds[]={ #ifdef WITH_XAVP {"pv_xavp_print", (cmd_function)pv_xavp_print, 0, 0, 0, ANY_ROUTE }, - {"pv_var_to_xavp", (cmd_function)w_var_to_xavp, 2, 0, 0, - ANY_ROUTE }, - {"pv_xavp_to_var", (cmd_function)w_xavp_to_var, 1, 0, 0, - ANY_ROUTE }, + {"pv_var_to_xavp", (cmd_function)w_var_to_xavp, 2, fixup_spve_spve, + fixup_free_spve_spve, ANY_ROUTE }, + {"pv_xavp_to_var", (cmd_function)w_xavp_to_var, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE }, #endif {"is_int", (cmd_function)is_int, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, @@ -721,30 +721,38 @@ static int is_int(struct sip_msg* msg, char* pvar, char* s2) return -1; } +/** + * script variable to xavp + */ static int w_var_to_xavp(sip_msg_t *msg, char *s1, char *s2) { - str xname, varname; + str xname = STR_NULL; + str varname = STR_NULL; - if(s1 == NULL || s2 == NULL) { - LM_ERR("wrong parameters\n"); + if(fixup_get_svalue(msg, (gparam_t*)s1, &varname)<0) { + LM_ERR("failed to get the var name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)s2, &xname)<0) { + LM_ERR("failed to get the xavp name\n"); return -1; } - varname.len = strlen(s1); varname.s = s1; - xname.s = s2; xname.len = strlen(s2); return pv_var_to_xavp(&varname, &xname); } +/** + * xavp to script variable + */ static int w_xavp_to_var(sip_msg_t *msg, char *s1) { - str xname; + str xname = STR_NULL; - if(s1 == NULL) { - LM_ERR("wrong parameters\n"); + if(fixup_get_svalue(msg, (gparam_t*)s1, &xname)<0) { + LM_ERR("failed to get the xavp name\n"); return -1; } - xname.s = s1; xname.len = strlen(s1); return pv_xavp_to_var(&xname); }

1 0

git:master:78722ff2: dialplan: catch error case from macro used inside dp_trans_fixup()
by Daniel-Constantin Mierla 25 Jul '17

25 Jul '17

Module: kamailio Branch: master Commit: 78722ff2f1e290dc6ae41a4d718e9c4cea20926b URL: https://github.com/kamailio/kamailio/commit/78722ff2f1e290dc6ae41a4d718e9c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-25T10:54:20+02:00 dialplan: catch error case from macro used inside dp_trans_fixup() --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/78722ff2f1e290dc6ae41a4d718e9c4… Patch: https://github.com/kamailio/kamailio/commit/78722ff2f1e290dc6ae41a4d718e9c4… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index e5710fd828..7fd6245a31 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -332,7 +332,7 @@ static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2) } -#define verify_par_type(_par_no, _spec)\ +#define verify_par_type(_par_no, _spec, _ret) \ do{\ if( ((_par_no == 1) \ && (_spec->type != PVT_AVP) && (_spec->type != PVT_XAVP) && \ @@ -343,7 +343,8 @@ static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2) && (_spec->type!=PVT_RURI) && (_spec->type!=PVT_RURI_USERNAME))){\ \ LM_ERR("Unsupported Parameter TYPE[%d]\n", _spec->type);\ - return E_UNSPEC;\ + _ret = E_UNSPEC; \ + goto error; \ }\ }while(0); @@ -359,6 +360,7 @@ static int dp_trans_fixup(void ** param, int param_no){ dp_param_p dp_par= NULL; char *p, *s=NULL; str lstr; + int ret = E_INVALID_PARAMS; if(param_no!=1 && param_no!=2) return 0; @@ -384,8 +386,8 @@ static int dp_trans_fixup(void ** param, int param_no){ lstr.s = *param; lstr.len = strlen(*param); if(str2sint(&lstr, &dpid) != 0) { LM_ERR("bad number <%s>\n",(char *)(*param)); - pkg_free(dp_par); - return E_CFG; + ret = E_CFG; + goto error; } dp_par->type = DP_VAL_INT; @@ -394,11 +396,10 @@ static int dp_trans_fixup(void ** param, int param_no){ lstr.s = p; lstr.len = strlen(p); dp_par->v.sp[0] = pv_cache_get(&lstr); if (dp_par->v.sp[0]==NULL) { - pkg_free(dp_par); goto error; } - verify_par_type(param_no, dp_par->v.sp[0]); + verify_par_type(param_no, dp_par->v.sp[0], ret); dp_par->type = DP_VAL_SPEC; } } else { @@ -413,7 +414,6 @@ static int dp_trans_fixup(void ** param, int param_no){ lstr.s = p; lstr.len = strlen(p); dp_par->v.sp[0] = pv_cache_get(&lstr); if(dp_par->v.sp[0]==NULL) { - pkg_free(dp_par); goto error; } @@ -421,10 +421,9 @@ static int dp_trans_fixup(void ** param, int param_no){ lstr.s = s; lstr.len = strlen(s); dp_par->v.sp[1] = pv_cache_get(&lstr); if (dp_par->v.sp[1]==NULL) { - pkg_free(dp_par); goto error; } - verify_par_type(param_no, dp_par->v.sp[1]); + verify_par_type(param_no, dp_par->v.sp[1], ret); } dp_par->type = DP_VAL_SPEC; @@ -437,7 +436,9 @@ static int dp_trans_fixup(void ** param, int param_no){ error: LM_ERR("failed to parse param %i\n", param_no); - return E_INVALID_PARAMS; + if(dp_par) pkg_free(dp_par); + + return ret; } /**

1 0

git:4.4:4d49b33b: tsilo: coherent locking in ts_append
by Federico Cabiddu 24 Jul '17

24 Jul '17

Module: kamailio Branch: 4.4 Commit: 4d49b33b6f2418329b4ede1e166239bb0d93af9e URL: https://github.com/kamailio/kamailio/commit/4d49b33b6f2418329b4ede1e166239b… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-24T15:19:32+02:00 tsilo: coherent locking in ts_append (cherry picked from commit 34265457e7c09b56dec295b753fd8250ef8b0c41) --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/4d49b33b6f2418329b4ede1e166239b… Patch: https://github.com/kamailio/kamailio/commit/4d49b33b6f2418329b4ede1e166239b… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index b0c605a0ee..b5c51393e5 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -46,32 +46,31 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int res; int appended; - - lock_entry_by_ruri(ruri); - + if (use_domain) { t_uri = ruri; } else { if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); return -1; } t_uri = &p_uri.user; } + lock_entry_by_ruri(t_uri); + res = get_ts_urecord(t_uri, &_r); if (res != 0) { - LM_ERR("failed to retrieve record for %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); + LM_ERR("failed to retrieve record for %.*s\n", t_uri->len, t_uri->s); + unlock_entry_by_ruri(t_uri); return -1; } ptr = _r->transactions; while(ptr) { - LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, ruri->len, ruri->s); + LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, t_uri->len, t_uri->s); appended = ts_append_to(msg, ptr->tindex, ptr->tlabel, table, ruri); if (appended > 0) @@ -79,7 +78,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { ptr = ptr->next; } - unlock_entry_by_ruri(ruri); + unlock_entry_by_ruri(t_uri); return 1; }

1 0

git:4.4:1765576b: tsilo: check return code for parse_uri()
by Federico Cabiddu 24 Jul '17

24 Jul '17

Module: kamailio Branch: 4.4 Commit: 1765576b013524e73131b9adb4d4ccb78de43658 URL: https://github.com/kamailio/kamailio/commit/1765576b013524e73131b9adb4d4ccb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-24T15:19:03+02:00 tsilo: check return code for parse_uri() (cherry picked from commit a19a06f6c302a7fbac9b137cc1558d47730ead2f) --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/1765576b013524e73131b9adb4d4ccb… Patch: https://github.com/kamailio/kamailio/commit/1765576b013524e73131b9adb4d4ccb… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index db47fdfad7..b0c605a0ee 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -51,9 +51,12 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { if (use_domain) { t_uri = ruri; - } - else { - parse_uri(ruri->s, ruri->len, &p_uri); + } else { + if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { + LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); + unlock_entry_by_ruri(ruri); + return -1; + } t_uri = &p_uri.user; }

1 0

git:5.0:3bfc9d49: tsilo: check return code for parse_uri()
by Federico Cabiddu 24 Jul '17

24 Jul '17

Module: kamailio Branch: 5.0 Commit: 3bfc9d4955cf3edd64fe29aa3e88d23609360209 URL: https://github.com/kamailio/kamailio/commit/3bfc9d4955cf3edd64fe29aa3e88d23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-24T15:18:29+02:00 tsilo: check return code for parse_uri() (cherry picked from commit a19a06f6c302a7fbac9b137cc1558d47730ead2f) --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/3bfc9d4955cf3edd64fe29aa3e88d23… Patch: https://github.com/kamailio/kamailio/commit/3bfc9d4955cf3edd64fe29aa3e88d23… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index 0076634109..e6e27e40cc 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -50,9 +50,12 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { if (use_domain) { t_uri = ruri; - } - else { - parse_uri(ruri->s, ruri->len, &p_uri); + } else { + if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { + LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); + unlock_entry_by_ruri(ruri); + return -1; + } t_uri = &p_uri.user; }

1 0

git:5.0:41392baa: tsilo: coherent locking in ts_append
by Federico Cabiddu 24 Jul '17

24 Jul '17

Module: kamailio Branch: 5.0 Commit: 41392baa1b9d40e2d5cff5e532b2fe3b6c132bb6 URL: https://github.com/kamailio/kamailio/commit/41392baa1b9d40e2d5cff5e532b2fe3… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-24T15:18:35+02:00 tsilo: coherent locking in ts_append (cherry picked from commit 34265457e7c09b56dec295b753fd8250ef8b0c41) --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/41392baa1b9d40e2d5cff5e532b2fe3… Patch: https://github.com/kamailio/kamailio/commit/41392baa1b9d40e2d5cff5e532b2fe3… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index e6e27e40cc..7d951865f0 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -45,32 +45,31 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int res; int appended; - - lock_entry_by_ruri(ruri); - + if (use_domain) { t_uri = ruri; } else { if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); return -1; } t_uri = &p_uri.user; } + lock_entry_by_ruri(t_uri); + res = get_ts_urecord(t_uri, &_r); if (res != 0) { - LM_ERR("failed to retrieve record for %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); + LM_ERR("failed to retrieve record for %.*s\n", t_uri->len, t_uri->s); + unlock_entry_by_ruri(t_uri); return -1; } ptr = _r->transactions; while(ptr) { - LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, ruri->len, ruri->s); + LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, t_uri->len, t_uri->s); appended = ts_append_to(msg, ptr->tindex, ptr->tlabel, table, ruri); if (appended > 0) @@ -78,7 +77,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { ptr = ptr->next; } - unlock_entry_by_ruri(ruri); + unlock_entry_by_ruri(t_uri); return 1; }

1 0

git:master:34265457: tsilo: coherent locking in ts_append
by Federico Cabiddu 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 34265457e7c09b56dec295b753fd8250ef8b0c41 URL: https://github.com/kamailio/kamailio/commit/34265457e7c09b56dec295b753fd825… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-24T15:16:21+02:00 tsilo: coherent locking in ts_append --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/34265457e7c09b56dec295b753fd825… Patch: https://github.com/kamailio/kamailio/commit/34265457e7c09b56dec295b753fd825… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index e6e27e40cc..7d951865f0 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -45,32 +45,31 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int res; int appended; - - lock_entry_by_ruri(ruri); - + if (use_domain) { t_uri = ruri; } else { if(parse_uri(ruri->s, ruri->len, &p_uri)<0) { LM_ERR("failed to parse uri %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); return -1; } t_uri = &p_uri.user; } + lock_entry_by_ruri(t_uri); + res = get_ts_urecord(t_uri, &_r); if (res != 0) { - LM_ERR("failed to retrieve record for %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); + LM_ERR("failed to retrieve record for %.*s\n", t_uri->len, t_uri->s); + unlock_entry_by_ruri(t_uri); return -1; } ptr = _r->transactions; while(ptr) { - LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, ruri->len, ruri->s); + LM_DBG("transaction %u:%u found for %.*s, going to append branches\n",ptr->tindex, ptr->tlabel, t_uri->len, t_uri->s); appended = ts_append_to(msg, ptr->tindex, ptr->tlabel, table, ruri); if (appended > 0) @@ -78,7 +77,7 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { ptr = ptr->next; } - unlock_entry_by_ruri(ruri); + unlock_entry_by_ruri(t_uri); return 1; }

1 0

git:master:0cf4ad7b: app_perl: free on error cases for modf execution
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 0cf4ad7b4e839856eef4dc2cd76adacd1627ce7c URL: https://github.com/kamailio/kamailio/commit/0cf4ad7b4e839856eef4dc2cd76adac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T13:24:49+02:00 app_perl: free on error cases for modf execution --- Modified: src/modules/app_perl/kamailioxs.xs --- Diff: https://github.com/kamailio/kamailio/commit/0cf4ad7b4e839856eef4dc2cd76adac… Patch: https://github.com/kamailio/kamailio/commit/0cf4ad7b4e839856eef4dc2cd76adac… --- diff --git a/src/modules/app_perl/kamailioxs.xs b/src/modules/app_perl/kamailioxs.xs index 8d2604c1a5..385fa1a115 100644 --- a/src/modules/app_perl/kamailioxs.xs +++ b/src/modules/app_perl/kamailioxs.xs @@ -289,6 +289,7 @@ int moduleFunc(struct sip_msg *m, char *func, LM_ERR("Module function '%s' is unsafe. Call is refused.\n", func); if (argv[0]) pkg_free(argv[0]); if (argv[1]) pkg_free(argv[1]); + pkg_free(act); *retval = -1; return -1; } @@ -297,6 +298,9 @@ int moduleFunc(struct sip_msg *m, char *func, *retval = exp_func_struct->fixup(&(act->val[3].u.data), 2); if (*retval < 0) { LM_ERR("Error in fixup (2)\n"); + if (argv[0]) pkg_free(argv[0]); + if (argv[1]) pkg_free(argv[1]); + pkg_free(act); return -1; } act->val[3].type = MODFIXUP_ST; @@ -305,6 +309,9 @@ int moduleFunc(struct sip_msg *m, char *func, *retval = exp_func_struct->fixup(&(act->val[2].u.data), 1); if (*retval < 0) { LM_ERR("Error in fixup (1)\n"); + if (argv[0]) pkg_free(argv[0]); + if (argv[1]) pkg_free(argv[1]); + pkg_free(act); return -1; } act->val[2].type = MODFIXUP_ST; @@ -313,6 +320,9 @@ int moduleFunc(struct sip_msg *m, char *func, *retval = exp_func_struct->fixup(0, 0); if (*retval < 0) { LM_ERR("Error in fixup (0)\n"); + if (argv[0]) pkg_free(argv[0]); + if (argv[1]) pkg_free(argv[1]); + pkg_free(act); return -1; } } @@ -337,7 +347,7 @@ int moduleFunc(struct sip_msg *m, char *func, if (argv[1]) pkg_free(argv[1]); pkg_free(act); - + return 1; } @@ -699,7 +709,9 @@ getFullHeader(self) LM_ERR("getFullHeader: Invalid message type.\n"); ST(0) = &PL_sv_undef; } else { - parse_headers(msg, ~0, 0); + if(parse_headers(msg, ~0, 0)<0) { + LM_ERR("failed to parse headers\n"); + } if (getType(msg) == SIP_REQUEST) { firsttoken = (msg->first_line).u.request.method.s; } else { /* SIP_REPLY */ @@ -713,7 +725,7 @@ getFullHeader(self) -((long)(firsttoken)); if (headerlen > 0) { - ST(0) = + ST(0) = sv_2mortal(newSVpv(firsttoken, headerlen)); } else { ST(0) = &PL_sv_undef; @@ -739,7 +751,9 @@ getBody(self) LM_ERR("Invalid message reference\n"); ST(0) = &PL_sv_undef; } else { - parse_headers(msg, ~0, 0); + if(parse_headers(msg, ~0, 0)<0) { + LM_ERR("failed to parse headers\n"); + } ST(0) = sv_2mortal(newSVpv(get_body(msg), 0)); } @@ -792,7 +806,9 @@ getHeader(self, name) if (!msg) { LM_ERR("Invalid message reference\n"); } else { - parse_headers(msg, ~0, 0); + if(parse_headers(msg, ~0, 0)<0) { + LM_ERR("failed to parse headers\n"); + } for (hf = msg->headers; hf; hf = hf->next) { if (namelen == hf->name.len) { if (strncmp(name, hf->name.s, namelen) == 0) { @@ -825,11 +841,13 @@ getHeaderNames(self) struct hdr_field *hf = NULL; int found = 0; PPCODE: - + if (!msg) { LM_ERR("Invalid message reference\n"); } else { - parse_headers(msg, ~0, 0); + if(parse_headers(msg, ~0, 0)<0) { + LM_ERR("failed to parse headers\n"); + } for (hf = msg->headers; hf; hf = hf->next) { found = 1; XPUSHs(sv_2mortal(newSVpv(hf->name.s, hf->name.len))); @@ -1231,17 +1249,22 @@ getParsedRURI(self) LM_ERR("Invalid message reference\n"); ST(0) = NULL; } else { - parse_sip_msg_uri(msg); - parse_headers(msg, ~0, 0); - - uri = &(msg->parsed_uri); - ret = sv_newmortal(); - sv_setref_pv(ret, "Kamailio::URI", (void *)uri); - SvREADONLY_on(SvRV(ret)); + if(parse_sip_msg_uri(msg)<0) { + LM_ERR("Invalid message uri\n"); + ST(0) = NULL; + } else { + if(parse_headers(msg, ~0, 0)<0) { + LM_ERR("failed to parse headers\n"); + } + uri = &(msg->parsed_uri); + ret = sv_newmortal(); + sv_setref_pv(ret, "Kamailio::URI", (void *)uri); + SvREADONLY_on(SvRV(ret)); - ST(0) = ret; + ST(0) = ret; + } } - + MODULE = Kamailio PACKAGE = Kamailio::URI

1 0

git:master:96582d77: xcap_client: safety check for namespace variable
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 96582d77583719d7bb9c5e5437198800ae9e7a12 URL: https://github.com/kamailio/kamailio/commit/96582d77583719d7bb9c5e543719880… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T12:22:00+02:00 xcap_client: safety check for namespace variable --- Modified: src/modules/xcap_client/xcap_functions.c --- Diff: https://github.com/kamailio/kamailio/commit/96582d77583719d7bb9c5e543719880… Patch: https://github.com/kamailio/kamailio/commit/96582d77583719d7bb9c5e543719880… --- diff --git a/src/modules/xcap_client/xcap_functions.c b/src/modules/xcap_client/xcap_functions.c index 6b875b17d0..cee161b7d0 100644 --- a/src/modules/xcap_client/xcap_functions.c +++ b/src/modules/xcap_client/xcap_functions.c @@ -223,7 +223,7 @@ xcap_node_sel_t* xcapNodeSelAddStep(xcap_node_sel_t* curr_sel, str* name, } curr_sel->size+= 1+ new_step.len; - if(namespace->len) + if(namespace && namespace->len) { curr_sel->size+= namespace->len+ 3; }

1 0

git:master:0f3fb6b8: xmlrpc: handle return codes
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 0f3fb6b8cb04162be07e9246c23bcfa8b8e4e4e6 URL: https://github.com/kamailio/kamailio/commit/0f3fb6b8cb04162be07e9246c23bcfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T13:00:44+02:00 xmlrpc: handle return codes --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/0f3fb6b8cb04162be07e9246c23bcfa… Patch: https://github.com/kamailio/kamailio/commit/0f3fb6b8cb04162be07e9246c23bcfa… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index ef1535cc88..61b73d0993 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -654,7 +654,7 @@ static int fix_delayed_reply_ctx(rpc_ctx_t* ctx) { if ((ctx->flags & XMLRPC_DELAYED_CTX_F) && (ctx->reply.buf.s==0)){ if (init_xmlrpc_reply(&ctx->reply) <0) return -1; - add_xmlrpc_reply(&ctx->reply, &success_prefix); + if(add_xmlrpc_reply(&ctx->reply, &success_prefix)<0) return -1; if (ctx->flags & RET_ARRAY) return add_xmlrpc_reply(&ctx->reply, &array_prefix); } @@ -787,7 +787,7 @@ static int get_rpc_document(str* doc, sip_msg_t* msg) */ static int send_reply(sip_msg_t* msg, str* body) { - if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) < 0) { + if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) == 0) { ERR("Error while adding reply lump\n"); return -1; } @@ -1965,6 +1965,7 @@ static int rpc_struct_scan(struct rpc_struct* s, char* fmt, ...) break; default: ERR("Invalid parameter type in formatting string: %c\n", *fmt); + va_end(ap); return -1; } fmt++; @@ -2176,7 +2177,7 @@ static int init_context(rpc_ctx_t* ctx, sip_msg_t* msg) ctx->doc = 0; ctx->structs = 0; if (init_xmlrpc_reply(&ctx->reply) < 0) return -1; - add_xmlrpc_reply(&ctx->reply, &success_prefix); + if (add_xmlrpc_reply(&ctx->reply, &success_prefix)<0) return -1; if (open_doc(ctx, msg) < 0) return -1; return 0; } @@ -2367,7 +2368,9 @@ static int process_xmlrpc(sip_msg_t* msg) n_method = method[0] + (method[1] << 8) + (method[2] << 16) + (method[3] << 24); n_method |= 0x20202020; - n_method &= ((method_len < 4) * (1U << method_len * 8) - 1); + if(method_len < 4) { + n_method &= ((1U << (method_len * 8)) - 1); + } /* accept only GET or POST */ if ((n_method == N_HTTP_GET) || ((n_method == N_HTTP_POST) && (method_len == HTTP_POST_LEN))) {

1 0

git:master:e6e04f4c: xcap_client: removed unused api function get_elem()
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: e6e04f4c96e5fdd7a3a90f265fd6cb7470f1135b URL: https://github.com/kamailio/kamailio/commit/e6e04f4c96e5fdd7a3a90f265fd6cb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T12:15:55+02:00 xcap_client: removed unused api function get_elem() --- Modified: src/modules/xcap_client/xcap_functions.c Modified: src/modules/xcap_client/xcap_functions.h --- Diff: https://github.com/kamailio/kamailio/commit/e6e04f4c96e5fdd7a3a90f265fd6cb7… Patch: https://github.com/kamailio/kamailio/commit/e6e04f4c96e5fdd7a3a90f265fd6cb7… --- diff --git a/src/modules/xcap_client/xcap_functions.c b/src/modules/xcap_client/xcap_functions.c index 1b2e6b457f..6b875b17d0 100644 --- a/src/modules/xcap_client/xcap_functions.c +++ b/src/modules/xcap_client/xcap_functions.c @@ -50,7 +50,6 @@ int bind_xcap(xcap_api_t* api) LM_ERR("Invalid parameter value\n"); return -1; } - api->get_elem= xcapGetElem; api->int_node_sel= xcapInitNodeSel; api->add_step= xcapNodeSelAddStep; api->add_terminal= xcapNodeSelAddTerminal; @@ -455,39 +454,6 @@ char* get_xcap_path(xcap_get_req_t req) return NULL; } -/* xcap_root must be a NULL terminated string */ - -char* xcapGetElem(xcap_get_req_t req, char** etag) -{ - char* path= NULL; - char* stream= NULL; - - path= get_xcap_path(req); - if(path== NULL) - { - LM_ERR("while constructing xcap path\n"); - return NULL; - } - - stream= send_http_get(path, req.port, req.etag, req.match_type, etag); - if(stream== NULL) - { - LM_DBG("the serched element was not found\n"); - } - - if(etag== NULL) - { - LM_ERR("no etag found\n"); - pkg_free(stream); - stream= NULL; - } - - if(path) - pkg_free(path); - - return stream; -} - size_t get_xcap_etag( void *ptr, size_t size, size_t nmemb, void *stream) { int len= 0; diff --git a/src/modules/xcap_client/xcap_functions.h b/src/modules/xcap_client/xcap_functions.h index 8750aeae53..44ae635972 100644 --- a/src/modules/xcap_client/xcap_functions.h +++ b/src/modules/xcap_client/xcap_functions.h @@ -103,11 +103,6 @@ xcap_node_sel_t* xcapNodeSelAddTerminal(xcap_node_sel_t* curr_sel, typedef xcap_node_sel_t* (*xcap_nodeSel_add_terminal_t)(xcap_node_sel_t* curr_sel, char* attr_sel, char* namespace_sel, char* extra_sel ); -/* generical function to get an element from an xcap server */ -char* xcapGetElem(xcap_get_req_t req, char** etag); - -typedef char* (*xcap_get_elem_t)(xcap_get_req_t req, char** etag); - void xcapFreeNodeSel(xcap_node_sel_t* node); typedef void (*xcap_nodeSel_free_t)(xcap_node_sel_t* node); @@ -118,7 +113,6 @@ char* xcapGetNewDoc(xcap_get_req_t req, str user, str domain); typedef char* (*xcapGetNewDoc_t)(xcap_get_req_t req, str user, str domain); typedef struct xcap_api { - xcap_get_elem_t get_elem; xcap_nodeSel_init_t int_node_sel; xcap_nodeSel_add_step_t add_step; xcap_nodeSel_add_terminal_t add_terminal;

1 0

git:master:8147009b: xcap_client: handle return code for strchr()
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 8147009b34639304fb75d4f6c39269c49ee385ca URL: https://github.com/kamailio/kamailio/commit/8147009b34639304fb75d4f6c39269c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T12:15:09+02:00 xcap_client: handle return code for strchr() --- Modified: src/modules/xcap_client/xcap_client.c --- Diff: https://github.com/kamailio/kamailio/commit/8147009b34639304fb75d4f6c39269c… Patch: https://github.com/kamailio/kamailio/commit/8147009b34639304fb75d4f6c39269c… --- diff --git a/src/modules/xcap_client/xcap_client.c b/src/modules/xcap_client/xcap_client.c index e96511651d..0b8a707d8d 100644 --- a/src/modules/xcap_client/xcap_client.c +++ b/src/modules/xcap_client/xcap_client.c @@ -310,24 +310,33 @@ int parse_doc_url(str doc_url, char** serv_addr, xcap_doc_sel_t* doc_sel) char* sl, *str_type; sl= strchr(doc_url.s, '/'); + if(sl==NULL) { + return -1; + } *sl= '\0'; *serv_addr= doc_url.s; sl++; doc_sel->auid.s= sl; sl= strchr(sl, '/'); + if(sl==NULL) { + return -1; + } doc_sel->auid.len= sl- doc_sel->auid.s; sl++; str_type= sl; sl= strchr(sl, '/'); + if(sl==NULL) { + return -1; + } *sl= '\0'; - if(strcasecmp(str_type, "users")== 0) + if(strcasecmp(str_type, "users")== 0) { doc_sel->type= USERS_TYPE; - else - if(strcasecmp(str_type, "group")== 0) + } else if(strcasecmp(str_type, "group")== 0) { doc_sel->type= GLOBAL_TYPE; + } sl++;

1 0

git:master:4ba40243: stun: link attribute when calling stun_parse_body() with an existing list
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 4ba402434449ec9cb426d5200b12c5cec4d07ab4 URL: https://github.com/kamailio/kamailio/commit/4ba402434449ec9cb426d5200b12c5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T11:56:57+02:00 stun: link attribute when calling stun_parse_body() with an existing list --- Modified: src/modules/stun/kam_stun.c --- Diff: https://github.com/kamailio/kamailio/commit/4ba402434449ec9cb426d5200b12c5c… Patch: https://github.com/kamailio/kamailio/commit/4ba402434449ec9cb426d5200b12c5c… --- diff --git a/src/modules/stun/kam_stun.c b/src/modules/stun/kam_stun.c index 8257fbab4c..350317b0e7 100644 --- a/src/modules/stun/kam_stun.c +++ b/src/modules/stun/kam_stun.c @@ -336,8 +336,10 @@ static int stun_parse_body( } if (*unknown == NULL) { *unknown = body = tmp_unknown; - } - else { + } else { + if(body==NULL) { + body = *unknown; + } body->next = tmp_unknown; body = body->next; }

1 0

git:master:37129325: presence_xml: fixed misleading error message
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 371293257d000c004f78068f15a4184df3dbd57b URL: https://github.com/kamailio/kamailio/commit/371293257d000c004f78068f15a4184… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T12:14:18+02:00 presence_xml: fixed misleading error message --- Modified: src/modules/presence_xml/presence_xml.c --- Diff: https://github.com/kamailio/kamailio/commit/371293257d000c004f78068f15a4184… Patch: https://github.com/kamailio/kamailio/commit/371293257d000c004f78068f15a4184… --- diff --git a/src/modules/presence_xml/presence_xml.c b/src/modules/presence_xml/presence_xml.c index da0e056e3e..0f221852d7 100644 --- a/src/modules/presence_xml/presence_xml.c +++ b/src/modules/presence_xml/presence_xml.c @@ -242,7 +242,7 @@ static int mod_init(void) xcap_GetNewDoc= xcap_api.getNewDoc; if(xcap_GetNewDoc== NULL) { - LM_ERR("can't import get_elem from xcap_client module\n"); + LM_ERR("can't import getNewDoc from xcap_client module\n"); return -1; } @@ -559,4 +559,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_presence_xml_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:f75eba63: statsd: simplified error handling inside statsd_connect()
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: f75eba63a1f0176adc8cd38846a0d1943471e10c URL: https://github.com/kamailio/kamailio/commit/f75eba63a1f0176adc8cd38846a0d19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T11:44:21+02:00 statsd: simplified error handling inside statsd_connect() --- Modified: src/modules/statsd/lib_statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/f75eba63a1f0176adc8cd38846a0d19… Patch: https://github.com/kamailio/kamailio/commit/f75eba63a1f0176adc8cd38846a0d19… --- diff --git a/src/modules/statsd/lib_statsd.c b/src/modules/statsd/lib_statsd.c index bbda181d6a..79d99fcfbd 100644 --- a/src/modules/statsd/lib_statsd.c +++ b/src/modules/statsd/lib_statsd.c @@ -29,25 +29,24 @@ bool statsd_connect(void){ rc = getaddrinfo( statsd_connection.ip, statsd_connection.port, NULL, &serverAddr); - if (rc != 0) + if (rc != 0 || serverAddr == NULL) { - LM_ERR( - "Statsd: could not initiate server information (%s)\n", + LM_ERR("Statsd: could not initiate server information (%s)\n", gai_strerror(rc)); - if(serverAddr) freeaddrinfo(serverAddr); + if(serverAddr) freeaddrinfo(serverAddr); return false; } statsd_connection.sock = socket(serverAddr->ai_family, SOCK_DGRAM, IPPROTO_UDP); if (statsd_connection.sock < 0 ){ LM_ERR("Statsd: could not create a socket for statsd connection\n"); - if(serverAddr) freeaddrinfo(serverAddr); + freeaddrinfo(serverAddr); return false; } - rc = connect( - statsd_connection.sock, serverAddr->ai_addr, serverAddr->ai_addrlen); - freeaddrinfo(serverAddr); + rc = connect(statsd_connection.sock, serverAddr->ai_addr, + serverAddr->ai_addrlen); + freeaddrinfo(serverAddr); if (rc < 0){ LM_ERR("Statsd: could not initiate a connect to statsd\n"); return false;

1 0

git:master:711a5600: statistics: free vars in case of error in fixup function
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 711a5600330793b2ca787ce451f2ad48620dd639 URL: https://github.com/kamailio/kamailio/commit/711a5600330793b2ca787ce451f2ad4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T11:38:51+02:00 statistics: free vars in case of error in fixup function --- Modified: src/modules/statistics/statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/711a5600330793b2ca787ce451f2ad4… Patch: https://github.com/kamailio/kamailio/commit/711a5600330793b2ca787ce451f2ad4… --- diff --git a/src/modules/statistics/statistics.c b/src/modules/statistics/statistics.c index 499b4198ba..c5ace8c185 100644 --- a/src/modules/statistics/statistics.c +++ b/src/modules/statistics/statistics.c @@ -135,6 +135,7 @@ static int fixup_stat(void** param, int param_no) if (s.s[0]=='$') { if (fixup_pvar_null(param, 1)!=0) { LM_ERR("invalid pv %s as parameter\n",s.s); + pkg_free(sopv); return E_CFG; } sopv->pv = (pv_spec_t*)(*param); @@ -143,10 +144,10 @@ static int fixup_stat(void** param, int param_no) sopv->stat = get_stat( &s ); if (sopv->stat==0) { LM_ERR("variable <%s> not defined\n", s.s); + pkg_free(sopv); return E_CFG; } } - pkg_free(s.s); *param=(void*)sopv; return 0; } else if (param_no==2) { @@ -160,6 +161,7 @@ static int fixup_stat(void** param, int param_no) if (s.s[0] == '$') { if (fixup_pvar_pvar(param, 2) != 0) { LM_ERR("invalid pv %s as parameter\n",s.s); + pkg_free(lopv); return E_CFG; } lopv->pv = (pv_spec_t*) (*param); @@ -179,13 +181,14 @@ static int fixup_stat(void** param, int param_no) if (err==0){ if (n==0 && (s.s[0]!='$')) { //we can't check the value of the pvar so have to ignore this check if it is a pvar LM_ERR("update with 0 has no sense\n"); + pkg_free(lopv); return E_CFG; } - pkg_free(s.s); *param=(void*)lopv; return 0; }else{ LM_ERR("bad update number <%s>\n",(char*)(*param)); + pkg_free(lopv); return E_CFG; } }

1 0

git:master:823bad5f: uid_uri_db: safer check for accessing to header
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 823bad5f3aad5c77ff9986ecf4be2517df043788 URL: https://github.com/kamailio/kamailio/commit/823bad5f3aad5c77ff9986ecf4be251… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T08:22:24+02:00 uid_uri_db: safer check for accessing to header --- Modified: src/modules/uid_uri_db/uid_uri_db_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/823bad5f3aad5c77ff9986ecf4be251… Patch: https://github.com/kamailio/kamailio/commit/823bad5f3aad5c77ff9986ecf4be251… --- diff --git a/src/modules/uid_uri_db/uid_uri_db_mod.c b/src/modules/uid_uri_db/uid_uri_db_mod.c index 4e5771f493..dba6454b81 100644 --- a/src/modules/uid_uri_db/uid_uri_db_mod.c +++ b/src/modules/uid_uri_db/uid_uri_db_mod.c @@ -238,14 +238,14 @@ static int lookup_uid(struct sip_msg* msg, long id, int store) } else if (id == USE_TO) { get_to_did(&did, msg); if (!msg->to) { - if (parse_headers( msg, HDR_TO_F, 0 )==-1) { + if (parse_headers(msg, HDR_TO_F, 0)==-1 || !msg->to) { ERR("unable to parse To header\n"); return -1; } } to = get_to(msg); if (!to) { - LOG(L_ERR, "uri_db:lookup_uid: Unable to get To username\n"); + LOG(L_ERR, "uri_db:lookup_uid: Unable to get To body\n"); return -1; } if (parse_uri(to->uri.s, to->uri.len, &puri) < 0) {

1 0

git:master:6997738a: sst: add 0 after memcpy
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 6997738a7098ef56becfd40cb6e7c7864d1975f0 URL: https://github.com/kamailio/kamailio/commit/6997738a7098ef56becfd40cb6e7c78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-24T08:26:38+02:00 sst: add 0 after memcpy --- Modified: src/modules/sst/sst_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/6997738a7098ef56becfd40cb6e7c78… Patch: https://github.com/kamailio/kamailio/commit/6997738a7098ef56becfd40cb6e7c78… --- diff --git a/src/modules/sst/sst_handlers.c b/src/modules/sst/sst_handlers.c index ba1d4928b0..be55eb8883 100644 --- a/src/modules/sst/sst_handlers.c +++ b/src/modules/sst/sst_handlers.c @@ -791,11 +791,12 @@ static int append_header(struct sip_msg *msg, const char *header) return(1); } len = strlen(header); - if ((s = (char *)pkg_malloc(len)) == 0) { + if ((s = (char *)pkg_malloc(len+1)) == 0) { LM_ERR("No more pkg memory. (size requested = %d)\n", len); return(1); } memcpy(s, header, len); + s[len] = '\0'; if (insert_new_lump_before(anchor, s, len, 0) == 0) { LM_ERR("failed to insert lump\n"); pkg_free(s);

1 0

git:master:021e49d6: tm: refactored error handling for eval_uac_routing()
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 021e49d6293cc156cd85791dfc9d59307e62fba0 URL: https://github.com/kamailio/kamailio/commit/021e49d6293cc156cd85791dfc9d593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-23T10:08:47+02:00 tm: refactored error handling for eval_uac_routing() --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/021e49d6293cc156cd85791dfc9d593… Patch: https://github.com/kamailio/kamailio/commit/021e49d6293cc156cd85791dfc9d593… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 3bd76b32fe..c4ab254076 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -912,7 +912,6 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, int is_req; struct sip_uri puri; static size_t chklen; - int ret = -1; /* parse the retr. buffer */ memset(&orig_inv, 0, sizeof(struct sip_msg)); @@ -931,14 +930,14 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, /* the bug is at message assembly */ LM_BUG("failed to parse INVITE retr. buffer and/or extract 'To' HF:" "\n%.*s\n", (int)orig_inv.len, orig_inv.buf); - goto end; + goto error; } if (((struct to_body *)orig_inv.to->parsed)->tag_value.len) { LM_DBG("building ACK for in-dialog INVITE (using RS in orig. INV.)\n"); if (parse_headers(&orig_inv, HDR_EOH_F, 0) < 0) { LM_BUG("failed to parse INVITE retr. buffer to EOH:" "\n%.*s\n", (int)orig_inv.len, orig_inv.buf); - goto end; + goto error; } sipmsg = &orig_inv; is_req = 1; @@ -951,7 +950,7 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, /* extract the route set */ if (get_uac_rs(sipmsg, is_req, &rtset) < 0) { LM_ERR("failed to extract route set.\n"); - goto end; + goto error; } if (! rtset) { /* No routes */ @@ -961,7 +960,7 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, if (parse_uri(rtset->ptr->nameaddr.uri.s, rtset->ptr->nameaddr.uri.len, &puri) < 0) { LM_ERR("failed to parse first route in set.\n"); - goto end; + goto error; } if (puri.lr.s) { /* Next hop is loose router */ @@ -993,7 +992,7 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, } else { LM_ERR("failed to establish what kind of router the next " "hop is.\n"); - goto end; + goto error; } break; case F_RB_NH_LOOSE: @@ -1028,8 +1027,7 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, } else { prev_t->next = NULL; } - ret = -1; - goto end; + goto error; } /* this way, .free_rr is also set to 0 (!!!) */ memset(t, 0, chklen); @@ -1054,19 +1052,21 @@ static int eval_uac_routing(sip_msg_t *rpl, const struct retr_buf *inv_rb, #ifdef EXTRA_DEBUG abort(); #else - goto end; + goto error; #endif } } *list = rtset; + free_sip_msg(&orig_inv); /* all went well */ - ret = 0; -end: + return 0; + +error: free_sip_msg(&orig_inv); - if (ret < 0) + if (rtset) free_rte_list(rtset); - return ret; + return -1; } /*

1 0

git:master:dd0c6fb5: msilo: reorganized tests to free db_res and build of extra headers
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: dd0c6fb586a61cb7e2eed1093ccf8f5158761ae3 URL: https://github.com/kamailio/kamailio/commit/dd0c6fb586a61cb7e2eed1093ccf8f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-23T09:42:21+02:00 msilo: reorganized tests to free db_res and build of extra headers --- Modified: src/modules/msilo/msfuncs.c Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/dd0c6fb586a61cb7e2eed1093ccf8f5… Patch: https://github.com/kamailio/kamailio/commit/dd0c6fb586a61cb7e2eed1093ccf8f5… --- diff --git a/src/modules/msilo/msfuncs.c b/src/modules/msilo/msfuncs.c index 43bc82ce60..5262a81159 100644 --- a/src/modules/msilo/msfuncs.c +++ b/src/modules/msilo/msfuncs.c @@ -211,30 +211,30 @@ int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) if(date > 0) { lenDate = timetToSipDateStr(date,strDate,48); - strncpy(p, strDate, lenDate); + memcpy(p, strDate, lenDate); p += lenDate; } if(ctype.len > 0) { - strncpy(p, "Content-Type: ", 14); + memcpy(p, "Content-Type: ", 14); p += 14; - strncpy(p, ctype.s, ctype.len); + memcpy(p, ctype.s, ctype.len); p += ctype.len; - strncpy(p, CRLF, CRLF_LEN); + memcpy(p, CRLF, CRLF_LEN); p += CRLF_LEN; } if(contact.len > 0 && ms_add_contact) { - strncpy(p, CONTACT_PREFIX, CONTACT_PREFIX_LEN); + memcpy(p, CONTACT_PREFIX, CONTACT_PREFIX_LEN); p += CONTACT_PREFIX_LEN; - strncpy(p, contact.s, contact.len); + memcpy(p, contact.s, contact.len); p += contact.len; - strncpy(p, CONTACT_SUFFIX, CONTACT_SUFFIX_LEN); + memcpy(p, CONTACT_SUFFIX, CONTACT_SUFFIX_LEN); p += CONTACT_SUFFIX_LEN; } if (extra.len > 0) { - strncpy(p, extra.s, extra.len); + memcpy(p, extra.s, extra.len); p += extra.len; } buf->len = p - buf->s; @@ -263,18 +263,18 @@ int m_build_body(str *body, time_t date, str msg, time_t sdate) { if(sdate!=0) { - strncpy(p, "[Reminder message - ", 20); + memcpy(p, "[Reminder message - ", 20); p += 20; - strncpy(p, ctime(&sdate), 24); + memcpy(p, ctime(&sdate), 24); p += 24; *p++ = ']'; } else { - strncpy(p, "[Offline message - ", 19); + memcpy(p, "[Offline message - ", 19); p += 19; - strncpy(p, ctime(&date), 24); + memcpy(p, ctime(&date), 24); p += 24; *p++ = ']'; diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index d231ae7e6e..f62557ce2a 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -1039,8 +1039,11 @@ static int m_dump(struct sip_msg* msg, str* owner_s) } if (msilo_dbf.query(db_con,db_keys,db_ops,db_vals,db_cols,db_no_keys, - db_no_cols, ob_key, &db_res) < 0) { + db_no_cols, ob_key, &db_res) < 0 || db_res==NULL) { LM_ERR("failed to query database\n"); + if (db_res!=NULL && msilo_dbf.free_result(db_con, db_res) < 0) { + LM_ERR("failed to free the query result\n"); + } goto error; } @@ -1071,13 +1074,13 @@ static int m_dump(struct sip_msg* msg, str* owner_s) (time_t)RES_ROWS(db_res)[i].values[5/*inc time*/].val.int_val; if (ms_extra_hdrs != NULL) { - if (fixup_get_svalue(msg, (gparam_p)*ms_extra_hdrs_sp, - &extra_hdrs_str) != 0) { - if (msilo_dbf.free_result(db_con, db_res) < 0) - LM_ERR("failed to free the query result\n"); - LM_ERR("unable to get extra_hdrs value\n"); - goto error; - } + if(fixup_get_svalue(msg, (gparam_p)*ms_extra_hdrs_sp, + &extra_hdrs_str) != 0) { + if(msilo_dbf.free_result(db_con, db_res) < 0) + LM_ERR("failed to free the query result\n"); + LM_ERR("unable to get extra_hdrs value\n"); + goto error; + } } else { extra_hdrs_str.len = 0; } @@ -1153,7 +1156,7 @@ static int m_dump(struct sip_msg* msg, str* owner_s) * Free the result because we don't need it * anymore */ - if ((db_res !=NULL) && msilo_dbf.free_result(db_con, db_res) < 0) + if (msilo_dbf.free_result(db_con, db_res) < 0) LM_ERR("failed to free result of query\n"); return 1;

1 0

git:master:9c34b68e: presence_conference: free xml array in case of error
by Daniel-Constantin Mierla 24 Jul '17

24 Jul '17

Module: kamailio Branch: master Commit: 9c34b68ee840880dd6be37694de8e8255f8bfb45 URL: https://github.com/kamailio/kamailio/commit/9c34b68ee840880dd6be37694de8e82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-23T09:58:16+02:00 presence_conference: free xml array in case of error --- Modified: src/modules/presence_conference/notify_body.c --- Diff: https://github.com/kamailio/kamailio/commit/9c34b68ee840880dd6be37694de8e82… Patch: https://github.com/kamailio/kamailio/commit/9c34b68ee840880dd6be37694de8e82… --- diff --git a/src/modules/presence_conference/notify_body.c b/src/modules/presence_conference/notify_body.c index ff27946fbe..78108dd69e 100644 --- a/src/modules/presence_conference/notify_body.c +++ b/src/modules/presence_conference/notify_body.c @@ -92,7 +92,7 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n, in xmlNsPtr namespace = NULL; xmlNodePtr p_root= NULL; - xmlDocPtr* xml_array ; + xmlDocPtr* xml_array = NULL ; xmlNodePtr node = NULL; str *body= NULL; char buf[MAX_URI_SIZE+1]; @@ -129,8 +129,7 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n, in if(j == 0) /* no body */ { - if(xml_array) - pkg_free(xml_array); + pkg_free(xml_array); return NULL; } @@ -142,7 +141,7 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n, in /* create the new NOTIFY body */ if ( (pres_user->len + pres_domain->len + 1) > MAX_URI_SIZE ) { LM_ERR("entity URI too long, maximum=%d\n", MAX_URI_SIZE); - return NULL; + goto error; } memcpy(buf, pres_user->s, pres_user->len); buf[pres_user->len] = '@';

1 0

git:master:65ac6de1: mediaproxy: handle return pointer values
by Daniel-Constantin Mierla 23 Jul '17

23 Jul '17

Module: kamailio Branch: master Commit: 65ac6de1aebd6143c44f35ef28f46c2cd3a56723 URL: https://github.com/kamailio/kamailio/commit/65ac6de1aebd6143c44f35ef28f46c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-23T09:01:07+02:00 mediaproxy: handle return pointer values --- Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/65ac6de1aebd6143c44f35ef28f46c2… Patch: https://github.com/kamailio/kamailio/commit/65ac6de1aebd6143c44f35ef28f46c2… --- diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index 71c365e07c..f1fa9613b0 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -809,12 +809,14 @@ static str get_sdp_line_separator(str *sdp) { char *ptr, *end_ptr, *sdp_end; - str separator; + str separator = STR_NULL; sdp_end = sdp->s + sdp->len; ptr = find_line_starting_with(sdp, "v=", False); + if(ptr==NULL) { return separator; } end_ptr = findendline(ptr, sdp_end-ptr); + if(end_ptr==NULL) { return separator; } separator.s = ptr = end_ptr; while ((*ptr=='\n' || *ptr=='\r') && ptr<sdp_end) ptr++; @@ -1329,7 +1331,7 @@ insert_element(struct sip_msg *msg, char *position, char *element) len = strlen(element); - buf = pkg_malloc(len); + buf = pkg_malloc(len+1); if (!buf) { LM_ERR("out of memory\n"); return False; @@ -1343,6 +1345,7 @@ insert_element(struct sip_msg *msg, char *position, char *element) } memcpy(buf, element, len); + buf[len] = '\0'; if (insert_new_lump_after(anchor, buf, len, 0)==0) { LM_ERR("failed to insert new element\n");

1 0

git:master:0efa76d8: json: remove use of deprecated macro is_error()
by Daniel-Constantin Mierla 23 Jul '17

23 Jul '17

Module: kamailio Branch: master Commit: 0efa76d80e159fd2a7516388fe2405ad4fb6c5b6 URL: https://github.com/kamailio/kamailio/commit/0efa76d80e159fd2a7516388fe2405a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-23T08:59:43+02:00 json: remove use of deprecated macro is_error() --- Modified: src/modules/json/json_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/0efa76d80e159fd2a7516388fe2405a… Patch: https://github.com/kamailio/kamailio/commit/0efa76d80e159fd2a7516388fe2405a… --- diff --git a/src/modules/json/json_funcs.c b/src/modules/json/json_funcs.c index 935877f651..2de892154b 100644 --- a/src/modules/json/json_funcs.c +++ b/src/modules/json/json_funcs.c @@ -56,9 +56,8 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) j = json_tokener_parse(json_s.s); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON\n"); - if(j!=NULL) json_object_put(j); return -1; } @@ -74,6 +73,6 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) ret = -1; } - if(j!=NULL) json_object_put(j); + json_object_put(j); return ret; }

1 0

[kamailio/kamailio] tls mod cannot be loaded on Alpine Linux (#1188)
by sergey-safarov 22 Jul '17

22 Jul '17

### Description I want use kamailio on Alpine linux dist. All looks fine except tls module. During config file checking i got errors ``` / # / # vi /etc/kamailio/kamailio.cfg / # kamailio -c -f /etc/kamailio/kamailio.cfg loading modules under config path: /usr/lib/kamailio/modules/ 0(15) ERROR: <core> [core/sr_module.c:570]: load_module(): could not find module <mi_fifo> in </usr/lib/kamailio/modules/> 0(15) CRITICAL: <core> [core/cfg.y:3400]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 218, column 12-23: failed to load module 0(15) ERROR: <core> [core/sr_module.c:570]: load_module(): could not find module <mi_rpc> in </usr/lib/kamailio/modules/> 0(15) CRITICAL: <core> [core/cfg.y:3400]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 234, column 12-22: failed to load module 0(15) ERROR: <core> [core/sr_module.c:582]: load_module(): could not open module </usr/lib/kamailio/modules/tls.so>: Error relocating /usr/lib/kamailio/modules/tls.so: EC_KEY_new_by_curve_name: symbol not found 0(15) CRITICAL: <core> [core/cfg.y:3400]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 265, column 12-19: failed to load module 0(15) ERROR: <core> [core/modparam.c:152]: set_mod_param_regex(): No module matching <mi_fifo> found 0(15) CRITICAL: <core> [core/cfg.y:3403]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 285, column 67: Can't set module parameter 0(15) ERROR: <core> [core/modparam.c:152]: set_mod_param_regex(): No module matching <tls> found 0(15) CRITICAL: <core> [core/cfg.y:3403]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 411, column 50: Can't set module parameter ERROR: bad config file (5 errors) 0(15) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized / # / # ``` Error load_module(): could not open module </usr/lib/kamailio/modules/tls.so>: Error relocating /usr/lib/kamailio/modules/tls.so: EC_KEY_new_by_curve_name: symbol not found #### Reproduction docker run -it alpine sh apk --no-cache add alpine-sdk linux-headers bison flex libressl-dev cd kamailio sed -i -e 's/0x10100000L/0x10100000L || defined(LIBRESSL_VERSION_NUMBER)/' src/modules/tls/tls_locking.c make include_modules="tls" cfg make all make install sed -i '1s/^/#!define WITH_TLS\n/' /usr/local/etc/kamailio/kamailio.cfg /usr/local/sbin/kamailio -c -f /usr/local/etc/kamailio/kamailio.cfg #### Log Messages ``` @8bdc47c389e6:/usr/local/etc/kamailio$ /usr/local/sbin/kamailio -c -f /usr/local/etc/kamailio/kamailio.cfg 0(22421) ERROR: <core> [core/sr_module.c:582]: load_module(): could not open module </usr/local/lib64/kamailio/modules/tls.so>: Error relocating /usr/local/lib64/kamailio/modules/tls.so: SSL_CTX_set_min_proto_version: symbol not found 0(22421) CRITICAL: <core> [core/cfg.y:3426]: yyerror_at(): parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 276, column 12-19: failed to load module 0(22421) ERROR: <core> [core/modparam.c:152]: set_mod_param_regex(): No module matching <tls> found 0(22421) CRITICAL: <core> [core/cfg.y:3429]: yyerror_at(): parse error in config file /usr/local/etc/kamailio/kamailio.cfg, line 426, column 60: Can't set module parameter ERROR: bad config file (2 errors) 0(22421) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` @8bdc47c389e6:/usr/local/etc/kamailio$ /usr/local/sbin/kamailio -v version: kamailio 5.1.0-dev5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 20:55:58 Jul 21 2017 with gcc 6.2.1 @8bdc47c389e6:/usr/local/etc/kamailio$ ``` * **Operating System**: Alpine linux 3.6 ``` @8bdc47c389e6:/usr/local/etc/kamailio$ uname -a Linux 8bdc47c389e6 3.10.0-514.16.1.el7.x86_64 #1 SMP Wed Apr 12 15:04:24 UTC 2017 x86_64 Linux``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1188

2 2

git:master:5f9eba3e: memcached: handle error cases and alloc enough for null termination
by Daniel-Constantin Mierla 22 Jul '17

22 Jul '17

Module: kamailio Branch: master Commit: 5f9eba3eb42cdb8a5c2ec840cec29757d480e136 URL: https://github.com/kamailio/kamailio/commit/5f9eba3eb42cdb8a5c2ec840cec2975… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-22T08:35:01+02:00 memcached: handle error cases and alloc enough for null termination --- Modified: src/modules/memcached/mcd_var.c Modified: src/modules/memcached/memcached.c --- Diff: https://github.com/kamailio/kamailio/commit/5f9eba3eb42cdb8a5c2ec840cec2975… Patch: https://github.com/kamailio/kamailio/commit/5f9eba3eb42cdb8a5c2ec840cec2975… --- diff --git a/src/modules/memcached/mcd_var.c b/src/modules/memcached/mcd_var.c index a55f57ba19..442cf219e3 100644 --- a/src/modules/memcached/mcd_var.c +++ b/src/modules/memcached/mcd_var.c @@ -442,6 +442,7 @@ int pv_parse_mcd_name(pv_spec_p sp, str *in) { if(pv_parse_format(in, &tmp) || tmp==NULL) { LM_ERR("wrong format [%.*s]\n", in->len, in->s); + if(tmp) pkg_free(tmp); return -1; } diff --git a/src/modules/memcached/memcached.c b/src/modules/memcached/memcached.c index be50316ceb..b85d8191ee 100644 --- a/src/modules/memcached/memcached.c +++ b/src/modules/memcached/memcached.c @@ -233,6 +233,7 @@ static int mod_init(void) { char *server, *port; unsigned int len = 0; memcached_return rc; + struct memcached_server_st *svt; if ((port = strchr(mcd_srv_str, ':')) != NULL) { port = port + 1; @@ -243,7 +244,7 @@ static int mod_init(void) { len = strlen(mcd_srv_str) ; } - server = pkg_malloc(len); + server = pkg_malloc(len+1); if (server == NULL) { PKG_MEM_ERROR; return -1; @@ -255,6 +256,7 @@ static int mod_init(void) { memcached_h = memcached_create(NULL); if (memcached_h == NULL) { LM_ERR("could not create memcached structure\n"); + pkg_free(server); return -1; } LM_DBG("allocated new server handle at %p", memcached_h); @@ -276,16 +278,28 @@ static int mod_init(void) { LM_DBG("memory manager callbacks set\n"); } else { LM_ERR("memory manager callbacks not set, returned %s.\n", memcached_strerror(memcached_h, rc)); + pkg_free(server); return -1; } } else { LM_INFO("Use system memory manager for memcached client library\n"); } - servers = memcached_server_list_append(servers, server, atoi(port), &rc); + svt = memcached_server_list_append(servers, server, atoi(port), &rc); + if(svt==NULL) { + LM_ERR("failed to append server\n"); + if(servers) { + memcached_server_list_free(servers); + servers = NULL; + } + pkg_free(server); + return -1; + } + servers = svt; if (memcached_behavior_set(memcached_h, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, mcd_timeout) != MEMCACHED_SUCCESS) { LM_ERR("could not set server connection timeout\n"); + pkg_free(server); return -1; } rc = memcached_server_push(memcached_h, servers); @@ -293,6 +307,7 @@ static int mod_init(void) { LM_DBG("added server list to structure\n"); } else { LM_ERR("attempt to add server list to structure returned %s.\n", memcached_strerror(memcached_h, rc)); + pkg_free(server); return -1; }

1 0

git:master:449d4351: nat_traversal: handle return values for errors
by Daniel-Constantin Mierla 22 Jul '17

22 Jul '17

Module: kamailio Branch: master Commit: 449d435194338a4f3acf079774adcbef7ad7b794 URL: https://github.com/kamailio/kamailio/commit/449d435194338a4f3acf079774adcbe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-22T08:34:01+02:00 nat_traversal: handle return values for errors --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/449d435194338a4f3acf079774adcbe… Patch: https://github.com/kamailio/kamailio/commit/449d435194338a4f3acf079774adcbe… --- diff --git a/src/modules/nat_traversal/nat_traversal.c b/src/modules/nat_traversal/nat_traversal.c index 8bd4adde65..d3c6c95057 100644 --- a/src/modules/nat_traversal/nat_traversal.c +++ b/src/modules/nat_traversal/nat_traversal.c @@ -1573,6 +1573,10 @@ send_keepalive(NAT_Contact *contact) lport = 0; lproto = PROTO_NONE; hostent = sip_resolvehost(&nat_ip, &lport, &lproto); + if(hostent==NULL) { + LM_ERR("sip resolve host failed\n"); + return; + } hostent2su(&dst.to, hostent, 0, nat_port); dst.proto=PROTO_UDP; dst.send_sock=contact->socket; @@ -1900,7 +1904,9 @@ reply_filter(struct sip_msg *reply) static str prefix = {NULL, 0}; str call_id; - parse_headers(reply, HDR_VIA2_F, 0); + if(parse_headers(reply, HDR_VIA2_F, 0)<0) { + LM_DBG("second via not parsed\n"); + } if (reply->via2) return 1;

1 0

git:master:1891dcb9: pdt: reorder checks to avoid null access
by Daniel-Constantin Mierla 22 Jul '17

22 Jul '17

Module: kamailio Branch: master Commit: 1891dcb958100b5383f40278c4d675474d309df4 URL: https://github.com/kamailio/kamailio/commit/1891dcb958100b5383f40278c4d6754… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-22T08:33:22+02:00 pdt: reorder checks to avoid null access --- Modified: src/modules/pdt/pdt.c --- Diff: https://github.com/kamailio/kamailio/commit/1891dcb958100b5383f40278c4d6754… Patch: https://github.com/kamailio/kamailio/commit/1891dcb958100b5383f40278c4d6754… --- diff --git a/src/modules/pdt/pdt.c b/src/modules/pdt/pdt.c index 6505d8a3d5..09eacace4f 100644 --- a/src/modules/pdt/pdt.c +++ b/src/modules/pdt/pdt.c @@ -617,21 +617,25 @@ int pdt_load_db(void) { /* check for NULL values ?!?! */ sdomain.s = (char*)(RES_ROWS(db_res)[i].values[0].val.string_val); - sdomain.len = strlen(sdomain.s); - p.s = (char*)(RES_ROWS(db_res)[i].values[1].val.string_val); - p.len = strlen(p.s); - d.s = (char*)(RES_ROWS(db_res)[i].values[2].val.string_val); + + if(p.s==NULL || d.s==NULL || sdomain.s==NULL) + { + LM_ERR("Error - bad values in db\n"); + continue; + } + + sdomain.len = strlen(sdomain.s); + p.len = strlen(p.s); d.len = strlen(d.s); - if(p.s==NULL || d.s==NULL || sdomain.s==NULL || - p.len<=0 || d.len<=0 || sdomain.len<=0) + if(p.len<=0 || d.len<=0 || sdomain.len<=0) { LM_ERR("Error - bad values in db\n"); continue; } - + if(pdt_check_domain!=0 && _ptree_new!=NULL && pdt_check_pd(_ptree_new, &sdomain, &p, &d)==1) {

1 0

git:master:9136ce80: xhttp: proper check for return of add lump rpl
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: 9136ce8017660e92f624de6f7b8a07e50620dfa1 URL: https://github.com/kamailio/kamailio/commit/9136ce8017660e92f624de6f7b8a07e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T13:51:36+02:00 xhttp: proper check for return of add lump rpl --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9136ce8017660e92f624de6f7b8a07e… Patch: https://github.com/kamailio/kamailio/commit/9136ce8017660e92f624de6f7b8a07e… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index d41fc47f70..8a542bfc8b 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -382,11 +382,12 @@ static int xhttp_handler(sip_msg_t* msg) } else { DBG("new fake msg created (%d bytes):\n<%.*s>\n", fake_msg_len, fake_msg_len, fake_msg); - if (xhttp_process_request(msg, fake_msg, fake_msg_len)<0) + if (xhttp_process_request(msg, fake_msg, fake_msg_len)<0) { ret=NONSIP_MSG_ERROR; - pkg_free(fake_msg); } - return ret; + pkg_free(fake_msg); + } + return ret; } else { LM_DBG("http msg unchanged (%d bytes):\n<%.*s>\n", msg->len, msg->len, msg->buf); @@ -432,7 +433,7 @@ static int xhttp_send_reply(sip_msg_t *msg, int code, str *reason, if(body!=NULL && body->len>0) { - if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) < 0) + if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) == 0) { LM_ERR("Error while adding reply lump\n"); return -1;

1 0

git:master:08c404f2: xcap_server: proper test of retun code for add lump rpl
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: 08c404f245e55b37f71d4326afd959ecf1ea831c URL: https://github.com/kamailio/kamailio/commit/08c404f245e55b37f71d4326afd959e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T13:50:07+02:00 xcap_server: proper test of retun code for add lump rpl --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/08c404f245e55b37f71d4326afd959e… Patch: https://github.com/kamailio/kamailio/commit/08c404f245e55b37f71d4326afd959e… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 86f7816dd7..15c5a91209 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -284,7 +284,7 @@ static int xcaps_send_reply(sip_msg_t *msg, int code, str *reason, } if(body && body->len>0) { - if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) < 0) + if (add_lump_rpl(msg, body->s, body->len, LUMP_RPL_BODY) == 0) { LM_ERR("Error while adding reply lump\n"); return -1;

1 0

git:master:a2d010ce: xmlops: removed dead code return
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: a2d010cea219fa1cd84d0cf84825f3cc63536530 URL: https://github.com/kamailio/kamailio/commit/a2d010cea219fa1cd84d0cf84825f3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T13:51:19+02:00 xmlops: removed dead code return --- Modified: src/modules/xmlops/pv_xml.c --- Diff: https://github.com/kamailio/kamailio/commit/a2d010cea219fa1cd84d0cf84825f3c… Patch: https://github.com/kamailio/kamailio/commit/a2d010cea219fa1cd84d0cf84825f3c… --- diff --git a/src/modules/xmlops/pv_xml.c b/src/modules/xmlops/pv_xml.c index f002a53d44..872fea0de3 100644 --- a/src/modules/xmlops/pv_xml.c +++ b/src/modules/xmlops/pv_xml.c @@ -331,7 +331,6 @@ int pv_get_xml(struct sip_msg *msg, pv_param_t *param, default: return pv_get_null(msg, param, res); } - return pv_get_null(msg, param, res); } int pv_set_xml(struct sip_msg* msg, pv_param_t *param,

1 0

git:master:e6c9474e: core: cfg ctx - removed unused variable
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: e6c9474e456fb0673c87f87a325d9dc40aa10d32 URL: https://github.com/kamailio/kamailio/commit/e6c9474e456fb0673c87f87a325d9dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T10:27:57+02:00 core: cfg ctx - removed unused variable --- Modified: src/core/cfg/cfg_ctx.c --- Diff: https://github.com/kamailio/kamailio/commit/e6c9474e456fb0673c87f87a325d9dc… Patch: https://github.com/kamailio/kamailio/commit/e6c9474e456fb0673c87f87a325d9dc… --- diff --git a/src/core/cfg/cfg_ctx.c b/src/core/cfg/cfg_ctx.c index 6dc9a469c0..d251b11317 100644 --- a/src/core/cfg/cfg_ctx.c +++ b/src/core/cfg/cfg_ctx.c @@ -1373,8 +1373,7 @@ int cfg_get_default_value_by_name(cfg_ctx_t *ctx, str *group_name, cfg_mapping_t *var; void *p; static str s; /* we need the value even - after the function returns */ - cfg_group_inst_t *group_inst; + * after the function returns */ /* verify the context even if we do not need it now to make sure that a cfg driver has called the function

1 0

git:master:e7a89633: cfg_rpc: hanlde return code inside cfg.reset rpc command
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: e7a89633c809345aabdcf68f120f01e7d52d116d URL: https://github.com/kamailio/kamailio/commit/e7a89633c809345aabdcf68f120f01e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T10:11:07+02:00 cfg_rpc: hanlde return code inside cfg.reset rpc command --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e7a89633c809345aabdcf68f120f01e… Patch: https://github.com/kamailio/kamailio/commit/e7a89633c809345aabdcf68f120f01e… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index 18c16c8733..a9c42dc1e3 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -355,12 +355,12 @@ static void rpc_get(rpc_t* rpc, void* c) } } -static const char* rpc_reset_doc[2] = { +static const char* rpc_cfg_var_reset_doc[2] = { "Reset all the values of a configuration group and commit the change immediately", 0 }; -static void rpc_reset(rpc_t* rpc, void* c) +static void rpc_cfg_var_reset(rpc_t* rpc, void* c) { void *h; str gname, var; @@ -378,7 +378,7 @@ static void rpc_reset(rpc_t* rpc, void* c) if (get_group_id(&group, &group_id)) { rpc->fault(c, 400, "Wrong group syntax. Use either \"group\", or \"group[id]\""); - return; + return; } cfg_get_group_init(&h); @@ -402,10 +402,21 @@ static void rpc_reset(rpc_t* rpc, void* c) return; } - if (input_type == CFG_INPUT_INT) - cfg_set_now_int(ctx, &gname, group_id, &var, (int)(long)val); - else if (input_type == CFG_INPUT_STRING) - cfg_set_now_string(ctx, &gname, group_id, &var, val); + if (input_type == CFG_INPUT_INT) { + ret = cfg_set_now_int(ctx, &gname, group_id, &var, + (int)(long)val); + } else if (input_type == CFG_INPUT_STRING) { + ret = cfg_set_now_string(ctx, &gname, group_id, &var, val); + } else { + rpc->fault(c, 500, "Unsupported input type"); + return; + } + if(ret<0) { + rpc->fault(c, 500, "Reset failed"); + return; + } else if(ret==1) { + LM_WARN("unexpected situation - variable not found\n"); + } } } } @@ -601,7 +612,7 @@ static rpc_export_t rpc_calls[] = { {"cfg.commit", rpc_commit, rpc_commit_doc, 0}, {"cfg.rollback", rpc_rollback, rpc_rollback_doc, 0}, {"cfg.get", rpc_get, rpc_get_doc, 0}, - {"cfg.reset", rpc_reset, rpc_reset_doc, 0}, + {"cfg.reset", rpc_cfg_var_reset, rpc_cfg_var_reset_doc, 0}, {"cfg.help", rpc_help, rpc_help_doc, 0}, {"cfg.list", rpc_list, rpc_list_doc, 0}, {"cfg.diff", rpc_diff, rpc_diff_doc, 0},

1 0

git:master:1ed223dc: speeddial: simplified access to db_res and the free of it
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: 1ed223dcccf4c2ea623db75fdda16adc924b916e URL: https://github.com/kamailio/kamailio/commit/1ed223dcccf4c2ea623db75fdda16ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T08:57:39+02:00 speeddial: simplified access to db_res and the free of it --- Modified: src/modules/speeddial/sdlookup.c --- Diff: https://github.com/kamailio/kamailio/commit/1ed223dcccf4c2ea623db75fdda16ad… Patch: https://github.com/kamailio/kamailio/commit/1ed223dcccf4c2ea623db75fdda16ad… --- diff --git a/src/modules/speeddial/sdlookup.c b/src/modules/speeddial/sdlookup.c index c4f655efce..d9e52bf3cd 100644 --- a/src/modules/speeddial/sdlookup.c +++ b/src/modules/speeddial/sdlookup.c @@ -161,17 +161,17 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_funcs.use_table(db_handle, &table_s); if(db_funcs.query(db_handle, db_keys, NULL, db_vals, db_cols, - nr_keys /*no keys*/, 1 /*no cols*/, NULL, &db_res)!=0) + nr_keys /*no keys*/, 1 /*no cols*/, NULL, &db_res)!=0 || db_res==NULL) { LM_ERR("failed to query database\n"); goto err_server; } - if (RES_ROW_N(db_res)<=0 || RES_ROWS(db_res)[0].values[0].nul != 0) - { + if(RES_ROW_N(db_res) <= 0 || RES_ROWS(db_res)[0].values[0].nul != 0) { LM_DBG("no sip address found for R-URI\n"); - if (db_res!=NULL && db_funcs.free_result(db_handle, db_res) < 0) + if(db_funcs.free_result(db_handle, db_res) < 0) { LM_DBG("failed to free result of query\n"); + } return -1; } @@ -199,8 +199,7 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) break; default: LM_ERR("unknown type of DB new_uri column\n"); - if (db_res != NULL && db_funcs.free_result(db_handle, db_res) < 0) - { + if (db_funcs.free_result(db_handle, db_res) < 0) { LM_DBG("failed to free result of query\n"); } goto err_server; @@ -217,8 +216,9 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) /** * Free the result because we don't need it anymore */ - if (db_res!=NULL && db_funcs.free_result(db_handle, db_res) < 0) + if (db_funcs.free_result(db_handle, db_res) < 0) { LM_DBG("failed to free result of query\n"); + } /* set the URI */ LM_DBG("URI of sd from R-URI [%s]\n", user_s.s);

1 0

git:master:8f460d16: sqlops: free allocated pv list in case of error inside fixup_sql_pvquery()
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: 8f460d16e84b9bc0b01463113c6e7e79d297f64e URL: https://github.com/kamailio/kamailio/commit/8f460d16e84b9bc0b01463113c6e7e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T08:56:58+02:00 sqlops: free allocated pv list in case of error inside fixup_sql_pvquery() --- Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/8f460d16e84b9bc0b01463113c6e7e7… Patch: https://github.com/kamailio/kamailio/commit/8f460d16e84b9bc0b01463113c6e7e7… --- diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index ce3f8730f7..502819e76a 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -391,6 +391,7 @@ static int fixup_sql_pvquery(void** param, int param_no) if (pvl->sname.setf == NULL) { LM_ERR("result variable [%d] is read-only\n", i); + free_pvname_list(res); return E_UNSPEC; } i++;

1 0

git:master:f2796ceb: dialog: increase puid size for profile to ensure null termination
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: f2796ceb0a127c1a6580a9d9582ec9bc0fba6081 URL: https://github.com/kamailio/kamailio/commit/f2796ceb0a127c1a6580a9d9582ec9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T08:55:04+02:00 dialog: increase puid size for profile to ensure null termination --- Modified: src/modules/dialog/dlg_profile.c Modified: src/modules/dialog/dlg_profile.h Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/f2796ceb0a127c1a6580a9d9582ec9b… Patch: https://github.com/kamailio/kamailio/commit/f2796ceb0a127c1a6580a9d9582ec9b… --- diff --git a/src/modules/dialog/dlg_profile.c b/src/modules/dialog/dlg_profile.c index 3576f68036..89d994616b 100644 --- a/src/modules/dialog/dlg_profile.c +++ b/src/modules/dialog/dlg_profile.c @@ -667,7 +667,7 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi } if(puid && puid->s && puid->len>0) { if(puid->len<SRUID_SIZE) { - strcpy(linker->hash_linker.puid, puid->s); + memcpy(linker->hash_linker.puid, puid->s, puid->len); linker->hash_linker.puid_len = puid->len; } else { LM_ERR("puid size is too large\n"); @@ -677,7 +677,8 @@ int dlg_add_profile(dlg_cell_t *dlg, str *value, struct dlg_profile_table *profi } else { sruid_next_safe(&_dlg_profile_sruid); if(_dlg_profile_sruid.uid.len<SRUID_SIZE) { - strcpy(linker->hash_linker.puid, _dlg_profile_sruid.uid.s); + memcpy(linker->hash_linker.puid, _dlg_profile_sruid.uid.s, + _dlg_profile_sruid.uid.len); linker->hash_linker.puid_len = _dlg_profile_sruid.uid.len; } else { LM_ERR("sruid size is too large\n"); diff --git a/src/modules/dialog/dlg_profile.h b/src/modules/dialog/dlg_profile.h index 3d6c94d6d4..5c09dd6083 100644 --- a/src/modules/dialog/dlg_profile.h +++ b/src/modules/dialog/dlg_profile.h @@ -54,7 +54,7 @@ typedef struct dlg_profile_hash { str value; /*!< hash value */ struct dlg_cell *dlg; /*!< dialog cell */ - char puid[SRUID_SIZE]; + char puid[SRUID_SIZE+2]; int puid_len; time_t expires; int flags; diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index a67b976137..d37bbbf514 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -406,7 +406,7 @@ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) dlg_lreq_callee_headers.len); lhdrs.len += dlg_lreq_callee_headers.len; if(dlg_lreq_callee_headers.s[dlg_lreq_callee_headers.len-1]!='\n') { - strncpy(lhdrs.s+lhdrs.len, CRLF, CRLF_LEN); + memcpy(lhdrs.s+lhdrs.len, CRLF, CRLF_LEN); lhdrs.len += CRLF_LEN; } }

1 0

git:master:bd5873c4: dialplan: free allocated vars in case of errors
by Daniel-Constantin Mierla 21 Jul '17

21 Jul '17

Module: kamailio Branch: master Commit: bd5873c4e33188238633a8f6c48a0c5c28041179 URL: https://github.com/kamailio/kamailio/commit/bd5873c4e33188238633a8f6c48a0c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-21T08:56:10+02:00 dialplan: free allocated vars in case of errors --- Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/bd5873c4e33188238633a8f6c48a0c5… Patch: https://github.com/kamailio/kamailio/commit/bd5873c4e33188238633a8f6c48a0c5… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index b319607e3d..e5710fd828 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -267,7 +267,7 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * src, pv_spec_t * dest, set_attr_pvar: - if(!attr_pvar) + if(attr_pvar==NULL || attrs==NULL) return 0; val.rs = *attrs; @@ -393,8 +393,10 @@ static int dp_trans_fixup(void ** param, int param_no){ }else{ lstr.s = p; lstr.len = strlen(p); dp_par->v.sp[0] = pv_cache_get(&lstr); - if (dp_par->v.sp[0]==NULL) + if (dp_par->v.sp[0]==NULL) { + pkg_free(dp_par); goto error; + } verify_par_type(param_no, dp_par->v.sp[0]); dp_par->type = DP_VAL_SPEC; @@ -410,14 +412,18 @@ static int dp_trans_fixup(void ** param, int param_no){ lstr.s = p; lstr.len = strlen(p); dp_par->v.sp[0] = pv_cache_get(&lstr); - if(dp_par->v.sp[0]==NULL) + if(dp_par->v.sp[0]==NULL) { + pkg_free(dp_par); goto error; + } if (s != 0) { lstr.s = s; lstr.len = strlen(s); dp_par->v.sp[1] = pv_cache_get(&lstr); - if (dp_par->v.sp[1]==NULL) + if (dp_par->v.sp[1]==NULL) { + pkg_free(dp_par); goto error; + } verify_par_type(param_no, dp_par->v.sp[1]); } diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 2c0d9b3b12..85741677df 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -234,7 +234,7 @@ dpl_dyn_pcre_p dpl_dynamic_pcre_list(sip_msg_t *msg, str *expr) l = pkg_malloc(sizeof(struct str_list)); if(l==NULL) { PKG_MEM_ERROR; - return NULL; + goto error; } memset(l, 0, sizeof(struct str_list)); if(dpl_get_avp_values(msg, elem, avp_elem, &l)<0) { @@ -342,8 +342,10 @@ struct subst_expr* repl_exp_parse(str subst) rw_no = 0; repl = p; - if((rw_no = parse_repl(rw, &p, end, &max_pmatch, WITHOUT_SEP))< 0) + if((rw_no = parse_repl(rw, &p, end, &max_pmatch, WITHOUT_SEP))< 0) { + LM_ERR("parse repl failed\n"); goto error; + } repl_end=p; @@ -378,7 +380,6 @@ struct subst_expr* repl_exp_parse(str subst) error: if(shms.s != NULL) shm_free(shms.s); - if (se) { repl_expr_free(se);} return NULL; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev