sr-dev

sr-dev@lists.kamailio.org

20 participants
45176 discussions

git:5.4:3a44d393: pua: convert to PKG/SHM memory logging helper functions
by Victor Seva 01 Aug '20

01 Aug '20

Module: kamailio Branch: 5.4 Commit: 3a44d393dc24d1f7caafedef90c0714c8ed74ff2 URL: https://github.com/kamailio/kamailio/commit/3a44d393dc24d1f7caafedef90c0714… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-01T10:42:29+02:00 pua: convert to PKG/SHM memory logging helper functions * remove trailing spaces (cherry picked from commit c91e852d203017b571ae15e48c289f73f4824136) --- Modified: src/modules/pua/add_events.c Modified: src/modules/pua/event_list.c Modified: src/modules/pua/hash.c Modified: src/modules/pua/pua.c Modified: src/modules/pua/pua_callback.c Modified: src/modules/pua/pua_db.c Modified: src/modules/pua/send_publish.c Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/3a44d393dc24d1f7caafedef90c0714… Patch: https://github.com/kamailio/kamailio/commit/3a44d393dc24d1f7caafedef90c0714…

1 0

[kamailio/kamailio] pua: update_version_puadb() use pres_id to select record (#2420)
by Victor Seva 01 Aug '20

01 Aug '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2414 #### Description * only relevant when db_mode is PUA_DB_ONLY * call_id/to_tag/from_tag values can be "", for instance with DIALOG_PUBLISH.* records. Then **ALL** records get version field update * update_vesion_puadb() is called from send_publish() and pres->id value is valid after a call to get_record_puadb() You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2420 -- Commit Summary -- * pua: update_version_puadb() use pres_id to select record -- File Changes -- M src/modules/pua/pua_db.c (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2420.patch https://github.com/kamailio/kamailio/pull/2420.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/2420

1 1

git:master:e4aed5c2: pua: update_version_puadb() use pres_id to select record
by Victor Seva 01 Aug '20

01 Aug '20

Module: kamailio Branch: master Commit: e4aed5c272c8144dd1ddf58163c3ba501bb46a5b URL: https://github.com/kamailio/kamailio/commit/e4aed5c272c8144dd1ddf58163c3ba5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-01T10:34:35+02:00 pua: update_version_puadb() use pres_id to select record * only relevant when db_mode is PUA_DB_ONLY * call_id/to_tag/from_tag values can be "", for instance with DIALOG_PUBLISH.* records. Then **ALL** records get version field update * update_vesion_puadb() is called from send_publish() and pres->id value is valid after a call to get_record_puadb() related to #2414 --- Modified: src/modules/pua/pua_db.c --- Diff: https://github.com/kamailio/kamailio/commit/e4aed5c272c8144dd1ddf58163c3ba5… Patch: https://github.com/kamailio/kamailio/commit/e4aed5c272c8144dd1ddf58163c3ba5… --- diff --git a/src/modules/pua/pua_db.c b/src/modules/pua/pua_db.c index 9a5c34b8ec..9f9b36cab4 100644 --- a/src/modules/pua/pua_db.c +++ b/src/modules/pua/pua_db.c @@ -1485,8 +1485,8 @@ int update_contact_puadb(ua_pres_t *pres, str *contact) int update_version_puadb(ua_pres_t *pres) { - db_key_t q_cols[3], db_cols[1]; - db_val_t q_vals[3], db_vals[1]; + db_key_t q_cols[1], db_cols[1]; + db_val_t q_vals[1], db_vals[1]; int n_query_cols= 0, n_update_cols=0; if (pres==NULL) @@ -1496,22 +1496,10 @@ int update_version_puadb(ua_pres_t *pres) } /* cols and values used for search query */ - q_cols[n_query_cols] = &str_call_id_col; - q_vals[n_query_cols].type = DB1_STR; - q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->call_id; - n_query_cols++; - - q_cols[n_query_cols] = &str_to_tag_col; - q_vals[n_query_cols].type = DB1_STR; - q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->to_tag; - n_query_cols++; - - q_cols[n_query_cols] = &str_from_tag_col; + q_cols[n_query_cols] = &str_pres_id_col; q_vals[n_query_cols].type = DB1_STR; q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->from_tag; + q_vals[n_query_cols].val.str_val = pres->id; n_query_cols++; /* we overwrite contact even if not changed */

1 0

Re: [sr-dev] ACC events missing to-tag when doing t_reply
by Julien Chavanton 31 Jul '20

31 Jul '20

I can see TM API is exposing tmb.t_get_reply_totag(msg, &to_tag); looking at what can be done from acc_logic.c on_missed /* set env variables */ env_set_to( get_rpl_to(t,reply) ); env_set_code_status( code, reply); ... On Thu, Jul 30, 2020 at 11:51 PM Julien Chavanton <jchavanton(a)gmail.com> wrote: > Hi, considering this example : > > > modparam("acc_json", "acc_missed_flag", 6) > > failure_route[test] { > setflag(6); // MISSED_ACC, the failure will be recorded by ACC > t_flush_flags(); // This will set the flags in the newly created transaction > t_reply("500", "Service Unavailable"); > } > > This does generate an ACC event, however the to-tag is not populated, my guess this is because the TM callback is done before the to-tag is generated. > > I wonder if there is a way to populate the to-tag immediately ? > > I will dig it further, but maybe there is a trick I am missing > >

1 5

[kamailio/kamailio] ACK being dropped at SIP Edge (#2419)
by malcolmohare 30 Jul '20

30 Jul '20

### Description I have an edge fleet of kamailio hosts holding connections to SIP clients. Behind this edge fleet I have authoritative proxies (APs) managing call routing and branching. I have noticed an issue with ACK processing in this scenario: 1. Branch a call to multiple devices which are connected to the same edge host. 2. AP fowards the INVITEs to a single kamailio edge host. which then fowards those INVITEs to the devices 3. On device with branch index 0, reply 4xx response 4. The authoritative proxy will automatically ACK this response back to the edge host. Edge host receives ACK for branch index 0 5. Have another device reply 200 OK. This gets back to the caller device fine. 6. The caller will send the ACK for the 200 OK. At the authoritative proxy, kamailio will build the via and hardcodes this via construction with branch index 0. 7. Edge host receives ACK with branch index 0, checks and sees it already got the ACK with branch index 0 (ACK from step 4) and does not forward the 200 OK ACK to the device which is trying to accept the call. Summary: Kamailio builds VIA headers which suffix the branch index. Note the .0 in the via header below. This via was generated from a message with branch index 0. SIP/2.0/TLS 172.xxx.xxx.xxx:5061;received=34.xxx.xxx.xxx;branch=z9hG4bK3e52.8b4427a3530f17e60bf152a73caf0b38.0;i=9c52a When doing ACK processing, Kamailio fowards ACKs with hardcoded 0-th branch index (this gets suffix'd to the via branch). If the branch with index 0 had already replied, it may have already been ACK'd and therefore the next ACK will not be forwarded by the edge host. https://github.com/kamailio/kamailio/blob/master/src/core/forward.c#L527 ### Possible Solutions The simplest solution I can see to this problem is to change how the VIA is constructed for INVITE requests. To avoid collisions with the 200 OK ACK, change the logic so that the value written to the branch index part of the via branch value is 1 greater than the actual branch index. As far as I can tell, this requires changes inside t_msgbuilder.c and t_lookup. The first change is to pass b + 1 instead of b when constructing the via header value. ``` int t_calc_branch(struct cell *t, int b, char *branch, int *branch_len) { return branch_builder( t->hash_index, 0, t->md5, b+1, branch, branch_len ); } ``` The second is to update the reply matching logic which parses the branch index, so that it decrements the value. ``` /* sanity check */ if (unlikely(reverse_hex2int(hashi, hashl, &hash_index)<0 ||hash_index>=TABLE_ENTRIES || reverse_hex2int(branchi, branchl, &branch_id)<0 || branch_id>=sr_dst_max_branches <--- this should become strict greater || loopl!=MD5_LEN) ) { DBG("DEBUG: t_reply_matching: poor reply labels %d label %d " "branch %d\n", hash_index, entry_label, branch_id ); goto nomatch2; } /* add the decrement here */ branch_id--; ``` -- 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/2419

1 2

git:master:3bbaca47: modules: readme files regenerated - app_lua ... [skip ci]
by Kamailio Dev 30 Jul '20

30 Jul '20

Module: kamailio Branch: master Commit: 3bbaca477c27b2e1864a72491578279be2295fe1 URL: https://github.com/kamailio/kamailio/commit/3bbaca477c27b2e1864a72491578279… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-07-30T20:46:13+02:00 modules: readme files regenerated - app_lua ... [skip ci] --- Modified: src/modules/app_lua/README --- Diff: https://github.com/kamailio/kamailio/commit/3bbaca477c27b2e1864a72491578279… Patch: https://github.com/kamailio/kamailio/commit/3bbaca477c27b2e1864a72491578279… --- diff --git a/src/modules/app_lua/README b/src/modules/app_lua/README index a1f0c05984..545fb78f14 100644 --- a/src/modules/app_lua/README +++ b/src/modules/app_lua/README @@ -94,6 +94,9 @@ Chapter 1. Admin Guide To read more about KEMI exports and available KSR submodules, see: * http://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/ + Note: to have the old Lua module 'sr' available, load the 'app_lua_sr' + Kamailio module. + Lua (http://www.lua.org) is a fast and easy to embed scripting language. Exported API from SIP router to Lua is documented in the dokuwiki. @@ -203,7 +206,7 @@ lua_dofile("/usr/local/etc/kamailio/lua/myscript.lua"); Example 1.6. lua_dostring usage ... -if(!lua_dostring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) +if(!lua_dostring("KSR.log([[err]], [[----------- Hello World from $fU\n]])")) { xdbg("SCRIPT: failed to execute lua script!\n"); } @@ -237,7 +240,7 @@ lua_run("lua_func3", "$rU", "2", "$si"); Example 1.8. lua_runstring usage ... -if(!lua_runstring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) +if(!lua_runstring("KSR.log([[err]], [[----------- Hello World from $fU\n]])")) { xdbg("SCRIPT: failed to execute lua script!\n"); } @@ -297,7 +300,7 @@ if(!lua_runstring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) '/usr/local/etc/kamailio/lua/myscript.lua'. ... function sr_append_fu_to_reply() - sr.hdr.append_to_reply("P-From: " .. sr.pv.get("$fu") .. "\r\n"); + KSR.hdr.append_to_reply("P-From: " .. KSR.pv.get("$fu") .. "\r\n"); end ...

1 0

git:master:34efa835: app_lua: docs - note about availability of 'sr' Lua module
by Daniel-Constantin Mierla 30 Jul '20

30 Jul '20

Module: kamailio Branch: master Commit: 34efa83569bedb1f36c3661ee063ff6334633e4a URL: https://github.com/kamailio/kamailio/commit/34efa83569bedb1f36c3661ee063ff6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-07-30T20:33:06+02:00 app_lua: docs - note about availability of 'sr' Lua module - use KSR in the examples --- Modified: src/modules/app_lua/doc/app_lua_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/34efa83569bedb1f36c3661ee063ff6… Patch: https://github.com/kamailio/kamailio/commit/34efa83569bedb1f36c3661ee063ff6… --- diff --git a/src/modules/app_lua/doc/app_lua_admin.xml b/src/modules/app_lua/doc/app_lua_admin.xml index 91015da55f..de6567135c 100644 --- a/src/modules/app_lua/doc/app_lua_admin.xml +++ b/src/modules/app_lua/doc/app_lua_admin.xml @@ -30,6 +30,10 @@ </listitem> </itemizedlist> </para> + <para> + Note: to have the old Lua module 'sr' available, load the 'app_lua_sr' + &kamailio; module. + </para> <para> Lua (http://www.lua.org) is a fast and easy to embed scripting language. Exported API from SIP router to Lua is documented in the @@ -207,7 +211,7 @@ lua_dofile("/usr/local/etc/kamailio/lua/myscript.lua"); <title><function>lua_dostring</function> usage</title> <programlisting format="linespecific"> ... -if(!lua_dostring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) +if(!lua_dostring("KSR.log([[err]], [[----------- Hello World from $fU\n]])")) { xdbg("SCRIPT: failed to execute lua script!\n"); } @@ -257,7 +261,7 @@ lua_run("lua_func3", "$rU", "2", "$si"); <title><function>lua_runstring</function> usage</title> <programlisting format="linespecific"> ... -if(!lua_runstring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) +if(!lua_runstring("KSR.log([[err]], [[----------- Hello World from $fU\n]])")) { xdbg("SCRIPT: failed to execute lua script!\n"); } @@ -346,7 +350,7 @@ if(!lua_runstring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) <programlisting format="linespecific"> ... function sr_append_fu_to_reply() - sr.hdr.append_to_reply("P-From: " .. sr.pv.get("$fu") .. "\r\n"); + KSR.hdr.append_to_reply("P-From: " .. KSR.pv.get("$fu") .. "\r\n"); end ... </programlisting>

1 0

git:master:b44b2452: topos: more flexible contact_mode 1/2 param parsing by using existing parse functions
by Henning Westerholt 30 Jul '20

30 Jul '20

Module: kamailio Branch: master Commit: b44b245244a64d9b71c40eb35db227afc0f71fd1 URL: https://github.com/kamailio/kamailio/commit/b44b245244a64d9b71c40eb35db227a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-07-30T15:53:37Z topos: more flexible contact_mode 1/2 param parsing by using existing parse functions --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/b44b245244a64d9b71c40eb35db227a… Patch: https://github.com/kamailio/kamailio/commit/b44b245244a64d9b71c40eb35db227a… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index e3d4ab41cb..c296cd5b30 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -303,6 +303,7 @@ int tps_dlg_detect_direction(sip_msg_t *msg, tps_data_t *ptsd, int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) { str tmp; + int ret; if(parse_sip_msg_uri(msg)<0) { LM_ERR("failed to parse r-uri\n"); @@ -314,12 +315,17 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) LM_DBG("not an expected param format\n"); return 1; } - - tmp.s = msg->parsed_uri.sip_params.s; - // skip param and '=' sign - tmp.s += _tps_cparam_name.len + 1; - tmp.len = msg->parsed_uri.sip_params.len - _tps_cparam_name.len - 1; - + // find parameter, there might be others + ret = tps_get_param_value(&msg->parsed_uri.params, + &_tps_cparam_name, &tmp); + if (ret < 0) { + LM_ERR("failed to parse param\n"); + return -1; + } + if (ret == 1) { + LM_DBG("prefix para not found\n"); + return 1; + } if(memcmp(tmp.s, "atpsh-", 6)==0) { ptsd->a_uuid = tmp; return 0;

1 0

[kamailio/kamailio] pua: fix send_publish() behavior on PUA_DB_ONLY (#2416)
by Victor Seva 30 Jul '20

30 Jul '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2414 #### Description * dialog PUBLISH was missing SIP-If-Mach * pua was inserting a new record for every dialog state You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2416 -- Commit Summary -- * pua: fix send_publish() behavior on PUA_DB_ONLY -- File Changes -- M src/modules/pua/send_publish.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2416.patch https://github.com/kamailio/kamailio/pull/2416.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/2416

1 1

git:master:91d9441a: pua: fix send_publish() behavior on PUA_DB_ONLY
by Victor Seva 30 Jul '20

30 Jul '20

Module: kamailio Branch: master Commit: 91d9441a242da4746171bfa532fa2378328e8d73 URL: https://github.com/kamailio/kamailio/commit/91d9441a242da4746171bfa532fa237… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-07-30T15:37:52+02:00 pua: fix send_publish() behavior on PUA_DB_ONLY * dialog PUBLISH was missing SIP-If-Mach * pua was inserting a new record for every dialog state fixes #2414 --- Modified: src/modules/pua/send_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/91d9441a242da4746171bfa532fa237… Patch: https://github.com/kamailio/kamailio/commit/91d9441a242da4746171bfa532fa237… --- diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index e88c342f5c..338ee892b4 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -516,14 +516,11 @@ int send_publish( publ_info_t* publ ) if (dbmode==PUA_DB_ONLY) { - if (publ->etag) { - memset(&dbpres, 0, sizeof(dbpres)); - dbpres.pres_uri = &pres_uri; - dbpres.watcher_uri = &watcher_uri; - dbpres.extra_headers = &extra_headers; - presentity = get_record_puadb(publ->id, publ->etag, - &dbpres, &res); - } + memset(&dbpres, 0, sizeof(dbpres)); + dbpres.pres_uri = &pres_uri; + dbpres.watcher_uri = &watcher_uri; + dbpres.extra_headers = &extra_headers; + presentity = get_record_puadb(publ->id, publ->etag, &dbpres, &res); } else {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev