sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
285 discussions

git:master:7c347e24: dialog: reworked kemi export for dlg_get_var()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7c347e244cf761d04d5aff906e88571cd68217f3 URL: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T16:07:56+02:00 dialog: reworked kemi export for dlg_get_var() - return SR_KEMIP_XVAL type --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… Patch: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index b169dc2d26..5347c0fa1d 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1511,7 +1511,7 @@ static int fixup_dlg_bridge(void** param, int param_no) return 0; } -static str *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) +static str *ki_dlg_get_var_helper(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) { dlg_cell_t *dlg = NULL; unsigned int dir = 0; @@ -1538,6 +1538,30 @@ static str *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) return val; } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_dialog_xval = {0}; + +static sr_kemi_xval_t *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) +{ + str *val = NULL; + + memset(&_sr_kemi_dialog_xval, 0, sizeof(sr_kemi_xval_t)); + + val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); + if(!val) { + sr_kemi_xval_null(&_sr_kemi_dialog_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_dialog_xval; + } + + _sr_kemi_dialog_xval.vtype = SR_KEMIP_STR; + _sr_kemi_dialog_xval.v.s = *pval; + + return &_sr_kemi_dialog_xval; + +} + static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char *key, char *pv) { str sc = STR_NULL; @@ -1582,7 +1606,7 @@ static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char return -1; } dst_pv = (pv_spec_t *)pv; - val = ki_dlg_get_var(msg, &sc, &sf, &st, &k); + val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); if(val) { memset(&dst_val, 0, sizeof(pv_value_t)); dst_val.flags |= PV_VAL_STR; @@ -2155,11 +2179,6 @@ static int ki_dlg_var_sets(sip_msg_t *msg, str *name, str *val) return (ret==0)?1:ret; } -/** - * - */ -static sr_kemi_xval_t _sr_kemi_dialog_xval = {0}; - /** * */ @@ -2289,7 +2308,7 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("dlg_get_var"), - SR_KEMIP_STR, ki_dlg_get_var, + SR_KEMIP_XVAL, ki_dlg_get_var, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } },

2 years, 7 months

git:master:3efc0c10: modules: readme files regenerated - registrar ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3efc0c1093ed3c9b5a11e40e4ccc65c93f4627a4 URL: https://github.com/kamailio/kamailio/commit/3efc0c1093ed3c9b5a11e40e4ccc65c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-20T13:31:17+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/3efc0c1093ed3c9b5a11e40e4ccc65c… Patch: https://github.com/kamailio/kamailio/commit/3efc0c1093ed3c9b5a11e40e4ccc65c… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 22483876ad..bf0a663710 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -96,6 +96,7 @@ Bogdan-Andre Iancu 4.9. reg_fetch_contacts(domain, uri, profile) 4.10. reg_free_contacts(profile) 4.11. reg_send_reply() + 4.12. reg_from_user(ultable, uri, mode) 5. Event Routes @@ -162,8 +163,9 @@ Bogdan-Andre Iancu 1.43. reg_fetch_contacts usage 1.44. reg_free_contacts usage 1.45. reg_send_reply usage - 1.46. event_route[usrloc:contact-expired] usage - 1.47. $ulc(name) usage + 1.46. reg_from_user usage + 1.47. event_route[usrloc:contact-expired] usage + 1.48. $ulc(name) usage Chapter 1. Admin Guide @@ -230,6 +232,7 @@ Chapter 1. Admin Guide 4.9. reg_fetch_contacts(domain, uri, profile) 4.10. reg_free_contacts(profile) 4.11. reg_send_reply() + 4.12. reg_from_user(ultable, uri, mode) 5. Event Routes @@ -991,6 +994,7 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 4.9. reg_fetch_contacts(domain, uri, profile) 4.10. reg_free_contacts(profile) 4.11. reg_send_reply() + 4.12. reg_from_user(ultable, uri, mode) 4.1. save(domain, [, flags [, uri]]) @@ -1293,6 +1297,30 @@ save("location", "0x2"); reg_send_reply(); ... +4.12. reg_from_user(ultable, uri, mode) + + The function returns true if the SIP message comes from the user + identified by 'uri' parameter by matching the associated location + records. The matching is done with the field 'received' if it is set, + otherwise with the contact address. + + Meaning of the parameters is as follows: + * ultable - user location table (e.g., 'location') + * uri - SIP URI to identify the location records to match against. + * mode - matching mode (int) - host part (IP address) is matched + always. If mode has bit 1 set (value 1), then the port is matched + as well. If mode has bit 2 set (value 2), then the protocol is + matched as well. + + This function can be used from ANY_ROUTE. + + Example 1.46. reg_from_user usage +... +if(reg_from_user("location", "sip:alice@server.com", "0")) { + # message coming from where 'alice' sent before a REGISTER request +} +... + 5. Event Routes 5.1. event_route[usrloc:contact-expired] @@ -1302,7 +1330,7 @@ reg_send_reply(); Executed when a contact in location table has expired. The variable $ulc(exp=>...) is filled with the attributes of the expired contact. - Example 1.46. event_route[usrloc:contact-expired] usage + Example 1.47. event_route[usrloc:contact-expired] usage ... event_route[usrloc:contact-expired] { xlog("expired contact for $ulc(exp=>aor)\n"); @@ -1376,7 +1404,7 @@ event_route[usrloc:contact-expired] { The pseudo-variable accepts positive index value to access a specific contact record. - Example 1.47. $ulc(name) usage + Example 1.48. $ulc(name) usage ... if(reg_fetch_contacts("location", "$fu", "caller")) {

2 years, 7 months

git:master:f0bf4ceb: registrar: docs for reg_from_user() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f0bf4cebef916887cd5196dce0521d4784904ab8 URL: https://github.com/kamailio/kamailio/commit/f0bf4cebef916887cd5196dce0521d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T13:26:00+02:00 registrar: docs for reg_from_user() function --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f0bf4cebef916887cd5196dce0521d4… Patch: https://github.com/kamailio/kamailio/commit/f0bf4cebef916887cd5196dce0521d4… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index d8a3c88b57..c402ab4b20 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1813,6 +1813,52 @@ save("location", "0x2"); ... reg_send_reply(); ... +</programlisting> + </example> + </section> + <section id="registrar.f.reg_from_user"> + <title> + <function moreinfo="none">reg_from_user(ultable, uri, mode)</function> + </title> + <para> + The function returns true if the SIP message comes from the user + identified by 'uri' parameter by matching the associated location + records. The matching is done with the field 'received' if it is set, + otherwise with the contact address. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>ultable</emphasis> - user location table (e.g., 'location') + </para> + </listitem> + <listitem> + <para> + <emphasis>uri</emphasis> - SIP URI to identify the location records + to match against. + </para> + </listitem> + <listitem> + <para> + <emphasis>mode</emphasis> - matching mode (int) - host part (IP address) + is matched always. If mode has bit 1 set (value 1), then the port is + matched as well. If mode has bit 2 set (value 2), then the protocol + is matched as well. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>reg_from_user</function> usage</title> + <programlisting format="linespecific"> +... +if(reg_from_user("location", "sip:alice@server.com", "0")) { + # message coming from where 'alice' sent before a REGISTER request +} +... </programlisting> </example> </section>

2 years, 7 months

git:master:005e8afe: registrar: added function reg_from_user(ultable, uri, mode)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 005e8afeb6a9297bd9c752c6daaa0d99f6b4eaad URL: https://github.com/kamailio/kamailio/commit/005e8afeb6a9297bd9c752c6daaa0d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T13:17:24+02:00 registrar: added function reg_from_user(ultable, uri, mode) - return true if the message came from the user identified uri parameter by matching agains its location records --- Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/regpv.c Modified: src/modules/registrar/regpv.h --- Diff: https://github.com/kamailio/kamailio/commit/005e8afeb6a9297bd9c752c6daaa0d9… Patch: https://github.com/kamailio/kamailio/commit/005e8afeb6a9297bd9c752c6daaa0d9…

2 years, 7 months

git:master:5e4576a5: core: mod fixup helpers for params sequence str, str, int

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5e4576a54e7783b1ee8fde6af7919232a5e207c4 URL: https://github.com/kamailio/kamailio/commit/5e4576a54e7783b1ee8fde6af791923… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T13:15:43+02:00 core: mod fixup helpers for params sequence str, str, int --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/5e4576a54e7783b1ee8fde6af791923… Patch: https://github.com/kamailio/kamailio/commit/5e4576a54e7783b1ee8fde6af791923… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 325e3d117b..925048d940 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -801,6 +801,38 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen) return -1; } +/** + * + */ +int fixup_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_spve_null(param, 1); + case 3: + return fixup_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_free_spve_null(param, 1); + case 3: + return fixup_free_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index ca63a5a804..8c2c766c1e 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -163,6 +163,9 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen); int fixup_igp_regexp(void** param, int param_no); int fixup_free_igp_regexp(void** param, int param_no); +int fixup_ssi(void** param, int param_no); +int fixup_free_ssi(void** param, int param_no); + int fixup_sssi(void** param, int param_no); int fixup_free_sssi(void** param, int param_no);

2 years, 7 months

git:master:18972def: seas: proper print formater %.*s instead of %*.s

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 18972def7a21506088988c1011b8aa6f13e1b8a9 URL: https://github.com/kamailio/kamailio/commit/18972def7a21506088988c1011b8aa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T09:51:44+02:00 seas: proper print formater %.*s instead of %*.s --- Modified: src/modules/seas/encode_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/18972def7a21506088988c1011b8aa6… Patch: https://github.com/kamailio/kamailio/commit/18972def7a21506088988c1011b8aa6… --- diff --git a/src/modules/seas/encode_msg.c b/src/modules/seas/encode_msg.c index 1a99c22e26..e496397888 100644 --- a/src/modules/seas/encode_msg.c +++ b/src/modules/seas/encode_msg.c @@ -324,7 +324,7 @@ int print_encoded_msg(FILE* fd,char *code,char *prefix) fprintf(fd,"MESSAGE:\n[%.*s]\n",msglen,msg); r=(i<100)?1:0; if(r){ - fprintf(fd,"%sREQUEST CODE=%d==%.*s,URI=%.*s,VERSION=%*.s\n",prefix,i, + fprintf(fd,"%sREQUEST CODE=%d==%.*s,URI=%.*s,VERSION=%.*s\n",prefix,i, payload[METHOD_CODE_IDX+1],&msg[payload[METHOD_CODE_IDX]], payload[URI_REASON_IDX+1],&msg[payload[URI_REASON_IDX]], payload[VERSION_IDX+1],&msg[payload[VERSION_IDX]]);

2 years, 7 months

git:master:fce806b5: kazoo: proper print formater %.*s instead of %*.s

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fce806b5715286fa15148bbb8117ff3b9b4d0897 URL: https://github.com/kamailio/kamailio/commit/fce806b5715286fa15148bbb8117ff3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T09:50:27+02:00 kazoo: proper print formater %.*s instead of %*.s --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/fce806b5715286fa15148bbb8117ff3… Patch: https://github.com/kamailio/kamailio/commit/fce806b5715286fa15148bbb8117ff3… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 15d5b259a1..c7088a3c71 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1340,7 +1340,7 @@ int kz_amqp_async_query_ex(struct sip_msg* msg, char* _exchange, char* _routing_ json_obj = json_tokener_parse(json_s.s); if (json_obj==NULL) { - LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); + LM_ERR("empty or invalid JSON payload : %.*s\n", json_s.len, json_s.s); goto error; } @@ -1499,7 +1499,7 @@ int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, cha struct json_object *j = json_tokener_parse(json_s.s); if (j==NULL) { - LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); + LM_ERR("empty or invalid JSON payload : %.*s\n", json_s.len, json_s.s); return -1; }

2 years, 7 months

[kamailio/kamailio] TOPOS + RE-INVITE problem - Contact IP not updated (Issue #3118)

by chris-issy

It seems that TOPOS is not working properly on RE-INVITE and stop masking IP and contact on some RE-INVITE. When a RE-INVITE is send with Kamailio IP as Request-URI TOPOS is not operating. Note : we are using the HTABLE trick to rewrite $ru and match the call but we would need to have TOPOS re-evaluating the dialog once done. We use a standard configuration with 2 modifications. 1) in route[DISPATCH] to set the HTABLE if(is_method("INVITE")) { $sht(ct=>$ci::$ft) = $sel(contact.uri); } 2) in route[WITHINDLG] to find the call if R-URI = myself if(has_totag() && uri==myself) { if($sht(ct=>$ci::$ft) != $null && $T_reply_code > 400) $shtex(ct=>$ci::$ft) = 10 ; if($sht(ct=>$ci::$tt) != $null) { $ru = $sht(ct=>$ci::$tt); if (is_method("BYE")) $shtex(ct=>$ci::$tt) = 10 ; route(RELAY); } } As you can see in the PCAP the RE-INVITE goes directly to calling stating with the Contact not updated and the 200 OK is also sent to called party with wrong Contact info too. [topos-issue.zip](https://github.com/kamailio/kamailio/files/8730489/topos-i… This behavior breaks the BYE procedure. Any advice ? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3118 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3118(a)github.com>

2 years, 7 months

[kamailio/kamailio] Added an equal 0 on TLS test on kemi t_relay_to_proto functions. (Issue #3111)

by hallthmann

### Description  module: tm kemi proto relay functions fails on TLS: - ki_t_relay_to_proto - ki_t_relay_to_proto_addr ### Troubleshooting #### Reproduction  #### Debugging Data  ``` ``` #### Log Messages  ``` 13(19) ERROR: {1 1 REGISTER 184193281845942-18001879945554(a)192.168.1.135} tm [tm.c:2934]: ki_t_relay_to_proto(): bad protocol specified <TLS> 13(19) ERROR: {1 1 REGISTER 184193281845942-18001879945554(a)192.168.1.135} sl [sl_funcs.c:414]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  It's missing an equal zero (== 0) on TLS test. Code: tm.c if (strncasecmp(sproto->s, "UDP", 3) == 0) { proto = PROTO_UDP; } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { proto = PROTO_TCP; } else if (strncasecmp(sproto->s, "TLS", 3)) { proto = PROTO_TLS; } else { LM_ERR("bad protocol specified <%s>\n", sproto->s); return E_UNSPEC; } Fix: if (strncasecmp(sproto->s, "UDP", 3) == 0) { proto = PROTO_UDP; } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { proto = PROTO_TCP; } else if (strncasecmp(sproto->s, "TLS", 3) == 0) { proto = PROTO_TLS; } else { LM_ERR("bad protocol specified <%s>\n", sproto->s); return E_UNSPEC; } ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.0 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_BLOCKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` * **Operating System**:  ``` No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 8.11 (jessie) Release: 8.11 Codename: jessie Linux routersip 4.18.0-348.el8.0.2.x86_64 #1 SMP Sun Nov 14 00:51:12 UTC 2021 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3111 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3111(a)github.com>

2 years, 7 months

git:5.6:ce68e763: siprepo: set name for timer function

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: ce68e763a5115d0f98bddac8c329ee6626581543 URL: https://github.com/kamailio/kamailio/commit/ce68e763a5115d0f98bddac8c329ee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-18T09:20:30+02:00 siprepo: set name for timer function (cherry picked from commit 81265e41b52cfda9a284233c93683522a98f0a64) --- Modified: src/modules/siprepo/siprepo_data.c --- Diff: https://github.com/kamailio/kamailio/commit/ce68e763a5115d0f98bddac8c329ee6… Patch: https://github.com/kamailio/kamailio/commit/ce68e763a5115d0f98bddac8c329ee6… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index f4e4d71a94..1b498f5daa 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -505,7 +505,7 @@ int siprepo_msg_async_pull(str *callid, str *msgid, str *gname, str *rname, /** * */ -void siprepo_timer_exec(unsigned int ticks, int worker, void *param) +void siprepo_msg_timer(unsigned int ticks, int worker, void *param) { time_t tnow; int i;

2 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2022