- sr-dev - kamailio.org

git:master:60c8d903: acc_json: support for leg_info fields
by Julien Chavanton 03 Dec '18

03 Dec '18

Module: kamailio Branch: master Commit: 60c8d903ff4b6c8f9f88952ef0f666aa457437a8 URL: https://github.com/kamailio/kamailio/commit/60c8d903ff4b6c8f9f88952ef0f666a… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-12-03T06:37:31Z acc_json: support for leg_info fields --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/60c8d903ff4b6c8f9f88952ef0f666a… Patch: https://github.com/kamailio/kamailio/commit/60c8d903ff4b6c8f9f88952ef0f666a… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index 908d7d0eb9..ee3f84bf6b 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -160,6 +160,7 @@ static void destroy(void) int acc_json_init(acc_init_info_t *inf) { + LM_DBG(" init ...\n"); return 0; } @@ -246,6 +247,27 @@ int acc_json_send_request(struct sip_msg *req, acc_info_t *inf) extra = extra->next; } + /* add leginfo fields */ + if(inf->leg_info) { + o = accb.get_leg_attrs(inf->leg_info, req, inf->varr + attr_cnt, + inf->iarr + attr_cnt, inf->tarr + attr_cnt, 1); + attr_cnt += o; + m = attr_cnt; + + struct acc_extra *leg_info = inf->leg_info; + for(; i < m; i++) { + LM_DBG("[%d][%s][%.*s]\n", i, leg_info->name.s, inf->varr[i].len, + inf->varr[i].s); + char *tmp = strndup(inf->varr[i].s, inf->varr[i].len); + json_t *value = json_string(tmp); + if(!value) + value = json_string("NON-UTF8"); + json_object_set_new(object, leg_info->name.s, value); + free(tmp); + leg_info = leg_info->next; + } + } + if(object) { if(json_object_size(object) == 0) { LM_ERR("json object empty\n");

1 0

git:4.4:97f3081f: utils/kamctl: [pgsql] add missing options for pgsql_ro_query()
by Victor Seva 03 Dec '18

03 Dec '18

Module: kamailio Branch: 4.4 Commit: 97f3081f8af788e0c4a420e22bd2d5267f43d4ec URL: https://github.com/kamailio/kamailio/commit/97f3081f8af788e0c4a420e22bd2d52… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-03T12:34:21+01:00 utils/kamctl: [pgsql] add missing options for pgsql_ro_query() Thanks Andreas Maus <maus+debianbug(a)ypbind.de> fix #1750 (cherry picked from commit 1894b378f975e7129024f6f10640c6c642e30a1b) --- Modified: utils/kamctl/kamctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/97f3081f8af788e0c4a420e22bd2d52… Patch: https://github.com/kamailio/kamailio/commit/97f3081f8af788e0c4a420e22bd2d52… --- diff --git a/utils/kamctl/kamctl.pgsql b/utils/kamctl/kamctl.pgsql index 60cbd92f06..8b9e7f04bf 100644 --- a/utils/kamctl/kamctl.pgsql +++ b/utils/kamctl/kamctl.pgsql @@ -46,8 +46,9 @@ pgsql_query() { # input: sql query, optional pgsql command-line params pgsql_ro_query() { - mdbg "pgsql_ro_query: $PGSQL $2 -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" + mdbg "pgsql_ro_query: $PGSQL $2 -A -q -t -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -U $DBROUSER \ $DBNAME \

1 0

git:5.0:85b85617: utils/kamctl: [pgsql] add missing options for pgsql_ro_query()
by Victor Seva 03 Dec '18

03 Dec '18

Module: kamailio Branch: 5.0 Commit: 85b85617032533a56a15e6fc4ac90b61df98a36a URL: https://github.com/kamailio/kamailio/commit/85b85617032533a56a15e6fc4ac90b6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-03T12:31:59+01:00 utils/kamctl: [pgsql] add missing options for pgsql_ro_query() Thanks Andreas Maus <maus+debianbug(a)ypbind.de> fix #1750 (cherry picked from commit 1894b378f975e7129024f6f10640c6c642e30a1b) --- Modified: utils/kamctl/kamctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/85b85617032533a56a15e6fc4ac90b6… Patch: https://github.com/kamailio/kamailio/commit/85b85617032533a56a15e6fc4ac90b6… --- diff --git a/utils/kamctl/kamctl.pgsql b/utils/kamctl/kamctl.pgsql index 7e5abaef9a..1250dc0d7e 100644 --- a/utils/kamctl/kamctl.pgsql +++ b/utils/kamctl/kamctl.pgsql @@ -57,15 +57,17 @@ pgsql_query() { # input: sql query, optional pgsql command-line params pgsql_ro_query() { - mdbg "pgsql_ro_query: $PGSQL $2 -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" + mdbg "pgsql_ro_query: $PGSQL $2 -A -q -t -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" if [ -z "$DBPORT" ] ; then PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -U $DBROUSER \ $DBNAME \ -c "$1" else PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -p $DBPORT \ -U $DBROUSER \

1 0

git:5.1:54c904e4: utils/kamctl: [pgsql] add missing options for pgsql_ro_query()
by Victor Seva 03 Dec '18

03 Dec '18

Module: kamailio Branch: 5.1 Commit: 54c904e4dc9dae3cd82e547e2328cad9381e48ec URL: https://github.com/kamailio/kamailio/commit/54c904e4dc9dae3cd82e547e2328cad… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-03T12:31:18+01:00 utils/kamctl: [pgsql] add missing options for pgsql_ro_query() Thanks Andreas Maus <maus+debianbug(a)ypbind.de> fix #1750 (cherry picked from commit 1894b378f975e7129024f6f10640c6c642e30a1b) --- Modified: utils/kamctl/kamctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/54c904e4dc9dae3cd82e547e2328cad… Patch: https://github.com/kamailio/kamailio/commit/54c904e4dc9dae3cd82e547e2328cad… --- diff --git a/utils/kamctl/kamctl.pgsql b/utils/kamctl/kamctl.pgsql index 7e5abaef9a..1250dc0d7e 100644 --- a/utils/kamctl/kamctl.pgsql +++ b/utils/kamctl/kamctl.pgsql @@ -57,15 +57,17 @@ pgsql_query() { # input: sql query, optional pgsql command-line params pgsql_ro_query() { - mdbg "pgsql_ro_query: $PGSQL $2 -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" + mdbg "pgsql_ro_query: $PGSQL $2 -A -q -t -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" if [ -z "$DBPORT" ] ; then PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -U $DBROUSER \ $DBNAME \ -c "$1" else PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -p $DBPORT \ -U $DBROUSER \

1 0

[kamailio/kamailio] Missing options for psql in pgsql_ro_query prevents usage of kamctl (#1750)
by Victor Seva 03 Dec '18

03 Dec '18

>From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906233 > In the current version missing command line options for the read-only psql call (in pgsql_ro_query) prevents usage of kamctl for PostgreSQL backend, e.g. when adding a _new_ user: > root@debian9 ~ # kamctl add phone_u phone_p database engine 'PGSQL' loaded Control engine 'FIFO' loaded is_user: user counter=1 INFO: user 'phone_u' already exists > This is because the psql query returns the correct result (0 in this case) but the pgsql_ro_query function lacks the psql options -A -q -t as defined. >As a result the query contains the result and the coloumn name and footer,e.g. in this case: ``` root@debian9 ~ # /usr/bin/psql -h localhost -U kamailioro kamailio \ -c "select count(*) from subscriber where username='phone_u';" count ------- 0 (1 row) ``` >In this example the "kamctl add" command looks at the last line of the output to check if the user is already defined and misinterprets the result as it expectes "0" as the result. >This affect not only the "kamctl add" command but most calls that calls $DBROCMD in kamctl. -- 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/1750

1 1

[kamailio/kamailio] utils/kamctl: [pgsql] add missing options for pgsql_ro_query() (#1751)
by Victor Seva 03 Dec '18

03 Dec '18

Thanks Andreas Maus <maus+debianbug(a)ypbind.de>   #### 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:  - [X] PR should be backported to stable branches - [ ] Tested changes locally - [X] Related to issue #1750 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1751 -- Commit Summary -- * utils/kamctl: [pgsql] add missing options for pgsql_ro_query() -- File Changes -- M utils/kamctl/kamctl.pgsql (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1751.patch https://github.com/kamailio/kamailio/pull/1751.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/1751

2 2

git:master:1894b378: utils/kamctl: [pgsql] add missing options for pgsql_ro_query()
by Victor Seva 03 Dec '18

03 Dec '18

Module: kamailio Branch: master Commit: 1894b378f975e7129024f6f10640c6c642e30a1b URL: https://github.com/kamailio/kamailio/commit/1894b378f975e7129024f6f10640c6c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-12-03T12:29:33+01:00 utils/kamctl: [pgsql] add missing options for pgsql_ro_query() Thanks Andreas Maus <maus+debianbug(a)ypbind.de> fix #1750 --- Modified: utils/kamctl/kamctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/1894b378f975e7129024f6f10640c6c… Patch: https://github.com/kamailio/kamailio/commit/1894b378f975e7129024f6f10640c6c… --- diff --git a/utils/kamctl/kamctl.pgsql b/utils/kamctl/kamctl.pgsql index 7e5abaef9a..1250dc0d7e 100644 --- a/utils/kamctl/kamctl.pgsql +++ b/utils/kamctl/kamctl.pgsql @@ -57,15 +57,17 @@ pgsql_query() { # input: sql query, optional pgsql command-line params pgsql_ro_query() { - mdbg "pgsql_ro_query: $PGSQL $2 -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" + mdbg "pgsql_ro_query: $PGSQL $2 -A -q -t -h $DBHOST -U $DBROUSER $DBNAME -c '$1'" if [ -z "$DBPORT" ] ; then PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -U $DBROUSER \ $DBNAME \ -c "$1" else PGPASSWORD="$DBROPW" $PGSQL $2 \ + -A -q -t \ -h $DBHOST \ -p $DBPORT \ -U $DBROUSER \

1 0

git:master:c94207bf: textops: fixed the kemi export for regex_substring()
by Daniel-Constantin Mierla 03 Dec '18

03 Dec '18

Module: kamailio Branch: master Commit: c94207bf3a3324bb0f443da031feee7947a452f7 URL: https://github.com/kamailio/kamailio/commit/c94207bf3a3324bb0f443da031feee7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-03T08:23:35+01:00 textops: fixed the kemi export for regex_substring() --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/c94207bf3a3324bb0f443da031feee7… Patch: https://github.com/kamailio/kamailio/commit/c94207bf3a3324bb0f443da031feee7… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index c7c110beb1..3db4626232 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4856,7 +4856,7 @@ static sr_kemi_t sr_kemi_textops_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("textops"), str_init("regex_substring"), - SR_KEMIP_INT, regex_substring_f, + SR_KEMIP_INT, ki_regex_substring, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE } },

1 0

git:master:46401e46: dialog: safety checks for local cseq and contact vars
by Daniel-Constantin Mierla 30 Nov '18

30 Nov '18

Module: kamailio Branch: master Commit: 46401e465d88495d510d2cb36dc36ec86978c53e URL: https://github.com/kamailio/kamailio/commit/46401e465d88495d510d2cb36dc36ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-30T16:31:22+01:00 dialog: safety checks for local cseq and contact vars - avoid crash on systems not printing null string of length 0 - GH #1717 --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/46401e465d88495d510d2cb36dc36ec… Patch: https://github.com/kamailio/kamailio/commit/46401e465d88495d510d2cb36dc36ec… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index b6ce4d2bbd..a94dd641a4 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -200,7 +200,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, if (leg==DLG_CALLER_LEG) { if((!msg->cseq && (parse_headers(msg,HDR_CSEQ_F,0)<0 || !msg->cseq)) || !msg->cseq->parsed){ - LM_ERR("bad sip message or missing CSeq hdr :-/\n"); + LM_ERR("bad sip message or missing CSeq hdr\n"); goto error0; } cseq = (get_cseq(msg))->number; @@ -208,6 +208,10 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, /* use the same as in request */ cseq = dlg->cseq[DLG_CALLEE_LEG]; } + if(cseq.s==NULL || cseq.len<=0) { + LM_ERR("empty CSeq number\n"); + goto error0; + } /* extract the contact address */ if (!msg->contact&&(parse_headers(msg,HDR_CONTACT_F,0)<0||!msg->contact)){ @@ -221,6 +225,10 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, goto error0; } contact = ((contact_body_t *)msg->contact->parsed)->contacts->uri; + if(contact.s==NULL || contact.len<=0) { + LM_ERR("empty contact uri\n"); + goto error0; + } /* extract the record-route addresses */ if (leg==DLG_CALLER_LEG) { @@ -250,10 +258,10 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, LM_DBG("leg(%d) route_set [%.*s], contact [%.*s], cseq [%.*s]" " and bind_addr [%.*s]\n", - leg, rr_set.len, rr_set.s, contact.len, contact.s, - cseq.len, cseq.s, + leg, rr_set.len, ZSW(rr_set.s), contact.len, ZSW(contact.s), + cseq.len, ZSW(cseq.s), msg->rcv.bind_address->sock_str.len, - msg->rcv.bind_address->sock_str.s); + ZSW(msg->rcv.bind_address->sock_str.s)); if (dlg_set_leg_info( dlg, tag, &rr_set, &contact, &cseq, leg)!=0) { LM_ERR("dlg_set_leg_info failed (leg %d)\n", leg);

1 0

git:master:39b89a18: tm: reply_received() - simplify locking for processing sip response
by Daniel-Constantin Mierla 30 Nov '18

30 Nov '18

Module: kamailio Branch: master Commit: 39b89a18a8c357151a173ab02dc95dff1f02715d URL: https://github.com/kamailio/kamailio/commit/39b89a18a8c357151a173ab02dc95df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-30T16:05:30+01:00 tm: reply_received() - simplify locking for processing sip response - leverage the recursive mutex and skip several zones of unlock/lock, which can lead to races on delayed processing or fast reply retransmissions - related to GH #1613 #1744 --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/39b89a18a8c357151a173ab02dc95df… Patch: https://github.com/kamailio/kamailio/commit/39b89a18a8c357151a173ab02dc95df… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 8a95fe758d..859c73cd37 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2189,7 +2189,7 @@ int reply_received( struct sip_msg *p_msg ) #ifdef WITH_XAVP sr_xavp_t **backup_xavps; #endif - int replies_locked; + int replies_locked = 0; #ifdef USE_DNS_FAILOVER int branch_ret; int prev_branch; @@ -2223,10 +2223,15 @@ int reply_received( struct sip_msg *p_msg ) /* if transaction found, increment the rpl_received counter */ t_stats_rpl_received(); + /* lock -- onreply_route, safe avp usage, ... */ + /* - it is a recurrent mutex, so it is safe if a function executed + * down here does another lock/unlock */ + LOCK_REPLIES( t ); + replies_locked=1; + tm_ctx_set_branch_index(branch); init_cancel_info(&cancel_data); msg_status=p_msg->REPLY_STATUS; - replies_locked=0; uac=&t->uac[branch]; LM_DBG("org. status uas=%d, uac[%d]=%d local=%d is_invite=%d)\n", @@ -2363,11 +2368,6 @@ int reply_received( struct sip_msg *p_msg ) /* processing of on_reply block */ if (onreply_route) { set_route_type(TM_ONREPLY_ROUTE); - - /* lock onreply_route, for safe avp usage */ - LOCK_REPLIES( t ); - replies_locked=1; - /* transfer transaction flag to message context */ if (t->uas.request) { p_msg->flags=t->uas.request->flags; @@ -2444,27 +2444,12 @@ int reply_received( struct sip_msg *p_msg ) if (unlikely((ctx.run_flags&DROP_R_F) && (msg_status<200))) #endif /* TM_ONREPLY_FINAL_DROP_OK */ { - if (likely(replies_locked)) { - replies_locked = 0; - UNLOCK_REPLIES( t ); - } goto done; } #ifdef TM_ONREPLY_FINAL_DROP_OK if (msg_status >= 200) { /* stop final reply timers, now that we executed the onreply route * and the reply was not DROPed */ - if (likely(replies_locked)){ - /* if final reply => we have to execute stop_rb_timers, - * but with replies unlocked to avoid a possible deadlock - * (if the timer is currently running, stop_rb_timers() - * will wait until the timer handler ends, but the - * final_response_handler() will try to lock replies - * => deadlock). - */ - UNLOCK_REPLIES( t ); - replies_locked=0; - } stop_rb_timers(&uac->request); } #endif /* TM_ONREPLY_FINAL_DROP_OK */ @@ -2520,11 +2505,6 @@ int reply_received( struct sip_msg *p_msg ) branch_ret=add_uac_dns_fallback(t, t->uas.request, uac, !replies_locked); prev_branch=-1; - /* unlock replies to avoid sending() while holding a lock */ - if (unlikely(replies_locked)) { - UNLOCK_REPLIES( t ); - replies_locked = 0; - } while((branch_ret>=0) &&(branch_ret!=prev_branch)){ prev_branch=branch_ret; branch_ret=t_send_branch(t, branch_ret, t->uas.request , 0, 1); @@ -2533,12 +2513,8 @@ int reply_received( struct sip_msg *p_msg ) #endif if (unlikely(p_msg->msg_flags&FL_RPL_SUSPENDED)) { - goto skip_send_reply; - /* suspend the reply (async), no error */ - } - if (unlikely(!replies_locked)){ - LOCK_REPLIES( t ); - replies_locked=1; + /* suspended the reply (async) - no error */ + goto done; } if ( is_local(t) ) { /* local_reply() does UNLOCK_REPLIES( t ) */ @@ -2596,18 +2572,16 @@ int reply_received( struct sip_msg *p_msg ) uac->request.flags|=F_RB_FR_INV; /* mark fr_inv */ } /* provisional replies */ -skip_send_reply: - - if (likely(replies_locked)){ - /* unlock replies if still locked coming via goto skip_send_reply */ +done: + if (unlikely(replies_locked)){ + /* unlock replies if still locked coming via goto */ UNLOCK_REPLIES(t); replies_locked=0; } -done: tm_ctx_set_branch_index(T_BR_UNDEFINED); - /* we are done with the transaction, so unref it - the reference - * was incremented by t_check() function -bogdan*/ + /* done processing the transaction, so unref it + * - the reference counter was incremented by t_check() function */ t_unref(p_msg); /* don't try to relay statelessly neither on success * (we forwarded statefully) nor on error; on troubles,

1 0

[kamailio/kamailio] Private memory leaking in case of topos(redis) and topoh modules enable together (#1682)
by alexey-khabulyak 30 Nov '18

30 Nov '18

### Description  I tested kamailio's topoh+topos modules. udp worker's private memory is leaking when i enable both. after a couple of hour kamailio stops and spams error messages. ### Troubleshooting kamcmd pkg.stats shows lots of real_used memory(only udp workers are leaking). #### Reproduction Enable both modules.  #### Debugging Data  #### Log Messages  ``` Oct 18 17:00:55 /usr/sbin/kamailio[20801]: ERROR: <core> [core/receive.c:162]: receive_msg(): no mem for sip_msg Oct 18 17:00:55 /usr/sbin/kamailio[20802]: ERROR: <core> [core/mem/q_malloc.c:291]: qm_find_free(): qm_find_free(0x7fe6f5bee010, 1776); Free fragment not found! Oct 18 17:00:55 /usr/sbin/kamailio[20802]: ERROR: <core> [core/mem/q_malloc.c:425]: qm_malloc(): qm_malloc(0x7fe6f5bee010, 1776) called from core: core/receive.c: receive_msg(160), module: core; Free fragment not found! ```  ### Possible Solutions  disable one of modules ### Additional Information * **/etc/default/kamailio** ``` SHM_MEMORY=512 PKG_MEMORY=64 ``` Number of children = 8 * **Parameters**: ``` loadmodule "topoh.so" modparam("topoh", "mask_key", "N2hkVvBTxJ6Y") modparam("topoh", "mask_callid", 0) modparam("topoh", "sanity_checks", 1) modparam("topoh", "uri_prefix_checks", 1) modparam("topoh", "mask_ip", MY_IP_ADDR) loadmodule "topos.so" loadmodule "topos_redis.so" modparam("topos", "storage", "redis") modparam("topos", "branch_expire", 300) modparam("topos", "dialog_expire", 10800) modparam("topos", "clean_interval", 30) modparam("topos_redis", "serverid", "topo") ``` * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` * **Operating System**:  ``` Debian 8.10 ``` -- 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/1682

2 6

[kamailio/kamailio] Dispatcher fails to work with NAPTR/SRV as destination (#1743)
by patmurph11 30 Nov '18

30 Nov '18

### Description 1. Added 3 gateways to the dispatcher list file: ``` 1 sip:naptr.mydomain.net 0 0 2 sip:srv.mydomain.net 0 0 ``` started kamailio and ran: ```kamcmd dispatcher.list``` Output: ```error: 500 - No Destination Sets``` If I append to the list, one gateway which resolves to an A record (or an IP:PORT format) like e.g.: ```3 sip:a.mydomain.net:5060 0 0```, it shows up in the dispatcher list just fine: ``` { NRSETS: 1 RECORDS: { SET: { ID: 3 TARGETS: { DEST: { URI: sip:a.mydomain.net:5060 FLAGS: AP PRIORITY: 0 LATENCY: { AVG: 14.642 STD: 0.05 EST: 15.0345 MAX: 25.452 TIMEOUT: 0 } } } } } } ``` I also verified the DNS resolution with: ```kamcmd dns.lookup naptr naptr.mydomain.net``` and ```kamcmd dns.lookup srv srv.mydomain.net``` which was perfectly as expected. Since I wasn't even able to see a dispatcher loaded, there was no operation that I could do to it to set it to active or anything else. A network trace just shows A record queries to all gateways with no success on those which have NAPTR/SRV records. #### Reproduction 100% reproducible with the description above. ### Additional Information Tested on Kamailio version 4.4.5 and 5.1.1 with the following detailed version info: ``` version: kamailio 5.1.1 (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. compiled with /usr/bin/gcc 4.1.2 ``` -- 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/1743

3 4

Re: [sr-dev] [kamailio/kamailio] textops: new function regex_substring(itext, regex, index, mcount, dpv) (ca8967c)
by Yasin CANER 30 Nov '18

30 Nov '18

mistype? -- 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/ca8967cfb1dc4b5f97ace4c3a326075…

1 0

[kamailio/kamailio] textops : added a new function for getting substring with regular expression (#1733)
by Yasin CANER 30 Nov '18

30 Nov '18

#### 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 - [ ] 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  added a new function as get_regsub_string for getting substring with regular expression -regexec() function with REG_EXTENDED flags is used -setting variable as result You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1733 -- Commit Summary -- * textops : added a new function for getting substring with regular expression * textops: doc is added for get_regsub_string -- File Changes -- M src/modules/textops/doc/textops_admin.xml (147) M src/modules/textops/textops.c (122) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1733.patch https://github.com/kamailio/kamailio/pull/1733.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/1733

2 4

git:master:1a72cd21: textops: docs for regex_substring()
by Daniel-Constantin Mierla 30 Nov '18

30 Nov '18

Module: kamailio Branch: master Commit: 1a72cd21cf3a4ed245a20cd21adeaf8c7e75a1c5 URL: https://github.com/kamailio/kamailio/commit/1a72cd21cf3a4ed245a20cd21adeaf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-30T10:20:23+01:00 textops: docs for regex_substring() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1a72cd21cf3a4ed245a20cd21adeaf8… Patch: https://github.com/kamailio/kamailio/commit/1a72cd21cf3a4ed245a20cd21adeaf8…

1 0

git:master:ca8967cf: textops: new function regex_substring(itext, regex, index, mcount, dpv)
by Daniel-Constantin Mierla 30 Nov '18

30 Nov '18

Module: kamailio Branch: master Commit: ca8967cfb1dc4b5f97ace4c3a32607503a364f69 URL: https://github.com/kamailio/kamailio/commit/ca8967cfb1dc4b5f97ace4c3a326075… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-30T10:19:10+01:00 textops: new function regex_substring(itext, regex, index, mcount, dpv) - return a substring extracted by matching with a regular expression and the index of matched tocken - started from GH #1733 --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/ca8967cfb1dc4b5f97ace4c3a326075… Patch: https://github.com/kamailio/kamailio/commit/ca8967cfb1dc4b5f97ace4c3a326075…

1 0

[kamailio/kamailio] cdp deadlock (#1739)
by thulasizwe-n 30 Nov '18

30 Nov '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1739 -- Commit Summary -- * Add files via upload * Merge pull request #1 from thulasizwe-n/thulasizwe-n-patch-1 * fixed possible list corruption * cdp -- lockup fix -- File Changes -- A modules/routing.c (299) A msrp_env.c (226) A msrp_mod.c (505) A msrp_netio.c (453) A msrp_netio.h (42) A msrp_options.c (75) A msrp_options.h (21) A ro_session_hash.h (244) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1739.patch https://github.com/kamailio/kamailio/pull/1739.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/1739

3 5

[kamailio/kamailio] Allow startup with offline database. See issue https://github.com/kam… (#1706)
by mihovilkolaric 30 Nov '18

30 Nov '18

…ailio/kamailio/issues/1681   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1706 -- Commit Summary -- * Allow startup with offline database. See issue https://github.com/kamailio/kamailio/issues/1681 -- File Changes -- M src/modules/sqlops/README (25) M src/modules/sqlops/sqlops.c (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1706.patch https://github.com/kamailio/kamailio/pull/1706.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/1706

2 3

git:master:6c1c70bb: sqlops: docs for connect_mode parameter
by Daniel-Constantin Mierla 30 Nov '18

30 Nov '18

Module: kamailio Branch: master Commit: 6c1c70bbceeba87d6d87c852006c92f7d120ddb9 URL: https://github.com/kamailio/kamailio/commit/6c1c70bbceeba87d6d87c852006c92f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-30T09:25:53+01:00 sqlops: docs for connect_mode parameter --- Modified: src/modules/sqlops/doc/sqlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6c1c70bbceeba87d6d87c852006c92f… Patch: https://github.com/kamailio/kamailio/commit/6c1c70bbceeba87d6d87c852006c92f… --- diff --git a/src/modules/sqlops/doc/sqlops_admin.xml b/src/modules/sqlops/doc/sqlops_admin.xml index 4b38a3f7b8..aaec64f302 100644 --- a/src/modules/sqlops/doc/sqlops_admin.xml +++ b/src/modules/sqlops/doc/sqlops_admin.xml @@ -191,6 +191,27 @@ modparam("sqlops", "sqlres", "ra") ... modparam("sqlops", "tr_buf_size", 4096) ... +</programlisting> + </example> + </section> + <section id="sqlops.p.connect_mode"> + <title><varname>connect_mode</varname> (int)</title> + <para> + Control if the module must stop loading when connecting to database + server fails during start up. Values: 0 - stop loading; 1 - continue + even if connecting to database server fails. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>connect_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sqlops", "connect_mode", 1) +... </programlisting> </example> </section>

1 0

git:master:2df43b99: sqlops: option to start even when connecting to db fails
by Daniel-Constantin Mierla 30 Nov '18

30 Nov '18

Module: kamailio Branch: master Commit: 2df43b992b1e6932974bd0c928c0465a839b75da URL: https://github.com/kamailio/kamailio/commit/2df43b992b1e6932974bd0c928c0465… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-30T09:24:59+01:00 sqlops: option to start even when connecting to db fails - new parameter connect_mode: 0 (default) - do not start if connecting to db fails; 1 - start even if connecting to db fails - started from GH #1706 --- Modified: src/modules/sqlops/sql_api.c Modified: src/modules/sqlops/sql_api.h Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/2df43b992b1e6932974bd0c928c0465… Patch: https://github.com/kamailio/kamailio/commit/2df43b992b1e6932974bd0c928c0465…

1 0

git:master:1b014d65: lib/srdb1: memset db connection structure earlier in db_bind_mod()
by Daniel-Constantin Mierla 30 Nov '18

30 Nov '18

Module: kamailio Branch: master Commit: 1b014d65e26a99f9f5d4aea1b27949776f083c2d URL: https://github.com/kamailio/kamailio/commit/1b014d65e26a99f9f5d4aea1b279497… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-30T09:19:16+01:00 lib/srdb1: memset db connection structure earlier in db_bind_mod() --- Modified: src/lib/srdb1/db.c --- Diff: https://github.com/kamailio/kamailio/commit/1b014d65e26a99f9f5d4aea1b279497… Patch: https://github.com/kamailio/kamailio/commit/1b014d65e26a99f9f5d4aea1b279497… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index 4a250bc819..7d53f70361 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -163,6 +163,12 @@ int db_bind_mod(const str* mod, db_func_t* mydbf) LM_CRIT("null dbf parameter\n"); return -1; } + + /* for safety we initialize mydbf with 0 (this will cause + * a segfault immediately if someone tries to call a function + * from it without checking the return code from bind_dbmod */ + memset((void*)mydbf, 0, sizeof(db_func_t)); + if (mod->len > MAX_URL_LENGTH) { LM_ERR("SQL URL too long\n"); @@ -178,11 +184,6 @@ int db_bind_mod(const str* mod, db_func_t* mydbf) memcpy(name+3, mod->s, mod->len); name[mod->len+3] = 0; - /* for safety we initialize mydbf with 0 (this will cause - * a segfault immediately if someone tries to call a function - * from it without checking the return code from bind_dbmod */ - memset((void*)mydbf, 0, sizeof(db_func_t)); - p = strchr(name, ':'); if (p) { len = p - name;

1 0

git:master:cb7008a9: Merge pull request #1741 from ycaner06/patch-12
by GitHub 30 Nov '18

30 Nov '18

Module: kamailio Branch: master Commit: cb7008a985da57118a795de6982e0a21033ed165 URL: https://github.com/kamailio/kamailio/commit/cb7008a985da57118a795de6982e0a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-30T08:33:51+01:00 Merge pull request #1741 from ycaner06/patch-12 ims_charging : doc is fixed --- Modified: src/modules/ims_charging/doc/ims_charging_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/cb7008a985da57118a795de6982e0a2… Patch: https://github.com/kamailio/kamailio/commit/cb7008a985da57118a795de6982e0a2… --- diff --git a/src/modules/ims_charging/doc/ims_charging_admin.xml b/src/modules/ims_charging/doc/ims_charging_admin.xml index 4dd9453164..465044a126 100644 --- a/src/modules/ims_charging/doc/ims_charging_admin.xml +++ b/src/modules/ims_charging/doc/ims_charging_admin.xml @@ -762,7 +762,7 @@ modparam("ims_charging", "custom_user_avp", "$avp(from_user)") <section> <title><function moreinfo="none">Ro_CCR(route_name, direction, - reservation_units, domain, incoming_trunk_id, outgoing_trunk_id</function> + reservation_units, incoming_trunk_id, outgoing_trunk_id)</function> </title> <para>Perform a CCR on Diameter Ro interface for Charging</para> @@ -784,11 +784,6 @@ modparam("ims_charging", "custom_user_avp", "$avp(from_user)") <para><emphasis>reservation_units</emphasis> how many units (at the moment seconds) should be reserved at the moment.</para> </listitem> - - <listitem> - <para><emphasis>domain</emphasis> Logical domain within - registrar.</para> - </listitem> <listitem> <para><emphasis>incoming_trunk_id</emphasis> Identifies the trunk group

1 0

[kamailio/kamailio] ims_charging : doc is fixed (#1741)
by Yasin CANER 30 Nov '18

30 Nov '18

ims_charging : doc is fixed   #### 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:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Ro_CCR function doesnt get parameter like domain. it removed from doc. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1741 -- Commit Summary -- * ims_charging : doc is fixed -- File Changes -- M src/modules/ims_charging/doc/ims_charging_admin.xml (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1741.patch https://github.com/kamailio/kamailio/pull/1741.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/1741

2 2

git:master:37dae368: ims_charging : doc is fixed
by GitHub 30 Nov '18

30 Nov '18

Module: kamailio Branch: master Commit: 37dae368667fc82bc2f60639d722354e6528ec7f URL: https://github.com/kamailio/kamailio/commit/37dae368667fc82bc2f60639d722354… Author: Yasin CANER <12412027+ycaner06(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-28T16:02:25+03:00 ims_charging : doc is fixed ims_charging : doc is fixed --- Modified: src/modules/ims_charging/doc/ims_charging_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/37dae368667fc82bc2f60639d722354… Patch: https://github.com/kamailio/kamailio/commit/37dae368667fc82bc2f60639d722354… --- diff --git a/src/modules/ims_charging/doc/ims_charging_admin.xml b/src/modules/ims_charging/doc/ims_charging_admin.xml index 4dd9453164..465044a126 100644 --- a/src/modules/ims_charging/doc/ims_charging_admin.xml +++ b/src/modules/ims_charging/doc/ims_charging_admin.xml @@ -762,7 +762,7 @@ modparam("ims_charging", "custom_user_avp", "$avp(from_user)") <section> <title><function moreinfo="none">Ro_CCR(route_name, direction, - reservation_units, domain, incoming_trunk_id, outgoing_trunk_id</function> + reservation_units, incoming_trunk_id, outgoing_trunk_id)</function> </title> <para>Perform a CCR on Diameter Ro interface for Charging</para> @@ -784,11 +784,6 @@ modparam("ims_charging", "custom_user_avp", "$avp(from_user)") <para><emphasis>reservation_units</emphasis> how many units (at the moment seconds) should be reserved at the moment.</para> </listitem> - - <listitem> - <para><emphasis>domain</emphasis> Logical domain within - registrar.</para> - </listitem> <listitem> <para><emphasis>incoming_trunk_id</emphasis> Identifies the trunk group

1 0

[kamailio/kamailio] Body part comparison error logs (#1746)
by Y. Luis 29 Nov '18

29 Nov '18

### Description I used [get_body_part_by_filter](https://github.com/kamailio/kamailio/blob/f073f72a… to extract a body part from a `multipart/mixed` message. It works as expected but for every body part it compares and do not match (until finding the one that matches the filter) it shows error log messages like: `ERROR: <core> [core/parser/parse_body.c:513]: part_multipart_headers_cmp(): part_multipart_headers_cmp. error. "-2". "MIME types mismatch".` The comparison of body parts shouldn´t be logged as errors, since they are not.  ### Expected behavior No error logs. #### Actual observed behavior Error log messages. #### Log Messages  ``` ERROR: <core> [core/parser/parse_body.c:513]: part_multipart_headers_cmp(): part_multipart_headers_cmp. error. "-2". "MIME types mismatch". ``` ### Possible Solutions  Do not show logs or change log level. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.1 ``` * **Operating System**:  ``` CentOS 7 ``` -- 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/1746

2 2

git:master:08820db1: core: parse body - debug instead of error log message when mime mismatch
by Daniel-Constantin Mierla 29 Nov '18

29 Nov '18

Module: kamailio Branch: master Commit: 08820db104c7dbfce36af0f59dfcc28f97cffbd0 URL: https://github.com/kamailio/kamailio/commit/08820db104c7dbfce36af0f59dfcc28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-29T20:04:08+01:00 core: parse body - debug instead of error log message when mime mismatch - GH #1746 --- Modified: src/core/parser/parse_body.c --- Diff: https://github.com/kamailio/kamailio/commit/08820db104c7dbfce36af0f59dfcc28… Patch: https://github.com/kamailio/kamailio/commit/08820db104c7dbfce36af0f59dfcc28… --- diff --git a/src/core/parser/parse_body.c b/src/core/parser/parse_body.c index 05425b50ce..9794e43fb1 100644 --- a/src/core/parser/parse_body.c +++ b/src/core/parser/parse_body.c @@ -504,7 +504,11 @@ int part_multipart_headers_cmp (char *buffer, } if (error < 0) { - LM_ERR("part_multipart_headers_cmp. error. \"%i\". \"%s\".\n", error, error_msg); + if(error == -2) { + LM_DBG("result code: \"%i\" text: \"%s\".\n", error, error_msg); + } else { + LM_ERR("error code: \"%i\" error text: \"%s\".\n", error, error_msg); + } return 0; } else { return found;

1 0

git:master:ba31f4ec: dispatcher: docs for flags value 16
by Daniel-Constantin Mierla 29 Nov '18

29 Nov '18

Module: kamailio Branch: master Commit: ba31f4ec4f98487e9f1282fe12a5819d5df0b733 URL: https://github.com/kamailio/kamailio/commit/ba31f4ec4f98487e9f1282fe12a5819… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-29T18:31:07+01:00 dispatcher: docs for flags value 16 --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ba31f4ec4f98487e9f1282fe12a5819… Patch: https://github.com/kamailio/kamailio/commit/ba31f4ec4f98487e9f1282fe12a5819… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 023f6a0ba2..3b40c04622 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1780,17 +1780,21 @@ onreply_route { sending keepalives. It is a bitwise value that can be built using the folowing flags: <itemizedlist> - <listitem><para>1 (bit at index 0 - 1 <<0) - inactive destination<para> + <listitem><para>1 (bit at index 0 - 1 <<0) - inactive destination</para> </listitem> <listitem><para>2 (bit at index 1 - 1 <<1) - temporary trying destination (in the way to become inactive if it does not reply to keepalives - there is a module parameter to set the threshold of - failures)<para> + failures)</para> </listitem> - <listitem><para>4 (bit at index 2 - 1 <<2) - admin disabled destination<para> + <listitem><para>4 (bit at index 2 - 1 <<2) - admin disabled destination</para> </listitem> <listitem><para>8 (bit at index 3 - 1 <<3) - probing destination (sending keep alives);</para> </listitem> + <listitem><para>16 (bit at index 4 - 1 <<4) - skip DNS A/AAAA resolve at startup, + useful when the hostname of the destination address is a NAPTR or SRV record only. + Such addresses cannot be matched anymore with ds_is_from_list(...).</para> + </listitem> </itemizedlist> </para> </listitem>

1 0

git:master:9eba5b67: dispatcher: flag 16 (1<<4) for destinations with host not having A/AAAA record
by Daniel-Constantin Mierla 29 Nov '18

29 Nov '18

Module: kamailio Branch: master Commit: 9eba5b673cc1a80434642b280e6f7d53e310338e URL: https://github.com/kamailio/kamailio/commit/9eba5b673cc1a80434642b280e6f7d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-29T18:20:24+01:00 dispatcher: flag 16 (1<<4) for destinations with host not having A/AAAA record - use it for addresses that should not be resolved with an A/AAAA query at startup (e.g., it is a NAPTR or SRV only record for that specific hostname) - such addresses will not match when using ds_is_from_list(...) - GH #1743 --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/9eba5b673cc1a80434642b280e6f7d5… Patch: https://github.com/kamailio/kamailio/commit/9eba5b673cc1a80434642b280e6f7d5… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index cb8fe6ea81..59cf1d9302 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -424,11 +424,17 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) /* Do a DNS-Lookup for the Host-Name: */ he = resolvehost(hn); if(he == 0) { - LM_ERR("could not resolve %.*s\n", puri.host.len, puri.host.s); - goto err; + if(dp->flags & DS_NODNSARES_DST) { + dp->irmode |= DS_IRMODE_NOIPADDR; + } else { + LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", + puri.host.len, puri.host.s); + goto err; + } + } else { + /* Store hostent in the dispatcher structure */ + hostent2ip_addr(&dp->ip_address, he, 0); } - /* Free the hostname */ - hostent2ip_addr(&dp->ip_address, he, 0); /* Copy the port out of the URI */ dp->port = puri.port_no; @@ -2957,8 +2963,8 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) if(group == -1) { - rc = ds_is_addr_from_set_r( - _m, pipaddr, tport, tproto, _ds_list, mode, 1); + rc = ds_is_addr_from_set_r(_m, pipaddr, tport, tproto, _ds_list, + mode, 1); } else { list = ds_avl_find(_ds_list, group); if(list) { diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 0675b3ccd3..1c89c756e6 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -44,7 +44,8 @@ #define DS_TRYING_DST 2 /*!< temporary trying destination */ #define DS_DISABLED_DST 4 /*!< admin disabled destination */ #define DS_PROBING_DST 8 /*!< checking destination */ -#define DS_STATES_ALL 15 /*!< all bits for the states of destination */ +#define DS_NODNSARES_DST 16 /*!< no DNS A/AAAA resolve for host in uri */ +#define DS_STATES_ALL 31 /*!< all bits for the states of destination */ #define ds_skip_dst(flags) ((flags) & (DS_INACTIVE_DST|DS_DISABLED_DST)) @@ -68,6 +69,8 @@ #define DS_XAVP_CTX_SKIP_CNT 1 +#define DS_IRMODE_NOIPADDR 1 + /* clang-format on */ extern str ds_db_url; @@ -185,16 +188,17 @@ typedef struct _ds_latency_stats { } ds_latency_stats_t; typedef struct _ds_dest { - str uri; - int flags; - int priority; - int dload; - ds_attrs_t attrs; - ds_latency_stats_t latency_stats; - struct socket_info * sock; - struct ip_addr ip_address; /*!< IP-Address of the entry */ - unsigned short int port; /*!< Port of the URI */ - unsigned short int proto; /*!< Protocol of the URI */ + str uri; /*!< address/uri */ + int flags; /*!< flags */ + int priority; /*!< priority */ + int dload; /*!< load */ + ds_attrs_t attrs; /*!< the atttributes */ + ds_latency_stats_t latency_stats; /*!< latency statistics */ + int irmode; /*!< internal runtime mode (flags) */ + struct socket_info *sock; /*!< pointer to local socket */ + struct ip_addr ip_address; /*!< IP of the address */ + unsigned short int port; /*!< port of the URI */ + unsigned short int proto; /*!< protocol of the URI */ int message_count; struct _ds_dest *next; } ds_dest_t;

1 0

git:master:4e7e355d: dispatcher: rename internal functions to match the module pattern
by Daniel-Constantin Mierla 29 Nov '18

29 Nov '18

Module: kamailio Branch: master Commit: 4e7e355db6946850bec061ef4d113bd8b9505cb7 URL: https://github.com/kamailio/kamailio/commit/4e7e355db6946850bec061ef4d113bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-29T17:34:42+01:00 dispatcher: rename internal functions to match the module pattern --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/4e7e355db6946850bec061ef4d113bd… Patch: https://github.com/kamailio/kamailio/commit/4e7e355db6946850bec061ef4d113bd… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d247d6e104..cb8fe6ea81 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -213,7 +213,7 @@ int ds_log_sets(void) /** * */ -int init_data(void) +int ds_init_data(void) { int *p; @@ -864,7 +864,7 @@ void ds_disconnect_db(void) } /*! \brief Initialize and verify DB stuff*/ -int init_ds_db(void) +int ds_init_db(void) { int ret; diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 14db0e2a30..0675b3ccd3 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -114,8 +114,8 @@ extern str ds_outbound_proxy; extern str ds_default_socket; extern struct socket_info *ds_default_sockinfo; -int init_data(void); -int init_ds_db(void); +int ds_init_data(void); +int ds_init_db(void); int ds_load_list(char *lfile); int ds_connect_db(void); void ds_disconnect_db(void); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 66ed3248ef..d18652a05f 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -349,7 +349,7 @@ static int mod_init(void) ds_default_socket.len, ds_default_socket.s); } - if(init_data() != 0) + if(ds_init_data() != 0) return -1; if(ds_db_url.s) { @@ -369,7 +369,7 @@ static int mod_init(void) } } } - if(init_ds_db() != 0) { + if(ds_init_db() != 0) { LM_ERR("could not initiate a connect to the database\n"); return -1; }

1 0

git:master:f073f72a: dispatcher: docs - make a bullet list for the possible values for flags field
by Daniel-Constantin Mierla 28 Nov '18

28 Nov '18

Module: kamailio Branch: master Commit: f073f72af6a507e8113e06dc07ad161e3f4632c3 URL: https://github.com/kamailio/kamailio/commit/f073f72af6a507e8113e06dc07ad161… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-28T17:38:56+01:00 dispatcher: docs - make a bullet list for the possible values for flags field --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f073f72af6a507e8113e06dc07ad161… Patch: https://github.com/kamailio/kamailio/commit/f073f72af6a507e8113e06dc07ad161… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 34a4a1559a..023f6a0ba2 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1776,12 +1776,23 @@ onreply_route { </para> <itemizedlist> <listitem> - <para>flags (listed by index - can be bitwise mask of values): - 0 (value 1) - inactive destination; 1 (value 2) - temporary trying - destination (in the way to become inactive if it does not reply to - keepalives - there is a module parameter to set the threshold of - failures); 2 (value 4) - admin disabled destination; 3 (value 8) - - probing destination (sending keep alives);</para> + <para>flags - control the mode of using the destination address and + sending keepalives. It is a bitwise value that can be built using + the folowing flags: + <itemizedlist> + <listitem><para>1 (bit at index 0 - 1 <<0) - inactive destination<para> + </listitem> + <listitem><para>2 (bit at index 1 - 1 <<1) - temporary trying + destination (in the way to become inactive if it does not reply to + keepalives - there is a module parameter to set the threshold of + failures)<para> + </listitem> + <listitem><para>4 (bit at index 2 - 1 <<2) - admin disabled destination<para> + </listitem> + <listitem><para>8 (bit at index 3 - 1 <<3) - probing destination (sending keep alives);</para> + </listitem> + </itemizedlist> + </para> </listitem> <listitem> <para>priority: sets the priority in destination list (based on it

1 0

Kamailio v5.2.0 Released - new major version is out
by Daniel-Constantin Mierla 28 Nov '18

28 Nov '18

Kamailio v5.2.0 is out – it comes with 6 new modules and a consistent group of improvements touching more than 100 existing modules. You can read detailed release notes at: * https://www.kamailio.org/w/kamailio-v5-2-0-release-notes/ Many thanks to all developers and community members that made possible this release. v5.2.0 brings more flexibility and optimizations for KEMI interpreters (including two new interpreters for Python3 and Ruby), major enhancements to load balancer and tls implementations, new variables and lots of other new features. Enjoy Kamailio v5.2.0! Thank you for flying Kamailio! Daniel -- Daniel-Constantin Mierla http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference 2019 - http://www.kamailioworld.com

1 0

git:master:55c7f781: presence: test if event is dialog when attempting to delete old records
by Daniel-Constantin Mierla 28 Nov '18

28 Nov '18

Module: kamailio Branch: master Commit: 55c7f781be7cc40d0cd161640a47244aad60c0e7 URL: https://github.com/kamailio/kamailio/commit/55c7f781be7cc40d0cd161640a47244… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-28T12:49:58+01:00 presence: test if event is dialog when attempting to delete old records --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/55c7f781be7cc40d0cd161640a47244… Patch: https://github.com/kamailio/kamailio/commit/55c7f781be7cc40d0cd161640a47244… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 5527d3736a..07d51c8982 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -380,6 +380,10 @@ int delete_presentity_if_dialog_id_exists(presentity_t* presentity, int i = 0; presentity_t old_presentity; + if (presentity->event->evp->type != EVENT_DIALOG) { + return 0; + } + query_cols[n_query_cols] = &str_domain_col; query_ops[n_query_cols] = OP_EQ; query_vals[n_query_cols].type = DB1_STR;

1 0

git:5.2:d66ae278: Makefile.defs: version set to 5.2.0
by Daniel-Constantin Mierla 28 Nov '18

28 Nov '18

Module: kamailio Branch: 5.2 Commit: d66ae2788e1ec12f48a7a3a9bc3530977846c58b URL: https://github.com/kamailio/kamailio/commit/d66ae2788e1ec12f48a7a3a9bc35309… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-28T10:53:49+01:00 Makefile.defs: version set to 5.2.0 - new major release, first in 5.2.x series, built from git branch 5.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d66ae2788e1ec12f48a7a3a9bc35309… Patch: https://github.com/kamailio/kamailio/commit/d66ae2788e1ec12f48a7a3a9bc35309… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index d4c98fd9fa..eb29fdd08b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -rc2 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.2:535e13bf: ChangeLog: content updated for v5.2.0
by Daniel-Constantin Mierla 28 Nov '18

28 Nov '18

Module: kamailio Branch: 5.2 Commit: 535e13bf538c2321155085496e57c70945c1231c URL: https://github.com/kamailio/kamailio/commit/535e13bf538c2321155085496e57c70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-28T10:56:46+01:00 ChangeLog: content updated for v5.2.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/535e13bf538c2321155085496e57c70… Patch: https://github.com/kamailio/kamailio/commit/535e13bf538c2321155085496e57c70… --- diff --git a/ChangeLog b/ChangeLog index a92523af0d..5ca81b87e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,32 @@ ===================== Changes Since Version 5.1.0 =========================== +commit d66ae2788e1ec12f48a7a3a9bc3530977846c58b +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Wed Nov 28 10:53:49 2018 +0100 + + Makefile.defs: version set to 5.2.0 + + - new major release, first in 5.2.x series, built from git branch 5.2 + +commit 19b7af8c40bf98ba9a6d251d5e8862444f5bcd09 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Wed Nov 28 10:09:59 2018 +0100 + + INSTALL: added link to the install tutorial on the web + +commit 3272284062891272918ab4e9333d3392d1a5d8ee +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Wed Nov 28 10:07:21 2018 +0100 + + pkg: version set to 5.2.0 for alpine and oracle linux rpm specs + +commit 38380414744449796669a54d156c7d08d24aa9e3 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Wed Nov 28 09:59:04 2018 +0100 + + ChangeLog: initial update for preparing v5.2.0 + commit b93adeb703b8cac9ef3cf07cc68ea4c444364fe9 Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Wed Nov 28 08:38:53 2018 +0100

1 0

git:5.2:19b7af8c: INSTALL: added link to the install tutorial on the web
by Daniel-Constantin Mierla 28 Nov '18

28 Nov '18

Module: kamailio Branch: 5.2 Commit: 19b7af8c40bf98ba9a6d251d5e8862444f5bcd09 URL: https://github.com/kamailio/kamailio/commit/19b7af8c40bf98ba9a6d251d5e88624… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-28T10:09:59+01:00 INSTALL: added link to the install tutorial on the web --- Modified: INSTALL --- Diff: https://github.com/kamailio/kamailio/commit/19b7af8c40bf98ba9a6d251d5e88624… Patch: https://github.com/kamailio/kamailio/commit/19b7af8c40bf98ba9a6d251d5e88624… --- diff --git a/INSTALL b/INSTALL index 63c03062f4..6651cdbf85 100644 --- a/INSTALL +++ b/INSTALL @@ -18,6 +18,8 @@ - https://www.kamailio.org/w/documentation/ - https://www.kamailio.org/wiki/ + Recommended install tutorial: + - http://kamailio.org/docs/tutorials/5.2.x/kamailio-install-guide-git/ Table of Contents =================

1 0

git:5.2:32722840: pkg: version set to 5.2.0 for alpine and oracle linux rpm specs
by Daniel-Constantin Mierla 28 Nov '18

28 Nov '18

Module: kamailio Branch: 5.2 Commit: 3272284062891272918ab4e9333d3392d1a5d8ee URL: https://github.com/kamailio/kamailio/commit/3272284062891272918ab4e9333d339… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-28T10:07:21+01:00 pkg: version set to 5.2.0 for alpine and oracle linux rpm specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3272284062891272918ab4e9333d339… Patch: https://github.com/kamailio/kamailio/commit/3272284062891272918ab4e9333d339… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 0afec7e886..c0ad4045dc 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.0 +pkgver=5.2.0 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index e787ecd388..2a3f38c7c8 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.0 +%define ver 5.2.0 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index df65630a85..2059efad99 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.4.0 +%define ver 5.2.0 %define rel 0 %define _sharedir %{_prefix}/share

1 0

git:master:bc96bbad: ChangeLog: updates to reflect is v5.3.0 is under development
by Daniel-Constantin Mierla 28 Nov '18

28 Nov '18

Module: kamailio Branch: master Commit: bc96bbad8a00a83c9885cdaca50b1fa41b3b2212 URL: https://github.com/kamailio/kamailio/commit/bc96bbad8a00a83c9885cdaca50b1fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-28T10:01:49+01:00 ChangeLog: updates to reflect is v5.3.0 is under development --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/bc96bbad8a00a83c9885cdaca50b1fa… Patch: https://github.com/kamailio/kamailio/commit/bc96bbad8a00a83c9885cdaca50b1fa…

1 0

git:5.2:38380414: ChangeLog: initial update for preparing v5.2.0
by Daniel-Constantin Mierla 28 Nov '18

28 Nov '18

Module: kamailio Branch: 5.2 Commit: 38380414744449796669a54d156c7d08d24aa9e3 URL: https://github.com/kamailio/kamailio/commit/38380414744449796669a54d156c7d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-28T09:59:04+01:00 ChangeLog: initial update for preparing v5.2.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/38380414744449796669a54d156c7d0… Patch: https://github.com/kamailio/kamailio/commit/38380414744449796669a54d156c7d0…

1 0

git:5.2:b93adeb7: pkg/kamailio/deb: version set 5.2.0
by Victor Seva 28 Nov '18

28 Nov '18

Module: kamailio Branch: 5.2 Commit: b93adeb703b8cac9ef3cf07cc68ea4c444364fe9 URL: https://github.com/kamailio/kamailio/commit/b93adeb703b8cac9ef3cf07cc68ea4c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-28T08:38:53+01:00 pkg/kamailio/deb: version set 5.2.0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/b93adeb703b8cac9ef3cf07cc68ea4c… Patch: https://github.com/kamailio/kamailio/commit/b93adeb703b8cac9ef3cf07cc68ea4c…

1 0

Releasing Kamailio v5.2.0
by Daniel-Constantin Mierla 28 Nov '18

28 Nov '18

Hello, I am consider to release v5.2.0 (the first stable version out of branch 5.2) next week, likely on Wednesday, Nov 28, 2018. It still allows a bit more than a week of testing as well as well time to prepare the online resources for it (documentation, wiki pages, upgrade guidelines, etc...). If there is any issue you are of and not yet reported to github bug tracker, do it as soon as possible to give it a chance to be fixed in time for the next major release. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

1 2

git:5.2:bfe91103: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 27 Nov '18

27 Nov '18

Module: kamailio Branch: 5.2 Commit: bfe9110343ab73648976cdbead87fa1f60d8a40a URL: https://github.com/kamailio/kamailio/commit/bfe9110343ab73648976cdbead87fa1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-27T20:16:31+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textops/README Modified: src/modules/xmlrpc/README --- Diff: https://github.com/kamailio/kamailio/commit/bfe9110343ab73648976cdbead87fa1… Patch: https://github.com/kamailio/kamailio/commit/bfe9110343ab73648976cdbead87fa1…

1 0

git: new commits in branch 5.1
by The Root 27 Nov '18

27 Nov '18

- URL: https://github.com/kamailio/kamailio/commit/515d918657fe0ff5131351ea358c222… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:36+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/86cc5340df85809c935e7468fd73e7a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:36+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/f36203d229704ee2e04a0de015dbacd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:37+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/f47698feee205af4be362c5178c6d4e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:37+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/84aedfc45ac752189f23509512ed1d2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:37+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/68653fad1c3beef137a10f1416666cd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:37+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/f62d0e1ddab891d38ab1d9e6dffb648… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:37+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/976f923489a08480b3de39220dd91be… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:37+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/71237ef80465dfb239bfdaa5c470dae… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:38+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/f937feec42660cb9a7c0f3b852e7ffd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:38+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/837258b410ad5fd7313d4c9c74b554d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:38+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/ca910bf6b75fee4dfe5629733d52e41… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:38+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/5fef50e6c148fe257e50f4c43466945… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:38+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/953b2e6d1b6cbb7687a264f8592c97c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:38+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/f6e2441e95d0f7797893d8e6cd69c62… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:39+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/18d4a1e519ac4ba1ab39b6830d29cfa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:39+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/a3c674031974744a1c22f4c242c7188… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:39+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/023f42e3001a5e61dadb59d88b2ddf1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:39+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/37d5880dd2b70662f9b033671bc9f95… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:39+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/ed8857dd2eb5b9e0c4558a987121d5d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:39+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/2f96f64f25533c48e494dcca0b1b672… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:39+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/3cb04f02a2d47c747268f6a1716c583… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:40+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/111d23eef719054e7a1a63a44453b40… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:40+01:00 modules: readme files regenerated - modules ... [skip ci] - URL: https://github.com/kamailio/kamailio/commit/4317b3c6b88b0d7ae7c034a2fdfb1bf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-11-20T11:01:40+01:00 modules: readme files regenerated - modules ... [skip ci]

1 0

git:5.2:0387df55: xmlrpc: docs for event_callback parameter
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: 5.2 Commit: 0387df55d08c435e8ee4d8dde41c260f2ddb839b URL: https://github.com/kamailio/kamailio/commit/0387df55d08c435e8ee4d8dde41c260… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T20:03:34+01:00 xmlrpc: docs for event_callback parameter - GH #1736 (cherry picked from commit d74d67976905c9d0c49f00485046117bc2581e65) --- Modified: src/modules/xmlrpc/doc/xmlrpc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0387df55d08c435e8ee4d8dde41c260… Patch: https://github.com/kamailio/kamailio/commit/0387df55d08c435e8ee4d8dde41c260… --- diff --git a/src/modules/xmlrpc/doc/xmlrpc_admin.xml b/src/modules/xmlrpc/doc/xmlrpc_admin.xml index 381a1feff7..a61d63e6db 100644 --- a/src/modules/xmlrpc/doc/xmlrpc_admin.xml +++ b/src/modules/xmlrpc/doc/xmlrpc_admin.xml @@ -60,7 +60,7 @@ modparam("xmlrpc", "route", "route_for_xmlrpcs") <section id="autoconversion"> <title><varname>autoconversion</varname> (string)</title> <para> - Enable or disable automatic parameter type conversion globally, + Enable or disable automatic parameter type conversion globally, for all the methods parameters. If on, a type mismatch in a method parameter will not cause a fault if it is possible to automatically @@ -192,6 +192,45 @@ modparam("xmlrpc", "url_match", "^/RPC2") </programlisting> </example> </section> + <section id="event_callback"> + <title><varname>event_callback</varname> (string)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of route blocks defined by route parameter for xmlrpc request. + </para> + <para> + This route will be called only for HTTP messages whose method is + either GET or POST. The message visible inside the route + will be a HTTP request converted to SIP (the uri will be fixed and + a fake via will be added). + </para> + <para> + The route should perform additional security checks to + ensure the client is authorized to execute management/RPC functions + and then it should call the <function>dispatch_rpc()</function>. + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xmlrpc", "event_callback", "ksr_xmlrpc_event") +... +-- event callback function implemented in Lua +function ksr_xmlrpc_event(evname) + KSR.info("===== xmlrpc triggered event: " .. evname .. "\n"); + local rpc_method = KSR.pv.get("$rm") or "" + if ((rpc_method == "POST" or rpc_method == "GET")) then + if (KSR.xmlrpc.dispatch_rpc() < 0) then + KSR.err("error while executing xmlrpc event") + end + end + return 1; +end +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:5.2:0041d684: misc/examples: use core reply_route inside the anycast example
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: 5.2 Commit: 0041d6840e0d1dba76239f4f9e46a01efaedbc09 URL: https://github.com/kamailio/kamailio/commit/0041d6840e0d1dba76239f4f9e46a01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T20:03:43+01:00 misc/examples: use core reply_route inside the anycast example (cherry picked from commit 71a88b1d30b3bff5d6e8e1785ddeae08b3bfe4f2) --- Modified: misc/examples/mixed/kamailio-minimal-anycast.cfg --- Diff: https://github.com/kamailio/kamailio/commit/0041d6840e0d1dba76239f4f9e46a01… Patch: https://github.com/kamailio/kamailio/commit/0041d6840e0d1dba76239f4f9e46a01… --- diff --git a/misc/examples/mixed/kamailio-minimal-anycast.cfg b/misc/examples/mixed/kamailio-minimal-anycast.cfg index 812695d919..0c7c6027f0 100644 --- a/misc/examples/mixed/kamailio-minimal-anycast.cfg +++ b/misc/examples/mixed/kamailio-minimal-anycast.cfg @@ -300,17 +300,24 @@ route[WITHINDLG] { exit; } -# Manage outgoing branches +# TM manage for outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); } -# Manage incoming replies +# TM manage for incoming replies onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); +} - if($si != IPADDR_MAINSRV) { +# TM manage for failure routing cases +failure_route[MANAGE_FAILURE] { + if (t_is_canceled()) exit; +} +# Core handling for incoming replies +reply_route { + if($si != IPADDR_MAINSRV) { if($si == IPADDR_PAIRNODE) { # receiving a transparent proxied request from pair server if(is_present_hf("X-Src-Addr")) { @@ -338,8 +345,3 @@ onreply_route[MANAGE_REPLY] { } # from now on, the usual sip response processing } - -# Manage failure routing cases -failure_route[MANAGE_FAILURE] { - if (t_is_canceled()) exit; -}

1 0

git:5.2:6da8a5b4: textops: docs - notes that msg_apply_changes() may be required for multi-part operations
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: 5.2 Commit: 6da8a5b4cb1f9b97aa2f92bc5d97786443712099 URL: https://github.com/kamailio/kamailio/commit/6da8a5b4cb1f9b97aa2f92bc5d97786… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T20:03:55+01:00 textops: docs - notes that msg_apply_changes() may be required for multi-part operations - GH #1719 (cherry picked from commit 5460db2e59341f143d607de744faa8413216afd5) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6da8a5b4cb1f9b97aa2f92bc5d97786… Patch: https://github.com/kamailio/kamailio/commit/6da8a5b4cb1f9b97aa2f92bc5d97786… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 8e0f350056..d348ccf6be 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1638,6 +1638,7 @@ if (starts_with("$rU", "+358")) set_body_multipart("test", "text/plain", "delimiter"); msg_apply_changes(); append_body_part(...); +msg_apply_changes(); ... @@ -1690,12 +1691,17 @@ text The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>append_body_part</function> usage</title> <programlisting format="linespecific"> ... $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); +msg_apply_changes(); ... # Will append this to the body: @@ -1721,6 +1727,7 @@ Content-Disposition: signal;handling=required ... $var(b) = "<info>active</info>"; append_body_part("$var(b)", "application/xml\r\nX-Header: xyz"); +msg_apply_changes(); ... # Will append this to the body: @@ -1773,12 +1780,17 @@ Content-Disposition: signal;handling=required The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>append_body_part_hex</function> usage</title> <programlisting format="linespecific"> ... $var(b) = "6b 61 6d 61 69 6c 69 6f"; append_body_part_hex("$var(b)", "application/my-custom-ext"); +msg_apply_changes(); ... # Will append this to the body: @@ -1894,11 +1906,16 @@ get_body_part("application/vnd.cirpack.isdn-ext", "$var(hbody)"); The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>remove_body_part</function> usage</title> <programlisting format="linespecific"> ... remove_body_part("application/vnd.cirpack.isdn-ext"); +msg_apply_changes(); ... </programlisting> </example>

1 0

git:5.2:260ac297: xmlrpc: added event_callback parameter
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: 5.2 Commit: 260ac29706ce64f857959732831b685e0012cede URL: https://github.com/kamailio/kamailio/commit/260ac29706ce64f857959732831b685… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T20:03:26+01:00 xmlrpc: added event_callback parameter - specify the name of KEMI function to be executed for xmlrpc requests (cherry picked from commit d3a3e28dd20d731939f9a53c28fb231206268890) --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/260ac29706ce64f857959732831b685… Patch: https://github.com/kamailio/kamailio/commit/260ac29706ce64f857959732831b685… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 4985639134..793b2d2db2 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -416,6 +416,7 @@ static regex_t xmlrpc_url_match_regexp; static char* xmlrpc_url_skip = NULL; static regex_t xmlrpc_url_skip_regexp; +static str xmlrpc_event_callback = STR_NULL; /* * Exported functions @@ -438,6 +439,7 @@ static param_export_t params[] = { {"mode", PARAM_INT, &xmlrpc_mode}, {"url_match", PARAM_STRING, &xmlrpc_url_match}, {"url_skip", PARAM_STRING, &xmlrpc_url_skip}, + {"event_callback", PARAM_STR, &xmlrpc_event_callback}, {0, 0, 0} }; @@ -2294,7 +2296,11 @@ static int em_receive_request(sip_msg_t* orig_msg, { int ret; sip_msg_t tmp_msg, *msg; + int backup_rt; struct run_act_ctx ra_ctx; + str evrtname = str_init("xmlrpc:request"); + backup_rt = get_route_type(); + sr_kemi_eng_t *keng = NULL; ret=0; if (new_buf && new_len) { @@ -2328,10 +2334,22 @@ static int em_receive_request(sip_msg_t* orig_msg, } /* exec routing script */ init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, main_rt.rlist[xmlrpc_route_no], msg) < 0) { - ret=-1; - DBG("xmlrpc: error while trying script\n"); - goto end; + if(xmlrpc_route_no>=0) { + if (run_actions(&ra_ctx, main_rt.rlist[xmlrpc_route_no], msg) < 0) { + ret=-1; + DBG("xmlrpc: error while trying script\n"); + goto end; + } + }else{ + keng = sr_kemi_eng_get(); + if(keng!=NULL) { + if(keng->froute(msg, EVENT_ROUTE, + &xmlrpc_event_callback, &evrtname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } else { + LM_ERR("no event route or kemi callback found for execution\n"); + } } end: exec_post_script_cb(msg, REQUEST_CB_TYPE); /* needed for example if tm is used */ @@ -2339,6 +2357,7 @@ static int em_receive_request(sip_msg_t* orig_msg, if (msg != orig_msg) { /* avoid double free (freed from receive_msg too) */ free_sip_msg(msg); } + set_route_type(backup_rt); return ret; error: return -1; @@ -2583,22 +2602,31 @@ static int mod_init(void) { struct nonsip_hook nsh; int route_no; + sr_kemi_eng_t *keng = NULL; /* try to fix the xmlrpc route */ - if (xmlrpc_route){ - route_no=route_get(&main_rt, xmlrpc_route); - if (route_no==-1){ - ERR("xmlrpc: failed to fix route \"%s\": route_get() failed\n", - xmlrpc_route); + if(xmlrpc_event_callback.s!=NULL && xmlrpc_event_callback.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_ERR("failed to find kemi engine\n"); return -1; } - if (main_rt.rlist[route_no]==0){ - WARN("xmlrpc: xmlrpc route \"%s\" is empty / doesn't exist\n", - xmlrpc_route); + xmlrpc_route_no=-1; + } else { + if (xmlrpc_route) { + route_no=route_get(&main_rt, xmlrpc_route); + if (route_no==-1) { + ERR("xmlrpc: failed to fix route \"%s\": route_get() failed\n", + xmlrpc_route); + return -1; + } + if (main_rt.rlist[route_no]==0) { + WARN("xmlrpc: xmlrpc route \"%s\" is empty / doesn't exist\n", + xmlrpc_route); + } + xmlrpc_route_no=route_no; } - xmlrpc_route_no=route_no; } - /* bind the SL API */ if (sl_load_api(&slb)!=0) { LM_ERR("cannot bind to SL API\n");

1 0

[kamailio/kamailio] set_body_multipart produce broken body (#1719)
by sergey-safarov 27 Nov '18

27 Nov '18

### Description I want convert INVITE message with SDP body to multypart body. To do this is used patch for reference kamailio.cfg ``` [root@safarov-dell kamailio]# diff -u kamailio.cfg kamailio2.cfg --- kamailio.cfg 2018-11-09 18:28:36.000000000 +0300 +++ kamailio2.cfg 2018-11-10 22:49:43.604132033 +0300 @@ -1,5 +1,10 @@ #!KAMAILIO # +#!define WITH_DEBUG +#!define WITH_MYSQL +#!define WITH_AUTH +#!define WITH_USRLOCDB +# # Kamailio (OpenSER) SIP Server v5.2 - default configuration script # - web: https://www.kamailio.org # - git: https://github.com/kamailio/kamailio @@ -286,6 +291,8 @@ loadmodule "debugger.so" #!endif +loadmodule "textopsx.so" + # ----------------- setting module-specific parameters --------------- @@ -495,6 +502,10 @@ # account only INVITEs if (is_method("INVITE")) { setflag(FLT_ACC); # do accounting + set_body_multipart("test", "text/plain", "delimiter"); + msg_apply_changes(); + # # $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; + # # append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); } # dispatch requests to foreign domains ``` After `msg_apply_changes` kamailio send INVITE without original SDP and without trailing delimiter. ``` INVITE sip:safarov@192.168.100.28:43749;transport=tcp SIP/2.0 Record-Route: <sip:192.168.100.31;transport=tcp;r2=on;lr> Record-Route: <sip:192.168.100.31;r2=on;lr> Via: SIP/2.0/TCP 192.168.100.31;branch=z9hG4bK9a1.9a042f2f4fe26e1e0fa9b65185f3a733.0 Via: SIP/2.0/UDP 192.168.100.31:35060;received=192.168.100.31;rport=35060;branch=z9hG4bK1985869670 From: <sip:safarov@aio.kazoo>;tag=988293340 To: <sip:safarov@aio.kazoo> Call-ID: 1851253425 CSeq: 21 INVITE Contact: <sip:safarov@192.168.100.31:35060> Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO Max-Forwards: 69 User-Agent: Linphone/3.6.1 (eXosip2/3.6.0) Subject: Phone call Content-Length: 60 Content-Type: multipart/mixed;boundary="delimiter" Mime-Version: 1.0 --delimiter Content-Type: text/plain test --delimiter ``` ### Troubleshooting NA #### Reproduction 1) Need to apply patch provided above; 2) create any sip account; 3) register SIP client using auth data for created sip account; 4) place call for created account. #### Debugging Data NA #### Log Messages [kamailio.log](https://github.com/kamailio/kamailio/files/2568706/kamailio.l… #### SIP Traffic [kamailio.pcapng.gz](https://github.com/kamailio/kamailio/files/2568707/kama… ### Possible Solutions Not known ### Additional Information * **Kamailio Version** - output of `kamailio -v` Tested current master ``` version: kamailio 5.3.0-dev0 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_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 14:49:40 Nov 9 2018 with gcc 8.2.0 ``` * **Operating System**: ``` /etc/kamailio # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.0 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" /etc/kamailio # ``` -- 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/1719

3 17

git:master:5460db2e: textops: docs - notes that msg_apply_changes() may be required for multi-part operations
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: master Commit: 5460db2e59341f143d607de744faa8413216afd5 URL: https://github.com/kamailio/kamailio/commit/5460db2e59341f143d607de744faa84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T17:53:30+01:00 textops: docs - notes that msg_apply_changes() may be required for multi-part operations - GH #1719 --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5460db2e59341f143d607de744faa84… Patch: https://github.com/kamailio/kamailio/commit/5460db2e59341f143d607de744faa84… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 8e0f350056..d348ccf6be 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1638,6 +1638,7 @@ if (starts_with("$rU", "+358")) set_body_multipart("test", "text/plain", "delimiter"); msg_apply_changes(); append_body_part(...); +msg_apply_changes(); ... @@ -1690,12 +1691,17 @@ text The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>append_body_part</function> usage</title> <programlisting format="linespecific"> ... $var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); +msg_apply_changes(); ... # Will append this to the body: @@ -1721,6 +1727,7 @@ Content-Disposition: signal;handling=required ... $var(b) = "<info>active</info>"; append_body_part("$var(b)", "application/xml\r\nX-Header: xyz"); +msg_apply_changes(); ... # Will append this to the body: @@ -1773,12 +1780,17 @@ Content-Disposition: signal;handling=required The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>append_body_part_hex</function> usage</title> <programlisting format="linespecific"> ... $var(b) = "6b 61 6d 61 69 6c 69 6f"; append_body_part_hex("$var(b)", "application/my-custom-ext"); +msg_apply_changes(); ... # Will append this to the body: @@ -1894,11 +1906,16 @@ get_body_part("application/vnd.cirpack.isdn-ext", "$var(hbody)"); The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. </para> + <para> + Note: it may be required that msg_apply_changes() from textopsx module + has to be executed if there are other operations over the new body. + </para> <example> <title><function>remove_body_part</function> usage</title> <programlisting format="linespecific"> ... remove_body_part("application/vnd.cirpack.isdn-ext"); +msg_apply_changes(); ... </programlisting> </example>

1 0

[kamailio/kamailio] Modules:xmlrpc event_callback added for ksr routes (#1736)
by Surendra Tiwari 27 Nov '18

27 Nov '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1736 -- Commit Summary -- * Merge pull request #1 from kamailio/master * Modules:XMLRPC event_route callback added for ksr -- File Changes -- M src/modules/xmlrpc/xmlrpc.c (56) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1736.patch https://github.com/kamailio/kamailio/pull/1736.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/1736

2 9

git:master:71a88b1d: misc/examples: use core reply_route inside the anycast example
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: master Commit: 71a88b1d30b3bff5d6e8e1785ddeae08b3bfe4f2 URL: https://github.com/kamailio/kamailio/commit/71a88b1d30b3bff5d6e8e1785ddeae0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T12:52:13+01:00 misc/examples: use core reply_route inside the anycast example --- Modified: misc/examples/mixed/kamailio-minimal-anycast.cfg --- Diff: https://github.com/kamailio/kamailio/commit/71a88b1d30b3bff5d6e8e1785ddeae0… Patch: https://github.com/kamailio/kamailio/commit/71a88b1d30b3bff5d6e8e1785ddeae0… --- diff --git a/misc/examples/mixed/kamailio-minimal-anycast.cfg b/misc/examples/mixed/kamailio-minimal-anycast.cfg index 812695d919..0c7c6027f0 100644 --- a/misc/examples/mixed/kamailio-minimal-anycast.cfg +++ b/misc/examples/mixed/kamailio-minimal-anycast.cfg @@ -300,17 +300,24 @@ route[WITHINDLG] { exit; } -# Manage outgoing branches +# TM manage for outgoing branches branch_route[MANAGE_BRANCH] { xdbg("new branch [$T_branch_idx] to $ru\n"); } -# Manage incoming replies +# TM manage for incoming replies onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); +} - if($si != IPADDR_MAINSRV) { +# TM manage for failure routing cases +failure_route[MANAGE_FAILURE] { + if (t_is_canceled()) exit; +} +# Core handling for incoming replies +reply_route { + if($si != IPADDR_MAINSRV) { if($si == IPADDR_PAIRNODE) { # receiving a transparent proxied request from pair server if(is_present_hf("X-Src-Addr")) { @@ -338,8 +345,3 @@ onreply_route[MANAGE_REPLY] { } # from now on, the usual sip response processing } - -# Manage failure routing cases -failure_route[MANAGE_FAILURE] { - if (t_is_canceled()) exit; -}

1 0

git:master:d74d6797: xmlrpc: docs for event_callback parameter
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: master Commit: d74d67976905c9d0c49f00485046117bc2581e65 URL: https://github.com/kamailio/kamailio/commit/d74d67976905c9d0c49f00485046117… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T12:47:40+01:00 xmlrpc: docs for event_callback parameter - GH #1736 --- Modified: src/modules/xmlrpc/doc/xmlrpc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d74d67976905c9d0c49f00485046117… Patch: https://github.com/kamailio/kamailio/commit/d74d67976905c9d0c49f00485046117… --- diff --git a/src/modules/xmlrpc/doc/xmlrpc_admin.xml b/src/modules/xmlrpc/doc/xmlrpc_admin.xml index 381a1feff7..a61d63e6db 100644 --- a/src/modules/xmlrpc/doc/xmlrpc_admin.xml +++ b/src/modules/xmlrpc/doc/xmlrpc_admin.xml @@ -60,7 +60,7 @@ modparam("xmlrpc", "route", "route_for_xmlrpcs") <section id="autoconversion"> <title><varname>autoconversion</varname> (string)</title> <para> - Enable or disable automatic parameter type conversion globally, + Enable or disable automatic parameter type conversion globally, for all the methods parameters. If on, a type mismatch in a method parameter will not cause a fault if it is possible to automatically @@ -192,6 +192,45 @@ modparam("xmlrpc", "url_match", "^/RPC2") </programlisting> </example> </section> + <section id="event_callback"> + <title><varname>event_callback</varname> (string)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of route blocks defined by route parameter for xmlrpc request. + </para> + <para> + This route will be called only for HTTP messages whose method is + either GET or POST. The message visible inside the route + will be a HTTP request converted to SIP (the uri will be fixed and + a fake via will be added). + </para> + <para> + The route should perform additional security checks to + ensure the client is authorized to execute management/RPC functions + and then it should call the <function>dispatch_rpc()</function>. + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xmlrpc", "event_callback", "ksr_xmlrpc_event") +... +-- event callback function implemented in Lua +function ksr_xmlrpc_event(evname) + KSR.info("===== xmlrpc triggered event: " .. evname .. "\n"); + local rpc_method = KSR.pv.get("$rm") or "" + if ((rpc_method == "POST" or rpc_method == "GET")) then + if (KSR.xmlrpc.dispatch_rpc() < 0) then + KSR.err("error while executing xmlrpc event") + end + end + return 1; +end +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:d3a3e28d: xmlrpc: added event_callback parameter
by Daniel-Constantin Mierla 27 Nov '18

27 Nov '18

Module: kamailio Branch: master Commit: d3a3e28dd20d731939f9a53c28fb231206268890 URL: https://github.com/kamailio/kamailio/commit/d3a3e28dd20d731939f9a53c28fb231… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-27T12:46:49+01:00 xmlrpc: added event_callback parameter - specify the name of KEMI function to be executed for xmlrpc requests --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/d3a3e28dd20d731939f9a53c28fb231… Patch: https://github.com/kamailio/kamailio/commit/d3a3e28dd20d731939f9a53c28fb231… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 4985639134..793b2d2db2 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -416,6 +416,7 @@ static regex_t xmlrpc_url_match_regexp; static char* xmlrpc_url_skip = NULL; static regex_t xmlrpc_url_skip_regexp; +static str xmlrpc_event_callback = STR_NULL; /* * Exported functions @@ -438,6 +439,7 @@ static param_export_t params[] = { {"mode", PARAM_INT, &xmlrpc_mode}, {"url_match", PARAM_STRING, &xmlrpc_url_match}, {"url_skip", PARAM_STRING, &xmlrpc_url_skip}, + {"event_callback", PARAM_STR, &xmlrpc_event_callback}, {0, 0, 0} }; @@ -2294,7 +2296,11 @@ static int em_receive_request(sip_msg_t* orig_msg, { int ret; sip_msg_t tmp_msg, *msg; + int backup_rt; struct run_act_ctx ra_ctx; + str evrtname = str_init("xmlrpc:request"); + backup_rt = get_route_type(); + sr_kemi_eng_t *keng = NULL; ret=0; if (new_buf && new_len) { @@ -2328,10 +2334,22 @@ static int em_receive_request(sip_msg_t* orig_msg, } /* exec routing script */ init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, main_rt.rlist[xmlrpc_route_no], msg) < 0) { - ret=-1; - DBG("xmlrpc: error while trying script\n"); - goto end; + if(xmlrpc_route_no>=0) { + if (run_actions(&ra_ctx, main_rt.rlist[xmlrpc_route_no], msg) < 0) { + ret=-1; + DBG("xmlrpc: error while trying script\n"); + goto end; + } + }else{ + keng = sr_kemi_eng_get(); + if(keng!=NULL) { + if(keng->froute(msg, EVENT_ROUTE, + &xmlrpc_event_callback, &evrtname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } else { + LM_ERR("no event route or kemi callback found for execution\n"); + } } end: exec_post_script_cb(msg, REQUEST_CB_TYPE); /* needed for example if tm is used */ @@ -2339,6 +2357,7 @@ static int em_receive_request(sip_msg_t* orig_msg, if (msg != orig_msg) { /* avoid double free (freed from receive_msg too) */ free_sip_msg(msg); } + set_route_type(backup_rt); return ret; error: return -1; @@ -2583,22 +2602,31 @@ static int mod_init(void) { struct nonsip_hook nsh; int route_no; + sr_kemi_eng_t *keng = NULL; /* try to fix the xmlrpc route */ - if (xmlrpc_route){ - route_no=route_get(&main_rt, xmlrpc_route); - if (route_no==-1){ - ERR("xmlrpc: failed to fix route \"%s\": route_get() failed\n", - xmlrpc_route); + if(xmlrpc_event_callback.s!=NULL && xmlrpc_event_callback.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_ERR("failed to find kemi engine\n"); return -1; } - if (main_rt.rlist[route_no]==0){ - WARN("xmlrpc: xmlrpc route \"%s\" is empty / doesn't exist\n", - xmlrpc_route); + xmlrpc_route_no=-1; + } else { + if (xmlrpc_route) { + route_no=route_get(&main_rt, xmlrpc_route); + if (route_no==-1) { + ERR("xmlrpc: failed to fix route \"%s\": route_get() failed\n", + xmlrpc_route); + return -1; + } + if (main_rt.rlist[route_no]==0) { + WARN("xmlrpc: xmlrpc route \"%s\" is empty / doesn't exist\n", + xmlrpc_route); + } + xmlrpc_route_no=route_no; } - xmlrpc_route_no=route_no; } - /* bind the SL API */ if (sl_load_api(&slb)!=0) { LM_ERR("cannot bind to SL API\n");

1 0

[kamailio/kamailio] [5.1] cannot start TLS module on Alpine (#1738)
by sergey-safarov 23 Nov '18

23 Nov '18

### Description I try load kamailio:5.1 and get this error ``` / # kamailio -DD -E 0(167) 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: X509_free: symbol not found 0(167) CRITICAL: <core> [core/cfg.y:3460]: yyerror_at(): parse error in config file /etc/kamailio/tls-role.cfg, line 7, column 12-19: failed to load module 0(167) ERROR: <core> [core/modparam.c:152]: set_mod_param_regex(): No module matching <tls> found 0(167) CRITICAL: <core> [core/cfg.y:3463]: yyerror_at(): parse error in config file /etc/kamailio/tls-role.cfg, line 8, column 56: Can't set module parameter 0(167) ERROR: <core> [core/modparam.c:152]: set_mod_param_regex(): No module matching <tls> found 0(167) CRITICAL: <core> [core/cfg.y:3463]: yyerror_at(): parse error in config file /etc/kamailio/tls-role.cfg, line 9, column 40: Can't set module parameter ERROR: bad config file (3 errors) 0(167) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized / # ``` Used `alpine:edge` with `OpenSSL` ### Troubleshooting `ldd` utility properly located all shared libs ``` / # LD_PRELOAD=/usr/sbin/kamailio ldd /usr/lib/kamailio/modules/tls.so ldd (0x7fba9200c000) /usr/sbin/kamailio => /usr/sbin/kamailio (0x7fba91c09000) libssl.so.1.1 => /lib/libssl.so.1.1 (0x7fba91b8a000) libc.musl-x86_64.so.1 => ldd (0x7fba9200c000) libcrypto.so.1.1 => /lib/libcrypto.so.1.1 (0x7fba9190d000) / # ``` Symbol located at `/lib/libcrypto.so.1.1` of [`OpenSSL`](https://pkgs.alpinelinux.org/package/edge/main/x86_64/libcrypto1.1) package ``` / # apk info --who-owns /lib/libcrypto.so.1.1 /lib/libcrypto.so.1.1 is owned by libcrypto1.1-1.1.1a-r0 ``` #### Reproduction Need to add tls module to kamailio config and start kamailio. #### Debugging Data N/A #### Log Messages Provided above #### SIP Traffic N/A ### Possible Solutions Not known ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` / # kamailio -v version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_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 03:24:34 Nov 23 2018 with gcc 8.2.0 ``` * **Operating System**: ``` / # uname -a Linux node1a.i-telecoms.com 3.10.0-862.14.4.el7.x86_64 #1 SMP Wed Sep 26 15:12:11 UTC 2018 x86_64 Linux / # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.0 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" / # ``` -- 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/1738

1 3

[kamailio/kamailio] Crash in topoh module (#1735)
by Alexandru Pirvulescu 23 Nov '18

23 Nov '18

### Description We have multiple SIP trunks aggregated in a Kamailio router. One of them misbehaves in a way that I fail to see and it crashes our Kamailio. The conversation that triggers this bug is attached below. ### Troubleshooting #### Reproduction #### Debugging Data ``` (gdb) bt full #0 0x00007ff687ef2571 in th_add_via_cookie (msg=0x7ffe78aa3700, via=0x0) at th_msg.c:944 l = 0x7ff6b355d910 viap = 2024421120 out = {s = 0x7ff6b3591ff0 "TH: uch\r\n", len = 9} __func__ = "th_add_via_cookie" #1 0x00007ff687ef4042 in th_add_cookie (msg=0x7ffe78aa3700) at th_msg.c:1049 No locals. #2 0x00007ff687efcc90 in th_msg_received (evp=0x7ffe78aa3f60) at topoh_mod.c:381 msg = {id = 0, pid = 0, tval = {tv_sec = 0, tv_usec = 0}, fwd_send_flags = {f = 0, blst_imask = 0}, rpl_send_flags = {f = 0, blst_imask = 0}, first_line = {type = 2, flags = 1, len = 16, u = {request = {method = { s = 0xa595a0 <buf> "SIP/2.0 200 OK\r\nFrom: \"+XXXXXXXXXXX\" <sip:+XXXXXXXXXXX@10.0.120.171>;tag=as2a229f1f\r\nTo: \"+1YYYYYYYYYYY\" <sip:+1YYYYYYYYYYY@67.221.12.64>;tag=b6fefaafes\r\nCall-ID: 1acc23323a2c9d187927a6276fa49ebe@10.0.120.171:5060\r\nCSeq: 102 CANCEL\r\nServer: Brekeke SIP Server rev.286.3\r\nRecord-Route: <sip:aaa.bbb.ccc.ddd;lr;ftag=as2a229f1f;did=2b8.c3c1;nat=yes;vsf=", 'A' <repeats 39 times>, "-;vst=AAAAABtUBFEDVwABAwwMXXkCDhcCUAUfBlEXVVE4ZWFmZTc5OUAxMC4xMjguMC4xNA-->\r\nContent-Length: 0\r\n\r\n", len = 7}, uri = { s = 0xa595a8 <buf+8> "200 OK\r\nFrom: \"+XXXXXXXXXXX\" <sip:+XXXXXXXXXXX@10.0.120.171>;tag=as2a229f1f\r\nTo: \"+1YYYYYYYYYYY\" <sip:+1YYYYYYYYYYY@67.221.12.64>;tag=b6fefaafes\r\nCall-ID: 1acc23323a2c9d187927a6276fa49ebe@10.0.120.171:5060\r\nCSeq: 102 CANCEL\r\nServer: Brekeke SIP Server rev.286.3\r\nRecord-Route: <sip:aaa.bbb.ccc.ddd;lr;ftag=as2a229f1f;did=2b8.c3c1;nat=yes;vsf=", 'A' <repeats 39 times>, "-;vst=AAAAABtUBFEDVwABAwwMXXkCDhcCUAUfBlEXVVE4ZWFmZTc5OUAxMC4xMjguMC4xNA-->\r\nContent-Length: 0\r\n\r\n", len = 3}, version = { s = 0xa595ac <buf+12> "OK\r\nFrom: \"+XXXXXXXXXXX\" <sip:+XXXXXXXXXXX@10.0.120.171>;tag=as2a229f1f\r\nTo: \"+1YYYYYYYYYYY\" <sip:+1YYYYYYYYYYY@67.221.12.64>;tag=b6fefaafes\r\nCall-ID: 1acc23323a2c9d187927a6276fa49ebe@10.0.120.171:5060\r\nCSeq: 102 CANCEL\r\nServer: Brekeke SIP Server rev.286.3\r\nRecord-Route: <sip:aaa.bbb.ccc.ddd;lr;ftag=as2a229f1f;did=2b8.c3c1;nat=yes;vsf=", 'A' <repeats 39 times>, "-;vst=AAAAABtUBFEDVwABAwwMXXkCDhcCUAUfBlEXVVE4ZWFmZTc5OUAxMC4xMjguMC4xNA-->\r\nContent-Length: 0\r\n\r\n", len = 2}, method_value = 200}, reply = {version = { s = 0xa595a0 <buf> "SIP/2.0 200 OK\r\nFrom: \"+XXXXXXXXXXX\" <sip:+XXXXXXXXXXX@10.0.120.171>;tag=as2a229f1f\r\nTo: \"+1YYYYYYYYYYY\" <sip:+1YYYYYYYYYYY@67.221.12.64>;tag=b6fefaafes\r\nCall-ID: 1acc23323a2c9d187927a6276fa49ebe@10.0.120.171:5060\r\nCSeq: 102 CANCEL\r\nServer: Brekeke SIP Server rev.286.3\r\nRecord-Route: <sip:aaa.bbb.ccc.ddd;lr;ftag=as2a229f1f;did=2b8.c3c1;nat=yes;vsf=", 'A' <repeats 39 times>, "-;vst=AAAAABtUBFEDVwABAwwMXXkCDhcCUAUfBlEXVVE4ZWFmZTc5OUAxMC4xMjguMC4xNA-->\r\nContent-Length: 0\r\n\r\n", len = 7}, status = { s = 0xa595a8 <buf+8> "200 OK\r\nFrom: \"+XXXXXXXXXXX\" <sip:+XXXXXXXXXXX@10.0.120.171>;tag=as2a229f1f\r\nTo: \"+1YYYYYYYYYYY\" <sip:+1YYYYYYYYYYY@67.221.12.64>;tag=b6fefaafes\r\nCall-ID: 1acc23323a2c9d187927a6276fa49ebe@10.0.120.171:5060\r\nCSeq: 102 CANCEL\r\nServer: Brekeke SIP Server rev.286.3\r\nRecord-Route: <sip:aaa.bbb.ccc.ddd;lr;ftag=as2a229f1f;did=2b8.c3c1;nat=yes;vsf=", 'A' <repeats 39 times>, "-;vst=AAAAABtUBFEDVwABAwwMXXkCDhcCUAUfBlEXVVE4ZWFmZTc5OUAxMC4xMjguMC4xNA-->\r\nContent-Length: 0\r\n\r\n", len = 3}, reason = { s = 0xa595ac <buf+12> "OK\r\nFrom: \"+XXXXXXXXXXX\" <sip:+XXXXXXXXXXX@10.0.120.171>;tag=as2a229f1f\r\nTo: \"+1YYYYYYYYYYY\" <sip:+1YYYYYYYYYYY@67.221.12.64>;tag=b6fefaafes\r\nCall-ID: 1acc23323a2c9d187927a6276fa49ebe@10.0.120.171:5060\r\nCSeq: 102 CANCEL\r\nServer: Brekeke SIP Server rev.286.3\r\nRecord---Type <return> to continue, or q <return> to quit--- -Route: <sip:aaa.bbb.ccc.ddd;lr;ftag=as2a229f1f;did=2b8.c3c1;nat=yes;vsf=", 'A' <repeats 39 times>, "-;vst=AAAAABtUBFEDVwABAwwMXXkCDhcCUAUfBlEXVVE4ZWFmZTc5OUAxMC4xMjguMC4xNA-->\r\nContent-Length: 0\r\n\r\n", len = 2}, statuscode = 200}}}, via1 = 0x0, via2 = 0x0, headers = 0x7ff6b3563dd0, last_header = 0x7ff6b3564e68, parsed_flag = 18446744073709551615, h_via1 = 0x0, h_via2 = 0x0, callid = 0x7ff6b3591ba0, to = 0x7ff6b355dc90, cseq = 0x7ff6b355d280, from = 0x7ff6b3563dd0, contact = 0x0, maxforwards = 0x0, route = 0x0, record_route = 0x7ff6b355c8f8, content_type = 0x0, content_length = 0x7ff6b3564e68, authorization = 0x0, expires = 0x0, proxy_auth = 0x0, supported = 0x0, require = 0x0, proxy_require = 0x0, unsupported = 0x0, allow = 0x0, event = 0x0, accept = 0x0, accept_language = 0x0, organization = 0x0, priority = 0x0, subject = 0x0, user_agent = 0x0, server = 0x7ff6b355d328, content_disposition = 0x0, diversion = 0x0, rpid = 0x0, refer_to = 0x0, session_expires = 0x0, min_se = 0x0, sipifmatch = 0x0, subscription_state = 0x0, date = 0x0, identity = 0x0, identity_info = 0x0, pai = 0x0, ppi = 0x0, path = 0x0, privacy = 0x0, min_expires = 0x0, body = 0x0, eoh = 0xa59783 <buf+483> "\r\n", unparsed = 0xa59783 <buf+483> "\r\n", rcv = {src_ip = {af = 0, len = 0, u = {addrl = {0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, dst_ip = {af = 0, len = 0, u = {addrl = {0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, src_port = 0, dst_port = 0, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x0, proto = 0 '\000'}, buf = 0xa595a0 <buf> "SIP/2.0 200 OK\r\nFrom: \"+XXXXXXXXXXX\" <sip:+XXXXXXXXXXX@10.0.120.171>;tag=as2a229f1f\r\nTo: \"+1YYYYYYYYYYY\" <sip:+1YYYYYYYYYYY@67.221.12.64>;tag=b6fefaafes\r\nCall-ID: 1acc23323a2c9d187927a6276fa49ebe@10.0.120.171:5060\r\nCSeq: 102 CANCEL\r\nServer: Brekeke SIP Server rev.286.3\r\nRecord-Route: <sip:aaa.bbb.ccc.ddd;lr;ftag=as2a229f1f;did=2b8.c3c1;nat=yes;vsf=", 'A' <repeats 39 times>, "-;vst=AAAAABtUBFEDVwABAwwMXXkCDhcCUAUfBlEXVVE4ZWFmZTc5OUAxMC4xMjguMC4xNA-->\r\nContent-Length: 0\r\n\r\n", len = 485, new_uri = {s = 0x0, len = 0}, dst_uri = {s = 0x0, len = 0}, parsed_uri_ok = 0, parsed_uri = { user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x0, len = 0}, port = {s = 0x0, len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 0}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = (unknown: 0), transport = { s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = { s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = { s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}}, parsed_orig_ruri_ok = 0, parsed_orig_ruri = {user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, host = {s = 0x0, len = 0}, port = {s = 0x0, len = 0}, params = {s = 0x0, len = 0}, sip_params = {s = 0x0, len = 0}, headers = { s = 0x0, len = 0}, port_no = 0, proto = 0, type = ERROR_URI_T, flags = (unknown: 0), transport = {s = 0x0, len = 0}, ttl = {s = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = 0}, method = {s = 0x0, len = 0}, lr = {s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = { s = 0x0, len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, user_param_val = {s = 0x0, len = 0}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = 0x0, len = 0}}, add_rm = 0x7ff6b355d910, body_lumps = 0x0, reply_lump = 0x0, add_to_branch_s = '\000' <repeats 57 times>, add_to_branch_len = 0, hash_index = 0, msg_flags = 0, flags = 0, set_global_address = {s = 0x0, len = 0}, set_global_port = {s = 0x0, len = 0}, force_send_socket = 0x0, path_vec = { s = 0x0, len = 0}, instance = {s = 0x0, len = 0}, reg_id = 0, ruid = {s = 0x0, len = 0}, location_ua = {s = 0x0, len = 0}, ldv = {flow = { decoded = 0, rcv = {src_ip = {af = 0, len = 0, u = {addrl = {0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, dst_ip = {af = 0, len = 0, u = {addrl = {0, 0}, addr32 = {0, 0, 0, 0}, addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, addr = '\000' <repeats 15 times>}}, src_port = 0, dst_port = 0, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = { sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = { __u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x0, proto = 0 '\000'}}}} obuf = 0x7ffe78aa3f50 nbuf = 0x0 direction = 0 dialog = 0 __func__ = "th_msg_received" #3 0x0000000000587656 in sr_event_exec (type=1, evp=0x7ffe78aa3f60) at core/events.c:211 ret = 0 i = 0 #4 0x000000000058aa74 in receive_msg ( buf=0xa595a0 <buf> "SIP/2.0 200 OK\r\nFrom: \"+XXXXXXXXXXX\" <sip:+XXXXXXXXXXX@10.0.120.171>;tag=as2a229f1f\r\nTo: \"+1YYYYYYYYYYY\" <sip:+1YYYYYYYYYYY@67.221.12.64>;tag=b6fefaafes\r\nCall-ID: 1acc23323a2c9d187927a6276fa49ebe@10.0.120.171:5060\r\nCSeq: 102 CANCEL\r\nServer: Brekeke SIP Server rev.286.3\r\nRecord-Route: <sip:aaa.bbb.ccc.ddd;lr;ftag=as2a229f1f;did=2b8.c3c1;nat=yes;vsf=", 'A' <repeats 39 times>, "-;vst=AAAAABtUBFEDVwABAwwMXXkCDhcCUAUfBlEXVVE4ZWFmZTc5OUAxMC4xMjguMC4xNA-->\r\nContent-Length: 0\r\n\r\n", len=485, rcv_info=0x7ffe78aa4150) at core/receive.c:157 msg = 0x7ff6b35bce60 ctx = {rec_lev = -1900292352, run_flags = 32758, last_retcode = 1, jmp_env = {{__jmpbuf = {0, 0, -4294967296, -1, 0, 0, 5889493309647038041, 4517398388897088679}, __mask_was_saved = 0, __saved_mask = {__val = {0, 50195, 0, 1, 140696991361384, 50195, 3008780760, 6319390832, 140696991361384, 140730922844272, 4879653, 122, 4879789, 140697547463128, 140697547463128, 140730922844336}}}}} bctx = 0x0 ret = 32766 stats_on = 0 tvb = {tv_sec = 0, tv_usec = 0} tve = {tv_sec = 0, tv_usec = 1099511627775} tz = {tz_minuteswest = 0, tz_dsttime = 0} diff = 0 inb = { s = 0xa595a0 <buf> "SIP/2.0 200 OK\r\nFrom: \"+XXXXXXXXXXX\" <sip:+XXXXXXXXXXX@10.0.120.171>;tag=as2a229f1f\r\nTo: \"+1YYYYYYYYYYY\" <sip:+1YYYYYYYYYYY@67.221.12.64>;tag=b6fefaafes\r\nCall-ID: 1acc23323a2c9d187927a6276fa49ebe@10.0.120.171:5060\r\nCSeq: 102 CANCEL\r\nServer: Brekeke SIP Server rev.286.3\r\nRecord-Route: <sip:aaa.bbb.ccc.ddd;lr;ftag=as2a229f1f;did=2b8.c3c1;nat=yes;vsf=", 'A' <repeats 39 times>, "-;vst=AAAAABtUBFEDVwABAwwMXXkCDhcCUAUfBlEXVVE4ZWFmZTc5OUAxMC4xMjguMC4xNA-->\r\nContent-Length: 0\r\n\r\n", len = 485} netinfo = {data = {s = 0x51bbaef6148d2659 <error: Cannot access memory at address 0x51bbaef6148d2659>, len = -2027813721}, rcv = 0x0, dst = 0x0} keng = 0x0 evp = {data = 0x7ffe78aa3f50, rcv = 0x7ffe78aa4150, dst = 0x0} errsipmsg = 0 __func__ = "receive_msg" #5 0x00000000004af6b1 in udp_rcv_loop () at core/udp_server.c:554 len = 485 buf = "SIP/2.0 200 OK\r\nFrom: \"+XXXXXXXXXXX\" <sip:+XXXXXXXXXXX@10.0.120.171>;tag=as2a229f1f\r\nTo: \"+1YYYYYYYYYYY\" <sip:+1YYYYYYYYYYY@67.221.12.64>;tag=b6fefaafes\r\nCall-ID: 1acc23323a2c9d187927a6276fa49ebe@10.0.120.171:5060\r\nCSeq: 102 CANCEL\r\nServer: Brekeke SIP Server rev.286.3\r\nRecord-Route: <sip:aaa.bbb.ccc.ddd;lr;ftag=as2a229f1f;did=2b8.c3c1;nat=yes;vsf=", 'A' <repeats 39 times>, "-;vst=AAAAABtUBFEDVwABAwwMXXkCDhcCUAUfBlEXVVE4ZWFmZTc5OUAxMC4xMjguMC4xNA-->\r\nContent-Length: 0\r\n\r\n\000\065\061\064\063\064\066\065\066\065\062\" <sip:+15143465652@aaa.bbb.ccc.ddd>;tag=36DHD9eX6S4Xp\r\nCall-ID: 2a0cca3363b688be697749bc7fdadb86@10.0.109.150:5060\r\nCSeq: 102 INVITE\r\nContact: <sip:+15143465652@aaa.bbb.ccc.ddd:5060;transport=udp>\r\nUser-Agent: DNL-Switch\r\nAllow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, REGISTER\r\nContent-Type: application/sdp\r\nContent-Length: 172\r\nTH: uch\r\n\r\nv=0\r\no=- 1014311547 1014311547 IN IP4 aaa.bbb.ccc.ddd\r\ns=DNL-SWITCH\r\nc=IN IP4 aaa.bbb.ccc.ddd\r\nt=0 0\r\nm=audio 36180 RTP/AVP 0 101\r\na=rtpmap:101 telephone-event/8000\r\na=ptime:20\r\n\000\070\060 RTP/AVP 0 101\r\na=rtpmap:101 telephone-event/8000\r\na=ptime:20\r\n\000\060\r\na=fmtp:101 0-15\r\na=ptime:20\r\n\000sSIP-GW-UserAgent 4613 1015 IN IP4 aaa.bbb.ccc.ddd\r\ns=SIP Call\r\nc=IN IP4 aaa.bbb.ccc.ddd\r\nt=0 0\r\nm=audio 18288 RTP/AVP 0 101\r\nc=IN IP4 aaa.bbb.ccc.ddd\r\na=rtpmap:0 PCMU/8000\r\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-16\r\na=ptime:20\r\n\000\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-16\r\na=ptime:20\r\n\000:20\r\n\000: 0\r\n\r\n\000+18557772026@10.0.102.166:5060>\r\nContent-Length: 0\r\n\r\n\000\062.214\r\nt=0 0\r\nm=audio 40504 RTP/AVP 0 101\r\na=rtpmap:0 PCMU/8000\r\na=rtpmap:101 telephone-event/8000\r\na=ptime:20\r\n\000pmap:0 PCMU/8000\r\na=rtpmap:101 telephone-event/8000\r\na=ptime:20\r\n", '\000' <repeats 63877 times> tmp = 0x7ff69261039c "<" from = 0x7ff6b35659d8 fromlen = 16 ri = {src_ip = {af = 2, len = 4, u = {addrl = {125628636483, 128853312352}, addr32 = {1074584899, 29, 4293472, 30}, addr16 = {56643, 16396, 29, 0, 33632, 65, 30, 0}, addr = "C\335\f@\035\000\000\000`\203A\000\036\000\000"}}, dst_ip = {af = 2, len = 4, u = {addrl = {234913802, 0}, addr32 = {234913802, 0, 0, 0}, addr16 = {32778, 3584, 0, 0, 0, 0, 0, 0}, addr = "\n\200\000\016", '\000' <repeats 11 times>}}, src_port = 5060, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\023\304C\335\f@\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 50195, sin_addr = {s_addr = 1074584899}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 50195, sin6_flowinfo = 1074584899, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7ff6b34e54a8, proto = 1 '\001'} evp = {data = 0x0, rcv = 0x0, dst = 0x0} printbuf = "\001\200\255\373\377\377\377\377\240D\252x\376\177\000\000\240D\252x\376\177\000\000\240D\252x\376\177\000\000\240D\252x\035\000\000\000`\023P\263\366\177\000\000\037E\252x\376\177\000\000\240D\252x\376\177\000\000\037E\252x\376\177\000\000\234\003a\222\366\177\000\000`\203A\000\000\000\000\000\000H\252x\376\177", '\000' <repeats 18 times>, "\260B\252x\376\177\000\000\034\024U\000\000\000\000\000\000\000\377\377\377\377\377\377", '\000' <repeats 24 times>, "\377\377\377\377\035\000\000\000PEP\263\366\177", '\000' <repeats 18 times>, "\377\377\377\377\366\256\273Q\234\003a\222\366\177\000\000`\203A\000\000\000\000\000\000H\252x\376\177", '\000' <repeats 18 times>, "\060C\252x\376\177\000\000\034\024U\000\000\000\000\000 C\252x\376\177\000\000\231\224p\000\000\000\000\000\000\000\000\000\001\000\000\000\240\006\261\000\035\000\000\000\070\230\001\264\035\000\000\000XVP\263\366\177\000\000\272E\252Y\231\033f\265gRW\262\222\344\017ߠp\334fu\036\\\270\234\003a\222\366\177\000\000`\203A\000\000\000\000\000\000H\252x\376\177", '\000' <repeats 18 times>, "PC\252x\376\177\000\000\350\032U\000\000\000\000\000`\203A\000\000\000\000\000#\311ȳ\035\000\000\000\000D\252x\376\177\000\000\t\312L\000\000\000\000\000(VN\263\366\177\000\000h\350Y\263\366\177\000\000\000\004\000\000\000\000\000\000\020\020E\263\366\177\000\000\240D\252x\376\177\000\000\001\000\000\000\035\000\000\000`/w\000\000\000\000\000\377\377\377\377", '\000' <repeats 12 times>, "\035\000\000\000\256\250\334\036&H4B\000\000\000\000\200\000\000\000\000\000\000" i = -1914504396 j = 32758 l = 29 __func__ = "udp_rcv_loop" #6 0x00000000004246ac in main_loop () at main.c:1619 i = 28 pid = 0 si = 0x7ff6b34e54a8 si_desc = "udp receiver child=28 sock=10.128.0.14:5060 (aaa.bbb.ccc.ddd:5060)\000\020\000\000\000\000\330\065\213^\000\000\000\000`\203A\000\000\000\000\000\000H\252x\376\177", '\000' <repeats 18 times>, "@E\252x\376\177\000\000\026U`\000\000\000\000" nrprocs = 48 woneinit = 1 __func__ = "main_loop" #7 0x000000000042bd5c in main (argc=14, argv=0x7ffe78aa4808) at main.c:2638 cfg_stream = 0x262e010 c = -1 r = 0 tmp = 0x7ffe78aa72e6 "" tmp_len = 2024425184 port = 32766 proto = 2024425280 options = 0x75b068 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 5751405 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0xff000000ff p = 0x0 st = {st_dev = 2049, st_ino = 526460, st_nlink = 2, st_mode = 16895, st_uid = 105, st_gid = 107, __pad0 = 0, st_rdev = 0, st_size = 4096, st_blksize = 4096, st_blocks = 8, st_atim = {tv_sec = 1542886086, tv_nsec = 491654505}, st_mtim = {tv_sec = 1542886085, tv_nsec = 707593588}, st_ctim = {tv_sec = 1542886089, tv_nsec = 723905628}, __glibc_reserved = {0, 0, 0}} __func__ = "main" ``` It looks like `th_add_via_cookie` doesn't check if it's second parameter, `via`, is `NULL` and it segfaults. Here's the link to the code for convenience. https://github.com/kamailio/kamailio/blob/951df23f8ab9f4428e143949f1e580f76… #### Log Messages ``` 0(1) ALERT: <core> [main.c:738]: handle_sigs(): child process 60 exited by a signal 11 0(1) ALERT: <core> [main.c:741]: handle_sigs(): core was generated 0(1) INFO: <core> [main.c:764]: handle_sigs(): terminating due to SIGCHLD 1(32) INFO: <core> [main.c:819]: sig_usr(): signal 15 received 3(34) INFO: <core> [main.c:819]: sig_usr(): signal 15 received 2(33) INFO: <core> [main.c:819]: sig_usr(): signal 15 received 4(35) INFO: <core> [main.c:819]: sig_usr(): signal 15 received 52(83) INFO: <core> [main.c:819]: sig_usr(): signal 15 received ..... 0(1) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ``` #### SIP Traffic [HOMER5-10.128.0.14-0e6a7c51199e94990b417c9ce8eafe799-11_22_2018 19_25_32.txt](https://github.com/kamailio/kamailio/files/2608987/HOMER5-10.… ### Possible Solutions Enabling sanity checks for topoh module does not fix it. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 ``` * **Operating System**: ``` Linux ************** 4.15.0-1015-gcp #15~16.04.1-Ubuntu SMP Thu Jul 26 20:37:01 UTC 2018 x86_64 x86_64 x86_64 GNU/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/1735

2 2

git:master:b95791b3: pkg/kamailio/deb: version set to 5.3.0~dev1
by Victor Seva 23 Nov '18

23 Nov '18

Module: kamailio Branch: master Commit: b95791b346c2d71f229cc510c6120463c85453c3 URL: https://github.com/kamailio/kamailio/commit/b95791b346c2d71f229cc510c612046… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-23T09:19:56+01:00 pkg/kamailio/deb: version set to 5.3.0~dev1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/b95791b346c2d71f229cc510c612046… Patch: https://github.com/kamailio/kamailio/commit/b95791b346c2d71f229cc510c612046…

1 0

git:5.2:9e729b5c: pkg/kamailio/deb: version set to 5.2.0~rc2
by Victor Seva 23 Nov '18

23 Nov '18

Module: kamailio Branch: 5.2 Commit: 9e729b5ca8af5a6590a828f6aacc7ca23ae379de URL: https://github.com/kamailio/kamailio/commit/9e729b5ca8af5a6590a828f6aacc7ca… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-23T09:24:48+01:00 pkg/kamailio/deb: version set to 5.2.0~rc2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/9e729b5ca8af5a6590a828f6aacc7ca… Patch: https://github.com/kamailio/kamailio/commit/9e729b5ca8af5a6590a828f6aacc7ca…

1 0

git: new commits in branch 5.2
by Daniel-Constantin Mierla 23 Nov '18

23 Nov '18

- URL: https://github.com/kamailio/kamailio/commit/fb0ae02762b32e65210aebdf2cac0d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:54:02+01:00 lib/srdb1: schema - defined entities for sizes of aname and avalue columns - avalue column size set to 512 - GH #1723 (cherry picked from commit 5ce0020f25b4131e5b122df3d075eeb68626b470) - URL: https://github.com/kamailio/kamailio/commit/e13f8518e7842b3b0e352da27dd5011… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:54:24+01:00 kamctl: regenerated sql creation scripts - URL: https://github.com/kamailio/kamailio/commit/a1a95ab27911ce0ff02c3a7ec7c9286… Author: Yasin CANER <ycaner06(a)users.noreply.github.com> Date: 2018-11-23T08:55:08+01:00 core : add word to log get_boundary function added word to log for more understanding (cherry picked from commit 2daa351dd0cf716284ff90cd57d2241ee97f165d) - URL: https://github.com/kamailio/kamailio/commit/409bf1f43ce954d93cdce4db840abc5… Author: root <root(a)localhost.localdomain> Date: 2018-11-23T08:55:25+01:00 textops: fixed get_body_part function for non-multipart contents error get_body_part functions gives error even if content is not multipart. Fixed for non-multipart contents and set all contents for non-boundary params (cherry picked from commit 3436104cce943f055e0a33aa26692265185502bf) - URL: https://github.com/kamailio/kamailio/commit/e2ffc481a3f6673debf45f45abb7914… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:55:35+01:00 core: function to test if a msg structure is faked request (cherry picked from commit ab72c5e7188266baef0da70f1aa7d7d28b6d077c) - URL: https://github.com/kamailio/kamailio/commit/652180a88a549a6f2d91c39b053efce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:55:48+01:00 async: return error if trying to execute for faked message - GH #1727 (cherry picked from commit 8b71c46ba0db05051ee24bf88491f00387e1ca8b) - URL: https://github.com/kamailio/kamailio/commit/3b586d554740ae578283024c1508e91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:56:03+01:00 topos: allow various replies for INVITE without contact - GH #1720 (cherry picked from commit 416d79b462986317f2c3a3ed8aa30a502d116095) - URL: https://github.com/kamailio/kamailio/commit/8b52be4ec97e82f906aa392b1f7377a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:56:36+01:00 htable: safety checks for values replicated via dmq (cherry picked from commit 24c92c4f25e758fcd2265d824ca39b5f1ac2dcdd) - URL: https://github.com/kamailio/kamailio/commit/156706c03a29a7aed5b8f73fab8216e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:56:48+01:00 tm: info log message if attempting to create transaction for faked request (cherry picked from commit 4dd53abf13f9a98272af625f2a6591669730b374) - URL: https://github.com/kamailio/kamailio/commit/eb661d2284d2d004b7affbcf0728ff6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:56:57+01:00 tmx: do no suspend faked request (cherry picked from commit 6f6a0d136dfefe98631264092177344ed8d173a8) - URL: https://github.com/kamailio/kamailio/commit/e9320c09738766d80fae2fe2b1704fa… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Date: 2018-11-23T08:57:17+01:00 rtpengine: print command in log message on timeout - few indentation fixes - GH #1732 (cherry picked from commit 9d1e8e256e49968776f7abb740a6d02739547ec2) - URL: https://github.com/kamailio/kamailio/commit/3e3b51b3989c02b97b825e6e8b8285d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:57:28+01:00 topos: do not add contact header in outgoing 1xx responses if not present - GH #1720 (cherry picked from commit dcf9ee88dbf68eeaf0f64d203ce831eb6f536a85) - URL: https://github.com/kamailio/kamailio/commit/d7e6ac30293025f7d4bd0411d575b3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:57:38+01:00 core: added kemi KSR.is_myself_srcip() - equivalent of src_ip==myself condition (cherry picked from commit 929823cd5620f8ee3ee7c8961f810e16b2031b01) - URL: https://github.com/kamailio/kamailio/commit/568a91d54eec8010af3288839338c39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:57:48+01:00 dispatcher: ds_select_routes() - set r-uri/d-uri even when first group has no available dst - GH #1728 (cherry picked from commit 074d3c67a96a49e9b8c86f6ec4cfd61725b0ccce) - URL: https://github.com/kamailio/kamailio/commit/7dbeb45fd481d77a4ddee2432193eb7… Author: Joonas Keskitalo <git(a)joonake.fi> Date: 2018-11-23T08:57:57+01:00 misc/examples/kemi: Added 'msg' argument to ksr_route_relay (cherry picked from commit a35503b3837cfc804f30c7493fbd13573c1a55e1) - URL: https://github.com/kamailio/kamailio/commit/01828ecdff3e048845ee0cee58cfe1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:58:07+01:00 topoh: safety checks for couple of mandatory headers - first via and call-id - GH #1735 (cherry picked from commit 97da6b1a5f656db4a91c8909167706fc8ec3d932) - URL: https://github.com/kamailio/kamailio/commit/69a34ef19e9365c810ecd2ea91a3d47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:58:20+01:00 topos: safety checks for couple of mandatory headers - first via and call-id (cherry picked from commit 93e40d5b7fb66d33f31c46dfaea5425062505127) - URL: https://github.com/kamailio/kamailio/commit/6c768803e544cf8cf060b4099c601a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T09:08:14+01:00 topos: proper condition to detect 3xx redirect for contact updates - GH #1720 (cherry picked from commit 1f02ee62951523f001899d12d1750046f1ba53b6) - URL: https://github.com/kamailio/kamailio/commit/6707917811647ef26f7741dd40e81cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T09:10:33+01:00 Makefile.defs: version set to 5.2.0-rc2

1 0

git:master:41069ab5: Makefile.defs: version set to 5.3.0-dev1
by Daniel-Constantin Mierla 23 Nov '18

23 Nov '18

Module: kamailio Branch: master Commit: 41069ab5afbaa3d730ecf4aa52680ad31dedf2ba URL: https://github.com/kamailio/kamailio/commit/41069ab5afbaa3d730ecf4aa52680ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T09:11:33+01:00 Makefile.defs: version set to 5.3.0-dev1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/41069ab5afbaa3d730ecf4aa52680ad… Patch: https://github.com/kamailio/kamailio/commit/41069ab5afbaa3d730ecf4aa52680ad… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 8097402231..221a67002e 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:1f02ee62: topos: proper condition to detect 3xx redirect for contact updates
by Daniel-Constantin Mierla 23 Nov '18

23 Nov '18

Module: kamailio Branch: master Commit: 1f02ee62951523f001899d12d1750046f1ba53b6 URL: https://github.com/kamailio/kamailio/commit/1f02ee62951523f001899d12d175004… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T09:06:57+01:00 topos: proper condition to detect 3xx redirect for contact updates - GH #1720 --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/1f02ee62951523f001899d12d175004… Patch: https://github.com/kamailio/kamailio/commit/1f02ee62951523f001899d12d175004… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 9880650290..897f3b675e 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1077,8 +1077,8 @@ int tps_response_sent(sip_msg_t *msg) tps_remove_headers(msg, HDR_RECORDROUTE_T); /* keep contact without updates for redirect responses sent out */ - if(msg->first_line.u.reply.statuscode<300 - || msg->first_line.u.reply.statuscode>=400) { + if(msg->first_line.u.reply.statuscode>=300 + && msg->first_line.u.reply.statuscode<400) { contact_keep = 1; } if(contact_keep==0 && msg->first_line.u.reply.statuscode>100

1 0

git:master:93e40d5b: topos: safety checks for couple of mandatory headers
by Daniel-Constantin Mierla 23 Nov '18

23 Nov '18

Module: kamailio Branch: master Commit: 93e40d5b7fb66d33f31c46dfaea5425062505127 URL: https://github.com/kamailio/kamailio/commit/93e40d5b7fb66d33f31c46dfaea5425… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:51:18+01:00 topos: safety checks for couple of mandatory headers - first via and call-id --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/93e40d5b7fb66d33f31c46dfaea5425… Patch: https://github.com/kamailio/kamailio/commit/93e40d5b7fb66d33f31c46dfaea5425… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 2cc566c7a4..0e9f16b493 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -304,6 +304,12 @@ int tps_prepare_msg(sip_msg_t *msg) return 3; } + if(msg->via1==NULL || msg->callid==NULL) { + LM_ERR("mandatory headers missing - via1: %p callid: %p\n", + msg->via1, msg->callid); + return 4; + } + return 0; }

1 0

git:master:97da6b1a: topoh: safety checks for couple of mandatory headers
by Daniel-Constantin Mierla 23 Nov '18

23 Nov '18

Module: kamailio Branch: master Commit: 97da6b1a5f656db4a91c8909167706fc8ec3d932 URL: https://github.com/kamailio/kamailio/commit/97da6b1a5f656db4a91c8909167706f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-23T08:46:54+01:00 topoh: safety checks for couple of mandatory headers - first via and call-id - GH #1735 --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/97da6b1a5f656db4a91c8909167706f… Patch: https://github.com/kamailio/kamailio/commit/97da6b1a5f656db4a91c8909167706f… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 7bdc9a15c7..911c7dfe6e 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -286,6 +286,12 @@ int th_prepare_msg(sip_msg_t *msg) return 3; } + if(msg->via1==NULL || msg->callid==NULL) { + LM_ERR("mandatory headers missing - via1: %p callid: %p\n", + msg->via1, msg->callid); + return 4; + } + return 0; }

1 0

[kamailio/kamailio] dispatcher on 5.2 not setting the destination properly for the second route (#1728)
by David Villasmil 23 Nov '18

23 Nov '18

### Description When using `ds_select_routes` $du is properly set to the first setid (1) and limiting properly the calls (with maxload), but when the nodes on setid 1 are at maxload and kamailio properly selects the second setid (11) it does NOT set $du. ### Troubleshooting My dispatcher table is: ``` +-----+-------+-------------------------+-------+----------+-----------------------------------+-------------+ | id | setid | destination | flags | priority | attrs | description | +-----+-------+-------------------------+-------+----------+-----------------------------------+-------------+ | 213 | 1 | sip:1.1.1.1:5080 | 0 | 0 | weight=100;maxload=2;duid=cuore_1 | node1-proxy | | 229 | 1 | sip:2.2.2.2:5080 | 0 | 0 | weight=100;maxload=2;duid=cuore_2 | node2-proxy | | 232 | 11 | sip:3.3.3.3:5080 | 0 | 0 | weight=100;maxload=2;duid=cuore_3 | node3-proxy | +-----+-------+-------------------------+-------+----------+-----------------------------------+-------------+ ``` #### Log Messages ``` [DISPATCH] 1-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <sip:1.1.1.1:5080> [DISPATCH] 2-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <sip:2.2.2.2:5080> [DISPATCH] 3-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <sip:1.1.1.1:5080> [DISPATCH] 4-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <sip:2.2.2.2:5080> [DISPATCH] 5-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <<null>> [DISPATCH] 6-12743(a)192.168.1.201: ds_select_routes was succesful (ruri: sip:*TESTCALL@cuore-proxy.sandbox-sngl.com - du: <<null>> ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.0-dev0 (x86_64/linux) f465d2 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: f465d2 compiled on 01:08:37 Nov 17 2018 with gcc 4.9.2 ``` * **Operating System**:  ``` Linux my-proxy 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1 (2016-12-30) x86_64 GNU/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/1728

3 12

[kamailio/kamailio] Added 'msg' argument to ksr_route_relay (#1734)
by Joonas Keskitalo 22 Nov '18

22 Nov '18

#### 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  Kemi framework python example configuration had a problem when handling CANCEL messages. Called function needed 'msg' attribute. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1734 -- Commit Summary -- * Added 'msg' argument to ksr_route_relay -- File Changes -- M misc/examples/kemi/kamailio-basic-kemi-python.py (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1734.patch https://github.com/kamailio/kamailio/pull/1734.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/1734

2 2

git:master:fe259304: Merge pull request #1734 from Joonake/master
by GitHub 22 Nov '18

22 Nov '18

Module: kamailio Branch: master Commit: fe259304d83123842ce1f76aefe1ce8c905a5dae URL: https://github.com/kamailio/kamailio/commit/fe259304d83123842ce1f76aefe1ce8… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: GitHub <noreply(a)github.com> Date: 2018-11-22T19:54:30+02:00 Merge pull request #1734 from Joonake/master misc/examples/kemi: Added 'msg' argument to ksr_route_relay --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/fe259304d83123842ce1f76aefe1ce8… Patch: https://github.com/kamailio/kamailio/commit/fe259304d83123842ce1f76aefe1ce8… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index 7d952e413e..611a204087 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -62,7 +62,7 @@ def ksr_request_route(self, msg): # CANCEL processing if KSR.pv.get("$rm") == "CANCEL" : if KSR.tm.t_check_trans()>0 : - self.ksr_route_relay(); + self.ksr_route_relay(msg); return 1; # handle requests within SIP dialogs

1 0

git:master:a35503b3: misc/examples/kemi: Added 'msg' argument to ksr_route_relay
by root 22 Nov '18

22 Nov '18

Module: kamailio Branch: master Commit: a35503b3837cfc804f30c7493fbd13573c1a55e1 URL: https://github.com/kamailio/kamailio/commit/a35503b3837cfc804f30c7493fbd135… Author: Joonas Keskitalo <git(a)joonake.fi> Committer: root <root(a)joonake.fi> Date: 2018-11-22T19:17:53+02:00 misc/examples/kemi: Added 'msg' argument to ksr_route_relay --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/a35503b3837cfc804f30c7493fbd135… Patch: https://github.com/kamailio/kamailio/commit/a35503b3837cfc804f30c7493fbd135… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index 7d952e413e..611a204087 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -62,7 +62,7 @@ def ksr_request_route(self, msg): # CANCEL processing if KSR.pv.get("$rm") == "CANCEL" : if KSR.tm.t_check_trans()>0 : - self.ksr_route_relay(); + self.ksr_route_relay(msg); return 1; # handle requests within SIP dialogs

1 0

[kamailio/kamailio] Crash using TLS with many child processes (#1670)
by Adrien Menella 22 Nov '18

22 Nov '18

### Description Started from the [minimal proxy config](https://github.com/kamailio/kamailio/blob/master/misc/examples/mixe…, we tried to run **more than 1** process using TLS, and, unforntunately it crashed. Everything is working fine **using TLS with 1 child**. Everything is working fine with **more than 1 child process without TLS**. To ease the reproduction, we set an env var called `TARGET` at container instanciation, its value is set to a reachable SIP address using TLS (without DNS resolution). To reproduce issue you will need pjsip/pjsua with SSL/TLS enabled: * install OpenSSL (`sudo apt-get install openssl` for ubuntu) * [install pjsip using autoconf](https://trac.pjsip.org/repos/wiki/Getting-Started/Autoconf) * [manually configure TLS support if necessary](https://trac.pjsip.org/repos/wiki/TLS) * [build and install pjsua](https://trac.pjsip.org/repos/wiki/Python_SIP/Build_Install) We've seen on some issues that a low memory allocation could be an issue using TLS, so we are running kamailio using more memory `kamailio -DD -E -M 256 -m 1024` (still crashing). ### Troubleshooting #### Reproduction Here are the steps to reproduce the issue: * start from [Kamailio minimal proxy config](https://github.com/kamailio/kamailio/blob/master/misc/examples/mixe… * enable TLS by adding/uncommenting following lines: ```diff @@ -1,4 +1,5 @@ #!KAMAILIO +#!define WITH_TLS # # Kamailio (OpenSER) SIP Server v5.2 - default configuration script # - web: https://www.kamailio.org @@ -28,7 +29,7 @@ ####### Global Parameters ######### ### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR -debug=2 +debug=3 log_stderror=no memdbg=5 @@ -38,10 +39,13 @@ log_facility=LOG_LOCAL0 log_prefix="{$mt $hdr(CSeq) $ci} " /* number of SIP routing processes */ -children=2 +children=1 /* uncomment the next line to disable TCP (default on) */ # disable_tcp=yes +#!ifdef WITH_TLS +enable_tls=yes +#!endif /* uncomment the next line to disable the auto discovery of local aliases * based on reverse DNS on IPs (default on) */ @@ -65,6 +69,9 @@ children=2 ####### Modules Section ######## /* set paths to location of modules */ +#!ifdef WITH_TLS +loadmodule "tls.so" +#!endif loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" @@ -85,6 +92,9 @@ loadmodule "counters.so" # ----------------- setting module-specific parameters --------------- +#!ifdef WITH_TLS +modparam("tls", "config", "/etc/kamailio/tls.cfg") +#!endif # ----- jsonrpcs params ----- modparam("jsonrpcs", "pretty_format", 1) @@ -180,7 +190,7 @@ request_route { } # update $du to set the destination address for proxying - $du = "sip:" + $rd + ":9"; + $du = $env(TARGET); route(RELAY); exit; } ``` * use a proper `tls.cfg` file with self-signed certificates: ```c [server:default] method = TLSv1 verify_certificate = no require_certificate = no private_key = /etc/kamailio/privkey.pem certificate = /etc/kamailio/server-cert.pem [client:default] #method = TLSv1 verify_certificate = no require_certificate = no ``` * use following `Dockerfile`: ```docker FROM kamailio/kamailio-ci:master-alpine # Override default kamailio configuration COPY kamailio.cfg /etc/kamailio/kamailio.cfg COPY tls.cfg /etc/kamailio/tls.cfg COPY privkey.pem /etc/kamailio/privkey.pem COPY server-cert.pem /etc/kamailio/server-cert.pem ``` * build docker image `docker build -f Dockerfile -t kamailio-tls-issue .` * launch docker container using your own `TARGET`: ```sh docker run -it -p 5061:5061/tcp -e "TARGET=sip:AA.BB.CC.DD;transport=tls" kamailio-tls-issue ``` * make a SIP call with pjsua: ```sh pjsua --stun-srv=stun.l.google.com:19302 --use-tls --no-tcp --no-udp --use-srtp=2 --local-port=5062 --id=sip:alice@localhost "sip:bob@localhost;transport=tls" ``` **Everything should work fine because we only used 1 child process** * stop everything * update your `kamailio.cfg` by setting `children=2` (or above) * reproduce steps (build docker image, launch container, make a SIP call) * kamailio should crash with specific logs (see `Log messages` section) #### Log Messages Log messages from kamailio proxy: ```c 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <script>: new branch [0] to sip:bob@localhost;transport=tls 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/msg_translator.c:2933]: create_via_hf(): id added: <;i=1>, rcv proto=3 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/tcp_main.c:1747]: tcp_send(): no open tcp connection found, opening new one 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/ip_addr.c:229]: print_ip(): tcpconn_new: new tcp connection: 34.240.160.168 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/tcp_main.c:999]: tcpconn_new(): on port 5061, type 3 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/tcp_main.c:1305]: tcpconn_add(): hashes: 1752:0:0, 2 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_server.c:199]: tls_complete_init(): completing tls connection initialization 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_server.c:162]: tls_get_connect_server_name(): xavp with outbound server name not found 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_server.c:142]: tls_get_connect_server_id(): xavp with outbound server id not found 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_server.c:228]: tls_complete_init(): Using initial TLS domain TLSc<default> (dom 0x7fe7740bdaf0 ctx 0x55d98553ca40 sn []) 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_domain.c:1155]: tls_lookup_private_key(): Private key lookup for SSL_CTX-0x55d98553ca40: 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tls [tls_domain.c:737]: sr_ssl_ctx_info_callback(): SSL handshake started 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/tcp_main.c:2641]: tcpconn_1st_send(): pending write on new connection 0x7fe7742cd200 (-1/122 bytes written) (err: 11 - Resource temporarily unavailable) 13(18) DEBUG: <core> [core/tcp_main.c:3540]: handle_ser_child(): read response= 7fe7742cd200, 5, fd 29 from 11 (16) 13(18) DEBUG: <core> [core/io_wait.h:380]: io_watch_add(): DBG: io_watch_add(0x55d984d52f20, 29, 2, 0x7fe7742cd200), fd_no=18 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} tm [t_funcs.c:372]: t_relay_to(): new transaction forwarded 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/receive.c:353]: receive_msg(): request-route executed in: 10827 usec 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/usr_avp.c:636]: destroy_avp_list(): destroying list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/xavp.c:495]: xavp_destroy_list(): destroying xavp list 0 11(16) DEBUG: {1 32554 INVITE 1k3Hcf7IVCnjmhjZIJXU5S0x-LRhyB2x} <core> [core/receive.c:457]: receive_msg(): cleaning up 13(18) DEBUG: <core> [core/io_wait.h:777]: io_watch_chg(): DBG: io_watch_chg (0x55d984d52f20, 29, 0x1, 0xffffffff) fd_no=19 called 13(18) DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0x55d984d52f20, 29, -1, 0x0) fd_no=19 called 13(18) DEBUG: <core> [core/tcp_main.c:4196]: handle_tcpconn_ev(): sending to child, events 1 13(18) DEBUG: <core> [core/tcp_main.c:3875]: send2child(): selected tcp worker 1 12(17) for activity on [tls:172.17.0.2:5061], 0x7fe7742cd200 12(17) DEBUG: <core> [core/tcp_read.c:1767]: handle_io(): received n=8 con=0x7fe7742cd200, fd=7 13(18) DEBUG: <core> [core/tcp_main.c:3279]: handle_tcp_child(): dead tcp child 1 (pid 17, no 12) (shutting down?) 13(18) DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0x55d984d52f20, 27, -1, 0x0) fd_no=18 called 13(18) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 24 13(18) DEBUG: <core> [core/tcp_main.c:3512]: handle_ser_child(): dead child 12, pid 17 (shutting down?) 13(18) DEBUG: <core> [core/io_wait.h:602]: io_watch_del(): DBG: io_watch_del (0x55d984d52f20, 24, -1, 0x0) fd_no=17 called 0(1) ALERT: <core> [main.c:740]: handle_sigs(): child process 17 exited by a signal 11 0(1) ALERT: <core> [main.c:743]: handle_sigs(): core was generated 0(1) INFO: <core> [main.c:766]: handle_sigs(): terminating due to SIGCHLD 0(1) DEBUG: <core> [main.c:768]: handle_sigs(): terminating due to SIGCHLD 10(15) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 1(6) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 8(13) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 7(12) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 6(11) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 5(10) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 4(9) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 3(8) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 13(18) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 9(14) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 11(16) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 2(7) INFO: <core> [main.c:821]: sig_usr(): signal 15 received 0(1) DEBUG: tm [t_funcs.c:85]: tm_shutdown(): start 0(1) DEBUG: tm [t_funcs.c:88]: tm_shutdown(): emptying hash table 0(1) DEBUG: tm [h_table.c:133]: free_cell_helper(): freeing transaction 0x7fe7742c9580 from h_table.c:465 0(1) DEBUG: tm [t_funcs.c:90]: tm_shutdown(): removing semaphores 0(1) DEBUG: tm [t_funcs.c:92]: tm_shutdown(): destroying tmcb lists 0(1) DEBUG: tm [t_funcs.c:95]: tm_shutdown(): done ``` ### Additional Information * **Kamailio Version** : Kamailio (OpenSER) SIP Server v5.2 * **Operating System**: Kamailio was running on Linux Alpine from [kamailio/kamailio-ci:master-alpine](https://hub.docker.com/r/kamailio/kamai… docker image. -- 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/1670

4 15

git:master:074d3c67: dispatcher: ds_select_routes() - set r-uri/d-uri even when first group has no available dst
by Daniel-Constantin Mierla 22 Nov '18

22 Nov '18

Module: kamailio Branch: master Commit: 074d3c67a96a49e9b8c86f6ec4cfd61725b0ccce URL: https://github.com/kamailio/kamailio/commit/074d3c67a96a49e9b8c86f6ec4cfd61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-22T08:56:54+01:00 dispatcher: ds_select_routes() - set r-uri/d-uri even when first group has no available dst - GH #1728 --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/074d3c67a96a49e9b8c86f6ec4cfd61… Patch: https://github.com/kamailio/kamailio/commit/074d3c67a96a49e9b8c86f6ec4cfd61… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 80540ee6ba..d247d6e104 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2181,6 +2181,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) idx->dlist[hash].uri.len, idx->dlist[hash].uri.s); return -1; } + rstate->emode = 1; } LM_DBG("selected [%d-%d-%d/%d] <%.*s>\n", rstate->alg, rstate->setid, diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 7a798fc162..14db0e2a30 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -214,11 +214,12 @@ typedef struct _ds_set { } ds_set_t; typedef struct _ds_select_state { - int setid; - int alg; - int umode; - uint32_t limit; - int cnt; + int setid; /* dispatcher set id (group id) */ + int alg; /* algorithm to select destionations */ + int umode; /* update mode - push to: r-uri, d-uri, xavp */ + uint32_t limit; /* limit of destination addresses to be selected */ + int cnt; /* output: number of xavps set with destination addresses */ + int emode; /* output: update operation was executed or not */ sr_xavp_t *lxavp; } ds_select_state_t; diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 750f17b670..66ed3248ef 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -632,7 +632,6 @@ static int ki_ds_select_routes_limit(sip_msg_t *msg, str *srules, str *smode, int i; int vret; int gret; - int vfirst; sr_xval_t nxval; ds_select_state_t vstate; @@ -644,7 +643,6 @@ static int ki_ds_select_routes_limit(sip_msg_t *msg, str *srules, str *smode, } vret = -1; gret = -1; - vfirst = 0; i = 0; while(i<srules->len) { vstate.setid = 0; @@ -677,9 +675,11 @@ static int ki_ds_select_routes_limit(sip_msg_t *msg, str *srules, str *smode, } LM_DBG("routing with setid=%d alg=%d cnt=%d limit=0x%x (%u)\n", vstate.setid, vstate.alg, vstate.cnt, vstate.limit, vstate.limit); - + vstate.umode = DS_SETOP_XAVP; - if(vfirst==0) { + /* if no r-uri/d-uri was set already, keep using the update mode + * specified by the param, then just add to xavps list */ + if(vstate.emode==0) { switch(smode->s[0]) { case '0': case 'd': @@ -700,7 +700,6 @@ static int ki_ds_select_routes_limit(sip_msg_t *msg, str *srules, str *smode, smode->len, smode->s); return -1; } - vfirst = 1; } vret = ds_manage_routes(msg, &vstate); if(vret<0) {

1 0

git:master:929823cd: core: added kemi KSR.is_myself_srcip()
by Daniel-Constantin Mierla 22 Nov '18

22 Nov '18

Module: kamailio Branch: master Commit: 929823cd5620f8ee3ee7c8961f810e16b2031b01 URL: https://github.com/kamailio/kamailio/commit/929823cd5620f8ee3ee7c8961f810e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-22T08:30:09+01:00 core: added kemi KSR.is_myself_srcip() - equivalent of src_ip==myself condition --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/929823cd5620f8ee3ee7c8961f810e1… Patch: https://github.com/kamailio/kamailio/commit/929823cd5620f8ee3ee7c8961f810e1… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 9b1d0050a5..526ebf996b 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -274,12 +274,30 @@ static int sr_kemi_core_is_myself_suri(sip_msg_t *msg) if(get_src_uri(msg, 0, &suri)<0) { LM_ERR("cannot src address uri\n"); - return SR_KEMI_FALSE; + return SR_KEMI_FALSE; } return sr_kemi_core_is_myself(msg, &suri); } +/** + * + */ +static int sr_kemi_core_is_myself_srcip(sip_msg_t *msg) +{ + str srcip; + int ret; + + srcip.s = ip_addr2a(&msg->rcv.src_ip); + srcip.len = strlen(srcip.s); + + ret = check_self(&srcip, 0, 0); + if(ret==1) { + return SR_KEMI_TRUE; + } + return SR_KEMI_FALSE; +} + /** * */ @@ -1267,6 +1285,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_myself_srcip"), + SR_KEMIP_BOOL, sr_kemi_core_is_myself_srcip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("setflag"), SR_KEMIP_BOOL, sr_kemi_core_setflag, { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:dcf9ee88: topos: do not add contact header in outgoing 1xx responses if not present
by Daniel-Constantin Mierla 21 Nov '18

21 Nov '18

Module: kamailio Branch: master Commit: dcf9ee88dbf68eeaf0f64d203ce831eb6f536a85 URL: https://github.com/kamailio/kamailio/commit/dcf9ee88dbf68eeaf0f64d203ce831e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-21T10:42:02+01:00 topos: do not add contact header in outgoing 1xx responses if not present - GH #1720 --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/dcf9ee88dbf68eeaf0f64d203ce831e… Patch: https://github.com/kamailio/kamailio/commit/dcf9ee88dbf68eeaf0f64d203ce831e… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index b349865262..9880650290 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1029,6 +1029,7 @@ int tps_response_sent(sip_msg_t *msg) str lkey; uint32_t direction = TPS_DIR_UPSTREAM; str xvbranch = {0, 0}; + int contact_keep = 0; LM_DBG("handling outgoing response\n"); @@ -1078,8 +1079,15 @@ int tps_response_sent(sip_msg_t *msg) /* keep contact without updates for redirect responses sent out */ if(msg->first_line.u.reply.statuscode<300 || msg->first_line.u.reply.statuscode>=400) { + contact_keep = 1; + } + if(contact_keep==0 && msg->first_line.u.reply.statuscode>100 + && msg->first_line.u.reply.statuscode<200 + && msg->contact==NULL) { + contact_keep = 1; + } + if(contact_keep==0) { tps_remove_headers(msg, HDR_CONTACT_T); - if(direction==TPS_DIR_DOWNSTREAM) { tps_reinsert_contact(msg, &stsd, &stsd.as_contact); } else {

1 0

[kamailio/kamailio] Module: rtpengine timeout log fixed (#1732)
by Surendra Tiwari 21 Nov '18

21 Nov '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Previously for timeout reply kamailio was not printing the command for which we received the timeout, Also if kamailio not able to read the response then also command was not getting printed. some indention fix is also done.  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1732 -- Commit Summary -- * Merge pull request #1 from kamailio/master * Modules: rtpengine: fixing log for printing the command when timeout and bad error reply -- File Changes -- M src/modules/rtpengine/rtpengine.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1732.patch https://github.com/kamailio/kamailio/pull/1732.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/1732

2 3

git:master:9d1e8e25: rtpengine: print command in log message on timeout
by Daniel-Constantin Mierla 21 Nov '18

21 Nov '18

Module: kamailio Branch: master Commit: 9d1e8e256e49968776f7abb740a6d02739547ec2 URL: https://github.com/kamailio/kamailio/commit/9d1e8e256e49968776f7abb740a6d02… Author: Surendra Tiwari <surendratiwari3(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-21T09:30:06+01:00 rtpengine: print command in log message on timeout - few indentation fixes - GH #1732 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/9d1e8e256e49968776f7abb740a6d02… Patch: https://github.com/kamailio/kamailio/commit/9d1e8e256e49968776f7abb740a6d02… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 2ca9219e71..4074385b1d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2630,7 +2630,7 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t *dict, int *outlen) } v[0].iov_base = gencookie(); v[0].iov_len = strlen(v[0].iov_base); - rtpengine_retr = cfg_get(rtpengine,rtpengine_cfg,rtpengine_retr); + rtpengine_retr = cfg_get(rtpengine,rtpengine_cfg,rtpengine_retr); for (i = 0; i < rtpengine_retr; i++) { do { len = writev(rtpp_socks[node->idx], v, vcnt + 1); @@ -2640,14 +2640,14 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t *dict, int *outlen) LM_ERR("can't send command \"%.*s\" to RTP proxy <%s>\n", out.len, out.s, node->rn_url.s); goto badproxy; } - rtpengine_tout_ms = cfg_get(rtpengine,rtpengine_cfg,rtpengine_tout_ms); + rtpengine_tout_ms = cfg_get(rtpengine,rtpengine_cfg,rtpengine_tout_ms); while ((poll(fds, 1, rtpengine_tout_ms) == 1) && (fds[0].revents & POLLIN) != 0) { do { len = recv(rtpp_socks[node->idx], buf, sizeof(buf)-1, 0); } while (len == -1 && errno == EINTR); if (len <= 0) { - LM_ERR("can't read reply from RTP proxy <%s>\n", node->rn_url.s); + LM_ERR("can't read reply for command \"%.*s\" from RTP proxy <%s>\n", out.len, out.s, node->rn_url.s); goto badproxy; } if (len >= (v[0].iov_len - 1) && @@ -2664,7 +2664,7 @@ send_rtpp_command(struct rtpp_node *node, bencode_item_t *dict, int *outlen) } } if (i == rtpengine_retr) { - LM_ERR("timeout waiting reply from RTP proxy <%s>\n", node->rn_url.s); + LM_ERR("timeout waiting reply for command \"%.*s\" from RTP proxy <%s>\n", out.len, out.s, node->rn_url.s); goto badproxy; } }

1 0

git:master:4dd53abf: tm: info log message if attempting to create transaction for faked request
by Daniel-Constantin Mierla 20 Nov '18

20 Nov '18

Module: kamailio Branch: master Commit: 4dd53abf13f9a98272af625f2a6591669730b374 URL: https://github.com/kamailio/kamailio/commit/4dd53abf13f9a98272af625f2a65916… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-20T12:48:48+01:00 tm: info log message if attempting to create transaction for faked request --- Modified: src/modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/4dd53abf13f9a98272af625f2a65916… Patch: https://github.com/kamailio/kamailio/commit/4dd53abf13f9a98272af625f2a65916… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index dde02343cb..19f7979ee8 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -47,6 +47,7 @@ #include "../../core/parser/parser_f.h" #include "../../core/parser/parse_from.h" #include "../../core/ut.h" +#include "../../core/fmsg.h" #include "../../core/timer.h" #include "../../core/timer_ticks.h" #include "../../core/hash_func.h" @@ -1319,6 +1320,10 @@ int t_newtran( struct sip_msg* p_msg ) LM_DBG("msg id=%d , global msg id=%d ," " T on entrance=%p\n",p_msg->id,global_msg_id,T); + if(faked_msg_match(p_msg)) { + LM_INFO("attempt to create transaction for a faked request" + " - try to avoid it\n"); + } if ( T && T!=T_UNDEFINED ) { /* ERROR message moved to w_t_newtran */ LM_DBG("transaction already in process %p\n", T );

1 0

git:master:6f6a0d13: tmx: do no suspend faked request
by Daniel-Constantin Mierla 20 Nov '18

20 Nov '18

Module: kamailio Branch: master Commit: 6f6a0d136dfefe98631264092177344ed8d173a8 URL: https://github.com/kamailio/kamailio/commit/6f6a0d136dfefe98631264092177344… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-20T12:49:24+01:00 tmx: do no suspend faked request --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6f6a0d136dfefe98631264092177344… Patch: https://github.com/kamailio/kamailio/commit/6f6a0d136dfefe98631264092177344… --- diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index 7416e9efc9..a40a00da6e 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -37,6 +37,7 @@ #include "../../core/counters.h" #include "../../core/dset.h" #include "../../core/kemi.h" +#include "../../core/fmsg.h" #include "t_var.h" #include "tmx_pretran.h" @@ -705,6 +706,11 @@ static int ki_t_suspend(sip_msg_t* msg) unsigned int tlabel; tm_cell_t *t = 0; + if(faked_msg_match(msg)) { + LM_ERR("suspending a faked request is not allowed\n"); + return -1; + } + t=_tmx_tmb.t_gett(); if (t==NULL || t==T_UNDEFINED) {

1 0

git:master:24c92c4f: htable: safety checks for values replicated via dmq
by Daniel-Constantin Mierla 20 Nov '18

20 Nov '18

Module: kamailio Branch: master Commit: 24c92c4f25e758fcd2265d824ca39b5f1ac2dcdd URL: https://github.com/kamailio/kamailio/commit/24c92c4f25e758fcd2265d824ca39b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-20T12:34:15+01:00 htable: safety checks for values replicated via dmq --- Modified: src/modules/htable/ht_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/24c92c4f25e758fcd2265d824ca39b5… Patch: https://github.com/kamailio/kamailio/commit/24c92c4f25e758fcd2265d824ca39b5… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index d5ff1af645..986c2c769a 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -575,15 +575,18 @@ int ht_dmq_handle_sync(srjson_doc_t* jdoc) { } } - ht = ht_get_table(&htname); - if(ht==NULL) { - LM_WARN("unable to get table %.*s\n", - htname.len, (htname.s)?htname.s:""); - } + if(htname.s!=NULL && htname.len>0 && cname.s!=NULL + && cname.len>0) { + ht = ht_get_table(&htname); + if(ht==NULL) { + LM_WARN("unable to get table %.*s\n", + htname.len, (htname.s)?htname.s:""); + } - if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) { - LM_WARN("unable to set cell %.*s in table %.*s\n", - cname.len, cname.s, ht->name.len, ht->name.s); + if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) { + LM_WARN("unable to set cell %.*s in table %.*s\n", + cname.len, cname.s, ht->name.len, ht->name.s); + } } cell = cell->next;

1 0

git:master:3436104c: textops: fixed get_body_part function for non-multipart contents error
by root 20 Nov '18

20 Nov '18

Module: kamailio Branch: master Commit: 3436104cce943f055e0a33aa26692265185502bf URL: https://github.com/kamailio/kamailio/commit/3436104cce943f055e0a33aa2669226… Author: root <root(a)localhost.localdomain> Committer: root <root(a)localhost.localdomain> Date: 2018-11-19T11:27:33+03:00 textops: fixed get_body_part function for non-multipart contents error get_body_part functions gives error even if content is not multipart. Fixed for non-multipart contents and set all contents for non-boundary params --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/3436104cce943f055e0a33aa2669226… Patch: https://github.com/kamailio/kamailio/commit/3436104cce943f055e0a33aa2669226… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 40827baeae..ff784642e5 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -2761,7 +2761,7 @@ static int ki_remove_multibody(sip_msg_t* msg, str* content_type) } if(get_boundary(msg, &boundary)!=0) { - LM_ERR("Cannot get boundary. Is body multipart?\n"); + LM_ERR("Cannot get boundary from Content type header. Is body multipart?\n"); return -1; } @@ -2851,18 +2851,23 @@ static int ki_get_body_part_helper(sip_msg_t* msg, str* ctype, pv_spec_t *dst, body.s = get_body(msg); if (body.s == 0) { - LM_ERR("failed to get the message body\n"); + LM_ERR("failed to get the content message body\n"); return -1; } body.len = msg->len - (int)(body.s - msg->buf); if (body.len == 0) { - LM_DBG("message body has zero length\n"); + LM_DBG("Content body has zero length\n"); return -1; } if(get_boundary(msg, &boundary)!=0) { - LM_ERR("Cannot get boundary. Is body multipart?\n"); - return -1; + LM_DBG("Content is not multipart so return all content body as string\n"); + memset(&val, 0, sizeof(pv_value_t)); + val.flags = PV_VAL_STR; + val.rs.s = body.s; + val.rs.len =body.len; + dst->setf(msg, &dst->pvp, (int)EQ_T, &val); + return 1; } start = body.s; @@ -2968,7 +2973,7 @@ static int get_body_part_helper(sip_msg_t* msg, char* ctype, char* ovar, int mod str content_type; if(ctype==0) { - LM_ERR("invalid parameters\n"); + LM_ERR("invalid Content-type parameters\n"); return -1; } @@ -3680,7 +3685,7 @@ int ki_in_list_prefix(sip_msg_t* _m, str* subject, str* list, str* vsep) { int sep; char *at, *past, *next_sep, *s; - + if(subject==NULL || subject->len<=0 || list==NULL || list->len<=0 || vsep==NULL || vsep->len<=0) return -1;

2 1

[kamailio/kamailio] textops: fixed get_body_part function for non-multipart contents error (#1730)
by Yasin CANER 20 Nov '18

20 Nov '18

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  get_body_part functions gives error even if content is not multipart. Fixed for non-multipart contents and set all contents for non-boundary params You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1730 -- Commit Summary -- * core : add word to log get_boundary function * textops: fixed get_body_part function for non-multipart contents error -- File Changes -- M src/core/msg_translator.c (2) M src/modules/textops/textops.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1730.patch https://github.com/kamailio/kamailio/pull/1730.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/1730

3 3

git:5.0:0965f585: dialog: fix typo in warn message (#1731)
by Henning Westerholt 20 Nov '18

20 Nov '18

Module: kamailio Branch: 5.0 Commit: 0965f58554f5917efecbc9e3329789a9f7c4472f URL: https://github.com/kamailio/kamailio/commit/0965f58554f5917efecbc9e3329789a… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-20T10:56:31+01:00 dialog: fix typo in warn message (#1731) - GH #1731 (cherry picked from commit df6152fd69469eb340078535a3cf8b28e901ea7d) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/0965f58554f5917efecbc9e3329789a… Patch: https://github.com/kamailio/kamailio/commit/0965f58554f5917efecbc9e3329789a… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 0b9d77ce89..8e8b5b088b 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -565,11 +565,11 @@ static int load_dialog_vars_from_db(int fetch_num_rows) } dlg = dlg->next; if (!dlg) { - LM_WARN("insonsistent data: the dialog h_entry/h_id does not exist!\n"); + LM_WARN("inconsistent data: the dialog h_entry/h_id does not exist!\n"); } } } else { - LM_WARN("insonsistent data: the h_entry in the DB does not exist!\n"); + LM_WARN("inconsistent data: the h_entry in the DB does not exist!\n"); } }

1 0

git:5.2:2a42aebc: dialog: fix typo in warn message (#1731)
by Henning Westerholt 20 Nov '18

20 Nov '18

Module: kamailio Branch: 5.2 Commit: 2a42aebc8d6905989f21ec21459a1cd368632b6f URL: https://github.com/kamailio/kamailio/commit/2a42aebc8d6905989f21ec21459a1cd… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-20T10:52:57+01:00 dialog: fix typo in warn message (#1731) - GH #1731 (cherry picked from commit df6152fd69469eb340078535a3cf8b28e901ea7d) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/2a42aebc8d6905989f21ec21459a1cd… Patch: https://github.com/kamailio/kamailio/commit/2a42aebc8d6905989f21ec21459a1cd… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index d759140018..1b9d704cf6 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -643,14 +643,14 @@ static int load_dialog_vars_from_db(int fetch_num_rows, int mode, } dlg = dlg->next; if (!dlg) { - LM_WARN("insonsistent data: the dialog h_entry/h_id does not exist!\n"); + LM_WARN("inconsistent data: the dialog h_entry/h_id does not exist!\n"); } } if(mode==1 && mval!=NULL) { dlg_unlock(d_table, &(d_table->entries[VAL_INT(values)])); } } else { - LM_WARN("insonsistent data: the h_entry in the DB does not exist!\n"); + LM_WARN("inconsistent data: the h_entry in the DB does not exist!\n"); } }

1 0

git:5.1:7fd9d125: dialog: fix typo in warn message (#1731)
by Henning Westerholt 20 Nov '18

20 Nov '18

Module: kamailio Branch: 5.1 Commit: 7fd9d125ef3d0ee41fc054176e3eb56c2e1a4094 URL: https://github.com/kamailio/kamailio/commit/7fd9d125ef3d0ee41fc054176e3eb56… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-20T10:53:33+01:00 dialog: fix typo in warn message (#1731) - GH #1731 (cherry picked from commit df6152fd69469eb340078535a3cf8b28e901ea7d) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/7fd9d125ef3d0ee41fc054176e3eb56… Patch: https://github.com/kamailio/kamailio/commit/7fd9d125ef3d0ee41fc054176e3eb56… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 0b9d77ce89..8e8b5b088b 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -565,11 +565,11 @@ static int load_dialog_vars_from_db(int fetch_num_rows) } dlg = dlg->next; if (!dlg) { - LM_WARN("insonsistent data: the dialog h_entry/h_id does not exist!\n"); + LM_WARN("inconsistent data: the dialog h_entry/h_id does not exist!\n"); } } } else { - LM_WARN("insonsistent data: the h_entry in the DB does not exist!\n"); + LM_WARN("inconsistent data: the h_entry in the DB does not exist!\n"); } }

1 0

[kamailio/kamailio] dialog: fix typo in warn message (#1731)
by Dmitri Savolainen 20 Nov '18

20 Nov '18

- [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) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1731 -- Commit Summary -- * dialog: fix typo in warn message -- File Changes -- M src/modules/dialog/dlg_db_handler.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1731.patch https://github.com/kamailio/kamailio/pull/1731.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/1731

2 2

git:master:df6152fd: dialog: fix typo in warn message (#1731)
by Henning Westerholt 20 Nov '18

20 Nov '18

Module: kamailio Branch: master Commit: df6152fd69469eb340078535a3cf8b28e901ea7d URL: https://github.com/kamailio/kamailio/commit/df6152fd69469eb340078535a3cf8b2… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-11-20T10:42:05+01:00 dialog: fix typo in warn message (#1731) Thank you! --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/df6152fd69469eb340078535a3cf8b2… Patch: https://github.com/kamailio/kamailio/commit/df6152fd69469eb340078535a3cf8b2… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index d759140018..1b9d704cf6 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -643,14 +643,14 @@ static int load_dialog_vars_from_db(int fetch_num_rows, int mode, } dlg = dlg->next; if (!dlg) { - LM_WARN("insonsistent data: the dialog h_entry/h_id does not exist!\n"); + LM_WARN("inconsistent data: the dialog h_entry/h_id does not exist!\n"); } } if(mode==1 && mval!=NULL) { dlg_unlock(d_table, &(d_table->entries[VAL_INT(values)])); } } else { - LM_WARN("insonsistent data: the h_entry in the DB does not exist!\n"); + LM_WARN("inconsistent data: the h_entry in the DB does not exist!\n"); } }

1 0

git:master:416d79b4: topos: allow various replies for INVITE without contact
by Daniel-Constantin Mierla 20 Nov '18

20 Nov '18

Module: kamailio Branch: master Commit: 416d79b462986317f2c3a3ed8aa30a502d116095 URL: https://github.com/kamailio/kamailio/commit/416d79b462986317f2c3a3ed8aa30a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-20T08:11:18+01:00 topos: allow various replies for INVITE without contact - GH #1720 --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/416d79b462986317f2c3a3ed8aa30a5… Patch: https://github.com/kamailio/kamailio/commit/416d79b462986317f2c3a3ed8aa30a5… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 69d5c7c2b5..83d81172dd 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -353,6 +353,18 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) /* no mandatory contact unless is INVITE - done */ return 0; } + if(msg->first_line.type==SIP_REPLY) { + if(msg->first_line.u.reply.statuscode>=100 + && msg->first_line.u.reply.statuscode<200 + && msg->first_line.u.reply.statuscode!=183) { + /* provisional response with no mandatory contact header */ + return 0; + } + if(msg->first_line.u.reply.statuscode>=400) { + /* failure response with no mandatory contact header */ + return 0; + } + } LM_ERR("bad sip message or missing Contact hdr\n"); goto error; }

1 0

[kamailio/kamailio] tm: bad error in log (#1727)
by lazedo 19 Nov '18

19 Nov '18

### Description tm module writes a misleading log error that `triggers` ops alerts.  ### Troubleshooting #### Reproduction using this partial script ``` event_route[core:worker-one-init] { async_route("DEFERRED_CLEANUP", "20"); } route[DEFERRED_CLEANUP] { xlog("L_INFO", "processing deferred cleanup\n"); } ``` #### Log Messages  ``` 2018-11-15T19:22:44.547049+00:00 apps001 kamailio[2105]: INFO: <script>: processing deferred cleanup 2018-11-15T19:22:44.554085+00:00 apps001 kamailio[2105]: ERROR: tm [t_reply.c:551]: _reply_light(): no resolved dst to send reply to ``` ### Possible Solutions i silence the error with the below patch but i'm pretty sure its not the proper way to do it. ``` diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 8a95fe7..99c59db 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -548,7 +548,9 @@ * the chances for this increase a lot. */ if (unlikely(!trans->uas.response.dst.send_sock)) { - LM_ERR("no resolved dst to send reply to\n"); + if(is_local(trans)) { + LM_ERR("no resolved dst to send reply to\n"); + } } else { if (likely(SEND_PR_BUFFER( rb, buf, len )>=0)){ if (unlikely(code>=200 && !is_local(trans) && ```  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.0-dev0 (x86_64/linux) 37bff4-dirty flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. ``` * **Operating System**:  ``` Linux 2.6.32-754.el6.x86_64 #1 SMP Tue Jun 19 21:26:04 UTC 2018 x86_64 x86_64 x86_64 GNU/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/1727

2 7

[kamailio/kamailio] Wrong QOP value in UAC auth_alg (#1684)
by Sebastian Lauwers 19 Nov '18

19 Nov '18

### Description While trying to setup a handoff to a third party SIP trunk with authentication, I ran into some issues with said authentication. I'm using qop auth on the inbound leg (and `consume_credentials()`), and then UAC to authenticate against the SIP trunk with different credentials. The third party SIP trunk offers qop auth/auth-int. I manually tried to verify the digest that Kamailio was sending, but couldn't. I added some logging to the `auth_alg.c` file, and ran the whole thing again. HA1 is calculated correctly, and so is HA2. However, the final step of the algorithm produced an incorrect value. After further debugging, I realised that the issue comes from https://github.com/kamailio/kamailio/blob/master/src/modules/uac/auth_alg.c…. More specifically, in my case, the value passed on to `MD5Update` is `auth,auth-int`, instead of the simple `auth` I was expecting (uac doesn't support auth-int). ### Troubleshooting #### SIP Traffic I have PCAPs demonstrating the issue and the hack/fix below. I'd rather not post them publicly, however, I am happy to share them privately with Kamailio devs. In essence: ``` -> INVITE sip:12345@someprovider.org:5060;transport=tcp <- 401 Unauthorized WWW-Authenticate: Digest realm="someprovider.org", qop="auth,auth-int", nonce="5BCF48671749b873534dc63e76d5594f3988555f" -> INVITE sip:12345@someprovider.org:5060;transport=tcp Authorization: Digest username="redacted", realm="someprovider.org", nonce="5BCF48671749b873534dc63e76d5594f3988555f", uri="sip:12345@eu.out.didww.com:5060;transport=tcp", qop=auth, nc=00000001, cnonce="2106889321", response="redacted71d4c9ce119dcf3ec56209e", algorithm=MD5 ``` ### Possible Solutions The hack I've used for the time being is to replace: ```c MD5Update(&Md5Ctx, ":", 1); MD5Update(&Md5Ctx, auth->qop.s, auth->qop.len); MD5Update(&Md5Ctx, ":", 1); ``` with: ```c MD5Update(&Md5Ctx, ":auth:", 6); ``` Obviously, I realise this is not the correct fix, but I figured I'd let the experts fix the value of `auth->qop.len`. I can spend more time on this, if required, but I don't know exactly what the "correct" solution is. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 ``` * **Operating System**: Dockerized version of Kamailio on Ubuntu xenial: ``` kamailio/kamailio:5.1.6-xenial ``` -- 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/1684

2 6

git:master:ab72c5e7: core: function to test if a msg structure is faked request
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: ab72c5e7188266baef0da70f1aa7d7d28b6d077c URL: https://github.com/kamailio/kamailio/commit/ab72c5e7188266baef0da70f1aa7d7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T15:29:05+01:00 core: function to test if a msg structure is faked request --- Modified: src/core/fmsg.c Modified: src/core/fmsg.h --- Diff: https://github.com/kamailio/kamailio/commit/ab72c5e7188266baef0da70f1aa7d7d… Patch: https://github.com/kamailio/kamailio/commit/ab72c5e7188266baef0da70f1aa7d7d… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 9a84954f0b..28d24cd116 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -103,3 +103,8 @@ sip_msg_t* faked_msg_get_next_clear(void) } return faked_msg_next_clear(); } + +int faked_msg_match(sip_msg_t *tmsg) +{ + return ( tmsg == &_faked_msg ) ? 1 : 0; +} diff --git a/src/core/fmsg.h b/src/core/fmsg.h index b279100269..99eb9f61b3 100644 --- a/src/core/fmsg.h +++ b/src/core/fmsg.h @@ -29,5 +29,6 @@ sip_msg_t* faked_msg_next(void); sip_msg_t* faked_msg_get_next(void); sip_msg_t* faked_msg_next_clear(void); sip_msg_t* faked_msg_get_next_clear(void); +int faked_msg_match(sip_msg_t *tmsg); #endif

1 0

git:master:8b71c46b: async: return error if trying to execute for faked message
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: 8b71c46ba0db05051ee24bf88491f00387e1ca8b URL: https://github.com/kamailio/kamailio/commit/8b71c46ba0db05051ee24bf88491f00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T15:29:05+01:00 async: return error if trying to execute for faked message - GH #1727 --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8b71c46ba0db05051ee24bf88491f00… Patch: https://github.com/kamailio/kamailio/commit/8b71c46ba0db05051ee24bf88491f00… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index d039ea0bd1..88affb3bbd 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -28,6 +28,7 @@ #include "../../core/sr_module.h" #include "../../core/dprint.h" #include "../../core/ut.h" +#include "../../core/fmsg.h" #include "../../core/pvar.h" #include "../../core/timer_proc.h" #include "../../core/route_struct.h" @@ -153,6 +154,11 @@ static int w_async_sleep(sip_msg_t *msg, char *sec, char *str2) if(msg == NULL) return -1; + if(faked_msg_match(msg)) { + LM_ERR("invalid usage for faked message\n"); + return -1; + } + if(async_workers <= 0) { LM_ERR("no async mod timer workers (modparam missing?)\n"); return -1; @@ -210,6 +216,11 @@ int ki_async_route(sip_msg_t *msg, str *rn, int s) int ri; sr_kemi_eng_t *keng = NULL; + if(faked_msg_match(msg)) { + LM_ERR("invalid usage for faked message\n"); + return -1; + } + keng = sr_kemi_eng_get(); if(keng == NULL) { ri = route_lookup(&main_rt, rn->s); @@ -285,6 +296,11 @@ int ki_async_task_route(sip_msg_t *msg, str *rn) int ri; sr_kemi_eng_t *keng = NULL; + if(faked_msg_match(msg)) { + LM_ERR("invalid usage for faked message\n"); + return -1; + } + keng = sr_kemi_eng_get(); if(keng == NULL) { ri = route_lookup(&main_rt, rn->s);

1 0

user login with domain
by Saranga Nagesh 19 Nov '18

19 Nov '18

Hi, How can i allow to register with multiple domains and restrict with ip address user should register to asterisk with domain which given to user extension how can i do that. Thanks & Best Regards, Nagesh Saranga

1 0

[kamailio/kamailio] rr module is_direction("downstream") and $ruid("dir") always evaluate downstream to true. (#1729)
by Surendra Tiwari 19 Nov '18

19 Nov '18

### 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/1729

2 2

Still Failing: kamailio/kamailio#6676 (master - a98d06f)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6676 Status: Still Failing Duration: 6 mins and 46 secs Commit: a98d06f (master) Author: Daniel-Constantin Mierla Message: Merge pull request #1730 from ycaner06/patch-11 textops: fixed get_body_part function for non-multipart contents error View the changeset: https://github.com/kamailio/kamailio/compare/70f7a0e39d03...a98d06fcd32a View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456931169?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Still Failing: kamailio/kamailio#6675 (master - 70f7a0e)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6675 Status: Still Failing Duration: 7 mins and 27 secs Commit: 70f7a0e (master) Author: Daniel-Constantin Mierla Message: kamctl: regenerated sql creation scripts View the changeset: https://github.com/kamailio/kamailio/compare/ed861cfe7f0f...70f7a0e39d03 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456929684?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:a98d06fc: Merge pull request #1730 from ycaner06/patch-11
by GitHub 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: a98d06fcd32a0f9aa48ccb12e9056fa84f9d739e URL: https://github.com/kamailio/kamailio/commit/a98d06fcd32a0f9aa48ccb12e9056fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-19T12:57:26+01:00 Merge pull request #1730 from ycaner06/patch-11 textops: fixed get_body_part function for non-multipart contents error --- Modified: src/core/msg_translator.c Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/a98d06fcd32a0f9aa48ccb12e9056fa… Patch: https://github.com/kamailio/kamailio/commit/a98d06fcd32a0f9aa48ccb12e9056fa… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 83cdd134ca..a272aeb6bc 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -1713,7 +1713,7 @@ int get_boundary(struct sip_msg* msg, str* boundary) msg->content_type->body.len); if (params.s == NULL) { - LM_INFO("Content-Type hdr has no params <%.*s>\n", + LM_INFO("Content-Type hdr has no boundary params <%.*s>\n", msg->content_type->body.len, msg->content_type->body.s); return -1; } diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 40827baeae..ff784642e5 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -2761,7 +2761,7 @@ static int ki_remove_multibody(sip_msg_t* msg, str* content_type) } if(get_boundary(msg, &boundary)!=0) { - LM_ERR("Cannot get boundary. Is body multipart?\n"); + LM_ERR("Cannot get boundary from Content type header. Is body multipart?\n"); return -1; } @@ -2851,18 +2851,23 @@ static int ki_get_body_part_helper(sip_msg_t* msg, str* ctype, pv_spec_t *dst, body.s = get_body(msg); if (body.s == 0) { - LM_ERR("failed to get the message body\n"); + LM_ERR("failed to get the content message body\n"); return -1; } body.len = msg->len - (int)(body.s - msg->buf); if (body.len == 0) { - LM_DBG("message body has zero length\n"); + LM_DBG("Content body has zero length\n"); return -1; } if(get_boundary(msg, &boundary)!=0) { - LM_ERR("Cannot get boundary. Is body multipart?\n"); - return -1; + LM_DBG("Content is not multipart so return all content body as string\n"); + memset(&val, 0, sizeof(pv_value_t)); + val.flags = PV_VAL_STR; + val.rs.s = body.s; + val.rs.len =body.len; + dst->setf(msg, &dst->pvp, (int)EQ_T, &val); + return 1; } start = body.s; @@ -2968,7 +2973,7 @@ static int get_body_part_helper(sip_msg_t* msg, char* ctype, char* ovar, int mod str content_type; if(ctype==0) { - LM_ERR("invalid parameters\n"); + LM_ERR("invalid Content-type parameters\n"); return -1; } @@ -3680,7 +3685,7 @@ int ki_in_list_prefix(sip_msg_t* _m, str* subject, str* list, str* vsep) { int sep; char *at, *past, *next_sep, *s; - + if(subject==NULL || subject->len<=0 || list==NULL || list->len<=0 || vsep==NULL || vsep->len<=0) return -1;

1 0

git:master:2daa351d: core : add word to log get_boundary function
by GitHub 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: 2daa351dd0cf716284ff90cd57d2241ee97f165d URL: https://github.com/kamailio/kamailio/commit/2daa351dd0cf716284ff90cd57d2241… Author: Yasin CANER <ycaner06(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-19T10:00:40+03:00 core : add word to log get_boundary function added word to log for more understanding --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/2daa351dd0cf716284ff90cd57d2241… Patch: https://github.com/kamailio/kamailio/commit/2daa351dd0cf716284ff90cd57d2241… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 83cdd134ca..a272aeb6bc 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -1713,7 +1713,7 @@ int get_boundary(struct sip_msg* msg, str* boundary) msg->content_type->body.len); if (params.s == NULL) { - LM_INFO("Content-Type hdr has no params <%.*s>\n", + LM_INFO("Content-Type hdr has no boundary params <%.*s>\n", msg->content_type->body.len, msg->content_type->body.s); return -1; }

1 0

[kamailio/kamailio] utils/kamctl: Adjusted avalue column in location_attrs tables… (#1723)
by sergey-safarov 19 Nov '18

19 Nov '18

… to store long values #### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 During usage i can see errors in logs related to long values cannot be saved in PostgreSQL. This PR is fix for PostgreSQL and other similar databases. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1723 -- Commit Summary -- * utils/kamctl: Adjusted avalue column in location_attrs tables to store long values -- File Changes -- M utils/kamctl/db_sqlite/usrloc-create.sql (2) M utils/kamctl/mysql/usrloc-create.sql (2) M utils/kamctl/oracle/usrloc-create.sql (2) M utils/kamctl/postgres/usrloc-create.sql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1723.patch https://github.com/kamailio/kamailio/pull/1723.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/1723

2 4

git:master:5ce0020f: lib/srdb1: schema - defined entities for sizes of aname and avalue columns
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: 5ce0020f25b4131e5b122df3d075eeb68626b470 URL: https://github.com/kamailio/kamailio/commit/5ce0020f25b4131e5b122df3d075eeb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:49:13+01:00 lib/srdb1: schema - defined entities for sizes of aname and avalue columns - avalue column size set to 512 - GH #1723 --- Modified: src/lib/srdb1/schema/entities.xml Modified: src/lib/srdb1/schema/location_attrs.xml --- Diff: https://github.com/kamailio/kamailio/commit/5ce0020f25b4131e5b122df3d075eeb… Patch: https://github.com/kamailio/kamailio/commit/5ce0020f25b4131e5b122df3d075eeb… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 819fa74c3a..2bfe39540f 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -24,6 +24,8 @@ <!ENTITY description_len "255"> <!ENTITY event_len "64"> <!ENTITY etag_len "128"> +<!ENTITY aname_len "64"> +<!ENTITY avalue_len "512"> <!ENTITY MYSQL_TABLE_TYPE ""> <!ENTITY USERCOL "username"> <!ENTITY DEFAULT_ALIASES_EXPIRES "2030-05-28 21:32:15"> diff --git a/src/lib/srdb1/schema/location_attrs.xml b/src/lib/srdb1/schema/location_attrs.xml index 9e62e39ce0..24bf14e2eb 100644 --- a/src/lib/srdb1/schema/location_attrs.xml +++ b/src/lib/srdb1/schema/location_attrs.xml @@ -63,7 +63,7 @@ <column> <name>aname</name> <type>string</type> - <size>64</size> + <size>&aname_len;</size> <default/> <description>Attribute name.</description> </column> @@ -79,7 +79,7 @@ <column> <name>avalue</name> <type>string</type> - <size>255</size> + <size>&avalue_len;</size> <default/> <description>Attribute value.</description> </column>

1 0

git:master:70f7a0e3: kamctl: regenerated sql creation scripts
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: 70f7a0e39d039e5154bc7313b18d361cd4ef82f6 URL: https://github.com/kamailio/kamailio/commit/70f7a0e39d039e5154bc7313b18d361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:51:22+01:00 kamctl: regenerated sql creation scripts --- Modified: utils/kamctl/db_sqlite/usrloc-create.sql Modified: utils/kamctl/mysql/usrloc-create.sql Modified: utils/kamctl/oracle/usrloc-create.sql Modified: utils/kamctl/postgres/usrloc-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/70f7a0e39d039e5154bc7313b18d361… Patch: https://github.com/kamailio/kamailio/commit/70f7a0e39d039e5154bc7313b18d361… --- diff --git a/utils/kamctl/db_sqlite/usrloc-create.sql b/utils/kamctl/db_sqlite/usrloc-create.sql index c86c8f8f0b..676574f037 100644 --- a/utils/kamctl/db_sqlite/usrloc-create.sql +++ b/utils/kamctl/db_sqlite/usrloc-create.sql @@ -38,7 +38,7 @@ CREATE TABLE location_attrs ( domain VARCHAR(64) DEFAULT NULL, aname VARCHAR(64) DEFAULT '' NOT NULL, atype INTEGER DEFAULT 0 NOT NULL, - avalue VARCHAR(255) DEFAULT '' NOT NULL, + avalue VARCHAR(512) DEFAULT '' NOT NULL, last_modified TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:01' NOT NULL ); diff --git a/utils/kamctl/mysql/usrloc-create.sql b/utils/kamctl/mysql/usrloc-create.sql index a169ef878c..024123b949 100644 --- a/utils/kamctl/mysql/usrloc-create.sql +++ b/utils/kamctl/mysql/usrloc-create.sql @@ -38,7 +38,7 @@ CREATE TABLE `location_attrs` ( `domain` VARCHAR(64) DEFAULT NULL, `aname` VARCHAR(64) DEFAULT '' NOT NULL, `atype` INT(11) DEFAULT 0 NOT NULL, - `avalue` VARCHAR(255) DEFAULT '' NOT NULL, + `avalue` VARCHAR(512) DEFAULT '' NOT NULL, `last_modified` DATETIME DEFAULT '2000-01-01 00:00:01' NOT NULL ); diff --git a/utils/kamctl/oracle/usrloc-create.sql b/utils/kamctl/oracle/usrloc-create.sql index 4857ed827d..0cf6d822f1 100644 --- a/utils/kamctl/oracle/usrloc-create.sql +++ b/utils/kamctl/oracle/usrloc-create.sql @@ -46,7 +46,7 @@ CREATE TABLE location_attrs ( domain VARCHAR2(64) DEFAULT NULL, aname VARCHAR2(64) DEFAULT '', atype NUMBER(10) DEFAULT 0 NOT NULL, - avalue VARCHAR2(255) DEFAULT '', + avalue VARCHAR2(512) DEFAULT '', last_modified DATE DEFAULT to_date('2000-01-01 00:00:01','yyyy-mm-dd hh24:mi:ss') ); diff --git a/utils/kamctl/postgres/usrloc-create.sql b/utils/kamctl/postgres/usrloc-create.sql index 7046294784..b9e9c90583 100644 --- a/utils/kamctl/postgres/usrloc-create.sql +++ b/utils/kamctl/postgres/usrloc-create.sql @@ -38,7 +38,7 @@ CREATE TABLE location_attrs ( domain VARCHAR(64) DEFAULT NULL, aname VARCHAR(64) DEFAULT '' NOT NULL, atype INTEGER DEFAULT 0 NOT NULL, - avalue VARCHAR(255) DEFAULT '' NOT NULL, + avalue VARCHAR(512) DEFAULT '' NOT NULL, last_modified TIMESTAMP WITHOUT TIME ZONE DEFAULT '2000-01-01 00:00:01' NOT NULL );

1 0

Broken: kamailio/kamailio#6674 (5.2 - 1b71de8)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6674 Status: Broken Duration: 7 mins and 8 secs Commit: 1b71de8 (5.2) Author: Victor Seva Message: pkg/kamailio/deb: version set to 5.2.0~rc1 View the changeset: https://github.com/kamailio/kamailio/compare/555322155ce3...1b71de82c145 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456925519?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Broken: kamailio/kamailio#6673 (5.2 - 5553221)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6673 Status: Broken Duration: 6 mins and 1 sec Commit: 5553221 (5.2) Author: Daniel-Constantin Mierla Message: Makefile.defs: version set to 5.2.0-rc1 View the changeset: https://github.com/kamailio/kamailio/compare/3986987d97f3...555322155ce3 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456924088?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:5.2:1b71de82: pkg/kamailio/deb: version set to 5.2.0~rc1
by Victor Seva 19 Nov '18

19 Nov '18

Module: kamailio Branch: 5.2 Commit: 1b71de82c145285fb83478e65ac25a96d6d1bd2f URL: https://github.com/kamailio/kamailio/commit/1b71de82c145285fb83478e65ac25a9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-19T12:39:21+01:00 pkg/kamailio/deb: version set to 5.2.0~rc1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/1b71de82c145285fb83478e65ac25a9… Patch: https://github.com/kamailio/kamailio/commit/1b71de82c145285fb83478e65ac25a9…

1 0

git: new commits in branch 5.2
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

- URL: https://github.com/kamailio/kamailio/commit/9374328bb2c05955658042fbf31807b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:23:05+01:00 cfgutils: error log message mentioning the param lock_set_size (cherry picked from commit 55347626b189cd009c29b0e058949ed7671ae0d0) - URL: https://github.com/kamailio/kamailio/commit/0305e2773a07472f442ab8cf4fbecdc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:23:20+01:00 tmx: use branch index for $T_rpl() cache invalidation (cherry picked from commit e2ca5516ae086cf33c61dbb9e653a5484cca2074) - URL: https://github.com/kamailio/kamailio/commit/d9544b6fecdb72e5b1080434a2bdea1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:24:05+01:00 lib/srdb1: added entities to define the size for event and etag columns - etag column size set to 128 (it was 64, but some UAs generate a longer one) (cherry picked from commit 117051c695c815ab40b34c21c852a34386022116) - URL: https://github.com/kamailio/kamailio/commit/26f699afd218c1429894c2a50b95a21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:24:16+01:00 kamctl: regenerated the sql creation scripts (cherry picked from commit 89fcea29b43b3d456ce23ba31bf902add070c223) - URL: https://github.com/kamailio/kamailio/commit/44947e9626473909acf235f6e221e9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:24:32+01:00 lib/srdb1: schema - use etag size entity also for pua and xcap tables (cherry picked from commit 01ba0f334b5a3c2f9cbd5c746c18ac65ecdf44be) - URL: https://github.com/kamailio/kamailio/commit/9eac906cae5a8b6b6a26080056d9d0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:24:43+01:00 kamctl: new update to the sql creation scripts (cherry picked from commit aaabbc1adbd11724031c54137cd00ef01af3962a) - URL: https://github.com/kamailio/kamailio/commit/0327674281bcd27ef72bf617215f8e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:24:56+01:00 websocket: aligned example statements - few more details about return code of handshake process (cherry picked from commit d33ee59bc807acf95b07838d24b888b14a286ddd) - URL: https://github.com/kamailio/kamailio/commit/7ac7761891005ac5bebd2b19c2d0179… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:25:09+01:00 dispatcher: search in xavp sublist for ds_update_dst() attributes - safety checks for type of the value for root xavp - related to GH #1725 (cherry picked from commit f465d2410084ba9118c1f2610fbefa6989974ce9) - URL: https://github.com/kamailio/kamailio/commit/848252c1b202463965bcbb950521b69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:25:22+01:00 htable: init vars in ht_dmq_handle_sync() to avoid compile warnings (cherry picked from commit e0256096742a1f86e571949a5ffcf5e453401977) - URL: https://github.com/kamailio/kamailio/commit/25d2d9f41c6caec6bda3bbbba068235… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:25:38+01:00 htable: use local variable for name in log message instead of null htable pointer (cherry picked from commit 78225d064a76a5d5a3dbd198a4ae38f6423dd272) - URL: https://github.com/kamailio/kamailio/commit/46d4ecc67cddda1dafa834e1c005c98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:25:51+01:00 db_redis: log message if failure to get reply (cherry picked from commit cb8d366d6c5cc9a0af7159e8be65444ac23f47a1) - URL: https://github.com/kamailio/kamailio/commit/0532b6fec0fecf5a6262b04a0e2e31d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:26:01+01:00 tm: t_serial - safety check for searched xavps (cherry picked from commit 372993c82d2ebdafe9f7e1a672a3e3141a8ae2f5) - URL: https://github.com/kamailio/kamailio/commit/1333340f129b51b2e027d83d14e69ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:26:10+01:00 smsops: free after error log message printing a field (cherry picked from commit c571efefebc305b2049eb55458cb0ac1dc3202bb) - URL: https://github.com/kamailio/kamailio/commit/84ecfe146dd629d30086ac12a2c48d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:26:20+01:00 siptrace: convert status code to string using static buffer function (cherry picked from commit 95d56e986e90b0d9a7527d7fa026cb510b41d9c5) - URL: https://github.com/kamailio/kamailio/commit/5460f19d0129256a21794d4fe342033… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:26:39+01:00 presence: safety check for structure vars before accessing fields (cherry picked from commit ed861cfe7f0f4e265b6dc104a79d07ad7d2997e2) - URL: https://github.com/kamailio/kamailio/commit/555322155ce31a43e4528d984b1c722… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T12:35:20+01:00 Makefile.defs: version set to 5.2.0-rc1

1 0

Still Failing: kamailio/kamailio#6672 (master - ed861cf)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6672 Status: Still Failing Duration: 5 mins and 59 secs Commit: ed861cf (master) Author: Daniel-Constantin Mierla Message: presence: safety check for structure vars before accessing fields View the changeset: https://github.com/kamailio/kamailio/compare/95d56e986e90...ed861cfe7f0f View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456872851?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:ed861cfe: presence: safety check for structure vars before accessing fields
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: ed861cfe7f0f4e265b6dc104a79d07ad7d2997e2 URL: https://github.com/kamailio/kamailio/commit/ed861cfe7f0f4e265b6dc104a79d07a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T10:17:27+01:00 presence: safety check for structure vars before accessing fields --- Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/ed861cfe7f0f4e265b6dc104a79d07a… Patch: https://github.com/kamailio/kamailio/commit/ed861cfe7f0f4e265b6dc104a79d07a… --- diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 9ce259eeaa..258116d53a 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -193,9 +193,13 @@ presentity_t *pres_parse_json_presentity(srjson_t *in) } } + if(!p_event) { + LM_ERR("presence event not found\n"); + return NULL; + } + LM_DBG("building presentity from domain: %.*s, user: %.*s, expires: %d, " - "event: " - "%.*s, etag: %.*s, sender: %.*s", + "event: %.*s, etag: %.*s, sender: %.*s", p_domain.len, p_domain.s, p_user.len, p_user.s, p_expires, p_event->name.len, p_event->name.s, p_etag.len, p_etag.s, p_sender.len, p_sender.s); @@ -301,9 +305,9 @@ int pres_dmq_handle_msg( switch(action) { case PRES_DMQ_UPDATE_PRESENTITY: - if(update_presentity(NULL, presentity, &p_body, t_new, &sent_reply, - sphere, &cur_etag, &ruid, 0) - < 0) { + if(presentity==NULL + || update_presentity(NULL, presentity, &p_body, t_new, + &sent_reply, sphere, &cur_etag, &ruid, 0) < 0) { goto error; } break; diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 497bfa95ea..5527d3736a 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -807,7 +807,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } else { - LM_DBG("updating existing presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); if (ruid) { @@ -1265,7 +1264,7 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, done: - if (pres_enable_dmq>0) { + if (pres_enable_dmq>0 && p_ruid.s!=NULL) { pres_dmq_replicate_presentity(presentity, body, new_t, &cur_etag, sphere, &p_ruid, NULL); } @@ -1934,9 +1933,9 @@ int delete_offline_presentities(str *pres_uri, pres_ev_t *event) int _api_update_presentity(str *event, str *realm, str *user, str *etag, str *sender, str *body, int expires, int new_t, int replace) { - int ret; + int ret = -1; presentity_t *pres = NULL; - pres_ev_t *ev; + pres_ev_t *ev = NULL; char *sphere = NULL; ev = contains_event(event, NULL); @@ -1950,10 +1949,12 @@ int _api_update_presentity(str *event, str *realm, str *user, str *etag, if(sphere_enable) { sphere = extract_sphere(*body); } - ret = update_presentity(NULL, pres, body, new_t, NULL, sphere, NULL, NULL, replace); - - if(pres) + if(pres) { + ret = update_presentity(NULL, pres, body, new_t, NULL, sphere, NULL, + NULL, replace); pkg_free(pres); + } + if(sphere) pkg_free(sphere);

1 0

Still Failing: kamailio/kamailio#6671 (master - 95d56e9)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6671 Status: Still Failing Duration: 6 mins and 21 secs Commit: 95d56e9 (master) Author: Daniel-Constantin Mierla Message: siptrace: convert status code to string using static buffer function View the changeset: https://github.com/kamailio/kamailio/compare/c571efefebc3...95d56e986e90 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456866391?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:95d56e98: siptrace: convert status code to string using static buffer function
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: 95d56e986e90b0d9a7527d7fa026cb510b41d9c5 URL: https://github.com/kamailio/kamailio/commit/95d56e986e90b0d9a7527d7fa026cb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T10:01:21+01:00 siptrace: convert status code to string using static buffer function --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/95d56e986e90b0d9a7527d7fa026cb5… Patch: https://github.com/kamailio/kamailio/commit/95d56e986e90b0d9a7527d7fa026cb5… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index d1d32661fa..7de96b4b5d 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1136,7 +1136,7 @@ static void trace_onreply_in(struct cell *t, int type, struct tmcb_params *ps) siptrace_data_t sto; sip_msg_t *msg; sip_msg_t *req; - char statusbuf[8]; + char statusbuf[INT2STR_MAX_LEN]; if(t == NULL || t->uas.request == 0 || ps == NULL) { LM_DBG("no uas request, local transaction\n"); @@ -1170,8 +1170,11 @@ static void trace_onreply_in(struct cell *t, int type, struct tmcb_params *ps) sto.method = get_cseq(msg)->method; - strcpy(statusbuf, int2str(ps->code, &sto.status.len)); - sto.status.s = statusbuf; + sto.status.s = int2strbuf(ps->code, statusbuf, INT2STR_MAX_LEN, &sto.status.len); + if(sto.status.s == 0) { + LM_ERR("failure to get the status string\n"); + return; + } sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", siptrace_proto_name(msg->rcv.proto), @@ -1218,7 +1221,7 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) struct sip_msg *msg; struct sip_msg *req; struct ip_addr to_ip; - char statusbuf[8]; + char statusbuf[INT2STR_MAX_LEN]; dest_info_t *dst; if(t == NULL || t->uas.request == 0 || ps == NULL) { @@ -1293,8 +1296,11 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) } } - strcpy(statusbuf, int2str(ps->code, &sto.status.len)); - sto.status.s = statusbuf; + sto.status.s = int2strbuf(ps->code, statusbuf, INT2STR_MAX_LEN, &sto.status.len); + if(sto.status.s == 0) { + LM_ERR("failure to get the status string\n"); + return; + } memset(&to_ip, 0, sizeof(struct ip_addr)); dst = ps->dst; @@ -1341,7 +1347,7 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) siptrace_data_t sto; sip_msg_t *msg; ip_addr_t to_ip; - char statusbuf[5]; + char statusbuf[INT2STR_MAX_LEN]; if(slcbp == NULL || slcbp->req == NULL) { LM_ERR("bad parameters\n"); @@ -1385,8 +1391,11 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) } } - strcpy(statusbuf, int2str(slcbp->code, &sto.status.len)); - sto.status.s = statusbuf; + sto.status.s = int2strbuf(slcbp->code, statusbuf, INT2STR_MAX_LEN, &sto.status.len); + if(sto.status.s == 0) { + LM_ERR("failure to get the status string\n"); + return; + } memset(&to_ip, 0, sizeof(struct ip_addr)); if(slcbp->dst == 0) {

1 0

Still Failing: kamailio/kamailio#6670 (master - c571efe)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6670 Status: Still Failing Duration: 6 mins and 3 secs Commit: c571efe (master) Author: Daniel-Constantin Mierla Message: smsops: free after error log message printing a field View the changeset: https://github.com/kamailio/kamailio/compare/372993c82d2e...c571efefebc3 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456861437?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:c571efef: smsops: free after error log message printing a field
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: c571efefebc305b2049eb55458cb0ac1dc3202bb URL: https://github.com/kamailio/kamailio/commit/c571efefebc305b2049eb55458cb0ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T09:47:58+01:00 smsops: free after error log message printing a field --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/c571efefebc305b2049eb55458cb0ac… Patch: https://github.com/kamailio/kamailio/commit/c571efefebc305b2049eb55458cb0ac… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 8150d081d6..8df667bb77 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -564,9 +564,9 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Check for malicious length, which might cause buffer overflow if(udh_read + ie->data.len + 2 /* two octets are read so far */ > udh_len) { - pkg_free(ie); LM_ERR("IE Lenght for IE id %d is bigger than the remaining User-Data element!\n", ie->identifier); + pkg_free(ie); return -1; }

1 0

Still Failing: kamailio/kamailio#6668 (master - 372993c)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6668 Status: Still Failing Duration: 5 mins and 56 secs Commit: 372993c (master) Author: Daniel-Constantin Mierla Message: tm: t_serial - safety check for searched xavps View the changeset: https://github.com/kamailio/kamailio/compare/78225d064a76...372993c82d2e View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456854246?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:cb8d366d: db_redis: log message if failure to get reply
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: cb8d366d6c5cc9a0af7159e8be65444ac23f47a1 URL: https://github.com/kamailio/kamailio/commit/cb8d366d6c5cc9a0af7159e8be65444… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T09:19:58+01:00 db_redis: log message if failure to get reply --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/cb8d366d6c5cc9a0af7159e8be65444… Patch: https://github.com/kamailio/kamailio/commit/cb8d366d6c5cc9a0af7159e8be65444… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index e030472d9e..6743a97cf1 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -394,7 +394,9 @@ void db_redis_consume_replies(km_redis_con_t *con) { redis_key_t *query; while (con->append_counter > 0 && con->con && !con->con->err) { LM_DBG("consuming outstanding reply %u", con->append_counter); - db_redis_get_reply(con, (void**)&reply); + if(db_redis_get_reply(con, (void**)&reply) != REDIS_OK) { + LM_DBG("failure to get the reply\n"); + } if (reply) { freeReplyObject(reply); reply = NULL;

1 0

git:master:372993c8: tm: t_serial - safety check for searched xavps
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: 372993c82d2ebdafe9f7e1a672a3e3141a8ae2f5 URL: https://github.com/kamailio/kamailio/commit/372993c82d2ebdafe9f7e1a672a3e31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T09:24:39+01:00 tm: t_serial - safety check for searched xavps --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/372993c82d2ebdafe9f7e1a672a3e31… Patch: https://github.com/kamailio/kamailio/commit/372993c82d2ebdafe9f7e1a672a3e31… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index 8f8ee0646d..68b8afc1c3 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -599,10 +599,18 @@ int ki_t_next_contacts(struct sip_msg* msg) xavp_rm(prev_xavp, NULL); vavp = xavp_get(&q_flag_name, xavp->val.v.xavp); - q_flag = vavp->val.v.i; + if(vavp) { + q_flag = vavp->val.v.i; + } else { + q_flag = 0; + } vavp = xavp_get(&uri_name, xavp->val.v.xavp); - uri = vavp->val.v.s; + if(vavp) { + uri = vavp->val.v.s; + } else { + uri.len = 0; + } vavp = xavp_get(&dst_uri_name, xavp->val.v.xavp); if (vavp != NULL) {

1 0

Still Failing: kamailio/kamailio#6667 (master - 78225d0)
by Travis CI 19 Nov '18

19 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6667 Status: Still Failing Duration: 6 mins and 16 secs Commit: 78225d0 (master) Author: Daniel-Constantin Mierla Message: htable: use local variable for name in log message instead of null htable pointer View the changeset: https://github.com/kamailio/kamailio/compare/f465d2410084...78225d064a76 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456850836?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:78225d06: htable: use local variable for name in log message instead of null htable pointer
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: 78225d064a76a5d5a3dbd198a4ae38f6423dd272 URL: https://github.com/kamailio/kamailio/commit/78225d064a76a5d5a3dbd198a4ae38f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T09:10:46+01:00 htable: use local variable for name in log message instead of null htable pointer --- Modified: src/modules/htable/ht_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/78225d064a76a5d5a3dbd198a4ae38f… Patch: https://github.com/kamailio/kamailio/commit/78225d064a76a5d5a3dbd198a4ae38f… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index 33dd72e8d4..d5ff1af645 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -576,11 +576,15 @@ int ht_dmq_handle_sync(srjson_doc_t* jdoc) { } ht = ht_get_table(&htname); - if(ht==NULL) - LM_WARN("unable to get table %.*s\n", ht->name.len, ht->name.s); + if(ht==NULL) { + LM_WARN("unable to get table %.*s\n", + htname.len, (htname.s)?htname.s:""); + } - if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) - LM_WARN("unable to set cell %.*s in table %.*s\n", cname.len, cname.s, ht->name.len, ht->name.s); + if (ht_set_cell_ex(ht, &cname, type, &val, 0, expire - now) < 0) { + LM_WARN("unable to set cell %.*s in table %.*s\n", + cname.len, cname.s, ht->name.len, ht->name.s); + } cell = cell->next; }

1 0

git:master:e0256096: htable: init vars in ht_dmq_handle_sync() to avoid compile warnings
by Daniel-Constantin Mierla 19 Nov '18

19 Nov '18

Module: kamailio Branch: master Commit: e0256096742a1f86e571949a5ffcf5e453401977 URL: https://github.com/kamailio/kamailio/commit/e0256096742a1f86e571949a5ffcf5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-19T09:07:33+01:00 htable: init vars in ht_dmq_handle_sync() to avoid compile warnings --- Modified: src/modules/htable/ht_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/e0256096742a1f86e571949a5ffcf5e… Patch: https://github.com/kamailio/kamailio/commit/e0256096742a1f86e571949a5ffcf5e… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index f1fe069f17..33dd72e8d4 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -537,17 +537,16 @@ int ht_dmq_send_sync(dmq_node_t* node) { int ht_dmq_handle_sync(srjson_doc_t* jdoc) { LM_DBG("handling sync\n"); - srjson_t* cells; - srjson_t* cell; - srjson_t* it; - str htname; - str cname; - int type; - int_str val; - int expire; - ht_t* ht; - time_t now; - + srjson_t* cells = NULL; + srjson_t* cell = NULL; + srjson_t* it = NULL; + str htname = STR_NULL; + str cname = STR_NULL; + int type = 0; + int_str val = {0}; + int expire = 0; + ht_t* ht = NULL; + time_t now = 0; cells = jdoc->root->child; cell = cells->child;

1 0

[kamailio/kamailio] dispatcher : xavp_get fix in ds_update_dst (#1725)
by lazedo 17 Nov '18

17 Nov '18

#### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1725 -- Commit Summary -- * dispatcher : xavp_get fix in ds_update_dst -- File Changes -- M src/modules/dispatcher/dispatch.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1725.patch https://github.com/kamailio/kamailio/pull/1725.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/1725

3 5

Still Failing: kamailio/kamailio#6665 (master - f465d24)
by Travis CI 16 Nov '18

16 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6665 Status: Still Failing Duration: 6 mins and 25 secs Commit: f465d24 (master) Author: Daniel-Constantin Mierla Message: dispatcher: search in xavp sublist for ds_update_dst() attributes - safety checks for type of the value for root xavp - related to GH #1725 View the changeset: https://github.com/kamailio/kamailio/compare/aaabbc1adbd1...f465d2410084 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/456029532?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:d33ee59b: websocket: aligned example statements
by Daniel-Constantin Mierla 16 Nov '18

16 Nov '18

Module: kamailio Branch: master Commit: d33ee59bc807acf95b07838d24b888b14a286ddd URL: https://github.com/kamailio/kamailio/commit/d33ee59bc807acf95b07838d24b888b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-16T10:37:19+01:00 websocket: aligned example statements - few more details about return code of handshake process --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d33ee59bc807acf95b07838d24b888b… Patch: https://github.com/kamailio/kamailio/commit/d33ee59bc807acf95b07838d24b888b… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index 055498862e..338d37ef22 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -90,13 +90,13 @@ event_route[xhttp:request] { # Optional... perform HTTP authentication # ws_handle_handshake() exits (no further configuration file - # processing of the request) when complete. + # processing of the request) when complete in case of failure. if (ws_handle_handshake()) - { - # Optional... cache some information about the - # successful connection - exit; - } + { + # Optional... cache some information about the + # successful connection + exit; + } } xhttp_reply("404", "Not found", "", ""); @@ -181,9 +181,9 @@ route[WITHINDLG] { onreply_route[WS_REPLY] { if (nat_uac_test(64)) { # Do NAT traversal stuff for replies to a WebSocket connection - # - even if it is not behind a NAT! + # - even if it is not behind a NAT! # This won't be needed in the future if Kamailio and the - # WebSocket client support Outbound and Path. + # WebSocket client support Outbound and Path. add_contact_alias(); } } @@ -491,7 +491,8 @@ end <para>This function can be used from ANY_ROUTE (but will only work in <emphasis>event_route[xhttp:request]</emphasis>).</para> <note><para>This function returns 0, stopping all further - processing of the request, when there is a problem.</para></note> + processing of the request, when there is a problem. Otherwise, it + returns 1 (or positive number) in case of success.</para></note> <example> <title><function>ws_handle_handshake</function> usage</title> <programlisting format="linespecific">

1 0

git:master:f465d241: dispatcher: search in xavp sublist for ds_update_dst() attributes
by Daniel-Constantin Mierla 16 Nov '18

16 Nov '18

Module: kamailio Branch: master Commit: f465d2410084ba9118c1f2610fbefa6989974ce9 URL: https://github.com/kamailio/kamailio/commit/f465d2410084ba9118c1f2610fbefa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-16T16:37:06+01:00 dispatcher: search in xavp sublist for ds_update_dst() attributes - safety checks for type of the value for root xavp - related to GH #1725 --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f465d2410084ba9118c1f2610fbefa6… Patch: https://github.com/kamailio/kamailio/commit/f465d2410084ba9118c1f2610fbefa6… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b5677af058..80540ee6ba 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2286,7 +2286,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } rxavp = xavp_get(&ds_xavp_dst, NULL); - if(rxavp == NULL) { + if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with previous destination record\n"); return -1; } @@ -2297,12 +2297,14 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) xavp_rm(rxavp, NULL); rxavp = xavp_get(&ds_xavp_dst, NULL); - if(rxavp == NULL) { + if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with next destination record\n"); return -1; } } + /* retrieve attributes from sub list */ + rxavp = rxavp->val.v.xavp; lxavp = xavp_get(&ds_xavp_dst_sock, rxavp); if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_VPTR) { LM_DBG("socket enforced in next destination record\n");

1 0

[CRON] Broken: dbank888/kamailio#6 (master - 491e19e)
by Travis CI 15 Nov '18

15 Nov '18

Build Update for dbank888/kamailio ------------------------------------- Build: #6 Status: Broken Duration: 7 mins and 18 secs Commit: 491e19e (master) Author: Daniel-Constantin Mierla Message: tls: update to default session id value to reflect major version View the changeset: https://github.com/dbank888/kamailio/compare/9e13c9512b48ab9522f508465c6031… View the full build log and details: https://travis-ci.org/dbank888/kamailio/builds/455683268?utm_medium=notific… -- You can unsubscribe from build emails from the dbank888/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=21197393&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

[kamailio/kamailio] OBS Kamailio 5.0.7 RPM dependency on lib ims (#1721)
by Daniel-Constantin Mierla 15 Nov '18

15 Nov '18

### Description It was reported that using the RPM for v5.0.7 from opensuse build service is getting an error on dependency for internal lib ims. Getting the rpm from: * http://download.opensuse.org/repositories/home:/kamailio:/v5.0.x-rpms/RHEL_… Then: ``` rpm -ivh kamailio-5.0.7-8.el7.x86_64.rpm warning: kamailio-5.0.7-8.el7.x86_64.rpm: Header V3 DSA/SHA1 Signature, key ID 941fdbdd: NOKEY error: Failed dependencies: libkamailio_ims.so.0()(64bit) is needed by kamailio-5.0.7-8.el7.x86_64 ``` ### Troubleshooting #### Reproduction See above. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.0.7, but can be the same for 5.1 or newer. ``` * **Operating System**: ``` RHEL 7, but can be the same for other OSes ``` -- 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/1721

2 9

Broken: sergey-safarov/kamailio#80 (master - aaabbc1)
by Travis CI 15 Nov '18

15 Nov '18

Build Update for sergey-safarov/kamailio ------------------------------------- Build: #80 Status: Broken Duration: 6 mins and 12 secs Commit: aaabbc1 (master) Author: Daniel-Constantin Mierla Message: kamctl: new update to the sql creation scripts View the changeset: https://github.com/sergey-safarov/kamailio/compare/331f55077a24...aaabbc1ad… View the full build log and details: https://travis-ci.org/sergey-safarov/kamailio/builds/455427908?utm_medium=n… -- You can unsubscribe from build emails from the sergey-safarov/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=15162101&u…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:5.0:1d8e51cb: pkg/kamailio/obs: relocated ims_ocs moddule into kamailio-ims rpm package #1721
by Sergey Safarov 15 Nov '18

15 Nov '18

Module: kamailio Branch: 5.0 Commit: 1d8e51cb544d18e4d8810aee56ab9cac2c8f3e4f URL: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9ca… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-14T23:40:19+03:00 pkg/kamailio/obs: relocated ims_ocs moddule into kamailio-ims rpm package #1721 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9ca… Patch: https://github.com/kamailio/kamailio/commit/1d8e51cb544d18e4d8810aee56ab9ca… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7cc9fcf700..44cf481f66 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1110,7 +1110,6 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc -%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -1248,7 +1247,6 @@ fi %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so -%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/malloc_test.so @@ -1461,6 +1459,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_dialog %doc %{_docdir}/kamailio/modules/README.ims_icscf %doc %{_docdir}/kamailio/modules/README.ims_isc +%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ims_qos %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf @@ -1477,6 +1476,7 @@ fi %{_libdir}/kamailio/modules/ims_dialog.so %{_libdir}/kamailio/modules/ims_icscf.so %{_libdir}/kamailio/modules/ims_isc.so +%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ims_qos.so %{_libdir}/kamailio/modules/ims_registrar_pcscf.so %{_libdir}/kamailio/modules/ims_registrar_scscf.so

2 2

Broken: kamailio/kamailio#6661 (master - aaabbc1)
by Travis CI 15 Nov '18

15 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6661 Status: Broken Duration: 8 mins and 46 secs Commit: aaabbc1 (master) Author: Daniel-Constantin Mierla Message: kamctl: new update to the sql creation scripts View the changeset: https://github.com/kamailio/kamailio/compare/89fcea29b43b...aaabbc1adbd1 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/455386941?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Broken: kamailio/kamailio#6660 (master - 89fcea2)
by Travis CI 15 Nov '18

15 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6660 Status: Broken Duration: 6 mins and 9 secs Commit: 89fcea2 (master) Author: Daniel-Constantin Mierla Message: kamctl: regenerated the sql creation scripts View the changeset: https://github.com/kamailio/kamailio/compare/2abaab52b94b...89fcea29b43b View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/455385969?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:aaabbc1a: kamctl: new update to the sql creation scripts
by Daniel-Constantin Mierla 15 Nov '18

15 Nov '18

Module: kamailio Branch: master Commit: aaabbc1adbd11724031c54137cd00ef01af3962a URL: https://github.com/kamailio/kamailio/commit/aaabbc1adbd11724031c54137cd00ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-15T09:37:04+01:00 kamctl: new update to the sql creation scripts --- Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/aaabbc1adbd11724031c54137cd00ef… Patch: https://github.com/kamailio/kamailio/commit/aaabbc1adbd11724031c54137cd00ef… --- diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index 3ee28edca6..97cac9d6d4 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -77,7 +77,7 @@ CREATE TABLE xcap ( domain VARCHAR(64) NOT NULL, doc BLOB NOT NULL, doc_type INTEGER NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, source INTEGER NOT NULL, doc_uri VARCHAR(255) NOT NULL, port INTEGER NOT NULL, @@ -98,7 +98,7 @@ CREATE TABLE pua ( expires INTEGER NOT NULL, desired_expires INTEGER NOT NULL, flag INTEGER NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, tuple_id VARCHAR(64), watcher_uri VARCHAR(128) NOT NULL, call_id VARCHAR(255) NOT NULL, diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 9fe9f1c732..a0b4097523 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -77,7 +77,7 @@ CREATE TABLE `xcap` ( `domain` VARCHAR(64) NOT NULL, `doc` MEDIUMBLOB NOT NULL, `doc_type` INT(11) NOT NULL, - `etag` VARCHAR(64) NOT NULL, + `etag` VARCHAR(128) NOT NULL, `source` INT(11) NOT NULL, `doc_uri` VARCHAR(255) NOT NULL, `port` INT(11) NOT NULL, @@ -98,7 +98,7 @@ CREATE TABLE `pua` ( `expires` INT(11) NOT NULL, `desired_expires` INT(11) NOT NULL, `flag` INT(11) NOT NULL, - `etag` VARCHAR(64) NOT NULL, + `etag` VARCHAR(128) NOT NULL, `tuple_id` VARCHAR(64), `watcher_uri` VARCHAR(128) NOT NULL, `call_id` VARCHAR(255) NOT NULL, diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index 46361da72e..35a6f062ea 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -101,7 +101,7 @@ CREATE TABLE xcap ( domain VARCHAR2(64), doc BLOB, doc_type NUMBER(10), - etag VARCHAR2(64), + etag VARCHAR2(128), source NUMBER(10), doc_uri VARCHAR2(255), port NUMBER(10), @@ -130,7 +130,7 @@ CREATE TABLE pua ( expires NUMBER(10), desired_expires NUMBER(10), flag NUMBER(10), - etag VARCHAR2(64), + etag VARCHAR2(128), tuple_id VARCHAR2(64), watcher_uri VARCHAR2(128), call_id VARCHAR2(255), diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index b0c7939868..729fb6a37e 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -77,7 +77,7 @@ CREATE TABLE xcap ( domain VARCHAR(64) NOT NULL, doc BYTEA NOT NULL, doc_type INTEGER NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, source INTEGER NOT NULL, doc_uri VARCHAR(255) NOT NULL, port INTEGER NOT NULL, @@ -98,7 +98,7 @@ CREATE TABLE pua ( expires INTEGER NOT NULL, desired_expires INTEGER NOT NULL, flag INTEGER NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, tuple_id VARCHAR(64), watcher_uri VARCHAR(128) NOT NULL, call_id VARCHAR(255) NOT NULL,

1 0

git:master:01ba0f33: lib/srdb1: schema - use etag size entity also for pua and xcap tables
by Daniel-Constantin Mierla 15 Nov '18

15 Nov '18

Module: kamailio Branch: master Commit: 01ba0f334b5a3c2f9cbd5c746c18ac65ecdf44be URL: https://github.com/kamailio/kamailio/commit/01ba0f334b5a3c2f9cbd5c746c18ac6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-15T09:36:32+01:00 lib/srdb1: schema - use etag size entity also for pua and xcap tables --- Modified: src/lib/srdb1/schema/pr_pua.xml Modified: src/lib/srdb1/schema/pr_xcap.xml --- Diff: https://github.com/kamailio/kamailio/commit/01ba0f334b5a3c2f9cbd5c746c18ac6… Patch: https://github.com/kamailio/kamailio/commit/01ba0f334b5a3c2f9cbd5c746c18ac6… --- diff --git a/src/lib/srdb1/schema/pr_pua.xml b/src/lib/srdb1/schema/pr_pua.xml index 2a1c471f3b..1a0e8a6189 100644 --- a/src/lib/srdb1/schema/pr_pua.xml +++ b/src/lib/srdb1/schema/pr_pua.xml @@ -80,7 +80,7 @@ <column id="etag"> <name>etag</name> <type>string</type> - <size>&domain_len;</size> + <size>&etag_len;</size> <description>Etag</description> </column> diff --git a/src/lib/srdb1/schema/pr_xcap.xml b/src/lib/srdb1/schema/pr_xcap.xml index df54fc0bff..2eb1fc1a90 100644 --- a/src/lib/srdb1/schema/pr_xcap.xml +++ b/src/lib/srdb1/schema/pr_xcap.xml @@ -64,7 +64,7 @@ <column id="etag"> <name>etag</name> <type>string</type> - <size>&user_len;</size> + <size>&etag_len;</size> <description>Document Etag</description> </column>

1 0

git:master:117051c6: lib/srdb1: added entities to define the size for event and etag columns
by Daniel-Constantin Mierla 15 Nov '18

15 Nov '18

Module: kamailio Branch: master Commit: 117051c695c815ab40b34c21c852a34386022116 URL: https://github.com/kamailio/kamailio/commit/117051c695c815ab40b34c21c852a34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-15T09:34:26+01:00 lib/srdb1: added entities to define the size for event and etag columns - etag column size set to 128 (it was 64, but some UAs generate a longer one) --- Modified: src/lib/srdb1/schema/entities.xml Modified: src/lib/srdb1/schema/pr_presentity.xml --- Diff: https://github.com/kamailio/kamailio/commit/117051c695c815ab40b34c21c852a34… Patch: https://github.com/kamailio/kamailio/commit/117051c695c815ab40b34c21c852a34… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 506771361b..819fa74c3a 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -22,6 +22,8 @@ <!ENTITY expires_len "11"> <!ENTITY flag_len "11"> <!ENTITY description_len "255"> +<!ENTITY event_len "64"> +<!ENTITY etag_len "128"> <!ENTITY MYSQL_TABLE_TYPE ""> <!ENTITY USERCOL "username"> <!ENTITY DEFAULT_ALIASES_EXPIRES "2030-05-28 21:32:15"> diff --git a/src/lib/srdb1/schema/pr_presentity.xml b/src/lib/srdb1/schema/pr_presentity.xml index d06a1361e4..56a8044c23 100644 --- a/src/lib/srdb1/schema/pr_presentity.xml +++ b/src/lib/srdb1/schema/pr_presentity.xml @@ -51,7 +51,7 @@ <column id="event"> <name>event</name> <type>string</type> - <size>&user_len;</size> + <size>&event_len;</size> <description>Event</description> <natural/> </column> @@ -59,8 +59,8 @@ <column id="etag"> <name>etag</name> <type>string</type> - <size>&user_len;</size> - <description>User name</description> + <size>&etag_len;</size> + <description>Etag attribute</description> </column> <column id="expires">

1 0

git:master:89fcea29: kamctl: regenerated the sql creation scripts
by Daniel-Constantin Mierla 15 Nov '18

15 Nov '18

Module: kamailio Branch: master Commit: 89fcea29b43b3d456ce23ba31bf902add070c223 URL: https://github.com/kamailio/kamailio/commit/89fcea29b43b3d456ce23ba31bf902a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-15T09:34:26+01:00 kamctl: regenerated the sql creation scripts --- Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/89fcea29b43b3d456ce23ba31bf902a… Patch: https://github.com/kamailio/kamailio/commit/89fcea29b43b3d456ce23ba31bf902a… --- diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index df121b96d5..3ee28edca6 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -3,7 +3,7 @@ CREATE TABLE presentity ( username VARCHAR(64) NOT NULL, domain VARCHAR(64) NOT NULL, event VARCHAR(64) NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, expires INTEGER NOT NULL, received_time INTEGER NOT NULL, body BLOB NOT NULL, diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index d5fcc72770..9fe9f1c732 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -3,7 +3,7 @@ CREATE TABLE `presentity` ( `username` VARCHAR(64) NOT NULL, `domain` VARCHAR(64) NOT NULL, `event` VARCHAR(64) NOT NULL, - `etag` VARCHAR(64) NOT NULL, + `etag` VARCHAR(128) NOT NULL, `expires` INT(11) NOT NULL, `received_time` INT(11) NOT NULL, `body` BLOB NOT NULL, diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index ddcf6dcb63..46361da72e 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -3,7 +3,7 @@ CREATE TABLE presentity ( username VARCHAR2(64), domain VARCHAR2(64), event VARCHAR2(64), - etag VARCHAR2(64), + etag VARCHAR2(128), expires NUMBER(10), received_time NUMBER(10), body BLOB, diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 943aac0bd6..b0c7939868 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -3,7 +3,7 @@ CREATE TABLE presentity ( username VARCHAR(64) NOT NULL, domain VARCHAR(64) NOT NULL, event VARCHAR(64) NOT NULL, - etag VARCHAR(64) NOT NULL, + etag VARCHAR(128) NOT NULL, expires INTEGER NOT NULL, received_time INTEGER NOT NULL, body BYTEA NOT NULL,

1 0

git:master:5ecd43c1: rtp_media_server: add missing external dependence bcunit to doc
by Victor Seva 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: 5ecd43c19e5d3a41c33fe93c69616d26d0779c57 URL: https://github.com/kamailio/kamailio/commit/5ecd43c19e5d3a41c33fe93c69616d2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-14T10:17:51+01:00 rtp_media_server: add missing external dependence bcunit to doc --- Modified: src/modules/rtp_media_server/doc/rtp_media_server_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5ecd43c19e5d3a41c33fe93c69616d2… Patch: https://github.com/kamailio/kamailio/commit/5ecd43c19e5d3a41c33fe93c69616d2… --- diff --git a/src/modules/rtp_media_server/doc/rtp_media_server_admin.xml b/src/modules/rtp_media_server/doc/rtp_media_server_admin.xml index 8ce4c97997..ce9f175344 100644 --- a/src/modules/rtp_media_server/doc/rtp_media_server_admin.xml +++ b/src/modules/rtp_media_server/doc/rtp_media_server_admin.xml @@ -67,6 +67,15 @@ Mediastreamer2 is a powerful and lightweight streaming engine specialized for voice/video telephony applications. </para> </listitem> + <listitem> + <para> + <emphasis>bcunit</emphasis> git clone https://github.com/BelledonneCommunications/bcunit.git + </para> + <para> + fork of the defunct project CUnit, with several fixes and patches applied. + CUnit is a Unit testing framework for C. + </para> + </listitem> </itemizedlist> </section> </section>

2 1

git:master:b4aef50e: rtp_media_server: initial creation of README file
by Henning Westerholt 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: b4aef50ef2386e92c8c0bb1ad6232ae009d6621c URL: https://github.com/kamailio/kamailio/commit/b4aef50ef2386e92c8c0bb1ad6232ae… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-13T21:47:56+01:00 rtp_media_server: initial creation of README file --- Added: src/modules/rtp_media_server/README --- Diff: https://github.com/kamailio/kamailio/commit/b4aef50ef2386e92c8c0bb1ad6232ae… Patch: https://github.com/kamailio/kamailio/commit/b4aef50ef2386e92c8c0bb1ad6232ae…

3 10

[kamailio/kamailio] erlang: build fails on alpha (#1373)
by Victor Seva 14 Nov '18

14 Nov '18

>From 5.1.0 official Debian build ``` /usr/bin/make every-module group_include="kerlang" quiet=verbose make[1]: Entering directory '/<<PKGBUILDDIR>>' /usr/bin/make -C src/ every-module make[2]: Entering directory '/<<PKGBUILDDIR>>/src' config.mak loaded Makefile.defs defs skipped Makefile.defs defs skipped Makefile.defs defs skipped beam.smp: allocatestack.c:480: allocate_stack: Assertion `size != 0' failed. Aborted beam.smp: allocatestack.c:480: allocate_stack: Assertion `size != 0' failed. Aborted Makefile:16: *** Not found Erlang. Stop. ``` -- 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/1373

3 3

git:5.2:ee66571f: pkg/kamailio/obs: Fixed build on OpenSUSE dists
by Sergey Safarov 14 Nov '18

14 Nov '18

Module: kamailio Branch: 5.2 Commit: ee66571fe0556f6800629310507831acd6992911 URL: https://github.com/kamailio/kamailio/commit/ee66571fe0556f6800629310507831a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-14T14:31:11+03:00 pkg/kamailio/obs: Fixed build on OpenSUSE dists (cherry picked from commit af59382f6cb356087efd6eded5c28e2d228a7032) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ee66571fe0556f6800629310507831a… Patch: https://github.com/kamailio/kamailio/commit/ee66571fe0556f6800629310507831a… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6538f46c7d..c8327dd3d4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -184,12 +184,20 @@ %define _sharedstatedir /var/lib %endif +# Defining missing macros on OpenSUSE Leap +%if 0%{?suse_version} == 1315 +%define _fillupdir /var/adm/fillup-templates +%endif +%if 0%{?suse_version} == 1330 +%define _fillupdir /var/adm/fillup-templates +%endif + Summary: Kamailio (former OpenSER) - the Open Source SIP Server Name: %name Version: %ver Release: %rel Packager: Peter Dunkley <peter(a)dunkley.me.uk> -License: GPL +License: GPL-2.0 Group: System Environment/Daemons Source: http://kamailio.org/pub/kamailio/%{ver}/src/%{name}-%{ver}_src.tar.gz URL: http://kamailio.org/ @@ -219,6 +227,7 @@ Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver Conflicts: kamailio-uuid < %ver BuildRequires: bison, flex %if 0%{?suse_version} +Requires: filesystem BuildRequires: systemd-mini, shadow %endif %if 0%{?fedora} == 27 @@ -339,7 +348,7 @@ CPL (Call Processing Language) interpreter for Kamailio. %package crypto -Summary: Module to support cryptographic extensions for use in the Kamailio configuration +Summary: Module to support cryptographic extensions Group: System Environment/Daemons Requires: kamailio = %ver %if 0%{?rhel} == 6 @@ -735,9 +744,12 @@ SCTP transport for Kamailio. %package sipcapture-daemon-config -Summary: reference config for sipcapture daemon +Summary: Reference config for sipcapture daemon Group: System Environment/Daemons Requires: kamailio-sipcapture = %ver +%if 0%{?suse_version} +Requires: filesystem +%endif %description sipcapture-daemon-config reference config for sipcapture daemon. @@ -1140,11 +1152,11 @@ install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %endif %if 0%{?suse_version} -install -d %{buildroot}/var/adm/fillup-templates/ +install -d %{buildroot}%{_fillupdir} install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ - %{buildroot}/var/adm/fillup-templates/sysconfig.kamailio + %{buildroot}%{_fillupdir}/sysconfig.kamailio install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ - %{buildroot}/var/adm/fillup-templates/sysconfig.sipcapture + %{buildroot}%{_fillupdir}/sysconfig.sipcapture %else install -d %{buildroot}%{_sysconfdir}/sysconfig install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ @@ -1164,7 +1176,7 @@ install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ rm -f %{buildroot}%{_libdir}/kamailio/lib*.so %pre -%if 0%{?suse_version} == 1330 +%if 0%{?suse_version} if ! /usr/bin/getent group daemon &>/dev/null; then /usr/sbin/groupadd --gid 2 daemon &> /dev/null fi @@ -1342,7 +1354,7 @@ fi %config(noreplace) %{_sysconfdir}/kamailio/tls.cfg %dir %attr(-,kamailio,kamailio) %{_sharedstatedir}/kamailio %if 0%{?suse_version} -/var/adm/fillup-templates/sysconfig.kamailio +%{_fillupdir}/sysconfig.kamailio %else %config %{_sysconfdir}/sysconfig/kamailio %endif @@ -1884,7 +1896,7 @@ fi %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/kamailio/kamailio-sipcapture.cfg %if 0%{?suse_version} -/var/adm/fillup-templates/sysconfig.sipcapture +%{_fillupdir}/sysconfig.sipcapture %else %config(noreplace) %{_sysconfdir}/sysconfig/sipcapture %endif @@ -2016,7 +2028,7 @@ fi %changelog -* Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> +* Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-0 - removed packaging for Fedora 25, 26 as End Of Life * Sat Sep 02 2017 Sergey Safarov <s.safarov(a)gmail.com> - added packaging for Fedora 26 and openSUSE Leap 42.3

1 0

git:5.2:3986987d: pkg/kamailio/obs: Changed rpm package group for OpenSUSE dist
by Sergey Safarov 14 Nov '18

14 Nov '18

Module: kamailio Branch: 5.2 Commit: 3986987d97f34a0ffb11909a947f95dd25a2eabc URL: https://github.com/kamailio/kamailio/commit/3986987d97f34a0ffb11909a947f95d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-14T14:31:19+03:00 pkg/kamailio/obs: Changed rpm package group for OpenSUSE dist (cherry picked from commit e2ef2309aa5ca13b5650d0703f85a02d2846c976) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3986987d97f34a0ffb11909a947f95d… Patch: https://github.com/kamailio/kamailio/commit/3986987d97f34a0ffb11909a947f95d…

1 0

[kamailio/kamailio] RPM spec update (#1715)
by sergey-safarov 14 Nov '18

14 Nov '18

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Required backport to `5.2` branch. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1715 -- Commit Summary -- * pkg/kamailio/obs: Fixed build on OpenSUSE dists * pkg/kamailio/obs: Changed rpm package group for OpenSUSE dist -- File Changes -- M pkg/kamailio/obs/kamailio.spec (158) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1715.patch https://github.com/kamailio/kamailio/pull/1715.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/1715

3 6

git:master:2abaab52: Merge pull request #1715 from sergey-safarov/spec_update11
by GitHub 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: 2abaab52b94b0d3119a2f99f393218cf1d1d4d5b URL: https://github.com/kamailio/kamailio/commit/2abaab52b94b0d3119a2f99f393218c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-14T11:22:08+01:00 Merge pull request #1715 from sergey-safarov/spec_update11 RPM spec update --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/2abaab52b94b0d3119a2f99f393218c… Patch: https://github.com/kamailio/kamailio/commit/2abaab52b94b0d3119a2f99f393218c…

1 0

git:master:af59382f: pkg/kamailio/obs: Fixed build on OpenSUSE dists
by Sergey Safarov 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: af59382f6cb356087efd6eded5c28e2d228a7032 URL: https://github.com/kamailio/kamailio/commit/af59382f6cb356087efd6eded5c28e2… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-08T12:49:45Z pkg/kamailio/obs: Fixed build on OpenSUSE dists --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/af59382f6cb356087efd6eded5c28e2… Patch: https://github.com/kamailio/kamailio/commit/af59382f6cb356087efd6eded5c28e2… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 6538f46c7d..c8327dd3d4 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -184,12 +184,20 @@ %define _sharedstatedir /var/lib %endif +# Defining missing macros on OpenSUSE Leap +%if 0%{?suse_version} == 1315 +%define _fillupdir /var/adm/fillup-templates +%endif +%if 0%{?suse_version} == 1330 +%define _fillupdir /var/adm/fillup-templates +%endif + Summary: Kamailio (former OpenSER) - the Open Source SIP Server Name: %name Version: %ver Release: %rel Packager: Peter Dunkley <peter(a)dunkley.me.uk> -License: GPL +License: GPL-2.0 Group: System Environment/Daemons Source: http://kamailio.org/pub/kamailio/%{ver}/src/%{name}-%{ver}_src.tar.gz URL: http://kamailio.org/ @@ -219,6 +227,7 @@ Conflicts: kamailio-xmlrpc < %ver, kamailio-xmpp < %ver Conflicts: kamailio-uuid < %ver BuildRequires: bison, flex %if 0%{?suse_version} +Requires: filesystem BuildRequires: systemd-mini, shadow %endif %if 0%{?fedora} == 27 @@ -339,7 +348,7 @@ CPL (Call Processing Language) interpreter for Kamailio. %package crypto -Summary: Module to support cryptographic extensions for use in the Kamailio configuration +Summary: Module to support cryptographic extensions Group: System Environment/Daemons Requires: kamailio = %ver %if 0%{?rhel} == 6 @@ -735,9 +744,12 @@ SCTP transport for Kamailio. %package sipcapture-daemon-config -Summary: reference config for sipcapture daemon +Summary: Reference config for sipcapture daemon Group: System Environment/Daemons Requires: kamailio-sipcapture = %ver +%if 0%{?suse_version} +Requires: filesystem +%endif %description sipcapture-daemon-config reference config for sipcapture daemon. @@ -1140,11 +1152,11 @@ install -Dpm 0644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.tmpfiles %endif %if 0%{?suse_version} -install -d %{buildroot}/var/adm/fillup-templates/ +install -d %{buildroot}%{_fillupdir} install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ - %{buildroot}/var/adm/fillup-templates/sysconfig.kamailio + %{buildroot}%{_fillupdir}/sysconfig.kamailio install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ - %{buildroot}/var/adm/fillup-templates/sysconfig.sipcapture + %{buildroot}%{_fillupdir}/sysconfig.sipcapture %else install -d %{buildroot}%{_sysconfdir}/sysconfig install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/kamailio.sysconfig \ @@ -1164,7 +1176,7 @@ install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ rm -f %{buildroot}%{_libdir}/kamailio/lib*.so %pre -%if 0%{?suse_version} == 1330 +%if 0%{?suse_version} if ! /usr/bin/getent group daemon &>/dev/null; then /usr/sbin/groupadd --gid 2 daemon &> /dev/null fi @@ -1342,7 +1354,7 @@ fi %config(noreplace) %{_sysconfdir}/kamailio/tls.cfg %dir %attr(-,kamailio,kamailio) %{_sharedstatedir}/kamailio %if 0%{?suse_version} -/var/adm/fillup-templates/sysconfig.kamailio +%{_fillupdir}/sysconfig.kamailio %else %config %{_sysconfdir}/sysconfig/kamailio %endif @@ -1884,7 +1896,7 @@ fi %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/kamailio/kamailio-sipcapture.cfg %if 0%{?suse_version} -/var/adm/fillup-templates/sysconfig.sipcapture +%{_fillupdir}/sysconfig.sipcapture %else %config(noreplace) %{_sysconfdir}/sysconfig/sipcapture %endif @@ -2016,7 +2028,7 @@ fi %changelog -* Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> +* Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> 5.2.0-0 - removed packaging for Fedora 25, 26 as End Of Life * Sat Sep 02 2017 Sergey Safarov <s.safarov(a)gmail.com> - added packaging for Fedora 26 and openSUSE Leap 42.3

1 0

git:master:e2ef2309: pkg/kamailio/obs: Changed rpm package group for OpenSUSE dist
by Sergey Safarov 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: e2ef2309aa5ca13b5650d0703f85a02d2846c976 URL: https://github.com/kamailio/kamailio/commit/e2ef2309aa5ca13b5650d0703f85a02… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-08T12:49:54Z pkg/kamailio/obs: Changed rpm package group for OpenSUSE dist --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e2ef2309aa5ca13b5650d0703f85a02… Patch: https://github.com/kamailio/kamailio/commit/e2ef2309aa5ca13b5650d0703f85a02…

1 0

git:5.2:b2b8bc03: kazoo: fix compilation warnings
by Victor Seva 14 Nov '18

14 Nov '18

Module: kamailio Branch: 5.2 Commit: b2b8bc03d0658b0786a72e1e589b8b129ee7599e URL: https://github.com/kamailio/kamailio/commit/b2b8bc03d0658b0786a72e1e589b8b1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-14T10:58:17+01:00 kazoo: fix compilation warnings > kz_amqp.c:1884:5: warning: variable 'binding' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(bind == NULL) { > ^~~~~~~~~~~~ > kz_amqp.c:1919:5: note: uninitialized use occurs here > if(binding != NULL) > ^~~~~~~ > kz_amqp.c:1884:2: note: remove the 'if' if its condition is always false > if(bind == NULL) { > ^~~~~~~~~~~~~~~~~~ > kz_amqp.c:1896:2: note: variable 'binding' is declared here > kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); > ^ > kz_amqp.c:1965:5: warning: variable 'binding' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(bind == NULL) { > ^~~~~~~~~~~~ > kz_amqp.c:1992:8: note: uninitialized use occurs here > if(binding != NULL) > ^~~~~~~ > kz_amqp.c:1965:2: note: remove the 'if' if its condition is always false > if(bind == NULL) { > ^~~~~~~~~~~~~~~~~~ > kz_amqp.c:1972:2: note: variable 'binding' is declared here > kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); > ^ > kz_amqp.c:2875:5: warning: variable 'json_obj' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(payload == NULL) { > ^~~~~~~~~~~~~~~ > kz_amqp.c:2927:5: note: uninitialized use occurs here > if(json_obj) > ^~~~~~~~ > kz_amqp.c:2875:2: note: remove the 'if' if its condition is always false > if(payload == NULL) { > ^~~~~~~~~~~~~~~~~~~~~ > kz_amqp.c:2880:2: note: variable 'json_obj' is declared here > json_obj_ptr json_obj = kz_json_parse(payload ); > ^ > 3 warnings generated. (cherry picked from commit 232e8400caf7173e73229627af0270a704824f62) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/b2b8bc03d0658b0786a72e1e589b8b1… Patch: https://github.com/kamailio/kamailio/commit/b2b8bc03d0658b0786a72e1e589b8b1… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 36e7ea0843..00c8f3fb77 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1802,10 +1802,10 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) str* event_key = NULL; str* event_subkey = NULL; - - json_obj_ptr json_obj = NULL; struct json_object* tmpObj = NULL; + kz_amqp_bind_ptr bind = NULL; + kz_amqp_binding_ptr binding = NULL; if (fixup_get_svalue(msg, (gparam_p)payload, &payload_s) != 0) { LM_ERR("cannot get payload value\n"); @@ -1880,7 +1880,7 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) } queue = kz_amqp_queue_from_json(&queue_s, tmpObj); - kz_amqp_bind_ptr bind = kz_amqp_bind_alloc(exchange, exchange_binding, queue, routing, event_key, event_subkey); + bind = kz_amqp_bind_alloc(exchange, exchange_binding, queue, routing, event_key, event_subkey); if(bind == NULL) { LM_ERR("Could not allocate bind struct\n"); goto error; @@ -1893,7 +1893,7 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) bind->consistent_worker_key = consistent_worker_key; - kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); + binding = shm_malloc(sizeof(kz_amqp_binding)); if(binding == NULL) { LM_ERR("Could not allocate binding struct\n"); goto error; @@ -1935,7 +1935,8 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange kz_amqp_exchange_ptr exchange_ptr = NULL; kz_amqp_queue_ptr queue_ptr = NULL; kz_amqp_routings_ptr routing_ptr = NULL; - + kz_amqp_bind_ptr bind = NULL; + kz_amqp_binding_ptr binding = NULL; if (fixup_get_svalue(msg, (gparam_p)exchange, &exchange_s) != 0) { LM_ERR("cannot get exchange string value\n"); @@ -1961,7 +1962,7 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange queue_ptr = kz_amqp_queue_new(&queue_s); routing_ptr = kz_amqp_routing_new(routing_key_s.s); - kz_amqp_bind_ptr bind = kz_amqp_bind_alloc(exchange_ptr, NULL, queue_ptr, routing_ptr, NULL, NULL); + bind = kz_amqp_bind_alloc(exchange_ptr, NULL, queue_ptr, routing_ptr, NULL, NULL); if(bind == NULL) { LM_ERR("Could not allocate bind struct\n"); goto error; @@ -1969,7 +1970,7 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange bind->no_ack = 1; - kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); + binding = shm_malloc(sizeof(kz_amqp_binding)); if(binding == NULL) { LM_ERR("Could not allocate binding struct\n"); goto error; @@ -2870,6 +2871,7 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) char* server_id_str = NULL; kz_amqp_cmd_ptr cmd = NULL; json_object* JObj = NULL; + json_obj_ptr json_obj = NULL; char* payload = kz_local_amqp_bytes_dup(body); if(payload == NULL) { @@ -2877,7 +2879,7 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) goto error; } - json_obj_ptr json_obj = kz_json_parse(payload ); + json_obj = kz_json_parse(payload ); if (json_obj == NULL) { LM_ERR("error parsing json payload\n"); goto error;

1 0

git:5.2:e377ec1f: db_berkeley: fix compilation warning
by Victor Seva 14 Nov '18

14 Nov '18

Module: kamailio Branch: 5.2 Commit: e377ec1fb2ce841b0b96c7f9c4cea935ad6f10f6 URL: https://github.com/kamailio/kamailio/commit/e377ec1fb2ce841b0b96c7f9c4cea93… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-14T10:58:17+01:00 db_berkeley: fix compilation warning > CC (clang) [M db_berkeley.so] db_berkeley.o > db_berkeley.c:916:5: warning: variable 'dbcp' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if((ret = bdb_get_columns(_tp, _r, 0, 0)) != 0) { > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > db_berkeley.c:966:5: note: uninitialized use occurs here > if(dbcp) > ^~~~ > db_berkeley.c:916:2: note: remove the 'if' if its condition is always false > if((ret = bdb_get_columns(_tp, _r, 0, 0)) != 0) { > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > db_berkeley.c:901:6: warning: variable 'dbcp' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(!lkey) { > ^~~~~ > db_berkeley.c:966:5: note: uninitialized use occurs here > if(dbcp) > ^~~~ > db_berkeley.c:901:3: note: remove the 'if' if its condition is always false > if(!lkey) { > ^~~~~~~~~~~ > db_berkeley.c:875:11: note: initialize the variable 'dbcp' to silence this warning > DBC *dbcp; > ^ > = NULL > 2 warnings generated. (cherry picked from commit 93e0b7e7bcefa900e8686e7e60f1a59cc32f9b39) --- Modified: src/modules/db_berkeley/db_berkeley.c --- Diff: https://github.com/kamailio/kamailio/commit/e377ec1fb2ce841b0b96c7f9c4cea93… Patch: https://github.com/kamailio/kamailio/commit/e377ec1fb2ce841b0b96c7f9c4cea93… --- diff --git a/src/modules/db_berkeley/db_berkeley.c b/src/modules/db_berkeley/db_berkeley.c index c3ea90fc16..80c9aefac0 100644 --- a/src/modules/db_berkeley/db_berkeley.c +++ b/src/modules/db_berkeley/db_berkeley.c @@ -872,7 +872,7 @@ int _bdb_delete_cursor( int ret, klen = MAX_ROW_SIZE; DBT key, data; DB *db; - DBC *dbcp; + DBC *dbcp = NULL; int *lkey = NULL; ret = 0;

1 0

git:master:232e8400: kazoo: fix compilation warnings
by Victor Seva 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: 232e8400caf7173e73229627af0270a704824f62 URL: https://github.com/kamailio/kamailio/commit/232e8400caf7173e73229627af0270a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-14T10:53:06+01:00 kazoo: fix compilation warnings > kz_amqp.c:1884:5: warning: variable 'binding' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(bind == NULL) { > ^~~~~~~~~~~~ > kz_amqp.c:1919:5: note: uninitialized use occurs here > if(binding != NULL) > ^~~~~~~ > kz_amqp.c:1884:2: note: remove the 'if' if its condition is always false > if(bind == NULL) { > ^~~~~~~~~~~~~~~~~~ > kz_amqp.c:1896:2: note: variable 'binding' is declared here > kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); > ^ > kz_amqp.c:1965:5: warning: variable 'binding' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(bind == NULL) { > ^~~~~~~~~~~~ > kz_amqp.c:1992:8: note: uninitialized use occurs here > if(binding != NULL) > ^~~~~~~ > kz_amqp.c:1965:2: note: remove the 'if' if its condition is always false > if(bind == NULL) { > ^~~~~~~~~~~~~~~~~~ > kz_amqp.c:1972:2: note: variable 'binding' is declared here > kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); > ^ > kz_amqp.c:2875:5: warning: variable 'json_obj' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(payload == NULL) { > ^~~~~~~~~~~~~~~ > kz_amqp.c:2927:5: note: uninitialized use occurs here > if(json_obj) > ^~~~~~~~ > kz_amqp.c:2875:2: note: remove the 'if' if its condition is always false > if(payload == NULL) { > ^~~~~~~~~~~~~~~~~~~~~ > kz_amqp.c:2880:2: note: variable 'json_obj' is declared here > json_obj_ptr json_obj = kz_json_parse(payload ); > ^ > 3 warnings generated. --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/232e8400caf7173e73229627af0270a… Patch: https://github.com/kamailio/kamailio/commit/232e8400caf7173e73229627af0270a… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 36e7ea0843..00c8f3fb77 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1802,10 +1802,10 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) str* event_key = NULL; str* event_subkey = NULL; - - json_obj_ptr json_obj = NULL; struct json_object* tmpObj = NULL; + kz_amqp_bind_ptr bind = NULL; + kz_amqp_binding_ptr binding = NULL; if (fixup_get_svalue(msg, (gparam_p)payload, &payload_s) != 0) { LM_ERR("cannot get payload value\n"); @@ -1880,7 +1880,7 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) } queue = kz_amqp_queue_from_json(&queue_s, tmpObj); - kz_amqp_bind_ptr bind = kz_amqp_bind_alloc(exchange, exchange_binding, queue, routing, event_key, event_subkey); + bind = kz_amqp_bind_alloc(exchange, exchange_binding, queue, routing, event_key, event_subkey); if(bind == NULL) { LM_ERR("Could not allocate bind struct\n"); goto error; @@ -1893,7 +1893,7 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) bind->consistent_worker_key = consistent_worker_key; - kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); + binding = shm_malloc(sizeof(kz_amqp_binding)); if(binding == NULL) { LM_ERR("Could not allocate binding struct\n"); goto error; @@ -1935,7 +1935,8 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange kz_amqp_exchange_ptr exchange_ptr = NULL; kz_amqp_queue_ptr queue_ptr = NULL; kz_amqp_routings_ptr routing_ptr = NULL; - + kz_amqp_bind_ptr bind = NULL; + kz_amqp_binding_ptr binding = NULL; if (fixup_get_svalue(msg, (gparam_p)exchange, &exchange_s) != 0) { LM_ERR("cannot get exchange string value\n"); @@ -1961,7 +1962,7 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange queue_ptr = kz_amqp_queue_new(&queue_s); routing_ptr = kz_amqp_routing_new(routing_key_s.s); - kz_amqp_bind_ptr bind = kz_amqp_bind_alloc(exchange_ptr, NULL, queue_ptr, routing_ptr, NULL, NULL); + bind = kz_amqp_bind_alloc(exchange_ptr, NULL, queue_ptr, routing_ptr, NULL, NULL); if(bind == NULL) { LM_ERR("Could not allocate bind struct\n"); goto error; @@ -1969,7 +1970,7 @@ int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange bind->no_ack = 1; - kz_amqp_binding_ptr binding = shm_malloc(sizeof(kz_amqp_binding)); + binding = shm_malloc(sizeof(kz_amqp_binding)); if(binding == NULL) { LM_ERR("Could not allocate binding struct\n"); goto error; @@ -2870,6 +2871,7 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) char* server_id_str = NULL; kz_amqp_cmd_ptr cmd = NULL; json_object* JObj = NULL; + json_obj_ptr json_obj = NULL; char* payload = kz_local_amqp_bytes_dup(body); if(payload == NULL) { @@ -2877,7 +2879,7 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) goto error; } - json_obj_ptr json_obj = kz_json_parse(payload ); + json_obj = kz_json_parse(payload ); if (json_obj == NULL) { LM_ERR("error parsing json payload\n"); goto error;

1 0

git:master:93e0b7e7: db_berkeley: fix compilation warning
by Victor Seva 14 Nov '18

14 Nov '18

Module: kamailio Branch: master Commit: 93e0b7e7bcefa900e8686e7e60f1a59cc32f9b39 URL: https://github.com/kamailio/kamailio/commit/93e0b7e7bcefa900e8686e7e60f1a59… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-14T10:41:08+01:00 db_berkeley: fix compilation warning > CC (clang) [M db_berkeley.so] db_berkeley.o > db_berkeley.c:916:5: warning: variable 'dbcp' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if((ret = bdb_get_columns(_tp, _r, 0, 0)) != 0) { > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > db_berkeley.c:966:5: note: uninitialized use occurs here > if(dbcp) > ^~~~ > db_berkeley.c:916:2: note: remove the 'if' if its condition is always false > if((ret = bdb_get_columns(_tp, _r, 0, 0)) != 0) { > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > db_berkeley.c:901:6: warning: variable 'dbcp' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] > if(!lkey) { > ^~~~~ > db_berkeley.c:966:5: note: uninitialized use occurs here > if(dbcp) > ^~~~ > db_berkeley.c:901:3: note: remove the 'if' if its condition is always false > if(!lkey) { > ^~~~~~~~~~~ > db_berkeley.c:875:11: note: initialize the variable 'dbcp' to silence this warning > DBC *dbcp; > ^ > = NULL > 2 warnings generated. --- Modified: src/modules/db_berkeley/db_berkeley.c --- Diff: https://github.com/kamailio/kamailio/commit/93e0b7e7bcefa900e8686e7e60f1a59… Patch: https://github.com/kamailio/kamailio/commit/93e0b7e7bcefa900e8686e7e60f1a59… --- diff --git a/src/modules/db_berkeley/db_berkeley.c b/src/modules/db_berkeley/db_berkeley.c index c3ea90fc16..80c9aefac0 100644 --- a/src/modules/db_berkeley/db_berkeley.c +++ b/src/modules/db_berkeley/db_berkeley.c @@ -872,7 +872,7 @@ int _bdb_delete_cursor( int ret, klen = MAX_ROW_SIZE; DBT key, data; DB *db; - DBC *dbcp; + DBC *dbcp = NULL; int *lkey = NULL; ret = 0;

1 0

[kamailio/kamailio] rtp_media_server: adding module (#1701)
by Julien Chavanton 13 Nov '18

13 Nov '18

#### 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] New module #### Checklist: Tested with various sofphones : Ekiga, Linphone, CSipSimple #### Description By combining Kamailio, oRTP and mediastreamer2 this module is providing some very good foundation to support RTP endpoint and various media processing features. This seems like a great idea for various use cases like IoT, IVR or other specific needs. Kamailio is handling everything related to SIP/SDP (the module is adding some SDP parsing) as well as providing a scripting engine. oRTP is providing RTP endpoints compliant with (RFC 3550) MediaStreamer2, even if written in C is quite a high level library, because it is implementing a framework for audio processing using graphs of filters, filters can be to do various things. Similar to playing with lego blocks :) * Support for most free and some non free codecs can be added easily. * Work to bridge calls is already in progress in the module. * Mobile phone support ARM CPU * other embedded scenario should be supported * much more ... Mediastream2 is creating one thread per call "msticker", this can work smoothly in Kamailio even if it is forking processes. Shared memory allocation is supported using wrapper around malloc/free used by the libraries. Some extra work that needs to be done shorty * Syncronization with locks is not completed (minor task, only access to a linked list needs to be syncronized properly) * Memory leak not tested properly (not take the time to test with valgrind yet) This project was started last year, I think it is time to submit it, I will surely find the time to do the extra work needed shortly. Example config using the features already implemented ``` event_route[rms:start] { xnotice("[rms:start] play ...\n"); rms_play("/tmp/reference_8000.wav", "rms:after_play"); }; event_route[rms:after_play] { xnotice("[rms:after_play] play done...\n"); rms_hangup(); }; route { if (t_precheck_trans()) { t_check_trans(); exit; } t_check_trans(); if (is_method("INVITE") && !has_totag()) { if (!rms_answer()) { t_reply("503", "server error"); } } if (is_method("BYE")){ rms_media_stop(); } } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1701 -- Commit Summary -- * rtp_media_server: adding module -- File Changes -- M src/Makefile.groups (6) A src/modules/rtp_media_server/Makefile (13) A src/modules/rtp_media_server/config_example/kamailio.cfg (56) A src/modules/rtp_media_server/doc/Makefile (4) A src/modules/rtp_media_server/doc/rtp_media_server.xml (42) A src/modules/rtp_media_server/doc/rtp_media_server_admin.xml (193) A src/modules/rtp_media_server/install_bc.sh (45) A src/modules/rtp_media_server/rms_media.c (320) A src/modules/rtp_media_server/rms_media.h (103) A src/modules/rtp_media_server/rms_sdp.c (301) A src/modules/rtp_media_server/rms_sdp.h (45) A src/modules/rtp_media_server/rtp_media_server.c (718) A src/modules/rtp_media_server/rtp_media_server.h (91) A src/modules/rtp_media_server/voice_file/Bach_10s_8000.wav (0) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1701.patch https://github.com/kamailio/kamailio/pull/1701.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/1701

4 26

git:master:1d89c0e5: Makefile.groups: added k group for rtp_media_server
by Daniel-Constantin Mierla 13 Nov '18

13 Nov '18

Module: kamailio Branch: master Commit: 1d89c0e5310a4a0d64f9149f4131b45d001cea36 URL: https://github.com/kamailio/kamailio/commit/1d89c0e5310a4a0d64f9149f4131b45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-13T11:15:08+01:00 Makefile.groups: added k group for rtp_media_server - use full module name for list variable --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/1d89c0e5310a4a0d64f9149f4131b45… Patch: https://github.com/kamailio/kamailio/commit/1d89c0e5310a4a0d64f9149f4131b45… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 1e8227dadc..9729cdd1b5 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -208,7 +208,7 @@ mod_list_rabbitmq=rabbitmq mod_list_phonenum=phonenum # - modules depending on oRTP and mediastreamer2 libraries -mod_list_rtp_media=rtp_media_server +mod_list_rtp_media_server=rtp_media_server # - all modules mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ @@ -243,7 +243,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_http_async) $(mod_list_nsq) \ $(mod_list_rabbitmq) $(mod_list_jsdt)) \ $(mod_list_phonenum) \ - $(mod_list_rtp_media) + $(mod_list_rtp_media_server) @@ -457,6 +457,9 @@ module_group_krabbitmq=$(mod_list_rabbitmq) # K phonenumber modules module_group_kphonenum=$(mod_list_phonenum) +# K rtp_media_server modules +module_group_krtp_media_server=$(mod_list_rtp_media_server) + # list of static modules # static_modules:=

1 0

git:master:32c363e1: Merge pull request #1701 from jchavanton/rtp_media_server
by GitHub 13 Nov '18

13 Nov '18

Module: kamailio Branch: master Commit: 32c363e1053d423bbc13c5d4e87a02097964ac7c URL: https://github.com/kamailio/kamailio/commit/32c363e1053d423bbc13c5d4e87a020… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-13T00:34:58-08:00 Merge pull request #1701 from jchavanton/rtp_media_server rtp_media_server: adding module --- Added: src/modules/rtp_media_server/Makefile Added: src/modules/rtp_media_server/config_example/kamailio.cfg Added: src/modules/rtp_media_server/doc/Makefile Added: src/modules/rtp_media_server/doc/rtp_media_server.xml Added: src/modules/rtp_media_server/doc/rtp_media_server_admin.xml Added: src/modules/rtp_media_server/install_bc.sh Added: src/modules/rtp_media_server/rms_media.c Added: src/modules/rtp_media_server/rms_media.h Added: src/modules/rtp_media_server/rms_sdp.c Added: src/modules/rtp_media_server/rms_sdp.h Added: src/modules/rtp_media_server/rms_util.h Added: src/modules/rtp_media_server/rtp_media_server.c Added: src/modules/rtp_media_server/rtp_media_server.h Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/32c363e1053d423bbc13c5d4e87a020… Patch: https://github.com/kamailio/kamailio/commit/32c363e1053d423bbc13c5d4e87a020…

1 0

git:master:47e35db0: rtp_media_server: adding module
by Julien Chavanton 13 Nov '18

13 Nov '18

Module: kamailio Branch: master Commit: 47e35db05c5da1b2b2a24ae36b7b63d0625060c9 URL: https://github.com/kamailio/kamailio/commit/47e35db05c5da1b2b2a24ae36b7b63d… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-11-13T07:23:46Z rtp_media_server: adding module --- Added: src/modules/rtp_media_server/Makefile Added: src/modules/rtp_media_server/config_example/kamailio.cfg Added: src/modules/rtp_media_server/doc/Makefile Added: src/modules/rtp_media_server/doc/rtp_media_server.xml Added: src/modules/rtp_media_server/doc/rtp_media_server_admin.xml Added: src/modules/rtp_media_server/install_bc.sh Added: src/modules/rtp_media_server/rms_media.c Added: src/modules/rtp_media_server/rms_media.h Added: src/modules/rtp_media_server/rms_sdp.c Added: src/modules/rtp_media_server/rms_sdp.h Added: src/modules/rtp_media_server/rms_util.h Added: src/modules/rtp_media_server/rtp_media_server.c Added: src/modules/rtp_media_server/rtp_media_server.h Added: src/modules/rtp_media_server/voice_file/Bach_10s_8000.wav Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/47e35db05c5da1b2b2a24ae36b7b63d… Patch: https://github.com/kamailio/kamailio/commit/47e35db05c5da1b2b2a24ae36b7b63d…

1 0

git:master:2a76fdd4: rtp_media_server: support for multiple actions
by Julien Chavanton 13 Nov '18

13 Nov '18

Module: kamailio Branch: master Commit: 2a76fdd4336039da2df4db4459e6db4b5e3ba364 URL: https://github.com/kamailio/kamailio/commit/2a76fdd4336039da2df4db4459e6db4… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-11-13T08:20:45Z rtp_media_server: support for multiple actions --- Modified: src/modules/rtp_media_server/config_example/kamailio.cfg Modified: src/modules/rtp_media_server/doc/rtp_media_server_admin.xml Modified: src/modules/rtp_media_server/install_bc.sh Modified: src/modules/rtp_media_server/rms_media.c Modified: src/modules/rtp_media_server/rms_media.h Modified: src/modules/rtp_media_server/rtp_media_server.c Modified: src/modules/rtp_media_server/rtp_media_server.h Removed: src/modules/rtp_media_server/voice_file/Bach_10s_8000.wav --- Diff: https://github.com/kamailio/kamailio/commit/2a76fdd4336039da2df4db4459e6db4… Patch: https://github.com/kamailio/kamailio/commit/2a76fdd4336039da2df4db4459e6db4…

1 0

git:master:e2ca5516: tmx: use branch index for $T_rpl() cache invalidation
by Daniel-Constantin Mierla 13 Nov '18

13 Nov '18

Module: kamailio Branch: master Commit: e2ca5516ae086cf33c61dbb9e653a5484cca2074 URL: https://github.com/kamailio/kamailio/commit/e2ca5516ae086cf33c61dbb9e653a54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-13T08:59:43+01:00 tmx: use branch index for $T_rpl() cache invalidation --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/e2ca5516ae086cf33c61dbb9e653a54… Patch: https://github.com/kamailio/kamailio/commit/e2ca5516ae086cf33c61dbb9e653a54… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 47e300af11..9fd28ee44b 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -34,6 +34,7 @@ struct _pv_tmx_data { unsigned int index; unsigned int label; + int branch; struct sip_msg msg; struct sip_msg *tmsgp; char *buf; @@ -175,7 +176,8 @@ int pv_t_update_rpl(struct sip_msg *msg) if(t->uac[branch].reply==NULL || t->uac[branch].reply==FAKED_REPLY) return 1; - if (_pv_trpl.label == t->label && _pv_trpl.index == t->hash_index) + if (_pv_trpl.label == t->label && _pv_trpl.index == t->hash_index + && _pv_trpl.branch == branch) return 0; /* make a copy */ @@ -188,6 +190,7 @@ int pv_t_update_rpl(struct sip_msg *msg) _pv_trpl.tmsgp = NULL; _pv_trpl.index = 0; _pv_trpl.label = 0; + _pv_trpl.branch = 0; _pv_trpl.buf_size = t->uac[branch].reply->len+1; _pv_trpl.buf = (char*)pkg_malloc(_pv_trpl.buf_size*sizeof(char)); if(_pv_trpl.buf==NULL) @@ -207,6 +210,7 @@ int pv_t_update_rpl(struct sip_msg *msg) _pv_trpl.tmsgp = t->uac[branch].reply; _pv_trpl.index = t->hash_index; _pv_trpl.label = t->label; + _pv_trpl.branch = branch; if(pv_t_copy_msg(t->uac[branch].reply, &_pv_trpl.msg)!=0) { @@ -216,6 +220,7 @@ int pv_t_update_rpl(struct sip_msg *msg) _pv_trpl.tmsgp = NULL; _pv_trpl.index = 0; _pv_trpl.label = 0; + _pv_trpl.branch = 0; return -1; }

1 0

[kamailio/kamailio] Fixed alpine docker on master branch after switching from libress to openssl (#1718)
by sergey-safarov 09 Nov '18

09 Nov '18

Fixed alpine docker packaging on master branch after switching from libress to openssl This need only into master branch. (not backport) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1718 -- Commit Summary -- * pkg/kamailio/alpine: Update APKBUILD * pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container -- File Changes -- M pkg/docker (2) D pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch (20) M pkg/kamailio/alpine/APKBUILD (12) M pkg/kamailio/alpine/kamailio.initd (2) D pkg/kamailio/alpine/kamctl_build.patch (236) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1718.patch https://github.com/kamailio/kamailio/pull/1718.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/1718

2 1

git:master:37bff458: pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container
by Victor Seva 09 Nov '18

09 Nov '18

Module: kamailio Branch: master Commit: 37bff4588803a70873babdb483804e3734b42900 URL: https://github.com/kamailio/kamailio/commit/37bff4588803a70873babdb483804e3… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-09T17:38:21+01:00 pkg/docker: Alpine switched to use openssl. Updated rules for alpine docker container --- Modified: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD Removed: pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch --- Diff: https://github.com/kamailio/kamailio/commit/37bff4588803a70873babdb483804e3… Patch: https://github.com/kamailio/kamailio/commit/37bff4588803a70873babdb483804e3… --- diff --git a/pkg/docker b/pkg/docker index 3c8a156abe..6a18819230 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 3c8a156abef2a034d9a21df5bf73f4b5cc4d3e05 +Subproject commit 6a18819230742860f6db6996cda593f55f63cd8c diff --git a/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch b/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch deleted file mode 100644 index 08308f77b1..0000000000 --- a/pkg/kamailio/alpine/0004-src_core_tcp_read_c.patch +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_core_tcp_read_c,v 1.1 2017/07/03 22:14:20 sthen Exp $ - -Index: a/src/core/tcp_read.c ---- a/src/core/tcp_read.c.orig -+++ a/src/core/tcp_read.c -@@ -1497,6 +1497,14 @@ void release_tcpconn(struct tcp_connection* c, long st - ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, - ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port); - LM_DBG("extra_data %p\n", c->extra_data); -+ -+ /* experimental fix tls crash with libressl */ -+ /* add cleanup SSL structure in child process, in parent process SSL structure is empty */ -+ if ((c->type==PROTO_TLS || c->type==PROTO_WSS) && (c->extra_data) && c->fd != -1) { -+ tls_close(c, c->fd); -+ tls_tcpconn_clean(c); -+ } -+ - /* release req & signal the parent */ - c->reader_pid=0; /* reset it */ - if (c->fd!=-1){ diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 2b77da2a3d..96eb89c25e 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -27,7 +27,7 @@ depends="gawk" options="!check" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python2-dev pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev - lua-dev openldap-dev libressl-dev net-snmp-dev libuuid libev-dev + lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev libmaxminddb-dev libunistring-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -251,7 +251,6 @@ done source="${pkgname}-${pkgver}${_suffix}.tar.gz::https://github.com/kamailio/$pkgname/archive/$_gitcommit.tar.gz 0001-kamdbctl.base.patch - 0004-src_core_tcp_read_c.patch kamailio.initd " @@ -551,5 +550,4 @@ sipdump() { sha512sums="51ea5fccd27a9d3d1783cfc5596eb28ab27e34faeec3268600363f43c48a3634c3c584c479ba874fdb53b85766a0ce8fe7df0e20954c9c6514b1d9d41d9237e6 kamailio-5.1.0.20171125-991fe9b.tar.gz 6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch -af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076 0004-src_core_tcp_read_c.patch 321b1b160434150bcde3c0ad7f47ddf259791b68d4ce74ba4c35034026421a2bc6f5e86f26f393f5fcdb523d8cd75f944709473065553ce860b0ea06b3dc2a1b kamailio.initd"

1 0

git:master:6aca6c0d: pkg/kamailio/alpine: Update APKBUILD
by Victor Seva 09 Nov '18

09 Nov '18

Module: kamailio Branch: master Commit: 6aca6c0ddc201882d1ab75e662299450f578aa32 URL: https://github.com/kamailio/kamailio/commit/6aca6c0ddc201882d1ab75e66229945… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-09T17:38:21+01:00 pkg/kamailio/alpine: Update APKBUILD --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/alpine/kamailio.initd Removed: pkg/kamailio/alpine/kamctl_build.patch --- Diff: https://github.com/kamailio/kamailio/commit/6aca6c0ddc201882d1ab75e66229945… Patch: https://github.com/kamailio/kamailio/commit/6aca6c0ddc201882d1ab75e66229945…

1 0

error in Makefile.modules
by Juha Heinanen 09 Nov '18

09 Nov '18

When building debian package from master, I noticed this kind of error message: s ../../../doc/stylesheets/serdoc2man.xsl auth.xml make[3]: s: Command not found ../../Makefile.modules:283: recipe for target 'auth.7' failed The line in Makefile.modules is here: $(MOD_NAME).7: $(MOD_NAME).xml $(DOCBOOK) -s ../../../doc/stylesheets/serdoc2man.xsl $< Could it be that variable $(DOCBOOK) has not been defined? -- Juha

3 4

log_custom module - LC_LOG_MSG_MAX_SIZE
by Luis Martin Gil 09 Nov '18

09 Nov '18

Hi all, Is there any strong reason to set LC_LOG_MSG_MAX_SIZE to 16384 in the log_custom module? Any thoughts / undesired effects if changed to 32768 or higher? ``` $ grep -R 'define LC_LOG_MSG_MAX_SIZE' * src/modules/log_custom/log_custom_mod.c:#define LC_LOG_MSG_MAX_SIZE 16384 src/modules/log_systemd/log_systemd_mod.c:#define LC_LOG_MSG_MAX_SIZE 16384 ``` Thanks. Luis

2 1

[kamailio/kamailio] RPM spec update (#1711)
by sergey-safarov 09 Nov '18

09 Nov '18

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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: - [x] PR should be backported to `5.2` branche - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Need back port to 5.2 branch. For 5.1 branch also wanted but will be merged with conflict. Backport into 5.1 is optional. Then i will create dedicated PR You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1711 -- Commit Summary -- * pkg/kamailio/obs: update spec to mach currently used * pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists * pkg/kamailio/obs: smsops module relocated into main rpm package -- File Changes -- M pkg/kamailio/obs/kamailio.service (3) M pkg/kamailio/obs/kamailio.spec (51) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1711.patch https://github.com/kamailio/kamailio/pull/1711.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/1711

3 3

git:5.2:87759978: pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists
by Henning Westerholt 09 Nov '18

09 Nov '18

Module: kamailio Branch: 5.2 Commit: 87759978d3997f26fb935a95eed1342ffa079473 URL: https://github.com/kamailio/kamailio/commit/87759978d3997f26fb935a95eed1342… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-09T10:42:31+01:00 pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists (cherry picked from commit 68646c6fff4a06fa949296d1a41483ff51fc9389) --- Modified: pkg/kamailio/obs/kamailio.service Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/87759978d3997f26fb935a95eed1342… Patch: https://github.com/kamailio/kamailio/commit/87759978d3997f26fb935a95eed1342… --- diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service index 0be0dc0e63..237ad10ef5 100644 --- a/pkg/kamailio/obs/kamailio.service +++ b/pkg/kamailio/obs/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=simple diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8fc518fb0b..7c9dcc6905 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -9,6 +9,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -30,6 +31,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -51,6 +53,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -72,6 +75,7 @@ %bcond_without dnssec %bcond_without geoip %bcond_with http_async_client +%bcond_without ims %bcond_with jansson %bcond_with json %bcond_without lua @@ -94,6 +98,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -115,6 +120,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -136,6 +142,7 @@ %bcond_without dnssec %bcond_with geoip %bcond_with http_async_client +%bcond_with ims %bcond_with jansson %bcond_with json %bcond_with lua @@ -157,6 +164,7 @@ %bcond_with dnssec %bcond_with geoip %bcond_with http_async_client +%bcond_with ims %bcond_with jansson %bcond_with json %bcond_with lua @@ -164,7 +172,7 @@ %bcond_with memcached %bcond_without mongodb %bcond_without perl -%bcond_without rabbitmq +%bcond_with rabbitmq %bcond_without redis %bcond_with sctp %bcond_with websocket @@ -442,6 +450,7 @@ BuildRequires: libxml2-devel, libcurl-devel, zlib-devel This module implements protocol functions that use the libcurl to communicate with HTTP servers. +%if %{with ims} %package ims Summary: IMS modules and extensions module for Kamailio Group: System Environment/Daemons @@ -450,6 +459,7 @@ BuildRequires: libxml2-devel libmnl-devel %description ims IMS modules and extensions module for Kamailio. +%endif %if %{with jansson} @@ -967,7 +977,6 @@ make cfg prefix=/usr \ basedir=%{buildroot} \ cfg_prefix=%{buildroot} \ doc_prefix=%{buildroot} \ - share_prefix=%{_prefix} \ doc_dir=%{_docdir}/kamailio/ \ cfg_target=%{_sysconfdir}/kamailio/ modules_dirs="modules" make @@ -991,7 +1000,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with http_async_client} khttp_async \ %endif +%if %{with ims} kims \ +%endif %if %{with jansson} kjansson \ %endif @@ -1063,7 +1074,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with http_async_client} khttp_async \ %endif +%if %{with ims} kims \ +%endif %if %{with jansson} kjansson \ %endif @@ -1602,6 +1615,7 @@ fi %doc %{_docdir}/kamailio/modules/README.http_client %{_libdir}/kamailio/modules/http_client.so +%if %{with ims} %files ims %defattr(-,root,root) %{_libdir}/kamailio/libkamailio_ims.so.0 @@ -1638,6 +1652,7 @@ fi %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so %{_libdir}/kamailio/modules/smsops.so +%endif %if %{with jansson}

1 0

git:5.2:d9551180: pkg/kamailio/obs: smsops module relocated into main rpm package
by Henning Westerholt 09 Nov '18

09 Nov '18

Module: kamailio Branch: 5.2 Commit: d9551180fe9ae93f013d5ca3d4bdd2bf4f69640d URL: https://github.com/kamailio/kamailio/commit/d9551180fe9ae93f013d5ca3d4bdd2b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-09T10:42:43+01:00 pkg/kamailio/obs: smsops module relocated into main rpm package (cherry picked from commit b0e814315a196cb6b1e8eca453cf6e4eea26dca4) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d9551180fe9ae93f013d5ca3d4bdd2b… Patch: https://github.com/kamailio/kamailio/commit/d9551180fe9ae93f013d5ca3d4bdd2b… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7c9dcc6905..6538f46c7d 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1295,6 +1295,7 @@ fi %doc %{_docdir}/kamailio/modules/README.siputils %doc %{_docdir}/kamailio/modules/README.sl %doc %{_docdir}/kamailio/modules/README.sms +%doc %{_docdir}/kamailio/modules/README.smsops %doc %{_docdir}/kamailio/modules/README.speeddial %doc %{_docdir}/kamailio/modules/README.sqlops %doc %{_docdir}/kamailio/modules/README.ss7ops @@ -1445,6 +1446,7 @@ fi %{_libdir}/kamailio/modules/siputils.so %{_libdir}/kamailio/modules/sl.so %{_libdir}/kamailio/modules/sms.so +%{_libdir}/kamailio/modules/smsops.so %{_libdir}/kamailio/modules/speeddial.so %{_libdir}/kamailio/modules/sqlops.so %{_libdir}/kamailio/modules/ss7ops.so @@ -1635,7 +1637,6 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf -%doc %{_docdir}/kamailio/modules/README.smsops %{_libdir}/kamailio/modules/cdp.so %{_libdir}/kamailio/modules/cdp_avp.so %{_libdir}/kamailio/modules/ims_auth.so @@ -1651,7 +1652,6 @@ fi %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so -%{_libdir}/kamailio/modules/smsops.so %endif

1 0

git:5.2:5177db61: pkg/kamailio/obs: update spec to mach currently used
by Henning Westerholt 09 Nov '18

09 Nov '18

Module: kamailio Branch: 5.2 Commit: 5177db61931d7a9ca966dba7f38aa8087b45ff65 URL: https://github.com/kamailio/kamailio/commit/5177db61931d7a9ca966dba7f38aa80… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-11-09T10:42:09+01:00 pkg/kamailio/obs: update spec to mach currently used (cherry picked from commit 3dade81da58adb40b039a23dcaf67795e41ccebe) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/5177db61931d7a9ca966dba7f38aa80… Patch: https://github.com/kamailio/kamailio/commit/5177db61931d7a9ca966dba7f38aa80… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index c0356d8f73..8fc518fb0b 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -527,15 +527,6 @@ BuildRequires: openldap-devel LDAP search interface for Kamailio. -%package log_custom -Summary: Logging to custom backends from Kamailio -Group: System Environment/Daemons -Requires: kamailio = %ver - -%description log_custom -This module provides logging to custom systems, replacing the default core logging to syslog. - - %if %{with lua} %package lua Summary: Lua extensions for Kamailio @@ -1324,7 +1315,10 @@ fi %doc %{_docdir}/kamailio/modules/README.call_obj %doc %{_docdir}/kamailio/modules/README.evrexec %doc %{_docdir}/kamailio/modules/README.keepalive - +%doc %{_docdir}/kamailio/modules/README.log_custom +%doc %{_docdir}/kamailio/modules/README.statsc +%doc %{_docdir}/kamailio/modules/README.topos +%doc %{_docdir}/kamailio/modules/README.cfgt %dir %attr(-,kamailio,kamailio) %{_sysconfdir}/kamailio %config(noreplace) %{_sysconfdir}/kamailio/dictionary.kamailio @@ -1471,7 +1465,10 @@ fi %{_libdir}/kamailio/modules/call_obj.so %{_libdir}/kamailio/modules/evrexec.so %{_libdir}/kamailio/modules/keepalive.so - +%{_libdir}/kamailio/modules/log_custom.so +%{_libdir}/kamailio/modules/statsc.so +%{_libdir}/kamailio/modules/topos.so +%{_libdir}/kamailio/modules/cfgt.so %{_sbindir}/kamailio %{_sbindir}/kamctl @@ -1612,7 +1609,6 @@ fi %doc %{_docdir}/kamailio/modules/README.cdp %doc %{_docdir}/kamailio/modules/README.cdp_avp -%doc %{_docdir}/kamailio/modules/README.cfgt %doc %{_docdir}/kamailio/modules/README.ims_auth %doc %{_docdir}/kamailio/modules/README.ims_charging %doc %{_docdir}/kamailio/modules/README.ims_dialog @@ -1625,13 +1621,9 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf -%doc %{_docdir}/kamailio/modules/README.log_custom %doc %{_docdir}/kamailio/modules/README.smsops -%doc %{_docdir}/kamailio/modules/README.statsc -%doc %{_docdir}/kamailio/modules/README.topos %{_libdir}/kamailio/modules/cdp.so %{_libdir}/kamailio/modules/cdp_avp.so -%{_libdir}/kamailio/modules/cfgt.so %{_libdir}/kamailio/modules/ims_auth.so %{_libdir}/kamailio/modules/ims_charging.so %{_libdir}/kamailio/modules/ims_dialog.so @@ -1645,10 +1637,8 @@ fi %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so -%{_libdir}/kamailio/modules/log_custom.so %{_libdir}/kamailio/modules/smsops.so -%{_libdir}/kamailio/modules/statsc.so -%{_libdir}/kamailio/modules/topos.so + %if %{with jansson} %files jansson

1 0

git:5.2:9bc520a0: pkg/kamailio/oracle: wait for network to be up
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: 5.2 Commit: 9bc520a02428656c8eb0a5d875c950298ceaf2e7 URL: https://github.com/kamailio/kamailio/commit/9bc520a02428656c8eb0a5d875c9502… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:05:28+01:00 pkg/kamailio/oracle: wait for network to be up Units that strictly require a configured network connection should pull in network-online.target (via a Wants= type dependency) and order themselves after it. This target unit is intended to pull in a service that delays further execution until the network is sufficiently set up. What precisely this requires is left to the implementation of the network managing service. https://www.freedesktop.org/software/systemd/man/systemd.special.html https://lists.kamailio.org/pipermail/sr-users/2018-November/103668.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> (cherry picked from commit 37c2e5ca25cb3396d2ac969271f9f9330d88fd63) --- Modified: pkg/kamailio/oracle/el7/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/9bc520a02428656c8eb0a5d875c9502… Patch: https://github.com/kamailio/kamailio/commit/9bc520a02428656c8eb0a5d875c9502… --- diff --git a/pkg/kamailio/oracle/el7/kamailio.service b/pkg/kamailio/oracle/el7/kamailio.service index 63d6da747c..8192488b53 100644 --- a/pkg/kamailio/oracle/el7/kamailio.service +++ b/pkg/kamailio/oracle/el7/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio SIP router server daemon -After=syslog.target network.target auditd.service +Wants=network-online.target +After=syslog.target network-online.target auditd.service [Service] EnvironmentFile=/etc/sysconfig/kamailio

1 0

git:5.2:33fb7ac2: pkg/kamailio/deb: also restart service if unclean exit code
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: 5.2 Commit: 33fb7ac2b367b4145815ed6e6919deb8d7c8631d URL: https://github.com/kamailio/kamailio/commit/33fb7ac2b367b4145815ed6e6919deb… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:04:54+01:00 pkg/kamailio/deb: also restart service if unclean exit code New: If set to on-failure, the service will be restarted when the process exits with a non-zero exit code, is terminated by a signal (including on core dump, but excluding the aforementioned four signals), when an operation (such as service reload) times out, and when the configured watchdog timeout is triggered. Old: If set to on-abort, the service will be restarted only if the service process exits due to an uncaught signal not specified as a clean exit status. https://www.freedesktop.org/software/systemd/man/systemd.service.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> (cherry picked from commit a5c45d1af4bf31e872963a954c43b8ee5618a90a) --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/33fb7ac2b367b4145815ed6e6919deb… Patch: https://github.com/kamailio/kamailio/commit/33fb7ac2b367b4145815ed6e6919deb…

1 0

git:5.2:fb9dee9e: pkg/kamailio/deb: wait for network to be up
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: 5.2 Commit: fb9dee9efee7f832c7c95fab2d066fb3606b1fa8 URL: https://github.com/kamailio/kamailio/commit/fb9dee9efee7f832c7c95fab2d066fb… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:04:49+01:00 pkg/kamailio/deb: wait for network to be up Units that strictly require a configured network connection should pull in network-online.target (via a Wants= type dependency) and order themselves after it. This target unit is intended to pull in a service that delays further execution until the network is sufficiently set up. What precisely this requires is left to the implementation of the network managing service. https://www.freedesktop.org/software/systemd/man/systemd.special.html https://lists.kamailio.org/pipermail/sr-users/2018-November/103668.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> (cherry picked from commit f7867838eb8a68a9ae4c00f2487bdec078b94c88) --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/fb9dee9efee7f832c7c95fab2d066fb… Patch: https://github.com/kamailio/kamailio/commit/fb9dee9efee7f832c7c95fab2d066fb… --- diff --git a/pkg/kamailio/deb/bionic/kamailio.service b/pkg/kamailio/deb/bionic/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/bionic/kamailio.service +++ b/pkg/kamailio/deb/bionic/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/buster/kamailio.service b/pkg/kamailio/deb/buster/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/buster/kamailio.service +++ b/pkg/kamailio/deb/buster/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/debian/kamailio.service b/pkg/kamailio/deb/debian/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/debian/kamailio.service +++ b/pkg/kamailio/deb/debian/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/jessie/kamailio.service b/pkg/kamailio/deb/jessie/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/jessie/kamailio.service +++ b/pkg/kamailio/deb/jessie/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/sid/kamailio.service b/pkg/kamailio/deb/sid/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/sid/kamailio.service +++ b/pkg/kamailio/deb/sid/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/stretch/kamailio.service b/pkg/kamailio/deb/stretch/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/stretch/kamailio.service +++ b/pkg/kamailio/deb/stretch/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/xenial/kamailio.service b/pkg/kamailio/deb/xenial/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/xenial/kamailio.service +++ b/pkg/kamailio/deb/xenial/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking

1 0

[kamailio/kamailio] Optimize systemd units (#1716)
by Kevin Olbrich 08 Nov '18

08 Nov '18

#### 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  Please see conversation on ML for reference: https://lists.kamailio.org/pipermail/sr-users/2018-November/103668.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1716 -- Commit Summary -- * Wait for network to be up before starting kamailio.service * Restart service if it fails with unclean exit code instead of only unclean signal -- File Changes -- M pkg/kamailio/deb/bionic/kamailio.service (5) M pkg/kamailio/deb/buster/kamailio.service (5) M pkg/kamailio/deb/debian/kamailio.service (5) M pkg/kamailio/deb/jessie/kamailio.service (5) M pkg/kamailio/deb/sid/kamailio.service (5) M pkg/kamailio/deb/stretch/kamailio.service (5) M pkg/kamailio/deb/xenial/kamailio.service (5) M pkg/kamailio/oracle/el7/kamailio.service (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1716.patch https://github.com/kamailio/kamailio/pull/1716.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/1716

2 7

git:master:37c2e5ca: pkg/kamailio/oracle: wait for network to be up
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: master Commit: 37c2e5ca25cb3396d2ac969271f9f9330d88fd63 URL: https://github.com/kamailio/kamailio/commit/37c2e5ca25cb3396d2ac969271f9f93… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:02:32+01:00 pkg/kamailio/oracle: wait for network to be up Units that strictly require a configured network connection should pull in network-online.target (via a Wants= type dependency) and order themselves after it. This target unit is intended to pull in a service that delays further execution until the network is sufficiently set up. What precisely this requires is left to the implementation of the network managing service. https://www.freedesktop.org/software/systemd/man/systemd.special.html https://lists.kamailio.org/pipermail/sr-users/2018-November/103668.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> --- Modified: pkg/kamailio/oracle/el7/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/37c2e5ca25cb3396d2ac969271f9f93… Patch: https://github.com/kamailio/kamailio/commit/37c2e5ca25cb3396d2ac969271f9f93… --- diff --git a/pkg/kamailio/oracle/el7/kamailio.service b/pkg/kamailio/oracle/el7/kamailio.service index 63d6da747c..8192488b53 100644 --- a/pkg/kamailio/oracle/el7/kamailio.service +++ b/pkg/kamailio/oracle/el7/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio SIP router server daemon -After=syslog.target network.target auditd.service +Wants=network-online.target +After=syslog.target network-online.target auditd.service [Service] EnvironmentFile=/etc/sysconfig/kamailio

1 0

git:master:f7867838: pkg/kamailio/deb: wait for network to be up
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: master Commit: f7867838eb8a68a9ae4c00f2487bdec078b94c88 URL: https://github.com/kamailio/kamailio/commit/f7867838eb8a68a9ae4c00f2487bdec… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:02:32+01:00 pkg/kamailio/deb: wait for network to be up Units that strictly require a configured network connection should pull in network-online.target (via a Wants= type dependency) and order themselves after it. This target unit is intended to pull in a service that delays further execution until the network is sufficiently set up. What precisely this requires is left to the implementation of the network managing service. https://www.freedesktop.org/software/systemd/man/systemd.special.html https://lists.kamailio.org/pipermail/sr-users/2018-November/103668.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/f7867838eb8a68a9ae4c00f2487bdec… Patch: https://github.com/kamailio/kamailio/commit/f7867838eb8a68a9ae4c00f2487bdec… --- diff --git a/pkg/kamailio/deb/bionic/kamailio.service b/pkg/kamailio/deb/bionic/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/bionic/kamailio.service +++ b/pkg/kamailio/deb/bionic/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/buster/kamailio.service b/pkg/kamailio/deb/buster/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/buster/kamailio.service +++ b/pkg/kamailio/deb/buster/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/debian/kamailio.service b/pkg/kamailio/deb/debian/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/debian/kamailio.service +++ b/pkg/kamailio/deb/debian/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/jessie/kamailio.service b/pkg/kamailio/deb/jessie/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/jessie/kamailio.service +++ b/pkg/kamailio/deb/jessie/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/sid/kamailio.service b/pkg/kamailio/deb/sid/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/sid/kamailio.service +++ b/pkg/kamailio/deb/sid/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/stretch/kamailio.service b/pkg/kamailio/deb/stretch/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/stretch/kamailio.service +++ b/pkg/kamailio/deb/stretch/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking diff --git a/pkg/kamailio/deb/xenial/kamailio.service b/pkg/kamailio/deb/xenial/kamailio.service index e7a9e18484..99679e3372 100644 --- a/pkg/kamailio/deb/xenial/kamailio.service +++ b/pkg/kamailio/deb/xenial/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=forking

1 0

git:master:a5c45d1a: pkg/kamailio/deb: also restart service if unclean exit code
by Victor Seva 08 Nov '18

08 Nov '18

Module: kamailio Branch: master Commit: a5c45d1af4bf31e872963a954c43b8ee5618a90a URL: https://github.com/kamailio/kamailio/commit/a5c45d1af4bf31e872963a954c43b8e… Author: Kevin Olbrich <ko(a)sv01.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-08T18:02:32+01:00 pkg/kamailio/deb: also restart service if unclean exit code New: If set to on-failure, the service will be restarted when the process exits with a non-zero exit code, is terminated by a signal (including on core dump, but excluding the aforementioned four signals), when an operation (such as service reload) times out, and when the configured watchdog timeout is triggered. Old: If set to on-abort, the service will be restarted only if the service process exits due to an uncaught signal not specified as a clean exit status. https://www.freedesktop.org/software/systemd/man/systemd.service.html Signed-off-by: Kevin Olbrich <ko(a)sv01.de> --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/a5c45d1af4bf31e872963a954c43b8e… Patch: https://github.com/kamailio/kamailio/commit/a5c45d1af4bf31e872963a954c43b8e…

1 0

git:master:55347626: cfgutils: error log message mentioning the param lock_set_size
by Daniel-Constantin Mierla 08 Nov '18

08 Nov '18

Module: kamailio Branch: master Commit: 55347626b189cd009c29b0e058949ed7671ae0d0 URL: https://github.com/kamailio/kamailio/commit/55347626b189cd009c29b0e058949ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-08T08:24:59+01:00 cfgutils: error log message mentioning the param lock_set_size --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/55347626b189cd009c29b0e058949ed… Patch: https://github.com/kamailio/kamailio/commit/55347626b189cd009c29b0e058949ed… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 17cf6bfacc..e62012cd14 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -702,7 +702,8 @@ static int cfg_lock_helper(str *lkey, int mode) unsigned int pos; if(_cfg_lock_set==NULL) { - LM_ERR("lock set not initialized (attempt to do op: %d on: %.*s)\n", + LM_ERR("lock set not initialized (attempt to do op: %d on: %.*s) -" + " see param lock_set_size\n", mode, lkey->len, lkey->s); return -1; } @@ -897,6 +898,7 @@ static void mod_destroy(void) { lock_set_destroy(_cfg_lock_set); lock_set_dealloc(_cfg_lock_set); + _cfg_lock_set = NULL; } }

1 0

git:master:c61d3bf5: Merge pull request #1711 from sergey-safarov/spec_update11
by GitHub 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: c61d3bf53b18118030590a1f5066f66eb7da7ac4 URL: https://github.com/kamailio/kamailio/commit/c61d3bf53b18118030590a1f5066f66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-07T20:52:33+01:00 Merge pull request #1711 from sergey-safarov/spec_update11 RPM spec update --- Modified: pkg/kamailio/obs/kamailio.service Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/c61d3bf53b18118030590a1f5066f66… Patch: https://github.com/kamailio/kamailio/commit/c61d3bf53b18118030590a1f5066f66…

1 0

git:master:b0e81431: pkg/kamailio/obs: smsops module relocated into main rpm package
by Sergey Safarov 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: b0e814315a196cb6b1e8eca453cf6e4eea26dca4 URL: https://github.com/kamailio/kamailio/commit/b0e814315a196cb6b1e8eca453cf6e4… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-07T16:07:41Z pkg/kamailio/obs: smsops module relocated into main rpm package --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b0e814315a196cb6b1e8eca453cf6e4… Patch: https://github.com/kamailio/kamailio/commit/b0e814315a196cb6b1e8eca453cf6e4… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 7c9dcc6905..6538f46c7d 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1295,6 +1295,7 @@ fi %doc %{_docdir}/kamailio/modules/README.siputils %doc %{_docdir}/kamailio/modules/README.sl %doc %{_docdir}/kamailio/modules/README.sms +%doc %{_docdir}/kamailio/modules/README.smsops %doc %{_docdir}/kamailio/modules/README.speeddial %doc %{_docdir}/kamailio/modules/README.sqlops %doc %{_docdir}/kamailio/modules/README.ss7ops @@ -1445,6 +1446,7 @@ fi %{_libdir}/kamailio/modules/siputils.so %{_libdir}/kamailio/modules/sl.so %{_libdir}/kamailio/modules/sms.so +%{_libdir}/kamailio/modules/smsops.so %{_libdir}/kamailio/modules/speeddial.so %{_libdir}/kamailio/modules/sqlops.so %{_libdir}/kamailio/modules/ss7ops.so @@ -1635,7 +1637,6 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf -%doc %{_docdir}/kamailio/modules/README.smsops %{_libdir}/kamailio/modules/cdp.so %{_libdir}/kamailio/modules/cdp_avp.so %{_libdir}/kamailio/modules/ims_auth.so @@ -1651,7 +1652,6 @@ fi %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so -%{_libdir}/kamailio/modules/smsops.so %endif

1 0

git:master:68646c6f: pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists
by Sergey Safarov 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: 68646c6fff4a06fa949296d1a41483ff51fc9389 URL: https://github.com/kamailio/kamailio/commit/68646c6fff4a06fa949296d1a41483f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-07T16:07:10Z pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists --- Modified: pkg/kamailio/obs/kamailio.service Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/68646c6fff4a06fa949296d1a41483f… Patch: https://github.com/kamailio/kamailio/commit/68646c6fff4a06fa949296d1a41483f… --- diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service index 0be0dc0e63..237ad10ef5 100644 --- a/pkg/kamailio/obs/kamailio.service +++ b/pkg/kamailio/obs/kamailio.service @@ -1,6 +1,7 @@ [Unit] Description=Kamailio (OpenSER) - the Open Source SIP Server -After=network.target +Wants=network-online.target +After=network-online.target [Service] Type=simple diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 8fc518fb0b..7c9dcc6905 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -9,6 +9,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -30,6 +31,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -51,6 +53,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -72,6 +75,7 @@ %bcond_without dnssec %bcond_without geoip %bcond_with http_async_client +%bcond_without ims %bcond_with jansson %bcond_with json %bcond_without lua @@ -94,6 +98,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -115,6 +120,7 @@ %bcond_with dnssec %bcond_without geoip %bcond_without http_async_client +%bcond_without ims %bcond_without jansson %bcond_without json %bcond_without lua @@ -136,6 +142,7 @@ %bcond_without dnssec %bcond_with geoip %bcond_with http_async_client +%bcond_with ims %bcond_with jansson %bcond_with json %bcond_with lua @@ -157,6 +164,7 @@ %bcond_with dnssec %bcond_with geoip %bcond_with http_async_client +%bcond_with ims %bcond_with jansson %bcond_with json %bcond_with lua @@ -164,7 +172,7 @@ %bcond_with memcached %bcond_without mongodb %bcond_without perl -%bcond_without rabbitmq +%bcond_with rabbitmq %bcond_without redis %bcond_with sctp %bcond_with websocket @@ -442,6 +450,7 @@ BuildRequires: libxml2-devel, libcurl-devel, zlib-devel This module implements protocol functions that use the libcurl to communicate with HTTP servers. +%if %{with ims} %package ims Summary: IMS modules and extensions module for Kamailio Group: System Environment/Daemons @@ -450,6 +459,7 @@ BuildRequires: libxml2-devel libmnl-devel %description ims IMS modules and extensions module for Kamailio. +%endif %if %{with jansson} @@ -967,7 +977,6 @@ make cfg prefix=/usr \ basedir=%{buildroot} \ cfg_prefix=%{buildroot} \ doc_prefix=%{buildroot} \ - share_prefix=%{_prefix} \ doc_dir=%{_docdir}/kamailio/ \ cfg_target=%{_sysconfdir}/kamailio/ modules_dirs="modules" make @@ -991,7 +1000,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with http_async_client} khttp_async \ %endif +%if %{with ims} kims \ +%endif %if %{with jansson} kjansson \ %endif @@ -1063,7 +1074,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with http_async_client} khttp_async \ %endif +%if %{with ims} kims \ +%endif %if %{with jansson} kjansson \ %endif @@ -1602,6 +1615,7 @@ fi %doc %{_docdir}/kamailio/modules/README.http_client %{_libdir}/kamailio/modules/http_client.so +%if %{with ims} %files ims %defattr(-,root,root) %{_libdir}/kamailio/libkamailio_ims.so.0 @@ -1638,6 +1652,7 @@ fi %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so %{_libdir}/kamailio/modules/smsops.so +%endif %if %{with jansson}

1 0

git:master:3dade81d: pkg/kamailio/obs: update spec to mach currently used
by Sergey Safarov 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: 3dade81da58adb40b039a23dcaf67795e41ccebe URL: https://github.com/kamailio/kamailio/commit/3dade81da58adb40b039a23dcaf6779… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-07T11:42:20Z pkg/kamailio/obs: update spec to mach currently used --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3dade81da58adb40b039a23dcaf6779… Patch: https://github.com/kamailio/kamailio/commit/3dade81da58adb40b039a23dcaf6779… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index c0356d8f73..8fc518fb0b 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -527,15 +527,6 @@ BuildRequires: openldap-devel LDAP search interface for Kamailio. -%package log_custom -Summary: Logging to custom backends from Kamailio -Group: System Environment/Daemons -Requires: kamailio = %ver - -%description log_custom -This module provides logging to custom systems, replacing the default core logging to syslog. - - %if %{with lua} %package lua Summary: Lua extensions for Kamailio @@ -1324,7 +1315,10 @@ fi %doc %{_docdir}/kamailio/modules/README.call_obj %doc %{_docdir}/kamailio/modules/README.evrexec %doc %{_docdir}/kamailio/modules/README.keepalive - +%doc %{_docdir}/kamailio/modules/README.log_custom +%doc %{_docdir}/kamailio/modules/README.statsc +%doc %{_docdir}/kamailio/modules/README.topos +%doc %{_docdir}/kamailio/modules/README.cfgt %dir %attr(-,kamailio,kamailio) %{_sysconfdir}/kamailio %config(noreplace) %{_sysconfdir}/kamailio/dictionary.kamailio @@ -1471,7 +1465,10 @@ fi %{_libdir}/kamailio/modules/call_obj.so %{_libdir}/kamailio/modules/evrexec.so %{_libdir}/kamailio/modules/keepalive.so - +%{_libdir}/kamailio/modules/log_custom.so +%{_libdir}/kamailio/modules/statsc.so +%{_libdir}/kamailio/modules/topos.so +%{_libdir}/kamailio/modules/cfgt.so %{_sbindir}/kamailio %{_sbindir}/kamctl @@ -1612,7 +1609,6 @@ fi %doc %{_docdir}/kamailio/modules/README.cdp %doc %{_docdir}/kamailio/modules/README.cdp_avp -%doc %{_docdir}/kamailio/modules/README.cfgt %doc %{_docdir}/kamailio/modules/README.ims_auth %doc %{_docdir}/kamailio/modules/README.ims_charging %doc %{_docdir}/kamailio/modules/README.ims_dialog @@ -1625,13 +1621,9 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf -%doc %{_docdir}/kamailio/modules/README.log_custom %doc %{_docdir}/kamailio/modules/README.smsops -%doc %{_docdir}/kamailio/modules/README.statsc -%doc %{_docdir}/kamailio/modules/README.topos %{_libdir}/kamailio/modules/cdp.so %{_libdir}/kamailio/modules/cdp_avp.so -%{_libdir}/kamailio/modules/cfgt.so %{_libdir}/kamailio/modules/ims_auth.so %{_libdir}/kamailio/modules/ims_charging.so %{_libdir}/kamailio/modules/ims_dialog.so @@ -1645,10 +1637,8 @@ fi %{_libdir}/kamailio/modules/ims_registrar_scscf.so %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so %{_libdir}/kamailio/modules/ims_usrloc_scscf.so -%{_libdir}/kamailio/modules/log_custom.so %{_libdir}/kamailio/modules/smsops.so -%{_libdir}/kamailio/modules/statsc.so -%{_libdir}/kamailio/modules/topos.so + %if %{with jansson} %files jansson

1 0

[kamailio/kamailio] pkg/kamailio/alpine: Fixed docker image build for 5.2 branch (#1713)
by sergey-safarov 07 Nov '18

07 Nov '18

This PR is need for `5.2` branch. On next stable Alpine release this will be fixed and we revert back this PR You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1713 -- Commit Summary -- * pkg/kamailio/alpine: Fixed docker image build for 5.2 branch -- File Changes -- M pkg/kamailio/alpine/APKBUILD (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1713.patch https://github.com/kamailio/kamailio/pull/1713.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/1713

2 1

git:5.2:f436f07e: Merge pull request #1713 from sergey-safarov/spec_update9
by GitHub 07 Nov '18

07 Nov '18

Module: kamailio Branch: 5.2 Commit: f436f07eb34e73b27c8b0d86100eaccffc0869ce URL: https://github.com/kamailio/kamailio/commit/f436f07eb34e73b27c8b0d86100eacc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-07T20:52:11+01:00 Merge pull request #1713 from sergey-safarov/spec_update9 pkg/kamailio/alpine: Fixed docker image build for 5.2 branch --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/f436f07eb34e73b27c8b0d86100eacc… Patch: https://github.com/kamailio/kamailio/commit/f436f07eb34e73b27c8b0d86100eacc… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 4333ad90c6..0afec7e886 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -271,6 +271,12 @@ snapshot() { } prepare() { + # Workarround for broken hiredis-devel package (0.13.3-r1) + sudo sed -i -e 's:prefix=/usr/local:prefix=/usr:' \ + -e 's:^libdir.*$:libdir=${exec_prefix}/lib:' \ + -e 's:^includedir.*:includedir=${prefix}/include/hiredis:' \ + /usr/lib/pkgconfig/hiredis.pc + default_prepare cd "$builddir"

1 0

git:5.2:e5bc89e1: pkg/kamailio/alpine: Fixed docker image build for 5.2 branch
by Sergey Safarov 07 Nov '18

07 Nov '18

Module: kamailio Branch: 5.2 Commit: e5bc89e1dffc548e3d309f45b291c87c39f6fb4b URL: https://github.com/kamailio/kamailio/commit/e5bc89e1dffc548e3d309f45b291c87… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-07T18:28:31Z pkg/kamailio/alpine: Fixed docker image build for 5.2 branch --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/e5bc89e1dffc548e3d309f45b291c87… Patch: https://github.com/kamailio/kamailio/commit/e5bc89e1dffc548e3d309f45b291c87… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 4333ad90c6..0afec7e886 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -271,6 +271,12 @@ snapshot() { } prepare() { + # Workarround for broken hiredis-devel package (0.13.3-r1) + sudo sed -i -e 's:prefix=/usr/local:prefix=/usr:' \ + -e 's:^libdir.*$:libdir=${exec_prefix}/lib:' \ + -e 's:^includedir.*:includedir=${prefix}/include/hiredis:' \ + /usr/lib/pkgconfig/hiredis.pc + default_prepare cd "$builddir"

1 0

[kamailio/kamailio] Cannot build ims module on OpenSUSE (#1710)
by sergey-safarov 07 Nov '18

07 Nov '18

### Description `libmnl-devel` is present in OpenSUSE but build of ims module is failed. This because headers files is located on other path then kamailio expects. `libmnl-devel` package is designed to use pkgconfig. I checked on CentOS dist `libmnl-devel` also have files for pkgconfig. ### Troubleshooting #### Reproduction need to build ims module on openSUSE_Leap_42.3 #### Debugging Data NA #### Log Messages ``` [ 333s] make[3]: 'libkamailio_ims.so.0.1' is up to date. [ 333s] LD (gcc) [M ims_ocs.so] ims_ocs.so [ 333s] CC (gcc) [M ims_diameter_server.so] ims_diameter_server.o [ 333s] CC (gcc) [M ims_diameter_server.so] cJSON.o [ 333s] CC (gcc) [M ims_diameter_server.so] avp_helper.o [ 334s] make[3]: 'libkamailio_ims.so.0.1' is up to date. [ 334s] LD (gcc) [M ims_diameter_server.so] ims_diameter_server.so [ 334s] CC (gcc) [M ims_ipsec_pcscf.so] ims_ipsec_pcscf_mod.o [ 334s] CC (gcc) [M ims_ipsec_pcscf.so] ipsec.o [ 334s] ipsec.c:32:27: fatal error: libmnl/libmnl.h: No such file or directory [ 334s] #include <libmnl/libmnl.h> [ 334s] ^ [ 334s] compilation terminated. [ 334s] ../../Makefile.rules:100: recipe for target 'ipsec.o' failed [ 334s] make[2]: *** [ipsec.o] Error 1 [ 334s] Makefile:511: recipe for target 'modules' failed [ 334s] make[1]: *** [modules] Error 1 [ 334s] make[1]: Leaving directory '/home/abuild/rpmbuild/BUILD/kamailio-5.2.0/src' [ 334s] Makefile:27: recipe for target 'every-module' failed [ 334s] make: *** [every-module] Error 2 [ 334s] error: Bad exit status from /var/tmp/rpm-tmp.Yi6mZQ (%build) [ 334s] ``` #### SIP Traffic NA ### Possible Solutions Not known ### Additional Information master branch * **Operating System**: openSUSE_Leap_42.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/1710

2 5

git:5.2:3843c4c8: ims_ipsec_pcscf: Makefile - use pkg-config to get compile flags for libmnl
by Daniel-Constantin Mierla 07 Nov '18

07 Nov '18

Module: kamailio Branch: 5.2 Commit: 3843c4c8c086f31f6126f0659c732141681229b9 URL: https://github.com/kamailio/kamailio/commit/3843c4c8c086f31f6126f0659c73214… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T13:22:58+01:00 ims_ipsec_pcscf: Makefile - use pkg-config to get compile flags for libmnl - GH #1710 (cherry picked from commit af7db21e401f9cfc776944693a85d38498ce421a) --- Modified: src/modules/ims_ipsec_pcscf/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3843c4c8c086f31f6126f0659c73214… Patch: https://github.com/kamailio/kamailio/commit/3843c4c8c086f31f6126f0659c73214… --- diff --git a/src/modules/ims_ipsec_pcscf/Makefile b/src/modules/ims_ipsec_pcscf/Makefile index 4e4e43d14c..055e8b80ca 100644 --- a/src/modules/ims_ipsec_pcscf/Makefile +++ b/src/modules/ims_ipsec_pcscf/Makefile @@ -8,10 +8,25 @@ include ../../Makefile.defs auto_gen= NAME=ims_ipsec_pcscf.so +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBMNL = $(shell $(BUILDER) --exists libmnl > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBMNL),0) + BUILDER = +endif +endif +endif + +ifneq ($(BUILDER),) + DEFS += $(shell $(BUILDER) --cflags libmnl) + LIBS += $(shell $(BUILDER) --libs libmnl) +else ifneq ($(OS),darwin) LIBS += -lpthread LIBS += -lmnl endif +endif SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims

1 0

git:5.2:0eb813ee: evapi: convert return code for kemi functions to match the ones from cfg equivalents
by Daniel-Constantin Mierla 07 Nov '18

07 Nov '18

Module: kamailio Branch: 5.2 Commit: 0eb813ee88c03ecc5e6fb35d2a2b3225716b2fc0 URL: https://github.com/kamailio/kamailio/commit/0eb813ee88c03ecc5e6fb35d2a2b322… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T13:22:49+01:00 evapi: convert return code for kemi functions to match the ones from cfg equivalents (cherry picked from commit 6675a960490c9c72e69aab7a676a3012da2999b2) --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0eb813ee88c03ecc5e6fb35d2a2b322… Patch: https://github.com/kamailio/kamailio/commit/0eb813ee88c03ecc5e6fb35d2a2b322… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index c8d32ac9cb..7d3a4ecf36 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -586,7 +586,13 @@ static int w_evapi_set_tag(sip_msg_t* msg, char* ptag, char* p2) */ static int ki_evapi_relay(sip_msg_t *msg, str *sdata) { - return evapi_relay(sdata); + int ret; + + ret = evapi_relay(sdata); + + if(ret<0) return ret; + + return (ret+1); } /** @@ -598,7 +604,6 @@ static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) unsigned int tlabel; tm_cell_t *t = 0; - if(tmb.t_suspend==NULL) { LM_ERR("evapi async relay is disabled - tm module not loaded\n"); return -1; @@ -644,7 +649,13 @@ static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) */ static int ki_evapi_relay_unicast(sip_msg_t *msg, str *sdata, str *stag) { - return evapi_relay_unicast(sdata, stag); + int ret; + + ret = evapi_relay_unicast(sdata, stag); + + if(ret<0) return ret; + + return (ret+1); } /** @@ -652,7 +663,13 @@ static int ki_evapi_relay_unicast(sip_msg_t *msg, str *sdata, str *stag) */ static int ki_evapi_relay_multicast(sip_msg_t *msg, str *sdata, str *stag) { - return evapi_relay_multicast(sdata, stag); + int ret; + + ret = evapi_relay_multicast(sdata, stag); + + if(ret<0) return ret; + + return (ret+1); } /**

1 0

git:master:af7db21e: ims_ipsec_pcscf: Makefile - use pkg-config to get compile flags for libmnl
by Daniel-Constantin Mierla 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: af7db21e401f9cfc776944693a85d38498ce421a URL: https://github.com/kamailio/kamailio/commit/af7db21e401f9cfc776944693a85d38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T09:30:35+01:00 ims_ipsec_pcscf: Makefile - use pkg-config to get compile flags for libmnl - GH #1710 --- Modified: src/modules/ims_ipsec_pcscf/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/af7db21e401f9cfc776944693a85d38… Patch: https://github.com/kamailio/kamailio/commit/af7db21e401f9cfc776944693a85d38… --- diff --git a/src/modules/ims_ipsec_pcscf/Makefile b/src/modules/ims_ipsec_pcscf/Makefile index 4e4e43d14c..055e8b80ca 100644 --- a/src/modules/ims_ipsec_pcscf/Makefile +++ b/src/modules/ims_ipsec_pcscf/Makefile @@ -8,10 +8,25 @@ include ../../Makefile.defs auto_gen= NAME=ims_ipsec_pcscf.so +ifeq ($(CROSS_COMPILE),) + BUILDER = $(shell which pkg-config) +ifneq ($(BUILDER),) + PKGLIBMNL = $(shell $(BUILDER) --exists libmnl > /dev/null 2>&1 ; echo $$? ) +ifneq ($(PKGLIBMNL),0) + BUILDER = +endif +endif +endif + +ifneq ($(BUILDER),) + DEFS += $(shell $(BUILDER) --cflags libmnl) + LIBS += $(shell $(BUILDER) --libs libmnl) +else ifneq ($(OS),darwin) LIBS += -lpthread LIBS += -lmnl endif +endif SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims

1 0

git:master:6675a960: evapi: convert return code for kemi functions to match the ones from cfg equivalents
by Daniel-Constantin Mierla 07 Nov '18

07 Nov '18

Module: kamailio Branch: master Commit: 6675a960490c9c72e69aab7a676a3012da2999b2 URL: https://github.com/kamailio/kamailio/commit/6675a960490c9c72e69aab7a676a301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T08:34:13+01:00 evapi: convert return code for kemi functions to match the ones from cfg equivalents --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6675a960490c9c72e69aab7a676a301… Patch: https://github.com/kamailio/kamailio/commit/6675a960490c9c72e69aab7a676a301… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index c8d32ac9cb..7d3a4ecf36 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -586,7 +586,13 @@ static int w_evapi_set_tag(sip_msg_t* msg, char* ptag, char* p2) */ static int ki_evapi_relay(sip_msg_t *msg, str *sdata) { - return evapi_relay(sdata); + int ret; + + ret = evapi_relay(sdata); + + if(ret<0) return ret; + + return (ret+1); } /** @@ -598,7 +604,6 @@ static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) unsigned int tlabel; tm_cell_t *t = 0; - if(tmb.t_suspend==NULL) { LM_ERR("evapi async relay is disabled - tm module not loaded\n"); return -1; @@ -644,7 +649,13 @@ static int ki_evapi_async_relay(sip_msg_t *msg, str *sdata) */ static int ki_evapi_relay_unicast(sip_msg_t *msg, str *sdata, str *stag) { - return evapi_relay_unicast(sdata, stag); + int ret; + + ret = evapi_relay_unicast(sdata, stag); + + if(ret<0) return ret; + + return (ret+1); } /** @@ -652,7 +663,13 @@ static int ki_evapi_relay_unicast(sip_msg_t *msg, str *sdata, str *stag) */ static int ki_evapi_relay_multicast(sip_msg_t *msg, str *sdata, str *stag) { - return evapi_relay_multicast(sdata, stag); + int ret; + + ret = evapi_relay_multicast(sdata, stag); + + if(ret<0) return ret; + + return (ret+1); } /**

1 0

[kamailio/kamailio] Cannot be packaged into RPM master and 5.2 branch (#1709)
by sergey-safarov 07 Nov '18

07 Nov '18

### Description I testing package `master` and `5.2` branch int RPM. but cannot. Build and packaging logs is [here](https://build.opensuse.org/build/home:sergey-safarov:v5.2.x-rpms/Cent… Is happens because `make install-share` goal is try create folder `/usr/share/kamailio/` instead of `/home/build/rpmbuild/BUILDROOT/kamailio-5.2.0-0.el7.centos.x86_64/usr/share/kamailio/`. ### Troubleshooting #### Reproduction please look above #### Debugging Data NA. #### Log Messages ``` [build@node0 kamailio-5.2.0]$ pwd /home/build/rpmbuild/BUILD/kamailio-5.2.0 [build@node0 kamailio-5.2.0]$ make -C src install-share make: Entering directory `/home/build/rpmbuild/BUILD/kamailio-5.2.0/src' mkdir -p /usr/share/kamailio/ mkdir: cannot create directory ‘/usr/share/kamailio/’: Permission denied make: *** [/usr/share/kamailio/] Error 1 make: Leaving directory `/home/build/rpmbuild/BUILD/kamailio-5.2.0/src' [build@node0 kamailio-5.2.0]$ ``` #### SIP Traffic NA ### Possible Solutions Not known ### Additional Information tested current master and 5.2 branch * **Operating System**: CentOS 7 ``` Linux node0.docker.rcsnet.ru 4.14.13-300.fc27.x86_64 #1 SMP Thu Jan 11 04:00:01 UTC 2018 x86_64 x86_64 x86_64 GNU/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/1709

3 12

git:5.2:2a91ca46: Makefile.defs: use $(prefix) for setting share_target
by Daniel-Constantin Mierla 07 Nov '18

07 Nov '18

Module: kamailio Branch: 5.2 Commit: 2a91ca46d8f05fde52869bd9434897ad5d76625b URL: https://github.com/kamailio/kamailio/commit/2a91ca46d8f05fde52869bd9434897a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-07T08:24:07+01:00 Makefile.defs: use $(prefix) for setting share_target - GH #1709 (cherry picked from commit 2b295f83e1c40637012633b6cab2ad86415d4623) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2a91ca46d8f05fde52869bd9434897a… Patch: https://github.com/kamailio/kamailio/commit/2a91ca46d8f05fde52869bd9434897a… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 13ff1b0188..bcf69ffb09 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -497,7 +497,7 @@ bin_target = $(prefix)/$(bin_dir) #modules_target = $(prefix)/$(modules_dir) lib_target = $(prefix)/$(lib_dir) run_target = $(run_prefix)/$(run_dir) -share_target = $(share_prefix)/$(share_dir) +share_target = $(prefix)/$(share_dir) doc_target = $(prefix)/$(doc_dir) data_target = $(prefix)/$(data_dir) @@ -2095,7 +2095,8 @@ saved_chg_vars:=\ cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \ share_prefix share_dir lib_prefix lib_dir data_prefix data_dir \ - cfg_target lib_target data_target run_prefix run_dir run_target + cfg_target lib_target data_target run_prefix run_dir run_target \ + share_target #export relevant variables to the sub-makes

1 0

5.2.x OBS: CentOS/RHEL RPMs build app_python3.so with Software Collections?
by Anthony Alba 06 Nov '18

06 Nov '18

Sorry for the fat finger and earlier incomplete message... Although RHEL 7/CentOS 7 don't come with python3 in the base OS, it would be nice to have app_python3.so packaged for more extensive exposure in the wild. Can I suggest that kamailio OBS be built against the python3 packages in Software Collections? Currently rh-python36 is on RHEL and Software Collections for CentOS. Cheers Anthony Alba

2 1

Evapi not in 5.1
by bill＠telopar.net 06 Nov '18

06 Nov '18

Just installed 5.1 and see that the evapi module is no longer included. Has this been replaced by something new? Bill

3 3

[kamailio/kamailio] RPM spec update for 5.1 branch (#1708)
by sergey-safarov 06 Nov '18

06 Nov '18

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 - [x] Related to issue #1702 #### Description RPM spec update for 5.1 branch You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1708 -- Commit Summary -- * pkg/kamailio/ops: Added MongoDB rpm package * pkg/kamailio/obs: Updated obs meta * pkg/kamailio/obs: Removed end of life dist * pkg/kamailio/obs: Fixed bdb module build on fedora dists * [5.1] pkg/kamailio/obs: update spec to mach currently used -- File Changes -- M pkg/kamailio/obs/kamailio.spec (132) M pkg/kamailio/obs/meta (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1708.patch https://github.com/kamailio/kamailio/pull/1708.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/1708

2 1

git:5.1:84f00468: Merge pull request #1708 from sergey-safarov/spec_update10
by GitHub 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.1 Commit: 84f004689c4f78260592a38009665a591cc117df URL: https://github.com/kamailio/kamailio/commit/84f004689c4f78260592a38009665a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-06T16:19:09+01:00 Merge pull request #1708 from sergey-safarov/spec_update10 RPM spec update for 5.1 branch --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/84f004689c4f78260592a38009665a5… Patch: https://github.com/kamailio/kamailio/commit/84f004689c4f78260592a38009665a5…

1 0

git:5.1:094f5849: pkg/kamailio/obs: Fixed bdb module build on fedora dists
by Sergey Safarov 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.1 Commit: 094f584901ff4a4c60b6119b3fd7563472b2f88f URL: https://github.com/kamailio/kamailio/commit/094f584901ff4a4c60b6119b3fd7563… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-06T11:44:36Z pkg/kamailio/obs: Fixed bdb module build on fedora dists (cherry picked from commit 2c077b0434037f1b0f6b37d6026235b206ddbbb2) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/094f584901ff4a4c60b6119b3fd7563… Patch: https://github.com/kamailio/kamailio/commit/094f584901ff4a4c60b6119b3fd7563… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 85f8e4359f..57c3122257 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -212,6 +212,12 @@ BuildRequires: bison, flex %if 0%{?suse_version} BuildRequires: systemd-mini, shadow %endif +%if 0%{?fedora} == 27 +BuildRequires: python3-devel +%endif +%if 0%{?fedora} == 28 +BuildRequires: python3-devel +%endif %description Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able @@ -253,8 +259,13 @@ Requires: kamailio = %ver Requires: libdb-4_8 BuildRequires: libdb-4_8-devel %else +%if 0%{?rhel} == 6 Requires: db4 BuildRequires: db4-devel +%else +Requires: libdb +BuildRequires: libdb-devel +%endif %endif %description bdb @@ -1121,6 +1132,9 @@ install -m644 pkg/kamailio/%{dist_name}/%{dist_version}/sipcapture.sysconfig \ %if 0%{?suse_version} %py_compile -O %{buildroot}%{_libdir}/kamailio/kamctl/dbtextdb %endif +%if 0%{?fedora} +%py_byte_compile %{__python2} %{buildroot}%{_libdir}/kamailio/kamctl/dbtextdb +%endif # Removing devel files rm -f %{buildroot}%{_libdir}/kamailio/lib*.so

1 0

git:5.1:8f6d085c: pkg/kamailio/obs: Updated obs meta
by Sergey Safarov 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.1 Commit: 8f6d085cda34dc6d9edb043f8c8eb548af0090cb URL: https://github.com/kamailio/kamailio/commit/8f6d085cda34dc6d9edb043f8c8eb54… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-06T11:44:35Z pkg/kamailio/obs: Updated obs meta (cherry picked from commit 3c9547334166d43aa1e2cba8b9dab6e78dfed66a) --- Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/8f6d085cda34dc6d9edb043f8c8eb54… Patch: https://github.com/kamailio/kamailio/commit/8f6d085cda34dc6d9edb043f8c8eb54… --- diff --git a/pkg/kamailio/obs/meta b/pkg/kamailio/obs/meta index 32e9e9ffb7..452d5d764d 100644 --- a/pkg/kamailio/obs/meta +++ b/pkg/kamailio/obs/meta @@ -1,6 +1,6 @@ -<project name="home:kamailio:v5.0.x-rpms"> - <title>RPM Packages for Kamailio v5.0.x</title> - <description>RPM Packages for Kamailio v5.0.x</description> +<project name="home:kamailio:v5.1.x-rpms"> + <title>RPM Packages for Kamailio v5.1.x</title> + <description>RPM Packages for Kamailio v5.1.x</description> <person userid="kamailio" role="maintainer"/> <repository name="openSUSE_Tumbleweed"> <path project="openSUSE:Factory" repository="snapshot"/> @@ -24,20 +24,19 @@ <path project="Fedora:EPEL:6" repository="RHEL"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_27"> - <path project="Fedora:27" repository="update"/> - <path project="Fedora:27" repository="standard"/> + <repository name="Fedora_29"> + <path project="Fedora:29" repository="update"/> + <path project="Fedora:29" repository="standard"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_26"> - <path project="Fedora:26" repository="update"/> - <path project="Fedora:26" repository="standard"/> + <repository name="Fedora_28"> + <path project="Fedora:28" repository="update"/> + <path project="Fedora:28" repository="standard"/> <arch>x86_64</arch> </repository> - <repository name="Fedora_25"> - <path project="Fedora:25" repository="update"/> - <path project="Fedora:25" repository="standard"/> - <arch>i586</arch> + <repository name="Fedora_27"> + <path project="Fedora:27" repository="update"/> + <path project="Fedora:27" repository="standard"/> <arch>x86_64</arch> </repository> <repository name="CentOS_7">

1 0

git:5.1:18bf0d3a: pkg/kamailio/ops: Added MongoDB rpm package
by Sergey Safarov 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.1 Commit: 18bf0d3a34794606f06e9740d881badca50cfd5a URL: https://github.com/kamailio/kamailio/commit/18bf0d3a34794606f06e9740d881bad… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-06T11:44:35Z pkg/kamailio/ops: Added MongoDB rpm package (cherry picked from commit 702bfff175efaf25202e1644e39d143886ce7886) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/18bf0d3a34794606f06e9740d881bad… Patch: https://github.com/kamailio/kamailio/commit/18bf0d3a34794606f06e9740d881bad… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 56c6208a28..85f8e4359f 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -14,6 +14,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rebbitmq %bcond_without redis @@ -34,6 +35,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -54,6 +56,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rabbitmq %bcond_without redis @@ -74,6 +77,7 @@ %bcond_without lua %bcond_with kazoo %bcond_without memcached +%bcond_with mongodb %bcond_without perl %bcond_with rebbitmq %bcond_with redis @@ -95,6 +99,7 @@ %bcond_without lua %bcond_without kazoo %bcond_without memcached +%bcond_without mongodb %bcond_without perl %bcond_without rebbitmq %bcond_without redis @@ -115,6 +120,7 @@ %bcond_without lua %bcond_with kazoo %bcond_without memcached +%bcond_with mongodb %bcond_without perl %bcond_with rebbitmq %bcond_without redis @@ -135,6 +141,7 @@ %bcond_with lua %bcond_with kazoo %bcond_with memcached +%bcond_with mongodb %bcond_with perl %bcond_with rebbitmq %bcond_with redis @@ -155,6 +162,7 @@ %bcond_with lua %bcond_with kazoo %bcond_with memcached +%bcond_without mongodb %bcond_without perl %bcond_without rebbitmq %bcond_without redis @@ -187,7 +195,7 @@ 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-memcached < %ver, kamailio-mongodb < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver @@ -530,6 +538,19 @@ Memcached configuration file support for Kamailio. %endif +%if %{with mongodb} +%package mongodb +Summary: MongoDB database connectivity for Kamailio +Group: System Environment/Daemons +Requires: kamailio = %ver +Requires: mongo-c-driver +BuildRequires: mongo-c-driver-devel + +%description mongodb +MongoDB database connectivity for Kamailio. +%endif + + %package mysql Summary: MySQL database connectivity for Kamailio Group: System Environment/Daemons @@ -971,6 +992,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %endif %if %{with xmlrpc} kmi_xmlrpc \ +%endif +%if %{with mongodb} + kmongodb \ %endif kmysql koutbound \ %if %{with perl} @@ -1040,6 +1064,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %endif %if %{with xmlrpc} kmi_xmlrpc \ +%endif +%if %{with mongodb} + kmongodb \ %endif kmysql koutbound \ %if %{with perl} @@ -1638,6 +1665,16 @@ fi %endif +%if %{with mongodb} +%files mongodb +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.db_mongodb +%doc %{_docdir}/kamailio/modules/README.ndb_mongodb +%{_libdir}/kamailio/modules/db_mongodb.so +%{_libdir}/kamailio/modules/ndb_mongodb.so +%endif + + %files mysql %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.db_mysql

1 0

git:5.1:8ebb8932: pkg/kamailio/obs: Removed end of life dist
by Sergey Safarov 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.1 Commit: 8ebb8932c43ccbe1693062058bf779591eb84360 URL: https://github.com/kamailio/kamailio/commit/8ebb8932c43ccbe1693062058bf7795… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-11-06T11:44:35Z pkg/kamailio/obs: Removed end of life dist (cherry picked from commit 9aa98b12b3b7f3841facc20fee4873d8b3dc5fff) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/8ebb8932c43ccbe1693062058bf7795… Patch: https://github.com/kamailio/kamailio/commit/8ebb8932c43ccbe1693062058bf7795… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index fb3ae45af3..56c6208a28 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -2,46 +2,6 @@ %define ver 5.1.6 %define rel 0%{dist} -%if 0%{?fedora} == 25 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without perl -%bcond_without rebbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?fedora} == 26 -%define dist_name fedora -%define dist_version %{?fedora} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without geoip -%bcond_without http_async_client -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without perl -%bcond_without rebbitmq -%bcond_without redis -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - %if 0%{?fedora} == 27 %define dist_name fedora %define dist_version %{?fedora} @@ -944,19 +904,14 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} -ln -s ../obs pkg/kamailio/fedora/24 -ln -s ../obs pkg/kamailio/fedora/25 -ln -s ../obs pkg/kamailio/fedora/26 ln -s ../obs pkg/kamailio/fedora/27 ln -s ../obs pkg/kamailio/fedora/28 ln -s ../obs pkg/kamailio/fedora/29 -mkdir -p pkg/kamailio/rhel ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 -mkdir -p pkg/kamailio/opensuse ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 -mkdir -p pkg/kamailio/centos +ln -s ../obs pkg/kamailio/opensuse/1550 ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7 @@ -1959,6 +1914,8 @@ fi %changelog +* Sun Nov 04 2018 Sergey Safarov <s.safarov(a)gmail.com> + - removed packaging for Fedora 25, 26 as End Of Life * Sat Sep 02 2017 Sergey Safarov <s.safarov(a)gmail.com> - added packaging for Fedora 26 and openSUSE Leap 42.3 - removed packaging for Fedora 24 and openSUSE Leap 42.1 as End Of Life

1 0

git:master:2b295f83: Makefile.defs: use $(prefix) for setting share_target
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Module: kamailio Branch: master Commit: 2b295f83e1c40637012633b6cab2ad86415d4623 URL: https://github.com/kamailio/kamailio/commit/2b295f83e1c40637012633b6cab2ad8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-06T16:17:58+01:00 Makefile.defs: use $(prefix) for setting share_target - GH #1709 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/2b295f83e1c40637012633b6cab2ad8… Patch: https://github.com/kamailio/kamailio/commit/2b295f83e1c40637012633b6cab2ad8… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 86c9fafce9..8097402231 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -497,7 +497,7 @@ bin_target = $(prefix)/$(bin_dir) #modules_target = $(prefix)/$(modules_dir) lib_target = $(prefix)/$(lib_dir) run_target = $(run_prefix)/$(run_dir) -share_target = $(share_prefix)/$(share_dir) +share_target = $(prefix)/$(share_dir) doc_target = $(prefix)/$(doc_dir) data_target = $(prefix)/$(data_dir) @@ -2095,7 +2095,8 @@ saved_chg_vars:=\ cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ doc_prefix doc_dir man_prefix man_dir ut_prefix ut_dir \ share_prefix share_dir lib_prefix lib_dir data_prefix data_dir \ - cfg_target lib_target data_target run_prefix run_dir run_target + cfg_target lib_target data_target run_prefix run_dir run_target \ + share_target #export relevant variables to the sub-makes

1 0

git:5.2:249e019d: pkg/kamailio/deb: version set 5.2.0~rc0
by Victor Seva 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.2 Commit: 249e019d555387e49bf8641b32caa4f24fbb26ee URL: https://github.com/kamailio/kamailio/commit/249e019d555387e49bf8641b32caa4f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-06T10:36:04+01:00 pkg/kamailio/deb: version set 5.2.0~rc0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/249e019d555387e49bf8641b32caa4f… Patch: https://github.com/kamailio/kamailio/commit/249e019d555387e49bf8641b32caa4f…

1 0

git:master:81b4855e: pkg/kamailio/deb: version set 5.3.0~dev0
by Victor Seva 06 Nov '18

06 Nov '18

Module: kamailio Branch: master Commit: 81b4855e38796b2339a6f3602c6a55d26555bcc6 URL: https://github.com/kamailio/kamailio/commit/81b4855e38796b2339a6f3602c6a55d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-11-06T10:33:58+01:00 pkg/kamailio/deb: version set 5.3.0~dev0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/81b4855e38796b2339a6f3602c6a55d… Patch: https://github.com/kamailio/kamailio/commit/81b4855e38796b2339a6f3602c6a55d…

1 0

Development is open for future release v5.3.x series
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Hello, with the creation of branch 5.2 done this morning, the master branch is from now on open for adding new features, to be part of future release series v5.3.x. Any bug fix committed to master that applies to 5.2.x or older stable branches should be backported as usual with git cherry-pick to appropriate branches like 5.2 or 5.1. Expect that v5.2.0 will be released in about 2-3 weeks from now. Based on the workflow used during the past years, the next future release v5.3.0 should be out after another 8-10 months of development, plus 1-2 months of testing, so sometime in the summer or autumn of 2019. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

1 0

Branch 5.2 has been created
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Hello, the branch 5.2 has been created, to be used for releasing v5.2.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-5.2 cd kamailio-5.2 git checkout -b 5.2 origin/5.2 Pushing commits in this branch: git push origin 5.2:5.2 Note that 5.2 is an official stable branch, so only bug fixes, missing kemi exports (discuss on sr-dev if not sure) or improvements to documentation or helper tools can be pushed to this branch. As usual, if there is a bug fixed, commit and push first to master branch and then cherry pick to 5.2 branch. In few weeks, the first release from branch 5.2 will be out, respectively Kamailio v5.2.0. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

1 0

git:5.2:646b00c7: Makefile.defs: version set to 5.2.0-rc0
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Module: kamailio Branch: 5.2 Commit: 646b00c76bab0b1c3d6ffc2d755aeae70e45c45e URL: https://github.com/kamailio/kamailio/commit/646b00c76bab0b1c3d6ffc2d755aeae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-06T08:56:11+01:00 Makefile.defs: version set to 5.2.0-rc0 - branch for v5.2 release series has been created - branch name 5.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/646b00c76bab0b1c3d6ffc2d755aeae… Patch: https://github.com/kamailio/kamailio/commit/646b00c76bab0b1c3d6ffc2d755aeae… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index fb8820cb4c..13ff1b0188 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -pre3 +EXTRAVERSION = -rc0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

Failed: kamailio/kamailio#6618 (5.3 - 707d7cd)
by Travis CI 06 Nov '18

06 Nov '18

Build Update for kamailio/kamailio ------------------------------------- Build: #6618 Status: Failed Duration: 10 mins and 35 secs Commit: 707d7cd (5.3) Author: Daniel-Constantin Mierla Message: Makefile.defs: version set to 5.2.0-pre3 View the changeset: https://github.com/kamailio/kamailio/compare/5.3 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/451247164?utm_medium=notific… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:133b7e32: Makefile.defs: version set to 5.3.0-dev0
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Module: kamailio Branch: master Commit: 133b7e327519790221be3fd1e87f204aaf8c9100 URL: https://github.com/kamailio/kamailio/commit/133b7e327519790221be3fd1e87f204… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-06T08:54:36+01:00 Makefile.defs: version set to 5.3.0-dev0 - master branch is open for new features to be part of v5.3 release series --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/133b7e327519790221be3fd1e87f204… Patch: https://github.com/kamailio/kamailio/commit/133b7e327519790221be3fd1e87f204… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index fb8820cb4c..86c9fafce9 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 2 +PATCHLEVEL = 3 SUBLEVEL = 0 -EXTRAVERSION = -pre3 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:707d7cdc: Makefile.defs: version set to 5.2.0-pre3
by Daniel-Constantin Mierla 06 Nov '18

06 Nov '18

Module: kamailio Branch: master Commit: 707d7cdcb971b77b96ac854aa1432abae04ec7a8 URL: https://github.com/kamailio/kamailio/commit/707d7cdcb971b77b96ac854aa1432ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-06T08:44:46+01:00 Makefile.defs: version set to 5.2.0-pre3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/707d7cdcb971b77b96ac854aa1432ab… Patch: https://github.com/kamailio/kamailio/commit/707d7cdcb971b77b96ac854aa1432ab… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 19e7d87e72..fb8820cb4c 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -pre2 +EXTRAVERSION = -pre3 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] ims_diameter_server: fixing avp nested list #1686 (#1707)
by Rick 05 Nov '18

05 Nov '18

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1686 (replace XXXX with an open issue number) #### Description  Fixes nested lists avp You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1707 -- Commit Summary -- * ims_diameter_server: fixing avp nested list #1686 -- File Changes -- M src/modules/ims_diameter_server/avp_helper.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1707.patch https://github.com/kamailio/kamailio/pull/1707.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/1707

2 1

git:master:54f71b4d: Merge pull request #1707 from dunst0/fix/ims_diameter_server
by GitHub 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 54f71b4df5e64a87463098a081b1014458637766 URL: https://github.com/kamailio/kamailio/commit/54f71b4df5e64a87463098a081b1014… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-05T14:49:05+01:00 Merge pull request #1707 from dunst0/fix/ims_diameter_server ims_diameter_server: fixing avp nested list #1686 --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/54f71b4df5e64a87463098a081b1014… Patch: https://github.com/kamailio/kamailio/commit/54f71b4df5e64a87463098a081b1014… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index ab3974ac1f..04e2d6d967 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -342,8 +342,17 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level avp_list_s = cdpb.AAAGroupAVPS(avp_list); cdpb.AAAFreeAVPList(&avp_list); - diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, - cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_FREE_DATA, __FUNCTION__); + if(list) { + diameterserver_add_avp_list(list, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } else { + diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } } else if (cJSON_GetObjectItem(item,"int32")) { set_4bytes(x, cJSON_GetObjectItem(item,"int32")->valueint); if (list) {

1 0

git:master:7925c374: ims_diameter_server: fixing avp nested list #1686
by Rick Barenthin 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: 7925c3749b36a24615695b026983862ba03301b0 URL: https://github.com/kamailio/kamailio/commit/7925c3749b36a24615695b026983862… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Rick Barenthin <rick(a)ng-voice.com> Date: 2018-11-04T10:48:17+01:00 ims_diameter_server: fixing avp nested list #1686 --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/7925c3749b36a24615695b026983862… Patch: https://github.com/kamailio/kamailio/commit/7925c3749b36a24615695b026983862… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 9f6b67cf2e..9bfde85571 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -338,8 +338,17 @@ void parselist(AAAMessage *response, AAA_AVP_LIST *list, cJSON * item, int level avp_list_s = cdpb.AAAGroupAVPS(avp_list); cdpb.AAAFreeAVPList(&avp_list); - diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, cJSON_GetObjectItem(item,"avpCode")->valueint, flags, - cJSON_GetObjectItem(item,"vendorId")->valueint, AVP_FREE_DATA, __FUNCTION__); + if(list) { + diameterserver_add_avp_list(list, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } else { + diameterserver_add_avp(response, avp_list_s.s, avp_list_s.len, + cJSON_GetObjectItem(item, "avpCode")->valueint, flags, + cJSON_GetObjectItem(item, "vendorId")->valueint, AVP_FREE_DATA, + __FUNCTION__); + } } else if (cJSON_GetObjectItem(item,"int32")) { set_4bytes(x, cJSON_GetObjectItem(item,"int32")->valueint); if (list) {

1 0

git:master:e8aec6d1: regex: fixed section ids for functions
by Daniel-Constantin Mierla 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: e8aec6d15bcef95f628108398e682571763464c5 URL: https://github.com/kamailio/kamailio/commit/e8aec6d15bcef95f628108398e68257… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-05T12:53:06+01:00 regex: fixed section ids for functions - removed trailing whitespaces --- Modified: src/modules/regex/doc/regex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e8aec6d15bcef95f628108398e68257… Patch: https://github.com/kamailio/kamailio/commit/e8aec6d15bcef95f628108398e68257…

1 0

[kamailio/kamailio] Crash ims_diameter_server module (#1686)
by iman432 05 Nov '18

05 Nov '18

Hi dears When the below format from restful is sent, kamailio crashes List List List (Json with 3 lists), With 2 lists it works properly, When diameter is translated to json with 3 lists by this module it also works properly, Json format is correct too. Where is problem? 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/issues/1686

3 7

git:master:c9845c33: ims_diameter_server: safety check for diameter message parameter
by Daniel-Constantin Mierla 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: c9845c330ec0ed323d6dd098a746a7374642f1c6 URL: https://github.com/kamailio/kamailio/commit/c9845c330ec0ed323d6dd098a746a73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-11-05T10:45:38+01:00 ims_diameter_server: safety check for diameter message parameter - GH #1686 --- Modified: src/modules/ims_diameter_server/avp_helper.c --- Diff: https://github.com/kamailio/kamailio/commit/c9845c330ec0ed323d6dd098a746a73… Patch: https://github.com/kamailio/kamailio/commit/c9845c330ec0ed323d6dd098a746a73… --- diff --git a/src/modules/ims_diameter_server/avp_helper.c b/src/modules/ims_diameter_server/avp_helper.c index 9f6b67cf2e..ab3974ac1f 100644 --- a/src/modules/ims_diameter_server/avp_helper.c +++ b/src/modules/ims_diameter_server/avp_helper.c @@ -200,6 +200,10 @@ int pv_get_request(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { */ int diameterserver_add_avp(AAAMessage *m, char *d, int len, int avp_code, int flags, int vendorid, int data_do, const char *func) { AAA_AVP *avp; + if(m==NULL) { + LM_ERR("invalid diamemter message parameter\n"); + return 0; + } if (vendorid != 0) flags |= AAA_AVP_FLAG_VENDOR_SPECIFIC; avp = cdpb.AAACreateAVP(avp_code, flags, vendorid, d, len, data_do); if (!avp) {

1 0

[kamailio/kamailio] [CentOS 7] Kamailio 5.1.x mongodb package missing in OpenSUSE repo (#1702)
by denyspozniak 05 Nov '18

05 Nov '18

Hello! @sergey-safarov, please add module DB_MONGODB to the OpenSUSE repo (home:kamailio:v5.1.x-rpms.repo). -- 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/1702

3 3

git:master:a1672d29: Merge pull request #1705 from sergey-safarov/mongodb
by GitHub 05 Nov '18

05 Nov '18

Module: kamailio Branch: master Commit: a1672d2903c581ff5ae462f6db55979bedbde809 URL: https://github.com/kamailio/kamailio/commit/a1672d2903c581ff5ae462f6db55979… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-11-05T10:28:51+01:00 Merge pull request #1705 from sergey-safarov/mongodb pkg/kamailio/ops: Added MongoDB rpm package --- Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/obs/meta --- Diff: https://github.com/kamailio/kamailio/commit/a1672d2903c581ff5ae462f6db55979… Patch: https://github.com/kamailio/kamailio/commit/a1672d2903c581ff5ae462f6db55979…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev