sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
288 discussions

git:master:624da2b7: uac: docs for uac_reg_lookup_uri()
by Daniel-Constantin Mierla 07 May '21

07 May '21

Module: kamailio Branch: master Commit: 624da2b7deb2539064be70a7566783fd36a15886 URL: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-07T08:09:11+02:00 uac: docs for uac_reg_lookup_uri() --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… Patch: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 352d038ea2..52362af1e3 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1005,6 +1005,31 @@ if(uac_reg_lookup("$rU", "$ru")) { lookup("location"); } +... + </programlisting> + </example> + </section> + <section id="uac.f.uac_reg_lookup_uri"> + <title> + <function moreinfo="none">uac_reg_lookup_uri(uri, dst)</function> + </title> + <para> + This function sets the PV dst to SIP URI that correspond to the URI user + in uac registrations table. The uri can contain pseudo-variables and + dst must be the name of a pseudo-variable. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>uac_reg_lookup_uri</function> usage</title> + <programlisting format="linespecific"> +... + +if(uac_reg_lookup("$var(uri)", "$ru")) +{ + lookup("location"); +} ... </programlisting> </example>

1 0

git:master:7cee6518: uac: added uac_reg_lookup_uri() - do lookup for user in the uri
by Daniel-Constantin Mierla 07 May '21

07 May '21

Module: kamailio Branch: master Commit: 7cee6518421ed16b715d32a8b2ff6d222eac038b URL: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-07T08:00:34+02:00 uac: added uac_reg_lookup_uri() - do lookup for user in the uri --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… Patch: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 5f0a3ad635..c7e181dc7c 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -102,6 +102,7 @@ static int w_restore_to(struct sip_msg* msg, char* p1, char* p2); static int w_uac_auth(struct sip_msg* msg, char* str, char* str2); static int w_uac_auth_mode(struct sip_msg* msg, char* pmode, char* str2); static int w_uac_reg_lookup(struct sip_msg* msg, char* src, char* dst); +static int w_uac_reg_lookup_uri(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_status(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* mode_s); static int w_uac_reg_enable(struct sip_msg* msg, char* pfilter, char* pval); @@ -142,6 +143,8 @@ static cmd_export_t cmds[]={ {"uac_req_send", (cmd_function)w_uac_req_send, 0, 0, 0, ANY_ROUTE}, {"uac_reg_lookup", (cmd_function)w_uac_reg_lookup, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE }, + {"uac_reg_lookup_uri", (cmd_function)w_uac_reg_lookup_uri, 2, fixup_spve_pvar, + fixup_free_spve_pvar, ANY_ROUTE }, {"uac_reg_status", (cmd_function)w_uac_reg_status, 1, fixup_spve_null, 0, ANY_ROUTE }, {"uac_reg_request_to", (cmd_function)w_uac_reg_request_to, 2, @@ -666,6 +669,32 @@ static int ki_uac_reg_lookup(sip_msg_t* msg, str* userid, str* sdst) return uac_reg_lookup(msg, userid, dpv, 0); } +static int w_uac_reg_lookup_uri(struct sip_msg* msg, char* src, char* dst) +{ + pv_spec_t *dpv; + str sval; + + if(fixup_get_svalue(msg, (gparam_t*)src, &sval)<0) { + LM_ERR("cannot get the uuid parameter\n"); + return -1; + } + + dpv = (pv_spec_t*)dst; + + return uac_reg_lookup(msg, &sval, dpv, 1); +} + +static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* userid, str* sdst) +{ + pv_spec_t *dpv = NULL; + dpv = pv_cache_get(sdst); + if(dpv==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", sdst->len, sdst->s); + return -1; + } + return uac_reg_lookup(msg, userid, dpv, 1); +} + static int w_uac_reg_status(struct sip_msg* msg, char* src, char* p2) { str sval; @@ -827,6 +856,11 @@ static sr_kemi_t sr_kemi_uac_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("uac"), str_init("uac_reg_lookup_uri"), + SR_KEMIP_INT, ki_uac_reg_lookup_uri, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("uac"), str_init("uac_reg_status"), SR_KEMIP_INT, ki_uac_reg_status, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:7aa8056a: dialog: ignore 408 on keepalive with cseq 0
by Daniel-Constantin Mierla 06 May '21

06 May '21

Module: kamailio Branch: master Commit: 7aa8056a5e3a9804133cb9ff79640d8116be63da URL: https://github.com/kamailio/kamailio/commit/7aa8056a5e3a9804133cb9ff79640d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-06T12:27:05+02:00 dialog: ignore 408 on keepalive with cseq 0 - some UAs do not reply at all --- Modified: src/modules/dialog/dlg_req_within.c --- Diff: https://github.com/kamailio/kamailio/commit/7aa8056a5e3a9804133cb9ff79640d8… Patch: https://github.com/kamailio/kamailio/commit/7aa8056a5e3a9804133cb9ff79640d8… --- diff --git a/src/modules/dialog/dlg_req_within.c b/src/modules/dialog/dlg_req_within.c index d48d139965..809834527f 100644 --- a/src/modules/dialog/dlg_req_within.c +++ b/src/modules/dialog/dlg_req_within.c @@ -271,6 +271,12 @@ void dlg_ka_cb_all(struct cell* t, int type, struct tmcb_params* ps, int dir) LM_DBG("skip updating non-confirmed dialogs\n"); goto done; } + if(ps->code==408 && (dlg->cseq[dir].len==0 + || (dlg->cseq[dir].len==1 && dlg->cseq[dir].s[0]=='\0'))) { + LM_DBG("ignore 408 for %s cseq 0\n", + ((dir==DLG_CALLER_LEG)?"caller":"callee")); + goto done; + } tend = 0; if(dir==DLG_CALLER_LEG) { dlg->ka_src_counter++;

1 0

[kamailio/kamailio] lwsc: failed build on Fedora 33 (#2727)
by sergey-safarov 06 May '21

06 May '21

``` LD (gcc) [M app_lua_sr.so] app_lua_sr.so CC (gcc) [M lwsc.so] lwsc_mod.o lwsc_mod.c: In function 'lwsc_get_endpoint': lwsc_mod.c:533:13: error: 'struct lws_context_creation_info' has no member named 'ws_ping_pong_interval' 533 | ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ | ^ make[2]: *** [../../Makefile.rules:100: lwsc_mod.o] Error 1 make[1]: *** [Makefile:511: modules] Error 1 make[1]: Leaving directory '/root/rpmbuild/BUILD/kamailio-5.5.0/src' make: *** [Makefile:34: every-module] Error 2 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2727

2 6

git:5.5:4a4835e1: lwsc: set ws_ping_pong_interval only for libwebsockets 3.x
by Daniel-Constantin Mierla 06 May '21

06 May '21

Module: kamailio Branch: 5.5 Commit: 4a4835e122bb3a53d2a1794640e1dec66736a897 URL: https://github.com/kamailio/kamailio/commit/4a4835e122bb3a53d2a1794640e1dec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-06T11:39:33+02:00 lwsc: set ws_ping_pong_interval only for libwebsockets 3.x (cherry picked from commit 048ed4210d52fb817ae6b03756d95e9b25899330) --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4a4835e122bb3a53d2a1794640e1dec… Patch: https://github.com/kamailio/kamailio/commit/4a4835e122bb3a53d2a1794640e1dec… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index 17eb0ca30a..a6985acb6d 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -529,7 +529,7 @@ static lwsc_endpoint_t* lwsc_get_endpoint(str *wsurl, str *wsproto) ep->crtinfo.protocols = ep->protocols; ep->crtinfo.gid = -1; ep->crtinfo.uid = -1; -#if LWS_LIBRARY_VERSION_MAJOR >= 3 +#if LWS_LIBRARY_VERSION_MAJOR == 3 ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ #endif /* 1 internal and 1 (+ 1 http2 nwsi) */

1 0

git:master:048ed421: lwsc: set ws_ping_pong_interval only for libwebsockets 3.x
by Daniel-Constantin Mierla 06 May '21

06 May '21

Module: kamailio Branch: master Commit: 048ed4210d52fb817ae6b03756d95e9b25899330 URL: https://github.com/kamailio/kamailio/commit/048ed4210d52fb817ae6b03756d95e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-06T11:37:58+02:00 lwsc: set ws_ping_pong_interval only for libwebsockets 3.x --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/048ed4210d52fb817ae6b03756d95e9… Patch: https://github.com/kamailio/kamailio/commit/048ed4210d52fb817ae6b03756d95e9… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index 17eb0ca30a..a6985acb6d 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -529,7 +529,7 @@ static lwsc_endpoint_t* lwsc_get_endpoint(str *wsurl, str *wsproto) ep->crtinfo.protocols = ep->protocols; ep->crtinfo.gid = -1; ep->crtinfo.uid = -1; -#if LWS_LIBRARY_VERSION_MAJOR >= 3 +#if LWS_LIBRARY_VERSION_MAJOR == 3 ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ #endif /* 1 internal and 1 (+ 1 http2 nwsi) */

1 0

git:5.5:4f930b76: lost: use of parser functions parse_pai_header() and parse_from_header() related to #2723
by Wolfgang Kampichler 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: 4f930b7618e874a651083c5e4de55d9ed0027bf3 URL: https://github.com/kamailio/kamailio/commit/4f930b7618e874a651083c5e4de55d9… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-05T21:53:43+02:00 lost: use of parser functions parse_pai_header() and parse_from_header() related to #2723 - lost_get_pai_header(): parsing method update lost_get_from_header(): parsing method update - memset(): fixed number of bytes to be filled (unrelated) (cherry picked from commit 791672393aeba320fd1608746fb61e9a96e19d06) --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/4f930b7618e874a651083c5e4de55d9… Patch: https://github.com/kamailio/kamailio/commit/4f930b7618e874a651083c5e4de55d9…

1 0

git:5.5:e96c3517: lost: change in the method for parsing the From header in lost_get_from_header() related to #2723
by Wolfgang Kampichler 05 May '21

05 May '21

Module: kamailio Branch: 5.5 Commit: e96c35170ebb2b01fb25c4e9f422119696924086 URL: https://github.com/kamailio/kamailio/commit/e96c35170ebb2b01fb25c4e9f422119… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-05-05T21:53:12+02:00 lost: change in the method for parsing the From header in lost_get_from_header() related to #2723 (cherry picked from commit fe6923cd8e995c400fc1838304c95142cc00273e) --- Modified: src/modules/lost/utilities.c --- Diff: https://github.com/kamailio/kamailio/commit/e96c35170ebb2b01fb25c4e9f422119… Patch: https://github.com/kamailio/kamailio/commit/e96c35170ebb2b01fb25c4e9f422119… --- diff --git a/src/modules/lost/utilities.c b/src/modules/lost/utilities.c index bcb045f451..beb1d2e932 100644 --- a/src/modules/lost/utilities.c +++ b/src/modules/lost/utilities.c @@ -442,9 +442,10 @@ p_lost_geolist_t lost_get_geolocation_header(struct sip_msg *msg, int *items) str hdr = STR_NULL; p_lost_geolist_t list = NULL; + *items = 0; + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { LM_ERR("failed to parse SIP headers\n"); - *items = 0; return list; } @@ -481,8 +482,8 @@ char *lost_get_pai_header(struct sip_msg *msg, int *lgth) *lgth = 0; - if(parse_headers(msg, HDR_PAI_F, 0) == -1) { - LM_ERR("could not parse P-A-I header\n"); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse SIP headers\n"); return res; } @@ -640,34 +641,53 @@ int lost_get_nameinfo(char *ip, str *name, int flag) */ char *lost_get_from_header(struct sip_msg *msg, int *lgth) { - to_body_t *f_body; + struct hdr_field *hf; + to_body_t *from_body; char *res = NULL; *lgth = 0; - if(parse_headers(msg, HDR_FROM_F, 0) == -1) { - LM_ERR("failed to parse From header\n"); + if(parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse SIP headers\n"); return res; } - if(msg->from == NULL || get_from(msg) == NULL) { - LM_ERR("From header not found\n"); - return res; - } - f_body = get_from(msg); + for(hf = msg->headers; hf; hf = hf->next) { + if(hf->type == HDR_FROM_T) { - LM_DBG("From body: [%.*s]\n", f_body->body.len, f_body->body.s); + LM_DBG("From body: [%.*s]\n", hf->body.len, hf->body.s); - res = (char *)pkg_malloc((f_body->uri.len + 1) * sizeof(char)); - if(res == NULL) { - PKG_MEM_ERROR; - return res; - } else { - memset(res, 0, f_body->uri.len + 1); - memcpy(res, f_body->uri.s, f_body->uri.len + 1); - res[f_body->uri.len] = '\0'; + /* first, get some memory */ + from_body = pkg_malloc(sizeof(to_body_t)); + if(from_body == NULL) { + PKG_MEM_ERROR; + return res; + } + /* parse From body */ + memset(from_body, 0, sizeof(to_body_t)); + parse_to(hf->body.s, hf->body.s + hf->body.len + 1, from_body); + if(from_body->error == PARSE_ERROR) { + LM_ERR("bad From header\n"); + pkg_free(from_body); + return res; + } + if(from_body->error == PARSE_OK) { + res = (char *)pkg_malloc( + (from_body->uri.len + 1) * sizeof(char)); + if(res == NULL) { + PKG_MEM_ERROR; + pkg_free(from_body); + return res; + } else { + memset(res, 0, from_body->uri.len + 1); + memcpy(res, from_body->uri.s, from_body->uri.len + 1); + res[from_body->uri.len] = '\0'; + pkg_free(from_body); - *lgth = strlen(res); + *lgth = strlen(res); + } + } + } } return res;

1 0

[kamailio/kamailio] Default config and options for Kamailio 5.5.0 (#2719)
by Daniel-Constantin Mierla 05 May '21

05 May '21

With several days before releasing v5.5.0, let's see if there is any tuning that should be done to default kamailio.cfg. Note that the proposals and discussions must focus around current config, if any loaded module should have different values for parameters, if the routing blocks should be adjusted to cope better with common use cases. This is not for asking refactoring or adding major changes/features. In such cases, the option is to make PR to add to `misc/examples/` (new files or to existing files). >From the discussions done for 5.4.0, the next were considered for the future, however I haven't seen much activity on the community forums related to them during past months, so I am not sure they worth at this moment, but let list them for a starting point: * keepalive to be done with usrloc module to get round trip timer, etc * dlgs module loaded to see the basic stats about active calls -- 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/2719

2 3

[kamailio/kamailio] usrloc: cancel unnecessary db queries (#2726)
by korayvt 05 May '21

05 May '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  It looks like the db query is made before checking the configuration parameters for the following features: - internal keep-alive mechanism - contact-expired callback execution For example, although keepalive mode is turned off, the location table is periodically queried. This is also true when there is no usrloc:contact-expired route. In this commit, checks are added before these two db queries. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2726 -- Commit Summary -- * Merge pull request #1 from kamailio/master * Merge pull request #2 from kamailio/master * Merge pull request #3 from kamailio/master * usrloc: unnecessary periodic db queries cancelled -- File Changes -- M src/modules/usrloc/dlist.c (4) M src/modules/usrloc/udomain.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2726.patch https://github.com/kamailio/kamailio/pull/2726.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/2726

2 2

← Newer
1
...
19
20
21
22
23
24
25
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2021