- sr-dev - kamailio.org

git:master:b3b95b5b: topos: use INVITE transaction record to route BYE if dlg has no B-contact
by Daniel-Constantin Mierla 15 Aug '17

15 Aug '17

Module: kamailio Branch: master Commit: b3b95b5b701a7f7ebf9532a172cd31b6dca699ff URL: https://github.com/kamailio/kamailio/commit/b3b95b5b701a7f7ebf9532a172cd31b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-15T09:50:35+02:00 topos: use INVITE transaction record to route BYE if dlg has no B-contact --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/b3b95b5b701a7f7ebf9532a172cd31b… Patch: https://github.com/kamailio/kamailio/commit/b3b95b5b701a7f7ebf9532a172cd31b… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 22441b5fa9..75b6d02078 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -773,12 +773,25 @@ int tps_request_received(sip_msg_t *msg, int dialog) } use_branch = 1; } else { - if(tps_storage_load_dialog(msg, &mtsd, &stsd)<0) { + if(tps_storage_load_dialog(msg, &mtsd, &stsd) < 0) { goto error; } - /* detect direction - via from-tag */ - if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { - goto error; + if(((get_cseq(msg)->method_id) & (METHOD_BYE)) + && stsd.b_contact.len <= 0) { + /* BYE but not B-side contact, look for INVITE transaction record */ + memset(&stsd, 0, sizeof(tps_data_t)); + if(tps_storage_link_msg(msg, &mtsd, TPS_DIR_DOWNSTREAM) < 0) { + goto error; + } + if(tps_storage_load_branch(msg, &mtsd, &stsd, 1) < 0) { + goto error; + } + use_branch = 1; + } else { + /* detect direction - via from-tag */ + if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { + goto error; + } } }

1 0

Bug in subst() function
by Cléviton Mendes de Araújo 15 Aug '17

15 Aug '17

Hi fulks I try changing info value in PAI header-field by using subst() function into route block as below: route[3] { ... $var(fromU) = 22227777; ... subst('/^P-Asserted-Identity:(.*)sip:[^@]*@([a-zA-Z0-9.:]+)( .*)$/P-Asserted-Identity:\1sip:$var(fromU)@\2\3/ig'); ... ... forward(); exit; } But when I read ngrep command output I catch P-Asserted-Identity header as below: +++++++++++++++++++++++++++++++++++++++++++++++ before route[3] processing: INVITE sip:99992222@15.113.132.21:5060 SIP/2.0. ... P-Asserted-Identity: "Display Name 7777" <sip:7777@101.14.101.245>. ... +++++++++++++++++++++++++++++++++++++++++++++++ after route[3] processing: INVITE sip:99992222@15.113.132.21:5060 SIP/2.0. ... P-Asserted-Identity: "Display Name 7777" <sip:22227777@101.14.101.245>.P-Asserted-Identity: "Display Name 7777" <sip:7777@101.14.101.245>. ... +++++++++++++++++++++++++++++++++++++++++++++++ So, is it normal or bug behaviors? Regards CMA

2 1

unused var in rls/subscribe.c
by Juha Heinanen 15 Aug '17

15 Aug '17

CC (gcc) [M rls.so] subscribe.o subscribe.c: In function 'reply_200': subscribe.c:340:6: warning: unused variable 'len' [-Wunused-variable] int len; ^~~

2 1

git:master:f8c6ece3: rls: removed unused variable
by Daniel-Constantin Mierla 15 Aug '17

15 Aug '17

Module: kamailio Branch: master Commit: f8c6ece395a9601499c01f368c645d1d441a1789 URL: https://github.com/kamailio/kamailio/commit/f8c6ece395a9601499c01f368c645d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-15T09:01:50+02:00 rls: removed unused variable - reported by Juha Heinanen --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/f8c6ece395a9601499c01f368c645d1… Patch: https://github.com/kamailio/kamailio/commit/f8c6ece395a9601499c01f368c645d1… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index dc76e4fdba..655a9cde94 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -337,7 +337,6 @@ int reply_421(struct sip_msg* msg) int reply_200(struct sip_msg* msg, str* contact, int expires) { str hdr_append; - int len; hdr_append.s = (char *)pkg_malloc( sizeof(char)*(contact->len+70)); if(hdr_append.s == NULL)

1 0

git:master:1fe94fe8: pkg/kamailio/deb: version set to 5.1.0-dev6
by Victor Seva 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: 1fe94fe8129649703c92a87ebd402068faa66624 URL: https://github.com/kamailio/kamailio/commit/1fe94fe8129649703c92a87ebd40206… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-08-14T23:29:41+02:00 pkg/kamailio/deb: version set to 5.1.0-dev6 --- 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/1fe94fe8129649703c92a87ebd40206… Patch: https://github.com/kamailio/kamailio/commit/1fe94fe8129649703c92a87ebd40206… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 8174ad58ea..d2709ed68c 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev6) unstable; urgency=medium + + * version set to 5.1.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 14 Aug 2017 23:28:16 +0200 + kamailio (5.1.0~dev5) unstable; urgency=medium * version set to 5.1.0-dev5 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 8174ad58ea..d2709ed68c 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev6) unstable; urgency=medium + + * version set to 5.1.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 14 Aug 2017 23:28:16 +0200 + kamailio (5.1.0~dev5) unstable; urgency=medium * version set to 5.1.0-dev5 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 8174ad58ea..d2709ed68c 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev6) unstable; urgency=medium + + * version set to 5.1.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 14 Aug 2017 23:28:16 +0200 + kamailio (5.1.0~dev5) unstable; urgency=medium * version set to 5.1.0-dev5 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 8174ad58ea..d2709ed68c 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev6) unstable; urgency=medium + + * version set to 5.1.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 14 Aug 2017 23:28:16 +0200 + kamailio (5.1.0~dev5) unstable; urgency=medium * version set to 5.1.0-dev5 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 8174ad58ea..d2709ed68c 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev6) unstable; urgency=medium + + * version set to 5.1.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 14 Aug 2017 23:28:16 +0200 + kamailio (5.1.0~dev5) unstable; urgency=medium * version set to 5.1.0-dev5 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 8174ad58ea..d2709ed68c 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev6) unstable; urgency=medium + + * version set to 5.1.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 14 Aug 2017 23:28:16 +0200 + kamailio (5.1.0~dev5) unstable; urgency=medium * version set to 5.1.0-dev5 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 8174ad58ea..d2709ed68c 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev6) unstable; urgency=medium + + * version set to 5.1.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 14 Aug 2017 23:28:16 +0200 + kamailio (5.1.0~dev5) unstable; urgency=medium * version set to 5.1.0-dev5 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 8174ad58ea..d2709ed68c 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev6) unstable; urgency=medium + + * version set to 5.1.0-dev6 + + -- Victor Seva <vseva(a)debian.org> Mon, 14 Aug 2017 23:28:16 +0200 + kamailio (5.1.0~dev5) unstable; urgency=medium * version set to 5.1.0-dev5

1 0

Re: [sr-dev] [kamailio/kamailio] dialog: updates for core events API changes (4eec934)
by dryvoip 14 Aug '17

14 Aug '17

Compiling fails on CentOS 6 after this change ``` CC (gcc) [M dialog.so] dlg_cseq.o dlg_cseq.c:273: error: expected ')' before '*' token dlg_cseq.c:350: error: expected ')' before '*' token dlg_cseq.c: In function 'dlg_register_cseq_callbacks': dlg_cseq.c:538: error: 'dlg_cseq_msg_received' undeclared (first use in this function) dlg_cseq.c:538: error: (Each undeclared identifier is reported only once dlg_cseq.c:538: error: for each function it appears in.) dlg_cseq.c:539: error: 'dlg_cseq_msg_sent' undeclared (first use in this function) make[2]: *** [dlg_cseq.o] Error 1 make[1]: *** [modules] Error 1 ``` -- 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/4eec934a537551d78e833769c182f80…

1 0

