sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
306 discussions

[kamailio/kamailio] topos: fix PRACK message handling (#1097)

by sergey-vb

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

7 years, 3 months

git:master:bcff1c15: topos: added few debug messages when managing headers and ruri

by Daniel-Constantin Mierla

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); } }

7 years, 3 months

git:master:ad7e226d: topos_redis: load INVITE branch record when dealing with PRACK

by Daniel-Constantin Mierla

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…

7 years, 3 months

git:master:9dc27fa6: topos_redis: load contact fileds for branch and insert INVITE extra branch

by Daniel-Constantin Mierla

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…

7 years, 3 months

git:master:874a7d50: topos: increased defined value for tps nr keys

by Daniel-Constantin Mierla

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("");

7 years, 3 months

git:master:fbf8f68e: topos: load contact fields for transaction record

by Daniel-Constantin Mierla

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)

7 years, 3 months

git:master:5f4f5102: presence: pass pointer to subs_t for pres_update_status()

by Daniel-Constantin Mierla

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");

7 years, 3 months

git:master:30f1c139: modules: readme files regenerated - drouting ... [skip ci]

by Kamailio Dev

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

7 years, 3 months

git:master:9875e64a: drouting: pull out unavailable destinations for sort_order 1 and 2

by Guillaume Bour

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…

7 years, 3 months

git:master:361162ba: Merge pull request #1212 from gbour/drouting-w-keepalive

by GitHub

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…

7 years, 3 months

← Newer
1
...
14
15
16
17
18
19
20
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2017