sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

git:master:a5360fa2: uac: fix references in docs for AVPs

by Henning Westerholt

Module: kamailio Branch: master Commit: a5360fa28d8394bf420915645ecd0658dcd1c7b8 URL: https://github.com/kamailio/kamailio/commit/a5360fa28d8394bf420915645ecd065… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T16:25:56+02:00 uac: fix references in docs for AVPs --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a5360fa28d8394bf420915645ecd065… Patch: https://github.com/kamailio/kamailio/commit/a5360fa28d8394bf420915645ecd065… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index c4f5d82126..1967dcb91c 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -326,9 +326,9 @@ modparam("uac","credential","username:domain:password") <para><emphasis> If you define it, you also need to define <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-username-avp-id"/>) and + (<xref linkend="uac.p.auth_username_avp"/>) and <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>). + (<xref linkend="uac.p.auth_password_avp"/>). </emphasis></para> <example> <title>Set <varname>auth_realm_avp</varname> parameter</title> @@ -348,9 +348,9 @@ modparam("uac","auth_realm_avp","$avp(i:10)") <para><emphasis> If you define it, you also need to define <quote>auth_realm_avp</quote> - (<xref linkend="uac.p.auth-realm-avp-id"/>) and + (<xref linkend="uac.p.auth_realm_avp"/>) and <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>). + (<xref linkend="uac.p.auth_password_avp"/>). </emphasis></para> <example> <title>Set <varname>auth_username_avp</varname> parameter</title> @@ -370,9 +370,9 @@ modparam("uac","auth_username_avp","$avp(i:11)") <para><emphasis> If you define it, you also need to define <quote>auth_password_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>) and + (<xref linkend="uac.p.auth_realm_avp"/>) and <quote>auth_username_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>). + (<xref linkend="uac.p.auth_username_avp"/>). </emphasis></para> <example> <title>Set <varname>auth_password_avp</varname> parameter</title>

5 years, 3 months

git:master:c9758786: uac: extend docs for default_socket with a note about tcp_reuse_port

by Henning Westerholt

Module: kamailio Branch: master Commit: c975878648b7c34f6631a941555eb62f0506d638 URL: https://github.com/kamailio/kamailio/commit/c975878648b7c34f6631a941555eb62… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T16:25:56+02:00 uac: extend docs for default_socket with a note about tcp_reuse_port --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c975878648b7c34f6631a941555eb62… Patch: https://github.com/kamailio/kamailio/commit/c975878648b7c34f6631a941555eb62… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 91b8787870..c4f5d82126 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -567,16 +567,18 @@ modparam("uac", "reg_gc_interval", 60) <para> Default socket to be used for generating registration requests and sending requests with the function uac_req_send(). Useful e.g. when several public - interfaces are available. + interfaces are available. A send socket in the $uac_reg variable used + together with the uac_req_send() function will override this parameter. </para> <para> <emphasis> By default no default socket is defined, the send socket is choosen from the - <emphasis>tm</emphasis> module when the requests is send out. A send socket - in the $uac_reg variable used together with the uac_req_send() function will - override this parameter. + <quote>tm</quote> module when the requests is send out. </emphasis> </para> + <para>If you want to force a certain TCP port (e.g. 5060), you will need to set + the <emphasis>tcp_reuse_port=yes</emphasis> core parameter as well. + </para> <example> <title>Set the <quote>default_socket</quote> parameter</title> <programlisting format="linespecific">

5 years, 3 months

[kamailio/kamailio] Sipt Redirection Number Retrieves old values (#2030)

by duarterocha91

Greetings, I'm doing VoiceMail detection using $sipt(redirection_number) from SIPT module and i've been having some false positives on the detection. I inspected further and noticed that in some cases $sipt(redirection_number) returns old values from previous messages, which makes me think that it's value is not being correctly refreshed. I'm using this variable on a on_reply_route. As far as i know, $sipt(redirection_number) is read only and can't be refreshed by me in the code. Here is an example : Aug 7 16:51:49 dev_sbc_a_vts01 /usr/local/kamailio-5.2/sbin/kamailio[4746]: ERROR: <script>: VMD2 : Reply Code : 180 ; Sipt Redir = 9610050000 and Call ID = 00158FED-98B7-E911-8B3B-4DA50AE2ED72 at 192.168.24.86 and Cseq = 83 Here is the JSON from the 180 message : https://pastebin.com/zFHKxyav As you can see, there isn't any 9610050000 in the message. What can be causing this issue ? Best Regards, Duarte Rocha -- 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/2030

5 years, 3 months

git:master:885fdc85: kemix: exported functions to return message body

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 885fdc8521a7d2f78e195eaef447f01daf7ad800 URL: https://github.com/kamailio/kamailio/commit/885fdc8521a7d2f78e195eaef447f01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-09T15:02:40+02:00 kemix: exported functions to return message body --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/885fdc8521a7d2f78e195eaef447f01… Patch: https://github.com/kamailio/kamailio/commit/885fdc8521a7d2f78e195eaef447f01… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 9265d36890..91ad99dea9 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -617,6 +617,59 @@ static sr_kemi_xval_t* ki_kx_gets_status(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_body_mode(sip_msg_t *msg, int rmode) +{ + str s; + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, rmode); + return &_sr_kemi_kx_xval; + } + + s.s = get_body(msg); + + if(s.s == NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, rmode); + return &_sr_kemi_kx_xval; + } + s.len = msg->buf + msg->len - s.s; + if(s.len <=0) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, rmode); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s = s; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_body(sip_msg_t *msg) +{ + return ki_kx_get_body_mode(msg, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gete_body(sip_msg_t *msg) +{ + return ki_kx_get_body_mode(msg, SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_getw_body(sip_msg_t *msg) +{ + return ki_kx_get_body_mode(msg, SR_KEMI_XVAL_NULL_PRINT); +} + /** * */ @@ -777,6 +830,22 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_body"), + SR_KEMIP_XVAL, ki_kx_get_body, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("getw_body"), + SR_KEMIP_XVAL, ki_kx_getw_body, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gete_body"), + SR_KEMIP_XVAL, ki_kx_gete_body, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

5 years, 3 months

git:master:b038de70: uac: remove old unused #ifdef UAC_OLD_AUTH, related to extension in 2011

by Henning Westerholt

Module: kamailio Branch: master Commit: b038de70ffdde8d2179f49edc574afca62e41638 URL: https://github.com/kamailio/kamailio/commit/b038de70ffdde8d2179f49edc574afc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T14:54:23+02:00 uac: remove old unused #ifdef UAC_OLD_AUTH, related to extension in 2011 --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/b038de70ffdde8d2179f49edc574afc… Patch: https://github.com/kamailio/kamailio/commit/b038de70ffdde8d2179f49edc574afc… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 0e3cc65165..c19d758630 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -808,11 +808,6 @@ int uac_reg_tmdlg(dlg_t *tmdlg, sip_msg_t *rpl) if (get_from(rpl)->tag_value.len) { tmdlg->id.loc_tag = get_from(rpl)->tag_value; } -#if 0 - if (get_to(rpl)->tag_value.len) { - tmdlg->id.rem_tag = get_to(rpl)->tag_value; - } -#endif tmdlg->loc_uri = get_from(rpl)->uri; tmdlg->rem_uri = get_to(rpl)->uri; tmdlg->state= DLG_CONFIRMED; @@ -834,10 +829,6 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) struct uac_credential cred; char b_ruri[MAX_URI_SIZE]; str s_ruri; -#ifdef UAC_OLD_AUTH - char b_turi[MAX_URI_SIZE]; - str s_turi; -#endif char b_hdrs[MAX_UACH_SIZE]; str s_hdrs; uac_req_t uac_r; @@ -979,12 +970,6 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) goto error; } -#ifdef UAC_OLD_AUTH - snprintf(b_turi, MAX_URI_SIZE, "sip:%.*s@%.*s", - ri->r_username.len, ri->r_username.s, - ri->r_domain.len, ri->r_domain.s); - s_turi.s = b_turi; s_turi.len = strlen(s_turi.s); -#endif snprintf(b_hdrs, MAX_UACH_SIZE, "Contact: <sip:%.*s@%.*s>\r\n" "Expires: %d\r\n" @@ -1013,18 +998,6 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; -#ifdef UAC_OLD_AUTH - /* default socket */ - if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { - uac_r.ssock = &uac_default_socket; - } - ret = uac_tmb.t_request(&uac_r, /* UAC Req */ - &s_ruri, /* Request-URI */ - &s_turi, /* To */ - &s_turi, /* From */ - (ri->auth_proxy.len)?&ri->auth_proxy:NULL /* outbound uri */ - ); -#endif ret = uac_tmb.t_request_within(&uac_r); if(ret<0) {

5 years, 3 months

git:master:dd6b8d28: uac: fix error related to UAC_OLD_AUTH #define and default_socket addition

by Henning Westerholt

Module: kamailio Branch: master Commit: dd6b8d282289bbaf02adb5a9f341800ca17a0bfd URL: https://github.com/kamailio/kamailio/commit/dd6b8d282289bbaf02adb5a9f341800… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T11:31:40+02:00 uac: fix error related to UAC_OLD_AUTH #define and default_socket addition --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/dd6b8d282289bbaf02adb5a9f341800… Patch: https://github.com/kamailio/kamailio/commit/dd6b8d282289bbaf02adb5a9f341800… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index f7f62e0d9c..0e3cc65165 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1013,11 +1013,11 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) uac_r.cb = uac_reg_tm_callback; /* Callback parameter */ uac_r.cbp = (void*)uuid; +#ifdef UAC_OLD_AUTH /* default socket */ if(uac_default_socket.s != NULL && uac_default_socket.len > 0) { uac_r.ssock = &uac_default_socket; } -#ifdef UAC_OLD_AUTH ret = uac_tmb.t_request(&uac_r, /* UAC Req */ &s_ruri, /* Request-URI */ &s_turi, /* To */

5 years, 3 months

git:5.1:7219170e: domain: fix memory leak on domain reload (related to domain_attr table, struct domain_list)

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: 7219170e7def71eeb6a63ec7e278adf5a795886c URL: https://github.com/kamailio/kamailio/commit/7219170e7def71eeb6a63ec7e278adf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T11:23:49+02:00 domain: fix memory leak on domain reload (related to domain_attr table, struct domain_list) - fix memory leak on domain reload, reported by Mack Hendricks - related to domain_attr table, structure domain_list (cherry picked from commit f50177003c21f53564be6349c0bb4935be184e2d) --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/7219170e7def71eeb6a63ec7e278adf… Patch: https://github.com/kamailio/kamailio/commit/7219170e7def71eeb6a63ec7e278adf… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index 257d374dba..b093dbc3e4 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -204,6 +204,7 @@ void hash_table_free(struct domain_list **hash_table) shm_free(ap); ap = next_ap; } + shm_free(np); np = np->next; }

5 years, 3 months

git:5.2:643faf56: domain: fix memory leak on domain reload (related to domain_attr table, struct domain_list)

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 643faf56274d6432b9884a062a669d0920d04bd4 URL: https://github.com/kamailio/kamailio/commit/643faf56274d6432b9884a062a669d0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T11:23:45+02:00 domain: fix memory leak on domain reload (related to domain_attr table, struct domain_list) - fix memory leak on domain reload, reported by Mack Hendricks - related to domain_attr table, structure domain_list (cherry picked from commit f50177003c21f53564be6349c0bb4935be184e2d) --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/643faf56274d6432b9884a062a669d0… Patch: https://github.com/kamailio/kamailio/commit/643faf56274d6432b9884a062a669d0… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index 257d374dba..b093dbc3e4 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -204,6 +204,7 @@ void hash_table_free(struct domain_list **hash_table) shm_free(ap); ap = next_ap; } + shm_free(np); np = np->next; }

5 years, 3 months

git:5.2:24e32728: sipt: reset the static buffer for returning the number

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 24e327280b1790ed15e16f6fd251c5596728abd8 URL: https://github.com/kamailio/kamailio/commit/24e327280b1790ed15e16f6fd251c55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-09T11:22:33+02:00 sipt: reset the static buffer for returning the number - GH #2030 (cherry picked from commit 2c052974263c0785eb5280a935162673ac82dc6b) --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/24e327280b1790ed15e16f6fd251c55… Patch: https://github.com/kamailio/kamailio/commit/24e327280b1790ed15e16f6fd251c55… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index e75ecdc5b4..f64686dbc7 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -339,6 +339,7 @@ static int sipt_get_redirection_number(struct sip_msg *msg, pv_param_t *param, p str body; body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_ISUP,&body.len); + sb_s_buf[0] = '\0'; if(body.s == NULL) { LM_INFO("No ISUP Message Found"); @@ -350,9 +351,9 @@ static int sipt_get_redirection_number(struct sip_msg *msg, pv_param_t *param, p LM_DBG("message not an ACM or CPG\n"); return -1; } - + isup_get_redirection_number((unsigned char*)body.s, body.len, sb_s_buf); - + if (strlen(sb_s_buf) > 0) { pv_get_strzval(msg, param, res, sb_s_buf);

5 years, 3 months

git:master:abea963c: modules: readme files regenerated - uac ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: abea963c666fb39f263de7f9d5ff7ea97fb04529 URL: https://github.com/kamailio/kamailio/commit/abea963c666fb39f263de7f9d5ff7ea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-08-09T11:02:23+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/abea963c666fb39f263de7f9d5ff7ea… Patch: https://github.com/kamailio/kamailio/commit/abea963c666fb39f263de7f9d5ff7ea…

5 years, 3 months

← Newer
1
...
27
28
29
30
31
32
33
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019