[kamailio/kamailio] topos: fix PRACK message handling (#1097)
by sergey-vb 14 Aug '17

14 Aug '17

Currently PRACK was not handling properly because topos_d.b_contact field are filling only after receiving 200 OK. But PRACK is sending to 183 Progress responce. So I sink that we must filled topos_d.b_contact field after receiving 183 Progress. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1097 -- Commit Summary -- * topos: fix PRACK message handling -- File Changes -- M src/modules/topos/tps_storage.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1097.patch https://github.com/kamailio/kamailio/pull/1097.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/1097

2 4

git:master:bcff1c15: topos: added few debug messages when managing headers and ruri
by Daniel-Constantin Mierla 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: bcff1c15521b6841b747b6992e6ebb9850b7dd02 URL: https://github.com/kamailio/kamailio/commit/bcff1c15521b6841b747b6992e6ebb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-14T14:51:09+02:00 topos: added few debug messages when managing headers and ruri --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/bcff1c15521b6841b747b6992e6ebb9… Patch: https://github.com/kamailio/kamailio/commit/bcff1c15521b6841b747b6992e6ebb9… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 228996960e..22441b5fa9 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -179,6 +179,8 @@ int tps_add_headers(sip_msg_t *msg, str *hname, str *hbody, int hpos) hs.len += 2; } + LM_DBG("adding to headers(%d) - [%.*s]\n", hpos, hs.len, hs.s); + if (insert_new_lump_before(anchor, hs.s, hs.len, 0) == 0) { LM_ERR("can't insert lump\n"); pkg_free(hs.s); @@ -797,6 +799,8 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(rewrite_uri(msg, &nuri)<0) { LM_ERR("failed to update r-uri\n"); return -1; + } else { + LM_DBG("r-uri updated to: [%.*s]\n", nuri.len, nuri.s); } }

1 0

git:master:9dc27fa6: topos_redis: load contact fileds for branch and insert INVITE extra branch
by Daniel-Constantin Mierla 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: 9dc27fa6615dc22050448ce592f63e9533afaaf2 URL: https://github.com/kamailio/kamailio/commit/9dc27fa6615dc22050448ce592f63e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-14T14:05:30+02:00 topos_redis: load contact fileds for branch and insert INVITE extra branch - for INVITE store branch value on a key with call-id and to-tag when the reply is received --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/9dc27fa6615dc22050448ce592f63e9… Patch: https://github.com/kamailio/kamailio/commit/9dc27fa6615dc22050448ce592f63e9…

1 0

git:master:ad7e226d: topos_redis: load INVITE branch record when dealing with PRACK
by Daniel-Constantin Mierla 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: ad7e226dfc9fd3398a891534cf67f0a02d64bf4d URL: https://github.com/kamailio/kamailio/commit/ad7e226dfc9fd3398a891534cf67f0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-14T14:24:22+02:00 topos_redis: load INVITE branch record when dealing with PRACK --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/ad7e226dfc9fd3398a891534cf67f0a… Patch: https://github.com/kamailio/kamailio/commit/ad7e226dfc9fd3398a891534cf67f0a…

1 0

git:master:874a7d50: topos: increased defined value for tps nr keys
by Daniel-Constantin Mierla 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: 874a7d50779a582d1de809a3d57b4a07c3a1fbd9 URL: https://github.com/kamailio/kamailio/commit/874a7d50779a582d1de809a3d57b4a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-14T13:26:22+02:00 topos: increased defined value for tps nr keys --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/874a7d50779a582d1de809a3d57b4a0… Patch: https://github.com/kamailio/kamailio/commit/874a7d50779a582d1de809a3d57b4a0… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index b114360739..5662b80654 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -444,7 +444,7 @@ str tt_col_b_tag = str_init("b_tag"); str tt_col_s_method = str_init("s_method"); str tt_col_s_cseq = str_init("s_cseq"); -#define TPS_NR_KEYS 32 +#define TPS_NR_KEYS 48 str _tps_empty = str_init("");

1 0

git:master:fbf8f68e: topos: load contact fields for transaction record
by Daniel-Constantin Mierla 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: fbf8f68ed1f8df9af7ed60cb14d379e571550a03 URL: https://github.com/kamailio/kamailio/commit/fbf8f68ed1f8df9af7ed60cb14d379e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-14T13:15:52+02:00 topos: load contact fields for transaction record --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/fbf8f68ed1f8df9af7ed60cb14d379e… Patch: https://github.com/kamailio/kamailio/commit/fbf8f68ed1f8df9af7ed60cb14d379e… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 4f4397b918..b114360739 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -896,6 +896,8 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, db_cols[nr_cols++] = &tt_col_x_tag; db_cols[nr_cols++] = &tt_col_s_method; db_cols[nr_cols++] = &tt_col_s_cseq; + db_cols[nr_cols++] = &tt_col_a_contact; + db_cols[nr_cols++] = &tt_col_b_contact; if (_tpsdbf.use_table(_tps_db_handle, &tt_table_name) < 0) { LM_ERR("failed to perform use table\n"); @@ -938,6 +940,8 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, TPS_DATA_APPEND_DB(sd, db_res, n, &sd->x_tag); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_method); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_cseq); n++; + TPS_DATA_APPEND_DB(sd, db_res, n, &sd->a_contact); n++; + TPS_DATA_APPEND_DB(sd, db_res, n, &sd->b_contact); n++; done: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0)

1 0

git:master:5f4f5102: presence: pass pointer to subs_t for pres_update_status()
by Daniel-Constantin Mierla 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: 5f4f5102219ba2f3de820f795f8e1e9af64d5bf9 URL: https://github.com/kamailio/kamailio/commit/5f4f5102219ba2f3de820f795f8e1e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-14T09:10:26+02:00 presence: pass pointer to subs_t for pres_update_status() - passing content of a large structure may be inneficient at runtime --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5f4f5102219ba2f3de820f795f8e1e9… Patch: https://github.com/kamailio/kamailio/commit/5f4f5102219ba2f3de820f795f8e1e9… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index ad4275f64d..2b2079cc69 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -687,7 +687,7 @@ int ki_pres_refresh_watchers_file(sip_msg_t *msg, str *pres, str *event, return pres_refresh_watchers(pres, event, type, file_uri, filename); } -int pres_update_status(subs_t subs, str reason, db_key_t* query_cols, +int pres_update_status(subs_t *subs, str reason, db_key_t* query_cols, db_val_t* query_vals, int n_query_cols, subs_t** subs_array) { db_key_t update_cols[5]; @@ -715,29 +715,29 @@ int pres_update_status(subs_t subs, str reason, db_key_t* query_cols, update_vals[u_reason_col].type= DB1_STR; n_update_cols++; - status= subs.status; - if(subs.event->get_auth_status(&subs)< 0) + status= subs->status; + if(subs->event->get_auth_status(subs)< 0) { LM_ERR( "getting status from rules document\n"); return -1; } - LM_DBG("subs.status= %d\n", subs.status); - if(get_status_str(subs.status)== NULL) + LM_DBG("subs.status= %d\n", subs->status); + if(get_status_str(subs->status)== NULL) { - LM_ERR("wrong status: %d\n", subs.status); + LM_ERR("wrong status: %d\n", subs->status); return -1; } - if(subs.status!= status || reason.len!= subs.reason.len || - (reason.s && subs.reason.s && strncmp(reason.s, subs.reason.s, + if(subs->status!= status || reason.len!= subs->reason.len || + (reason.s && subs->reason.s && strncmp(reason.s, subs->reason.s, reason.len))) { /* update in watchers_table */ - query_vals[q_wuser_col].val.str_val= subs.watcher_user; - query_vals[q_wdomain_col].val.str_val= subs.watcher_domain; + query_vals[q_wuser_col].val.str_val= subs->watcher_user; + query_vals[q_wdomain_col].val.str_val= subs->watcher_domain; - update_vals[u_status_col].val.int_val= subs.status; - update_vals[u_reason_col].val.str_val= subs.reason; + update_vals[u_status_col].val.int_val= subs->status; + update_vals[u_reason_col].val.str_val= subs->reason; if (pa_dbf.use_table(pa_db, &watchers_table) < 0) { @@ -753,12 +753,12 @@ int pres_update_status(subs_t subs, str reason, db_key_t* query_cols, } /* save in the list all affected dialogs */ /* if status switches to terminated -> delete dialog */ - if(update_pw_dialogs(&subs, subs.db_flag, subs_array)< 0) + if(update_pw_dialogs(subs, subs->db_flag, subs_array)< 0) { LM_ERR( "extracting dialogs from [watcher]=%.*s(a)%.*s to" - " [presentity]=%.*s\n", subs.watcher_user.len, subs.watcher_user.s, - subs.watcher_domain.len, subs.watcher_domain.s, subs.pres_uri.len, - subs.pres_uri.s); + " [presentity]=%.*s\n", subs->watcher_user.len, subs->watcher_user.s, + subs->watcher_domain.len, subs->watcher_domain.s, subs->pres_uri.len, + subs->pres_uri.s); return -1; } } @@ -971,7 +971,7 @@ int update_watchers_status(str pres_uri, pres_ev_t* ev, str* rules_doc) subs.status = ws_list[i].status; memset(&subs.reason, 0, sizeof(str)); - if( pres_update_status(subs, reason, query_cols, query_vals, + if( pres_update_status(&subs, reason, query_cols, query_vals, n_query_cols, &subs_array)< 0) { LM_ERR("failed to update watcher status\n"); @@ -1014,7 +1014,7 @@ int update_watchers_status(str pres_uri, pres_ev_t* ev, str* rules_doc) subs.status= status; memset(&subs.reason, 0, sizeof(str)); - if( pres_update_status(subs,reason, query_cols, query_vals, + if( pres_update_status(&subs,reason, query_cols, query_vals, n_query_cols, &subs_array)< 0) { LM_ERR("failed to update watcher status\n");

1 0

git:master:30f1c139: modules: readme files regenerated - drouting ... [skip ci]
by Kamailio Dev 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: 30f1c139a144fd321f4c91928f2976a42d791733 URL: https://github.com/kamailio/kamailio/commit/30f1c139a144fd321f4c91928f2976a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-14T08:46:55+02:00 modules: readme files regenerated - drouting ... [skip ci] --- Modified: src/modules/drouting/README --- Diff: https://github.com/kamailio/kamailio/commit/30f1c139a144fd321f4c91928f2976a… Patch: https://github.com/kamailio/kamailio/commit/30f1c139a144fd321f4c91928f2976a… --- diff --git a/src/modules/drouting/README b/src/modules/drouting/README index e7e429500e..8e45c5ecf1 100644 --- a/src/modules/drouting/README +++ b/src/modules/drouting/README @@ -573,10 +573,11 @@ modparam("drouting", "drl_table", "my_gw_lists") tried in the given order; Ex: list 1,2;3,4,5;6 will lead to usage as 1,2,3,4,5,6 * 1 - the destinations from each group are randomly arranged (only - the two elements are randomly selected); groups do maintain their - order (as given); the resulting list is used (with all the defined - destinations). Ex: 1,2;3,4,5;6 -> randomizer -> (A) 2,1;4,3,5;6 -> - usage 2,1,4,3,5,6 (B) 1,2;3,5,4;6 -> usage 1,2,3,5,4,6 + the two first elements are randomly selected); groups do maintain + their order (as given); the resulting list is used (with all the + defined destinations). Ex: 1,2;3,4,5;6 -> randomizer -> (A) + 2,1;4,3,5;6 -> usage 2,1,4,3,5,6 (B) 1,2;3,5,4;6 -> usage + 1,2,3,5,4,6 * 2 - from each destination group, only a single destination is randomly selected; groups do maintain their order (as given); Ex: 1,2;3,4,5;6 -> randomizer -> @@ -699,10 +700,6 @@ modparam("drouting", "force_dns", 0) Enable monitoring of GW/destinations using keepalive module. Destinations found unavailable will not be used on do_routing() call. - NOTE: this option is only compatible with <em>sort_order</em> 0 - currently. With sort_order value of 1 or 2, destinations status will - simply be ignored. - Default value is “0 (disabled)”. Example 1.15. Set enable_keepalive parameter

1 0

git:master:361162ba: Merge pull request #1212 from gbour/drouting-w-keepalive
by GitHub 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: 361162ba1c5209890f2a8f1c60887a0aa7ed9783 URL: https://github.com/kamailio/kamailio/commit/361162ba1c5209890f2a8f1c60887a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-14T08:45:24+02:00 Merge pull request #1212 from gbour/drouting-w-keepalive drouting: pull out unavailable destinations for sort_order 1 and 2 --- Modified: src/modules/drouting/doc/drouting_admin.xml Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/361162ba1c5209890f2a8f1c60887a0… Patch: https://github.com/kamailio/kamailio/commit/361162ba1c5209890f2a8f1c60887a0…

1 0

git:master:9875e64a: drouting: pull out unavailable destinations for sort_order 1 and 2
by Guillaume Bour 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: 9875e64a95da6186ab616f1c560fc245916ac517 URL: https://github.com/kamailio/kamailio/commit/9875e64a95da6186ab616f1c560fc24… Author: Guillaume Bour <guillaume(a)bour.cc> Committer: Guillaume Bour <guillaume(a)bour.cc> Date: 2017-08-10T21:35:54+02:00 drouting: pull out unavailable destinations for sort_order 1 and 2 - destinations are monitored with keepalive module (when 'enable_keepalive' option is set) - it was already supported for sort_order 0 in a previous commit --- Modified: src/modules/drouting/doc/drouting_admin.xml Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/9875e64a95da6186ab616f1c560fc24… Patch: https://github.com/kamailio/kamailio/commit/9875e64a95da6186ab616f1c560fc24…

1 0

[kamailio/kamailio] drouting: pull out unavailable destinations for sort_order 1 and 2 (#1212)
by Guillaume Bour 14 Aug '17

14 Aug '17

#### 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 When destinations monitoring is enabled with option 'enable_keepalive' set to 1, unavailable destinations will be ignored when calling do_routing() function It was already implemented for sort_order 0 in a previous commit. This one adds the support for sor_order 1 & 2 also You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1212 -- Commit Summary -- * drouting: pull out unavailable destinations for sort_order 1 and 2 -- File Changes -- M src/modules/drouting/doc/drouting_admin.xml (9) M src/modules/drouting/drouting.c (62) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1212.patch https://github.com/kamailio/kamailio/pull/1212.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/1212

2 2

git:master:00b2d6a1: Merge pull request #1214 from sergey-safarov/spec_update10
by GitHub 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: 00b2d6a170848e9e354252f9f1c3d049619efcd6 URL: https://github.com/kamailio/kamailio/commit/00b2d6a170848e9e354252f9f1c3d04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-14T08:43:35+02:00 Merge pull request #1214 from sergey-safarov/spec_update10 pkg/kamailio/centos/7: Update CentOS spec file --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/00b2d6a170848e9e354252f9f1c3d04… Patch: https://github.com/kamailio/kamailio/commit/00b2d6a170848e9e354252f9f1c3d04… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index d6410c7e99..2d0099b901 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 5.1.0 -%define rel dev1%{dist} +%define rel dev6%{dist} %bcond_with dnssec @@ -191,7 +191,6 @@ This module implements protocol functions that use the libcurl to communicate wi %package http_client Summary: HTTP client module for Kamailio. Group: System Environment/Daemons -Requires: libcrypto %description http_client This module implements protocol functions that use the libcurl to communicate with HTTP servers. @@ -668,6 +667,7 @@ fi %dir %{_docdir}/kamailio/modules %doc %{_docdir}/kamailio/modules/README.acc +%doc %{_docdir}/kamailio/modules/README.acc_diameter %doc %{_docdir}/kamailio/modules/README.alias_db %doc %{_docdir}/kamailio/modules/README.app_jsdt %doc %{_docdir}/kamailio/modules/README.async @@ -810,6 +810,7 @@ fi %dir %{_libdir}/kamailio/modules %{_libdir}/kamailio/modules/acc.so +%{_libdir}/kamailio/modules/acc_diameter.so %{_libdir}/kamailio/modules/alias_db.so %{_libdir}/kamailio/modules/app_jsdt.so %{_libdir}/kamailio/modules/async.so

1 0

git:master:363cc61d: pkg/kamailio/centos/7: Update CentOS spec file
by Sergey Safarov 14 Aug '17

14 Aug '17

Module: kamailio Branch: master Commit: 363cc61d63fac8e4a9bcf4f7994de30f6a30b73d URL: https://github.com/kamailio/kamailio/commit/363cc61d63fac8e4a9bcf4f7994de30… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-08-13T12:05:34-04:00 pkg/kamailio/centos/7: Update CentOS spec file --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/363cc61d63fac8e4a9bcf4f7994de30… Patch: https://github.com/kamailio/kamailio/commit/363cc61d63fac8e4a9bcf4f7994de30… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index d6410c7e99..2d0099b901 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 5.1.0 -%define rel dev1%{dist} +%define rel dev6%{dist} %bcond_with dnssec @@ -191,7 +191,6 @@ This module implements protocol functions that use the libcurl to communicate wi %package http_client Summary: HTTP client module for Kamailio. Group: System Environment/Daemons -Requires: libcrypto %description http_client This module implements protocol functions that use the libcurl to communicate with HTTP servers. @@ -668,6 +667,7 @@ fi %dir %{_docdir}/kamailio/modules %doc %{_docdir}/kamailio/modules/README.acc +%doc %{_docdir}/kamailio/modules/README.acc_diameter %doc %{_docdir}/kamailio/modules/README.alias_db %doc %{_docdir}/kamailio/modules/README.app_jsdt %doc %{_docdir}/kamailio/modules/README.async @@ -810,6 +810,7 @@ fi %dir %{_libdir}/kamailio/modules %{_libdir}/kamailio/modules/acc.so +%{_libdir}/kamailio/modules/acc_diameter.so %{_libdir}/kamailio/modules/alias_db.so %{_libdir}/kamailio/modules/app_jsdt.so %{_libdir}/kamailio/modules/async.so

1 0

[kamailio/kamailio] pkg/kamailio/centos/7: Update CentOS spec file (#1214)
by sergey-safarov 14 Aug '17

14 Aug '17

update version suffix added unpackaged `acc_diameter` files removed dependency to not existed package `libcrypto ` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1214 -- Commit Summary -- * pkg/kamailio/centos/7: Update CentOS spec file -- File Changes -- M pkg/kamailio/centos/7/kamailio.spec (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1214.patch https://github.com/kamailio/kamailio/pull/1214.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/1214

2 2

[kamailio/kamailio] `advertise` keyword not take effect when `listen` is bounded NIC name (#1209)
by sergey-safarov 13 Aug '17

13 Aug '17

Tested on e5b8066e1e0f4a69a5d1161dd75aea67014314b5 commit -- 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/1209

2 10

git:master:97d8ebc9: sipcapture: safety checks for values inside w_float2int()
by Daniel-Constantin Mierla 13 Aug '17

13 Aug '17

Module: kamailio Branch: master Commit: 97d8ebc966aba71efb3a964e71b00736db51401b URL: https://github.com/kamailio/kamailio/commit/97d8ebc966aba71efb3a964e71b0073… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-13T11:07:42+02:00 sipcapture: safety checks for values inside w_float2int() --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/97d8ebc966aba71efb3a964e71b0073… Patch: https://github.com/kamailio/kamailio/commit/97d8ebc966aba71efb3a964e71b0073… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 8fb9deb16b..fdd736e7f9 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -1039,6 +1039,9 @@ static int w_float2int(struct sip_msg* _m, char* _val, char* _coof, char* s2) return -1; } + if(value.s==NULL || coof.s==NULL) + return -1; + ret = (int) (atof (value.s) * atoi(coof.s)); return ret ? ret : -1;

1 0

git:master:bb536c3d: rls: proper handling of return code for parse from/to uri
by Daniel-Constantin Mierla 12 Aug '17

12 Aug '17

Module: kamailio Branch: master Commit: bb536c3dae01865c42e556989e8aca5be85b20fe URL: https://github.com/kamailio/kamailio/commit/bb536c3dae01865c42e556989e8aca5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-12T08:48:21+02:00 rls: proper handling of return code for parse from/to uri --- Modified: src/modules/rls/rls.c Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/bb536c3dae01865c42e556989e8aca5… Patch: https://github.com/kamailio/kamailio/commit/bb536c3dae01865c42e556989e8aca5… --- diff --git a/src/modules/rls/rls.c b/src/modules/rls/rls.c index 86f9bf3c9f..d16d3a24a4 100644 --- a/src/modules/rls/rls.c +++ b/src/modules/rls/rls.c @@ -1023,8 +1023,7 @@ int rls_restore_db_subs(void) return 0; error: - if(res) - rls_dbf.free_result(rls_db, res); + rls_dbf.free_result(rls_db, res); return -1; } diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index 6ce59d58e3..b08e55e6f2 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -440,7 +440,7 @@ int rls_handle_subscribe0(struct sip_msg* msg) { struct to_body *pfrom; - if (parse_from_uri(msg) < 0) + if (parse_from_uri(msg) == NULL) { LM_ERR("failed to find From header\n"); if (slb.freply(msg, 400, &pu_400_rpl) < 0) @@ -507,7 +507,7 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma return 0; } /* check for To and From headesr */ - if(parse_to_uri(msg)<0 || parse_from_uri(msg)<0) + if(parse_to_uri(msg)==NULL || parse_from_uri(msg)==NULL) { LM_ERR("failed to find To or From headers\n"); if (slb.freply(msg, 400, &pu_400_rpl) < 0)

1 0

git:master:3d2359b5: rls: replace sprintf with safer snprintf
by Daniel-Constantin Mierla 12 Aug '17

12 Aug '17

Module: kamailio Branch: master Commit: 3d2359b5a349efe4d6571ec0953e5c4aae54a165 URL: https://github.com/kamailio/kamailio/commit/3d2359b5a349efe4d6571ec0953e5c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-12T08:59:06+02:00 rls: replace sprintf with safer snprintf - compact printing headers in 200ok function by doing it once in a snprintf, instead of combination of many sprintf and strncpy --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/3d2359b5a349efe4d6571ec0953e5c4… Patch: https://github.com/kamailio/kamailio/commit/3d2359b5a349efe4d6571ec0953e5c4… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index b08e55e6f2..dc76e4fdba 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -339,35 +339,24 @@ int reply_200(struct sip_msg* msg, str* contact, int expires) str hdr_append; int len; - hdr_append.s = (char *)pkg_malloc( sizeof(char)*(contact->len+ 70)); + hdr_append.s = (char *)pkg_malloc( sizeof(char)*(contact->len+70)); if(hdr_append.s == NULL) { LM_ERR("no more pkg memory\n"); return -1; } - hdr_append.len = sprintf(hdr_append.s, "Expires: %d\r\n", expires); - if(hdr_append.len< 0) + hdr_append.len = snprintf(hdr_append.s, contact->len+70, + "Expires: %d" CRLF + "Contact: <%.*s>" CRLF + "Require: eventlist" CRLF, + expires, + contact->len, contact->s + ); + if(hdr_append.len<0 || hdr_append.len>=contact->len+70) { - LM_ERR("unsuccessful sprintf\n"); + LM_ERR("unsuccessful snprintf\n"); goto error; } - strncpy(hdr_append.s+hdr_append.len ,"Contact: <", 10); - hdr_append.len += 10; - strncpy(hdr_append.s+hdr_append.len, contact->s, contact->len); - hdr_append.len+= contact->len; - strncpy(hdr_append.s+hdr_append.len, ">", 1); - hdr_append.len += 1; - strncpy(hdr_append.s+hdr_append.len, CRLF, CRLF_LEN); - hdr_append.len += CRLF_LEN; - - len = sprintf(hdr_append.s+ hdr_append.len, "Require: eventlist\r\n"); - if(len < 0) - { - LM_ERR("unsuccessful sprintf\n"); - goto error; - } - hdr_append.len+= len; - hdr_append.s[hdr_append.len]= '\0'; if (add_lump_rpl( msg, hdr_append.s, hdr_append.len, LUMP_RPL_HDR)==0 ) {

1 0

git:master:92daa0bb: evapi: removed unused variable
by Daniel-Constantin Mierla 12 Aug '17

12 Aug '17

Module: kamailio Branch: master Commit: 92daa0bb98e9d7c997e9f6ca4994d48134e07acc URL: https://github.com/kamailio/kamailio/commit/92daa0bb98e9d7c997e9f6ca4994d48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-12T08:26:55+02:00 evapi: removed unused variable --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/92daa0bb98e9d7c997e9f6ca4994d48… Patch: https://github.com/kamailio/kamailio/commit/92daa0bb98e9d7c997e9f6ca4994d48… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 04eab30e50..2aaaf1e6c9 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -138,8 +138,6 @@ int evapi_run_cfg_route(evapi_env_t *evenv, int rt, str *rtname) sip_msg_t *fmsg; sip_msg_t tmsg; sr_kemi_eng_t *keng = NULL; - str evname; - if(evenv==0 || evenv->eset==0) { LM_ERR("evapi env not set\n");

1 0

git:master:5be6d11e: topos_redis: removed unused variables
by Daniel-Constantin Mierla 12 Aug '17

12 Aug '17

Module: kamailio Branch: master Commit: 5be6d11ecd99670cf85cece3a534e10f3f015c52 URL: https://github.com/kamailio/kamailio/commit/5be6d11ecd99670cf85cece3a534e10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-12T08:27:15+02:00 topos_redis: removed unused variables --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5be6d11ecd99670cf85cece3a534e10… Patch: https://github.com/kamailio/kamailio/commit/5be6d11ecd99670cf85cece3a534e10… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 7753cd89c8..51c839487d 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -825,10 +825,8 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, str rcmd = str_init("HMSET"); str rkey = STR_NULL; char *rp; - str rval = STR_NULL; redisc_server_t *rsrv = NULL; redisReply *rrpl = NULL; - int32_t liflags; if(sd->a_uuid.len<=0 && sd->b_uuid.len<=0) { LM_INFO("no uuid for this message\n");

1 0

git:master:41f6d98c: acc_diameter: removed unused variable
by Daniel-Constantin Mierla 12 Aug '17

12 Aug '17

Module: kamailio Branch: master Commit: 41f6d98cc19e514de6d0aea05cc1d17be3d95065 URL: https://github.com/kamailio/kamailio/commit/41f6d98cc19e514de6d0aea05cc1d17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-12T08:26:22+02:00 acc_diameter: removed unused variable --- Modified: src/modules/acc_diameter/diam_tcp.c --- Diff: https://github.com/kamailio/kamailio/commit/41f6d98cc19e514de6d0aea05cc1d17… Patch: https://github.com/kamailio/kamailio/commit/41f6d98cc19e514de6d0aea05cc1d17… --- diff --git a/src/modules/acc_diameter/diam_tcp.c b/src/modules/acc_diameter/diam_tcp.c index 77525479c5..59b8755ce2 100644 --- a/src/modules/acc_diameter/diam_tcp.c +++ b/src/modules/acc_diameter/diam_tcp.c @@ -95,7 +95,6 @@ int tcp_send_recv(int sfd, char* buf, int len, rd_buf_t* rb, unsigned long int result_code; AAAMessage *msg; AAA_AVP *avp; - char serviceType; unsigned int m_id; /* try to write the message to the Diameter client */ @@ -184,7 +183,6 @@ int tcp_send_recv(int sfd, char* buf, int len, rd_buf_t* rb, LM_ERR("AVP_Service_Type not found\n"); return AAA_ERROR; } - serviceType = avp->data.s[0]; result_code = ntohl(*((unsigned long int*)(msg->res_code->data.s))); switch(result_code)

1 0

git:master:85def4c2: core: tcp - print str error in debug message if faling to write to connection
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 85def4c200e216dce5d3d8e53461a69ab408fa3c URL: https://github.com/kamailio/kamailio/commit/85def4c200e216dce5d3d8e53461a69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T16:11:19+02:00 core: tcp - print str error in debug message if faling to write to connection --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/85def4c200e216dce5d3d8e53461a69… Patch: https://github.com/kamailio/kamailio/commit/85def4c200e216dce5d3d8e53461a69… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 06812db509..09f7f4301b 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2621,8 +2621,14 @@ static int tcpconn_1st_send(int fd, struct tcp_connection* c, ENOTCONN appears on newer FreeBSD versions (non-blocking socket, connect() & send immediately) */ if ((n>=0) || errno==EAGAIN || errno==EWOULDBLOCK || errno==ENOTCONN){ - LM_DBG("pending write on new connection %p " - "(%d/%d bytes written)\n", c, n, len); + if(n<0) { + LM_DBG("pending write on new connection %p " + "(%d/%d bytes written) (err: %d - %s)\n", c, n, len, + errno, strerror(errno)); + } else { + LM_DBG("pending write on new connection %p " + "(%d/%d bytes written)\n", c, n, len); + } if (unlikely(n<0)) n=0; else{ if (likely(c->state == S_CONN_CONNECT))

1 0

git:master:125db2c3: Merge pull request #1213 from christoph-v/ims_get_body_coredump
by GitHub 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 125db2c3650843aae2927a4625e3d42a755fa309 URL: https://github.com/kamailio/kamailio/commit/125db2c3650843aae2927a4625e3d42… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-11T15:54:28+02:00 Merge pull request #1213 from christoph-v/ims_get_body_coredump ims_auth: fixed rare core dump, due to null ptr check --- Modified: src/modules/ims_auth/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/125db2c3650843aae2927a4625e3d42… Patch: https://github.com/kamailio/kamailio/commit/125db2c3650843aae2927a4625e3d42… --- diff --git a/src/modules/ims_auth/utils.c b/src/modules/ims_auth/utils.c index 2e40cf8c46..94d02e3fe7 100644 --- a/src/modules/ims_auth/utils.c +++ b/src/modules/ims_auth/utils.c @@ -204,7 +204,9 @@ str ims_get_body(struct sip_msg * msg) LM_DBG("Error parsing until header Content-Length: \n"); return x; } - x.len = (int)(long)msg->content_length->parsed; + if (msg->content_length) + // Content-Length header might be missing + x.len = (int)(long)msg->content_length->parsed; if (x.len>0) x.s = get_body(msg);

1 0

git:master:4e760394: ims_auth: fixed rare core dump, due to null ptr check
by Valentin Christoph 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 4e760394b63ab0bf3ca6deb1d527c96f800a834d URL: https://github.com/kamailio/kamailio/commit/4e760394b63ab0bf3ca6deb1d527c96… Author: Valentin Christoph <valentin(a)kapsch.net> Committer: Valentin Christoph <valentin(a)kapsch.net> Date: 2017-08-11T14:43:36+02:00 ims_auth: fixed rare core dump, due to null ptr check The ims_auth module reads the value from the Content-Length header of a REGISTER request, before decoding the message body. Due to a missing null pointer check, reading this value leads to core dump in case the Content-Length header is missing. --- Modified: src/modules/ims_auth/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/4e760394b63ab0bf3ca6deb1d527c96… Patch: https://github.com/kamailio/kamailio/commit/4e760394b63ab0bf3ca6deb1d527c96… --- diff --git a/src/modules/ims_auth/utils.c b/src/modules/ims_auth/utils.c index 2e40cf8c46..94d02e3fe7 100644 --- a/src/modules/ims_auth/utils.c +++ b/src/modules/ims_auth/utils.c @@ -204,7 +204,9 @@ str ims_get_body(struct sip_msg * msg) LM_DBG("Error parsing until header Content-Length: \n"); return x; } - x.len = (int)(long)msg->content_length->parsed; + if (msg->content_length) + // Content-Length header might be missing + x.len = (int)(long)msg->content_length->parsed; if (x.len>0) x.s = get_body(msg);

1 0

git:master:9df27ff7: tm: updated for the new shm global locking functions
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 9df27ff7afbf1cf8ee7b3afd1741355e9f6f866e URL: https://github.com/kamailio/kamailio/commit/9df27ff7afbf1cf8ee7b3afd1741355… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:38:39+02:00 tm: updated for the new shm global locking functions --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/9df27ff7afbf1cf8ee7b3afd1741355… Patch: https://github.com/kamailio/kamailio/commit/9df27ff7afbf1cf8ee7b3afd1741355… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index 2e8e8e7717..19b5daec0b 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -147,7 +147,7 @@ void free_cell_helper( if(unlikely(has_tran_tmcbs(dead_cell, TMCB_DESTROY))) run_trans_callbacks(TMCB_DESTROY, dead_cell, 0, 0, 0); - shm_lock(); + shm_global_lock(); /* UA Server */ if(dead_cell->uas.request) sip_msg_free_unsafe(dead_cell->uas.request); @@ -167,9 +167,9 @@ void free_cell_helper( * otherwise the release function must to be aware of * the lock state (Miklos) */ - shm_unlock(); + shm_global_unlock(); cbs_tmp->release(cbs_tmp->param); - shm_lock(); + shm_global_lock(); } shm_free_unsafe(cbs_tmp); } @@ -250,7 +250,7 @@ void free_cell_helper( /* the cell's body */ shm_free_unsafe(dead_cell); - shm_unlock(); + shm_global_unlock(); t_stats_freed(); }

1 0

git:master:1ec69642: core: main.c - updates for shm unlock in shutdown cleanup
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 1ec6964249dc5db4bd69c612b626466cae896c41 URL: https://github.com/kamailio/kamailio/commit/1ec6964249dc5db4bd69c612b626466… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:37:33+02:00 core: main.c - updates for shm unlock in shutdown cleanup - test if shm was initialized before global unlock --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/1ec6964249dc5db4bd69c612b626466… Patch: https://github.com/kamailio/kamailio/commit/1ec6964249dc5db4bd69c612b626466… --- diff --git a/src/main.c b/src/main.c index a98a35693f..b65b0020ca 100644 --- a/src/main.c +++ b/src/main.c @@ -518,10 +518,11 @@ void cleanup(int show_status) /*clean-up*/ #ifndef SHM_SAFE_MALLOC - if (_shm_lock) - shm_unlock(); /* hack: force-unlock the shared memory lock in case - some process crashed and let it locked; this will - allow an almost gracious shutdown */ + if(shm_initialized()) { + /* force-unlock the shared memory lock in case some process crashed + * and let it locked; this will allow an almost gracious shutdown */ + shm_global_unlock(); + } #endif destroy_rpcs(); destroy_modules();

1 0

git:master:13a1e6c2: core: mem/tlsf_malloc - shared memory locking implemented internally
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 13a1e6c23576ab3797af6fefde6fcbbd2d0b83e3 URL: https://github.com/kamailio/kamailio/commit/13a1e6c23576ab3797af6fefde6fcbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:31:40+02:00 core: mem/tlsf_malloc - shared memory locking implemented internally --- Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/13a1e6c23576ab3797af6fefde6fcbb… Patch: https://github.com/kamailio/kamailio/commit/13a1e6c23576ab3797af6fefde6fcbb…

1 0

git:master:bccdcf3c: core: mem/q_malloc - shared memory locking implemented internally
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: bccdcf3c456ef450399be337131fcf33e97eb57a URL: https://github.com/kamailio/kamailio/commit/bccdcf3c456ef450399be337131fcf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:26:25+02:00 core: mem/q_malloc - shared memory locking implemented internally --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/bccdcf3c456ef450399be337131fcf3… Patch: https://github.com/kamailio/kamailio/commit/bccdcf3c456ef450399be337131fcf3…

1 0

git:master:13bdd0e1: core: mem/shm - shared memory api updated to allow locking by manager
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 13bdd0e15883a07d396210b8a372c1b51786f2a9 URL: https://github.com/kamailio/kamailio/commit/13bdd0e15883a07d396210b8a372c1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:21:59+02:00 core: mem/shm - shared memory api updated to allow locking by manager - instead of generic global lock, allow memory manager to handle locking for shared memory --- Modified: src/core/mem/memapi.h Modified: src/core/mem/shm.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/13bdd0e15883a07d396210b8a372c1b… Patch: https://github.com/kamailio/kamailio/commit/13bdd0e15883a07d396210b8a372c1b… --- diff --git a/src/core/mem/memapi.h b/src/core/mem/memapi.h index 198bd4d25a..dc1cd80f03 100644 --- a/src/core/mem/memapi.h +++ b/src/core/mem/memapi.h @@ -46,6 +46,9 @@ typedef void* (*sr_resize_f)(void* mbp, void* p, size_t size); #endif /*DBG_SR_MEMORY*/ +typedef void (*sr_shm_glock_f)(void* mbp); +typedef void (*sr_shm_gunlock_f)(void* mbp); + typedef void (*sr_mem_status_f)(void* mbp); typedef void (*sr_mem_info_f)(void* mbp, struct mem_info* info); typedef unsigned long (*sr_mem_available_f)(void* mbp); @@ -128,6 +131,10 @@ typedef struct sr_shm_api { sr_mem_mod_get_stats_f xmodstats; /*memory stats free per module*/ sr_mem_mod_free_stats_f xfmodstats; + /*memory managing global lock*/ + sr_shm_glock_f xglock; + /*memory managing global unlock*/ + sr_shm_gunlock_f xgunlock; } sr_shm_api_t; #endif diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index f48cf3baad..3dbc34f11a 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -48,8 +48,6 @@ void shm_core_destroy(void); static int _shm_core_shmid[SHM_CORE_POOLS_SIZE] = { -1 }; /*shared memory id*/ #endif -gen_lock_t* _shm_lock=0; - static void* _shm_core_pools_mem[SHM_CORE_POOLS_SIZE] = { (void*)-1 }; static int _shm_core_pools_num = 1; @@ -168,41 +166,6 @@ void* shm_core_get_pool(void) } /** - * init the core lock - */ -int shm_core_lock_init(void) -{ - if (_shm_lock) { - LM_DBG("shared memory lock initialized\n"); - return 0; - } - _shm_lock=shm_malloc_unsafe(sizeof(gen_lock_t)); /* skip lock_alloc, - race cond*/ - if (_shm_lock==0){ - LOG(L_CRIT, "could not allocate lock\n"); - shm_core_destroy(); - return -1; - } - if (lock_init(_shm_lock)==0){ - LOG(L_CRIT, "could not initialize lock\n"); - shm_core_destroy(); - return -1; - } - return 0; -} - -/** - * - */ -void shm_core_lock_destroy(void) -{ - if (_shm_lock){ - DBG("destroying the shared memory lock\n"); - lock_destroy(_shm_lock); /* we don't need to dealloc it*/ - } -} - -/** * */ void shm_core_destroy(void) @@ -255,6 +218,8 @@ int shm_init_api(sr_shm_api_t *ap) _shm_root.xdestroy = ap->xdestroy; _shm_root.xmodstats = ap->xmodstats; _shm_root.xfmodstats = ap->xfmodstats; + _shm_root.xglock = ap->xglock; + _shm_root.xgunlock = ap->xgunlock; return 0; } @@ -291,11 +256,10 @@ int shm_init_manager(char *name) */ void shm_destroy_manager(void) { - shm_core_lock_destroy(); if(_shm_root.xdestroy) { - _shm_root.xdestroy(); LM_DBG("destroying memory manager: %s\n", (_shm_root.mname)?_shm_root.mname:"unknown"); + _shm_root.xdestroy(); } shm_core_destroy(); } diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 7af16be766..5d58071359 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -38,12 +38,6 @@ #include "../dprint.h" #include "../lock_ops.h" /* we don't include locking.h on purpose */ -extern gen_lock_t* _shm_lock; -#define shm_lock() lock_get(_shm_lock) -#define shm_unlock() lock_release(_shm_lock) -int shm_core_lock_init(void); -void shm_core_lock_destroy(void); - extern sr_shm_api_t _shm_root; #ifdef DBG_SR_MEMORY @@ -82,6 +76,9 @@ extern sr_shm_api_t _shm_root; # define shm_mod_get_stats(x) _shm_root.xmodstats(_shm_root.mem_block, x) # define shm_mod_free_stats(x) _shm_root.xfmodstats(x) +# define shm_global_lock() _shm_root.xglock(_shm_root.mem_block) +# define shm_global_unlock() _shm_root.xgunlock(_shm_root.mem_block) + void* shm_core_get_pool(void); int shm_init_api(sr_shm_api_t *ap);

1 0

git:master:fcff3426: core: mem/f_malloc - shared memory locking implemented internally
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: fcff3426798a925dffd32b75569b9d86e0f131c3 URL: https://github.com/kamailio/kamailio/commit/fcff3426798a925dffd32b75569b9d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:24:29+02:00 core: mem/f_malloc - shared memory locking implemented internally --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/fcff3426798a925dffd32b75569b9d8… Patch: https://github.com/kamailio/kamailio/commit/fcff3426798a925dffd32b75569b9d8…

1 0

git:master:cc9033be: tm: use standard shm malloc to store to-tag set
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: cc9033be4cbbd5330febecaec3c5718703c0267c URL: https://github.com/kamailio/kamailio/commit/cc9033be4cbbd5330febecaec3c5718… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T15:10:38+02:00 tm: use standard shm malloc to store to-tag set --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/cc9033be4cbbd5330febecaec3c5718… Patch: https://github.com/kamailio/kamailio/commit/cc9033be4cbbd5330febecaec3c5718… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 795da9cb14..c26b5eca32 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -306,10 +306,8 @@ inline static int update_totag_set(struct cell *t, struct sip_msg *ok) } } /* that's a new to-tag -- record it */ - shm_lock(); - n=(struct totag_elem*) shm_malloc_unsafe(sizeof(struct totag_elem)); - s=(char *)shm_malloc_unsafe(tag->len); - shm_unlock(); + n=(struct totag_elem*) shm_malloc(sizeof(struct totag_elem)); + s=(char *)shm_malloc(tag->len); if (!s || !n) { LM_ERR("no more shm memory \n"); if (n) shm_free(n);

1 0

git:master:fe441c45: core: mem - fix printing shm memory manager name
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: fe441c4561a8be852c2baae6568e48ef8203210d URL: https://github.com/kamailio/kamailio/commit/fe441c4561a8be852c2baae6568e48e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T12:03:54+02:00 core: mem - fix printing shm memory manager name --- Modified: src/core/mem/shm.c --- Diff: https://github.com/kamailio/kamailio/commit/fe441c4561a8be852c2baae6568e48e… Patch: https://github.com/kamailio/kamailio/commit/fe441c4561a8be852c2baae6568e48e… --- diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index 320f3366b0..f48cf3baad 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -306,5 +306,5 @@ void shm_destroy_manager(void) void shm_print_manager(void) { LM_DBG("shm - using memory manager: %s\n", - (_pkg_root.mname)?_pkg_root.mname:"unknown"); + (_shm_root.mname)?_shm_root.mname:"unknown"); }

1 0

git:master:751c181f: core: new parameter - verbose_startup
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 751c181fe4477861e3aa300b78e115b8642d12f4 URL: https://github.com/kamailio/kamailio/commit/751c181fe4477861e3aa300b78e115b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T12:07:27+02:00 core: new parameter - verbose_startup - control if printing routing tree and udp probing buffer debug messages should be printed at startup - default 0 (don't print); set to 1 to get those debug messages --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/route.c Modified: src/core/udp_server.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/751c181fe4477861e3aa300b78e115b… Patch: https://github.com/kamailio/kamailio/commit/751c181fe4477861e3aa300b78e115b…

1 0

git:master:401ec2f7: core: mem - initial framework to support many shm pools
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 401ec2f71fd237b3974114803cb61030172240ae URL: https://github.com/kamailio/kamailio/commit/401ec2f71fd237b3974114803cb6103… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T11:36:58+02:00 core: mem - initial framework to support many shm pools --- Modified: src/core/mem/shm.c --- Diff: https://github.com/kamailio/kamailio/commit/401ec2f71fd237b3974114803cb6103… Patch: https://github.com/kamailio/kamailio/commit/401ec2f71fd237b3974114803cb6103…

1 0

git:master:eb277e85: core: mem - extend pkg/shm init function for latest api fields
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: eb277e854d94eaca3a29d0856e9c903d04df0fd5 URL: https://github.com/kamailio/kamailio/commit/eb277e854d94eaca3a29d0856e9c903… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T11:06:24+02:00 core: mem - extend pkg/shm init function for latest api fields --- Modified: src/core/mem/pkg.c Modified: src/core/mem/shm.c --- Diff: https://github.com/kamailio/kamailio/commit/eb277e854d94eaca3a29d0856e9c903… Patch: https://github.com/kamailio/kamailio/commit/eb277e854d94eaca3a29d0856e9c903… --- diff --git a/src/core/mem/pkg.c b/src/core/mem/pkg.c index 53166ac932..f1e616eca6 100644 --- a/src/core/mem/pkg.c +++ b/src/core/mem/pkg.c @@ -39,8 +39,10 @@ int pkg_init_api(sr_pkg_api_t *ap) _pkg_root.mem_pool = ap->mem_pool; _pkg_root.mem_block = ap->mem_block; _pkg_root.xmalloc = ap->xmalloc; + _pkg_root.xmallocxz = ap->xmallocxz; _pkg_root.xfree = ap->xfree; _pkg_root.xrealloc = ap->xrealloc; + _pkg_root.xreallocxf = ap->xreallocxf; _pkg_root.xstatus = ap->xstatus; _pkg_root.xinfo = ap->xinfo; _pkg_root.xavailable = ap->xavailable; diff --git a/src/core/mem/shm.c b/src/core/mem/shm.c index e4f4ad6f17..8a2e93b92f 100644 --- a/src/core/mem/shm.c +++ b/src/core/mem/shm.c @@ -211,10 +211,12 @@ int shm_init_api(sr_shm_api_t *ap) _shm_root.mem_pool = ap->mem_pool; _shm_root.mem_block = ap->mem_block; _shm_root.xmalloc = ap->xmalloc; + _shm_root.xmallocxz = ap->xmallocxz; _shm_root.xmalloc_unsafe = ap->xmalloc_unsafe; _shm_root.xfree = ap->xfree; _shm_root.xfree_unsafe = ap->xfree_unsafe; _shm_root.xrealloc = ap->xrealloc; + _shm_root.xreallocxf = ap->xreallocxf; _shm_root.xresize = ap->xresize; _shm_root.xstatus = ap->xstatus; _shm_root.xinfo = ap->xinfo;

1 0

git:master:2415416d: sms: avoid overflowing ending 0 by sprintf()
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 2415416df6bd4c599c7fde57fbaa541e2e37f9c7 URL: https://github.com/kamailio/kamailio/commit/2415416df6bd4c599c7fde57fbaa541… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T10:21:08+02:00 sms: avoid overflowing ending 0 by sprintf() --- Modified: src/modules/sms/libsms_getsms.c --- Diff: https://github.com/kamailio/kamailio/commit/2415416df6bd4c599c7fde57fbaa541… Patch: https://github.com/kamailio/kamailio/commit/2415416df6bd4c599c7fde57fbaa541… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index 62efe0bfb6..e8c7590456 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -275,6 +275,8 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) { char* start; char* end; + char tbuf[TIME_LEN+1]; + char dbuf[DATE_LEN+1]; /* the text is after the \r */ for( start=source ; *start && *start!='\r' ; start++ ); @@ -312,12 +314,14 @@ static int splitascii(struct modem *mdm, char *source, struct incame_sms *sms) } /* Get the date */ start=end+3; - sprintf(sms->date,"%c%c-%c%c-%c%c",start[3],start[4],start[0],start[1], + sprintf(dbuf,"%c%c-%c%c-%c%c",start[3],start[4],start[0],start[1], start[6],start[7]); + memcpy(sms->date, dbuf, DATE_LEN); /* Get the time */ start+=9; - sprintf(sms->time,"%c%c:%c%c:%c%c",start[0],start[1],start[3],start[4], + sprintf(tbuf,"%c%c:%c%c:%c%c",start[0],start[1],start[3],start[4], start[7],start[7]); + memcpy(sms->time, tbuf, TIME_LEN); sms->userdatalength=strlen(sms->ascii); return 1; } @@ -418,9 +422,13 @@ static int splitpdu(struct modem *mdm, char* pdu, struct incame_sms *sms) if (end!=0) { memcpy(sms->name,start,end-start); sms->name[end-start]=0; + } else { + /*Unsupported type*/ + return -1; } - } else + } else { end=pdu; + } /* the pdu is after the first \r */ for( start=end+1 ; *start && *start!='\r' ; start++ );

1 0

git:master:617e8c40: acc_diameter: few updates to make cleaner avp handling
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 617e8c40608c5e2ac97dd4b39d9ab739a779b9bb URL: https://github.com/kamailio/kamailio/commit/617e8c40608c5e2ac97dd4b39d9ab73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T09:46:29+02:00 acc_diameter: few updates to make cleaner avp handling --- Modified: src/modules/acc_diameter/diam_avp.c Modified: src/modules/acc_diameter/diam_message.c Modified: src/modules/acc_diameter/diam_tcp.c --- Diff: https://github.com/kamailio/kamailio/commit/617e8c40608c5e2ac97dd4b39d9ab73… Patch: https://github.com/kamailio/kamailio/commit/617e8c40608c5e2ac97dd4b39d9ab73… --- diff --git a/src/modules/acc_diameter/diam_avp.c b/src/modules/acc_diameter/diam_avp.c index f9d98dc61d..2ea5a577fa 100644 --- a/src/modules/acc_diameter/diam_avp.c +++ b/src/modules/acc_diameter/diam_avp.c @@ -107,7 +107,7 @@ AAA_AVP* AAACreateAVP( size_t length, AVPDataStatus data_status) { - AAA_AVP *avp; + AAA_AVP *avp = NULL; /* first check the params */ if( data==0 || length==0) { @@ -146,7 +146,8 @@ AAA_AVP* AAACreateAVP( return avp; error: - LM_ERR("no more free memoryfor a new AVP!\n"); + LM_ERR("no more free memory for a new AVP!\n"); + if(avp) ad_free(avp); return 0; } diff --git a/src/modules/acc_diameter/diam_message.c b/src/modules/acc_diameter/diam_message.c index 07b441d969..614318b26d 100644 --- a/src/modules/acc_diameter/diam_message.c +++ b/src/modules/acc_diameter/diam_message.c @@ -293,11 +293,15 @@ AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen, /* create the AVP */ avp = AAACreateAVP( avp_code, avp_flags, avp_vendorID, (char*)ptr, avp_data_len, AVP_DONT_FREE_DATA); - if (!avp) + if (!avp) { + LM_ERR("failed to create aaa avp\n"); goto error; + } /* link the avp into aaa message to the end */ - AAAAddAVPToMessage( msg, avp, msg->avpList.tail); + if(AAAAddAVPToMessage( msg, avp, msg->avpList.tail)!= AAA_ERR_SUCCESS) { + LM_ERR("failed to add aaa avp to message\n"); + goto error; } ptr += to_32x_len( avp_data_len ); } diff --git a/src/modules/acc_diameter/diam_tcp.c b/src/modules/acc_diameter/diam_tcp.c index 724383d682..77525479c5 100644 --- a/src/modules/acc_diameter/diam_tcp.c +++ b/src/modules/acc_diameter/diam_tcp.c @@ -48,13 +48,13 @@ /*! \brief TCP connection setup */ int init_mytcp(char* host, int port) { - int sockfd; + int sfd; struct sockaddr_in serv_addr; struct hostent *server; - sockfd = socket(PF_INET, SOCK_STREAM, 0); + sfd = socket(PF_INET, SOCK_STREAM, 0); - if (sockfd < 0) + if (sfd < 0) { LM_ERR("failed to create the socket\n"); return -1; @@ -64,6 +64,7 @@ int init_mytcp(char* host, int port) if (server == NULL) { LM_ERR("failed to find the host\n"); + close(sfd); return -1; } @@ -73,18 +74,19 @@ int init_mytcp(char* host, int port) server->h_length); serv_addr.sin_port = htons(port); - if (connect(sockfd, (const struct sockaddr *)&serv_addr, + if (connect(sfd, (const struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) { LM_ERR("failed to connec to the DIAMETER client\n"); + close(sfd); return -1; } - return sockfd; + return sfd; } /*! \brief send a message over an already opened TCP connection */ -int tcp_send_recv(int sockfd, char* buf, int len, rd_buf_t* rb, +int tcp_send_recv(int sfd, char* buf, int len, rd_buf_t* rb, unsigned int waited_id) { int n, number_of_tries; @@ -97,7 +99,7 @@ int tcp_send_recv(int sockfd, char* buf, int len, rd_buf_t* rb, unsigned int m_id; /* try to write the message to the Diameter client */ - while( (n=write(sockfd, buf, len))==-1 ) + while( (n=write(sfd, buf, len))==-1 ) { if (errno==EINTR) continue; @@ -116,26 +118,26 @@ int tcp_send_recv(int sockfd, char* buf, int len, rd_buf_t* rb, /* Initialize the set of active sockets. */ FD_ZERO (&active_fd_set); - FD_SET (sockfd, &active_fd_set); + FD_SET (sfd, &active_fd_set); number_of_tries = 0; while(number_of_tries<MAX_TRIES) { read_fd_set = active_fd_set; - if (select (sockfd+1, &read_fd_set, NULL, NULL, &tv) < 0) + if (select (sfd+1, &read_fd_set, NULL, NULL, &tv) < 0) { LM_ERR("select function failed\n"); return AAA_ERROR; } - /* if (!FD_ISSET (sockfd, &read_fd_set)) + /* if (!FD_ISSET (sfd, &read_fd_set)) { LM_ERR("no response received\n"); // return AAA_ERROR; } */ /* Data arriving on a already-connected socket. */ reset_read_buffer(rb); - switch( do_read(sockfd, rb) ) + switch( do_read(sfd, rb) ) { case CONN_ERROR: LM_ERR("failed to read from socket\n");

1 0

git:master:26c94b32: topos: per contact and rr specific processing for receiving PRACK
by Daniel-Constantin Mierla 11 Aug '17

11 Aug '17

Module: kamailio Branch: master Commit: 26c94b32baec05a064beca7064e2f44eff9ca3ef URL: https://github.com/kamailio/kamailio/commit/26c94b32baec05a064beca7064e2f44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-11T09:14:27+02:00 topos: per contact and rr specific processing for receiving PRACK - records are taken from INVITE branch record --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/26c94b32baec05a064beca7064e2f44… Patch: https://github.com/kamailio/kamailio/commit/26c94b32baec05a064beca7064e2f44… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index ca360a975c..228996960e 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -774,20 +774,24 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_storage_load_dialog(msg, &mtsd, &stsd)<0) { goto error; } + /* detect direction - via from-tag */ + if(tps_dlg_detect_direction(msg, &stsd, &direction) < 0) { + goto error; + } } - /* detect direction - via from-tag */ - if(tps_dlg_detect_direction(msg, &stsd, &direction)<0) { - goto error; - } mtsd.direction = direction; tps_storage_lock_release(&lkey); - if(direction == TPS_DIR_UPSTREAM) { - nuri = stsd.a_contact; - } else { + if(use_branch) { nuri = stsd.b_contact; + } else { + if(direction == TPS_DIR_UPSTREAM) { + nuri = stsd.a_contact; + } else { + nuri = stsd.b_contact; + } } if(nuri.len>0) { if(rewrite_uri(msg, &nuri)<0) { @@ -796,31 +800,28 @@ int tps_request_received(sip_msg_t *msg, int dialog) } } - if(tps_reappend_route(msg, &stsd, &stsd.s_rr, - (direction==TPS_DIR_UPSTREAM)?0:1)<0) { - LM_ERR("failed to reappend s-route\n"); - return -1; - } - if(direction == TPS_DIR_UPSTREAM) { - if(use_branch) { - if(tps_reappend_route(msg, &stsd, &stsd.x_rr, 0)<0) { - LM_ERR("failed to reappend x-route\n"); - return -1; - } - } else { - if(tps_reappend_route(msg, &stsd, &stsd.a_rr, 0)<0) { - LM_ERR("failed to reappend a-route\n"); - return -1; - } + if(use_branch) { + if(tps_reappend_route(msg, &stsd, &stsd.s_rr, 1) < 0) { + LM_ERR("failed to reappend s-route\n"); + return -1; + } + if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1) < 0) { + LM_ERR("failed to reappend b-route\n"); + return -1; } } else { - if(use_branch) { - if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1)<0) { - LM_ERR("failed to reappend b-route\n"); + if(tps_reappend_route(msg, &stsd, &stsd.s_rr, + (direction == TPS_DIR_UPSTREAM) ? 0 : 1) < 0) { + LM_ERR("failed to reappend s-route\n"); + return -1; + } + if(direction == TPS_DIR_UPSTREAM) { + if(tps_reappend_route(msg, &stsd, &stsd.a_rr, 0) < 0) { + LM_ERR("failed to reappend a-route\n"); return -1; } } else { - if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { + if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1) < 0) { LM_ERR("failed to reappend b-route\n"); return -1; }

1 0

[kamailio/kamailio] Kamailio 5.0.2 suddenly stops processing traffic, then generates a core when restarting. (#1172)
by Joel Serrano 10 Aug '17

10 Aug '17

### Description Kamailio suddenly stops working (this is a production server so debug logging is disabled), when we restart it a core is generated and a segfault is logged. ### Troubleshooting The only thing I have seen is some reference to IPv6 in the backtrace. But no idea where to start looking. I'm pretty sure we will need more information, but I don't know how to read or understand backtraces, please let me know what you see in it so I can dig deeper into this problem. #### Reproduction I don't know how to reproduce yet, first I have to understand the cause. #### Debugging Data Backtrace: ``` [New LWP 12052] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/sbc.cfg -'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #1 0x00007efcf3b5e234 in OPENSSL_cleanup () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #2 0x00007efcf7721910 in __run_exit_handlers (status=0, listp=0x7efcf7a855d8 <__exit_funcs>, run_list_atexit=run_list_atexit@entry=true, run_dtors=run_dtors@entry=true) at exit.c:83 atfct = <optimized out> onfct = <optimized out> cxafct = <optimized out> f = <optimized out> #3 0x00007efcf772196a in __GI_exit (status=<optimized out>) at exit.c:105 No locals. #4 0x000055f0a9483d54 in handle_sigs () at main.c:699 chld = 845005216 chld_status = 845005248 any_chld_stopped = 32766 memlog = 0 __func__ = "handle_sigs" #5 0x000055f0a948ea43 in main_loop () at main.c:1758 i = 8 pid = 12091 si = 0x0 si_desc = "udp receiver child=7 sock=[2602:FF37:0:1:0:0:C601:377A]:5060\000\367v\215\200\262+\363\372~\000\000\025\067\236\003\000\000\000\000\300\017H\251\360U\000\000\340\305]2\376\177", '\000' <repeats 18 times>, "\020\303]2\376\177\000\000a\202g\251\360U\000" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #6 0x000055f0a9494fb9 in main (argc=13, argv=0x7ffe325dc5e8) at main.c:2646 cfg_stream = 0x55f0aa7fb010 c = -1 r = 0 tmp = 0x7ffe325dceb6 "" tmp_len = -133383536 port = 32508 proto = 845006016 options = 0x55f0a97d80e8 ":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 = 3679304743 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0xffffffff <error: Cannot access memory at address 0xffffffff> st = {st_dev = 19, st_ino = 14769, st_nlink = 2, st_mode = 16832, st_uid = 109, st_gid = 113, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1498523393, tv_nsec = 731915583}, st_mtim = {tv_sec = 1498533865, tv_nsec = 274210743}, st_ctim = {tv_sec = 1498533865, tv_nsec = 274210743}, __glibc_reserved = {0, 0, 0}} __func__ = "main" ``` Info locals: ``` [New LWP 12052] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/sbc.cfg -'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. ``` List: ``` [New LWP 12052] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/sbc.cfg -'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007efcf3b5df69 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ``` #### Log Messages We have regular logging with no issues, then suddenly we get: ``` Jun 28 01:57:51 kam-1 sbc[12075]: WARNING: <script>: [DISPATCHER] - Destination down: OPTIONS sip:A.A.A.A:5060 (<null>) Jun 28 01:57:51 kam-1 sbc[12075]: WARNING: <script>: [DISPATCHER] - Destination down: OPTIONS sip:B.B.B.B:5060 (<null>) Jun 28 01:58:40 kam-1 sbc[12076]: NOTICE: <script>: Node unavailable, trying next sip:A.A.A.A:5060 - M=INVITE R=sip:+12345678900@A.A.A.A:5060 ID=334f3vqDtj Jun 28 01:58:40 kam-1 sbc[12076]: NOTICE: <script>: Forwarding request - M=INVITE R=sip:+12345678900@A.A.A.A:5060 ID=334f3vqDtj Jun 28 01:58:55 kam-1 sbc[12075]: WARNING: dialog [dlg_handlers.c:1574]: dlg_ontimeout(): timeout for dlg with CallID '00g4gNy5KZ' and tags 'FHmrD-CM3' 'SZ3a5Sg58c5pB' Jun 28 01:58:55 kam-1 sbc[12075]: WARNING: dialog [dlg_handlers.c:1574]: dlg_ontimeout(): timeout for dlg with CallID 'Kj7uLRzJfd' and tags 'wRSVjfGaT' 'yQHvjNaZ5Z3rc' Jun 28 01:58:55 kam-1 sbc[12075]: WARNING: dialog [dlg_handlers.c:1574]: dlg_ontimeout(): timeout for dlg with CallID 'S5QUIXtS6-' and tags 'FV4ySEouz' 'eS7F910ycNg8H' Jun 28 01:59:10 kam-1 sbc[12075]: ERROR: <script>: No available gateways - M=INVITE R=sip:+12345678900@B.B.B.B:5060 ID=334f3vqDtj Jun 28 02:01:45 kam-1 sbc[12080]: NOTICE: dialog [dlg_hash.c:248]: dlg_clean_run(): dialog in delete state is too old (0x7efaf3904008 ref 1) Jun 28 02:03:15 kam-1 sbc[12080]: NOTICE: dialog [dlg_hash.c:248]: dlg_clean_run(): dialog in delete state is too old (0x7efaf40f0f50 ref 1) Jun 28 02:04:45 kam-1 sbc[12080]: NOTICE: dialog [dlg_hash.c:248]: dlg_clean_run(): dialog in delete state is too old (0x7efaf4d92108 ref 1) Jun 28 02:55:59 kam-1 sbc[12071]: INFO: <core> [main.c:823]: sig_usr(): signal 15 received Jun 28 02:55:59 kam-1 sbc[12052]: NOTICE: <core> [main.c:696]: handle_sigs(): Thank you for flying kamailio!!! ``` NOTE: The process stops logging at 02:04:45, then at 02:55:59 we manually restart kamailio and a core is generated. Also, in `dmesg` we have: ``` [138953.744199] kamailio[12052]: segfault at 7efaf32f51b8 ip 00007efcf3b5df69 sp 00007ffe325dc0c0 error 4 in libcrypto.so.1.1[7efcf39f6000+265000] ``` #### SIP Traffic I don't have sip traffic, If required I can start capturing it. ### Additional Information ``` # kamailio -v version: kamailio 5.0.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 # ``` ``` # dpkg -l | grep kamailio ii kamailio 5.0.2+stretch amd64 very fast, dynamic and configurable SIP server ii kamailio-dbg:amd64 5.0.2+stretch amd64 very fast and configurable SIP server [debug symbols] ii kamailio-extra-modules:amd64 5.0.2+stretch amd64 Extra modules for the Kamailio SIP Server ii kamailio-tls-modules:amd64 5.0.2+stretch amd64 TLS support for the Kamailio SIP server (authentication, transport) # ``` ``` # dpkg -l |grep libssl ii libssl1.0.2:amd64 1.0.2l-2 amd64 Secure Sockets Layer toolkit - shared libraries ii libssl1.1:amd64 1.1.0f-3 amd64 Secure Sockets Layer toolkit - shared libraries# ``` * **Operating System**: ``` # uname -a Linux kam-1 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u1 (2017-06-18) x86_64 GNU/Linux ``` ``` # lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 9.0 (stretch) Release: 9.0 Codename: stretch # ``` -- 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/1172

2 25

git:master:a3e80032: core: store advertise addr for new sockets created from interface name
by Daniel-Constantin Mierla 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: a3e8003274ded1420d2af677246a48ef5c743a3c URL: https://github.com/kamailio/kamailio/commit/a3e8003274ded1420d2af677246a48e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-10T14:05:13+02:00 core: store advertise addr for new sockets created from interface name - reported by GH #1209 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/a3e8003274ded1420d2af677246a48e… Patch: https://github.com/kamailio/kamailio/commit/a3e8003274ded1420d2af677246a48e… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index ee33d915f4..a50cfe3e59 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1353,13 +1353,15 @@ static int fix_hostname(str* name, struct ip_addr* address, str* address_str, * return 0 on succes, -1 on error */ static int addr_info_to_si_lst(struct addr_info* ai_lst, unsigned short port, - char proto, enum si_flags flags, + char proto, char *usename, + unsigned short useport, + enum si_flags flags, struct socket_info** list) { struct addr_info* ail; for (ail=ai_lst; ail; ail=ail->next){ - if(new_sock2list(ail->name.s, 0, port, proto, 0, 0, + if(new_sock2list(ail->name.s, 0, port, proto, usename, useport, ail->flags | flags, list)==0) return -1; } @@ -1374,7 +1376,10 @@ static int addr_info_to_si_lst(struct addr_info* ai_lst, unsigned short port, */ static int addr_info_to_si_lst_after(struct addr_info* ai_lst, unsigned short port, - char proto, enum si_flags flags, + char proto, + char *usename, + unsigned short useport, + enum si_flags flags, struct socket_info* el) { struct addr_info* ail; @@ -1382,7 +1387,7 @@ static int addr_info_to_si_lst_after(struct addr_info* ai_lst, for (ail=ai_lst; ail; ail=ail->next){ if((new_si=new_sock2list_after(ail->name.s, 0, port, proto, - 0, 0, ail->flags | flags, el))==0) + usename, useport, ail->flags | flags, el))==0) return -1; el=new_si; } @@ -1447,7 +1452,8 @@ static int fix_socket_list(struct socket_info **list, int* type_flags) }else{ /* add all addr. as separate interfaces */ if (addr_info_to_si_lst_after(ai_lst, si->port_no, si->proto, - si->flags, si)!=0) + si->useinfo.name.s, si->useinfo.port_no, + si->flags, si)!=0) goto error; /* ai_lst not needed anymore */ free_addr_info_lst(&ai_lst); @@ -1758,7 +1764,7 @@ int fix_all_socket_lists() #else && ( !auto_bind_ipv6 || add_interfaces(0, AF_INET6, 0, PROTO_UDP, &ai_lst) ==0 ) /* add_interface does not work for IPv6 on Linux */ #endif /* __OS_linux */ - ) && (addr_info_to_si_lst(ai_lst, 0, PROTO_UDP, 0, &udp_listen)==0)){ + ) && (addr_info_to_si_lst(ai_lst, 0, PROTO_UDP, 0, 0, 0, &udp_listen)==0)){ free_addr_info_lst(&ai_lst); ai_lst=0; /* if ok, try to add the others too */ @@ -1770,7 +1776,7 @@ int fix_all_socket_lists() #else || (auto_bind_ipv6 && add_interfaces(0, AF_INET6, 0, PROTO_TCP, &ai_lst) !=0 ) #endif /* __OS_linux */ - ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TCP, 0, + ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TCP, 0, 0, 0, &tcp_listen)!=0)) goto error; free_addr_info_lst(&ai_lst); @@ -1784,7 +1790,7 @@ int fix_all_socket_lists() #else || (auto_bind_ipv6 && add_interfaces(0, AF_INET6, 0, PROTO_TLS, &ai_lst)!=0) #endif /* __OS_linux */ - ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TLS, 0, + ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TLS, 0, 0, 0, &tls_listen)!=0)) goto error; } @@ -1801,7 +1807,7 @@ int fix_all_socket_lists() #else || (auto_bind_ipv6 && add_interfaces(0, AF_INET6, 0, PROTO_SCTP, &ai_lst) != 0) #endif /* __OS_linux */ - ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_SCTP, 0, + ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_SCTP, 0, 0, 0, &sctp_listen)!=0)) goto error; free_addr_info_lst(&ai_lst);

1 0

git:master:10be0865: modules: readme files regenerated - carrierroute ... [skip ci]
by Kamailio Dev 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: 10be086500d37d19674235b04cb302a0f34983fc URL: https://github.com/kamailio/kamailio/commit/10be086500d37d19674235b04cb302a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-10T13:01:57+02:00 modules: readme files regenerated - carrierroute ... [skip ci] --- Modified: src/modules/carrierroute/README --- Diff: https://github.com/kamailio/kamailio/commit/10be086500d37d19674235b04cb302a… Patch: https://github.com/kamailio/kamailio/commit/10be086500d37d19674235b04cb302a… --- diff --git a/src/modules/carrierroute/README b/src/modules/carrierroute/README index b766dac0fb..633c63e0d6 100644 --- a/src/modules/carrierroute/README +++ b/src/modules/carrierroute/README @@ -578,8 +578,8 @@ descavp) contiguous range starting at 1, limited by the configuration parameter max_targets. Possible values for hash_source are: call_id, from_uri, from_user, to_uri, to_user and rand - * decsavp - Name of the AVP where to store the description. This - parameter is optional. + * decsavp - AVP where to store the description. This parameter is + optional. 4.3. cr_nofallback_route(carrier, domain, prefix_matching, rewrite_user, hash_source, descavp)

1 0

git:master:bc3666ba: Merge pull request #1211 from dunst0/fix/carrierroute-README
by GitHub 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: bc3666ba9ff46fbaafa97483d5c9ee2f574a2d2c URL: https://github.com/kamailio/kamailio/commit/bc3666ba9ff46fbaafa97483d5c9ee2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-10T13:00:57+02:00 Merge pull request #1211 from dunst0/fix/carrierroute-README carrierroute: update to readme to precise that decsavp need to be an avp --- Modified: src/modules/carrierroute/doc/carrierroute_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bc3666ba9ff46fbaafa97483d5c9ee2… Patch: https://github.com/kamailio/kamailio/commit/bc3666ba9ff46fbaafa97483d5c9ee2… --- diff --git a/src/modules/carrierroute/doc/carrierroute_admin.xml b/src/modules/carrierroute/doc/carrierroute_admin.xml index 7d11d5365b..ecebcee57a 100644 --- a/src/modules/carrierroute/doc/carrierroute_admin.xml +++ b/src/modules/carrierroute/doc/carrierroute_admin.xml @@ -514,7 +514,7 @@ cr_tree_rewrite_uri(tree, domain) </para> </listitem> <listitem> - <para><emphasis>decsavp</emphasis> - Name of the AVP where to store the description. + <para><emphasis>decsavp</emphasis> - AVP where to store the description. This parameter is optional. </para> </listitem>

1 0

git:master:5328dc6d: carrierroute: update to readme to precise that decsavp need to be an avp
by Rick Barenthin 10 Aug '17

10 Aug '17

Module: kamailio Branch: master Commit: 5328dc6d511a57ef47600f2724813124e082e53e URL: https://github.com/kamailio/kamailio/commit/5328dc6d511a57ef47600f272481312… Author: Rick Barenthin <dunst0(a)gmail.com> Committer: Rick Barenthin <dunst0(a)gmail.com> Date: 2017-08-10T11:31:30+02:00 carrierroute: update to readme to precise that decsavp need to be an avp --- Modified: src/modules/carrierroute/doc/carrierroute_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5328dc6d511a57ef47600f272481312… Patch: https://github.com/kamailio/kamailio/commit/5328dc6d511a57ef47600f272481312… --- diff --git a/src/modules/carrierroute/doc/carrierroute_admin.xml b/src/modules/carrierroute/doc/carrierroute_admin.xml index 7d11d5365b..ecebcee57a 100644 --- a/src/modules/carrierroute/doc/carrierroute_admin.xml +++ b/src/modules/carrierroute/doc/carrierroute_admin.xml @@ -514,7 +514,7 @@ cr_tree_rewrite_uri(tree, domain) </para> </listitem> <listitem> - <para><emphasis>decsavp</emphasis> - Name of the AVP where to store the description. + <para><emphasis>decsavp</emphasis> - AVP where to store the description. This parameter is optional. </para> </listitem>

1 0

[kamailio/kamailio] carrierroute: update to readme to precise that decsavp need to be an avp (#1211)
by Rick 10 Aug '17

10 Aug '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #1210 (replace XXXX with an open issue number) #### Description  Make documentation of parameters description more clear that it has to be an avp not just the name. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1211 -- Commit Summary -- * carrierroute: update to readme to precise that decsavp need to be an avp -- File Changes -- M src/modules/carrierroute/doc/carrierroute_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1211.patch https://github.com/kamailio/kamailio/pull/1211.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/1211

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev