sr-dev October 2019

sr-dev@lists.kamailio.org

22 participants
436 discussions

git:5.3:841182e9: uri_db: spelling fix in variable name
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: 841182e9ee55dca5b932a7716d14b3350ab3671f URL: https://github.com/kamailio/kamailio/commit/841182e9ee55dca5b932a7716d14b33… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T21:24:46+02:00 uri_db: spelling fix in variable name (cherry picked from commit 23b60ed9fbf9396bd531c76f57c133d5850c0764) --- Modified: src/modules/uri_db/checks.h --- Diff: https://github.com/kamailio/kamailio/commit/841182e9ee55dca5b932a7716d14b33… Patch: https://github.com/kamailio/kamailio/commit/841182e9ee55dca5b932a7716d14b33… --- diff --git a/src/modules/uri_db/checks.h b/src/modules/uri_db/checks.h index 959dbbbfb3..5eb504a1a0 100644 --- a/src/modules/uri_db/checks.h +++ b/src/modules/uri_db/checks.h @@ -63,7 +63,7 @@ int uridb_db_ver(const str* db_url); int ki_check_to(struct sip_msg* _m); int ki_check_from(struct sip_msg* _m); int ki_check_uri(struct sip_msg* msg, str *suri); -int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername, str *srelam); +int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername, str *srealm); int ki_does_uri_exist(struct sip_msg* _msg); #endif /* CHECKS_H */

1 0

git:5.2:9617f51a: uac: spelling fix in uac docs
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 9617f51a19dc715932ddbb58e72fb264ae90b747 URL: https://github.com/kamailio/kamailio/commit/9617f51a19dc715932ddbb58e72fb26… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T21:24:00+02:00 uac: spelling fix in uac docs (cherry picked from commit 167efd5eea2e9a918ecda4249fa5574cfba4e310) --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9617f51a19dc715932ddbb58e72fb26… Patch: https://github.com/kamailio/kamailio/commit/9617f51a19dc715932ddbb58e72fb26… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 1eabfffab7..5b16cf6eb9 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1261,7 +1261,7 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>realm</emphasis> - remote relam, e.g.,: + <emphasis>realm</emphasis> - remote realm, e.g.,: sipprovider.com </para></listitem> </itemizedlist>

1 0

git:5.1:167efd5e: uac: spelling fix in uac docs
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.1 Commit: 167efd5eea2e9a918ecda4249fa5574cfba4e310 URL: https://github.com/kamailio/kamailio/commit/167efd5eea2e9a918ecda4249fa5574… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T21:22:38+02:00 uac: spelling fix in uac docs --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/167efd5eea2e9a918ecda4249fa5574… Patch: https://github.com/kamailio/kamailio/commit/167efd5eea2e9a918ecda4249fa5574… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index d96f49a90f..b996229305 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1152,7 +1152,7 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>realm</emphasis> - remote relam, e.g.,: + <emphasis>realm</emphasis> - remote realm, e.g.,: sipprovider.com </para></listitem> </itemizedlist>

1 0

git:master:073907aa: uac: spelling fix in docs, add missing title section for uac.reg_add
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: master Commit: 073907aa1f3b325b121801f06a65e7e7175154f3 URL: https://github.com/kamailio/kamailio/commit/073907aa1f3b325b121801f06a65e7e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T21:19:34+02:00 uac: spelling fix in docs, add missing title section for uac.reg_add --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/073907aa1f3b325b121801f06a65e7e… Patch: https://github.com/kamailio/kamailio/commit/073907aa1f3b325b121801f06a65e7e… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 1a48b5663e..8ddf26ca0f 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1279,6 +1279,9 @@ event_route[uac:reply] { </section> <section id="uac.r.uac.reg_add"> + <title> + <function moreinfo="none">uac.reg_add</function> + </title> <para> Add a new UAC remote registration record. If one with the same unique id is found, it is deleted. @@ -1356,7 +1359,7 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>realm</emphasis> - remote relam, e.g.,: + <emphasis>realm</emphasis> - remote realm, e.g.,: sipprovider.com </para></listitem> </itemizedlist>

1 0

git:master:23b60ed9: uri_db: spelling fix in variable name
by Henning Westerholt 09 Oct '19

09 Oct '19

Module: kamailio Branch: master Commit: 23b60ed9fbf9396bd531c76f57c133d5850c0764 URL: https://github.com/kamailio/kamailio/commit/23b60ed9fbf9396bd531c76f57c133d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-09T21:19:34+02:00 uri_db: spelling fix in variable name --- Modified: src/modules/uri_db/checks.h --- Diff: https://github.com/kamailio/kamailio/commit/23b60ed9fbf9396bd531c76f57c133d… Patch: https://github.com/kamailio/kamailio/commit/23b60ed9fbf9396bd531c76f57c133d… --- diff --git a/src/modules/uri_db/checks.h b/src/modules/uri_db/checks.h index 959dbbbfb3..5eb504a1a0 100644 --- a/src/modules/uri_db/checks.h +++ b/src/modules/uri_db/checks.h @@ -63,7 +63,7 @@ int uridb_db_ver(const str* db_url); int ki_check_to(struct sip_msg* _m); int ki_check_from(struct sip_msg* _m); int ki_check_uri(struct sip_msg* msg, str *suri); -int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername, str *srelam); +int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername, str *srealm); int ki_does_uri_exist(struct sip_msg* _msg); #endif /* CHECKS_H */

1 0

git:5.2:f36d6562: tm: skip resuming suspended transactions put on wait
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: f36d6562e54acc2b2f72c04a628b8e85f36bc9dd URL: https://github.com/kamailio/kamailio/commit/f36d6562e54acc2b2f72c04a628b8e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T19:37:58+02:00 tm: skip resuming suspended transactions put on wait - transaction is expired in that moment, pending its destroy process - GH #2055 (cherry picked from commit 52afc7b70f8e4abfb347c84872ab7daa202a6a24) (cherry picked from commit c44bd17c79bc0119ae201b826d84b9514700eda9) --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/f36d6562e54acc2b2f72c04a628b8e8… Patch: https://github.com/kamailio/kamailio/commit/f36d6562e54acc2b2f72c04a628b8e8… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 45cbf0b4ed..e2baadb2ae 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1586,11 +1586,12 @@ int t_get_canceled_ident(struct sip_msg* msg, unsigned int* hash_index, * 0). * @param hash_index - searched transaction hash_index (part of the ident). * @param label - searched transaction label (part of the ident). + * @param filter - if 1, skip transaction put on-wait (terminated state). * @return -1 on error/not found, 1 on success (found) * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). */ -int t_lookup_ident(struct cell ** trans, unsigned int hash_index, - unsigned int label) +int t_lookup_ident_filter(struct cell ** trans, unsigned int hash_index, + unsigned int label, int filter) { struct cell* p_cell; struct entry* hash_bucket; @@ -1608,9 +1609,19 @@ int t_lookup_ident(struct cell ** trans, unsigned int hash_index, #endif hash_bucket=&(get_tm_table()->entries[hash_index]); /* all the transactions from the entry are compared */ - clist_foreach(hash_bucket, p_cell, next_c){ + clist_foreach(hash_bucket, p_cell, next_c) { prefetch_loc_r(p_cell->next_c, 1); - if(p_cell->label == label){ + if(p_cell->label == label) { + if(filter==1) { + if(t_on_wait(p_cell)) { + /* transaction in terminated state */ + UNLOCK_HASH(hash_index); + set_t(0, T_BR_UNDEFINED); + *trans=NULL; + LM_DBG("transaction in terminated phase - skipping\n"); + return -1; + } + } REF_UNSAFE(p_cell); UNLOCK_HASH(hash_index); set_t(p_cell, T_BR_UNDEFINED); @@ -1622,14 +1633,27 @@ int t_lookup_ident(struct cell ** trans, unsigned int hash_index, UNLOCK_HASH(hash_index); set_t(0, T_BR_UNDEFINED); - *trans=p_cell; + *trans=NULL; LM_DBG("transaction not found\n"); return -1; } - +/** lookup a transaction based on its identifier (hash_index:label). + * @param trans - double pointer to cell structure, that will be filled + * with the result (a pointer to an existing transaction or + * 0). + * @param hash_index - searched transaction hash_index (part of the ident). + * @param label - searched transaction label (part of the ident). + * @return -1 on error/not found, 1 on success (found) + * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). + */ +int t_lookup_ident(struct cell ** trans, unsigned int hash_index, + unsigned int label) +{ + return t_lookup_ident_filter(trans, hash_index, label, 0); +} /** check if a transaction is local or not. * Check if the transaction corresponding to the current message diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index 2180311f69..d01528518b 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -94,6 +94,8 @@ typedef int (*tset_fr_f)(struct sip_msg*, unsigned int, unsigned int); int t_is_local(struct sip_msg*); int t_get_trans_ident(struct sip_msg* p_msg, unsigned int* hash_index, unsigned int* label); int t_lookup_ident(struct cell** trans, unsigned int hash_index, unsigned int label); +int t_lookup_ident_filter(struct cell ** trans, unsigned int hash_index, + unsigned int label, int filter); /* lookup a transaction by callid and cseq */ int t_lookup_callid(struct cell** trans, str callid, str cseq); diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index c2c0773b3f..3f129303fe 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -187,9 +187,9 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, backup_T = get_t(); backup_T_branch = get_t_branch(); - if (t_lookup_ident(&t, hash_index, label) < 0) { + if (t_lookup_ident_filter(&t, hash_index, label, 1) < 0) { set_t(backup_T, backup_T_branch); - LM_ERR("transaction not found\n"); + LM_ERR("active transaction not found\n"); return -1; }

1 0

git:5.2:9230834a: avp: free allocated variable in case of error
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.2 Commit: 9230834aec2de5a078c0a4a81f33bd5483729898 URL: https://github.com/kamailio/kamailio/commit/9230834aec2de5a078c0a4a81f33bd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T19:37:42+02:00 avp: free allocated variable in case of error (cherry picked from commit 5a18155c0fe661e7488f75afa7b0ea7638932943) (cherry picked from commit fc9ca0fcdff7ebc5399374038bc6a0aa02207229) --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/9230834aec2de5a078c0a4a81f33bd5… Patch: https://github.com/kamailio/kamailio/commit/9230834aec2de5a078c0a4a81f33bd5… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index f597086d92..f11d56baeb 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1380,7 +1380,7 @@ static int attr_hdr_body2attrs2(struct sip_msg* msg, char* header_, char* prefix static int attr_hdr_body2attrs_fixup(void **param, int param_no) { char *c, *params; - hdr_name_t *h; + hdr_name_t *h = NULL; int n; str *s; if(param_no == 1) { @@ -1427,6 +1427,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) LOG(L_ERR, "attr_hdr_body2attrs_fixup: bad field param " "modifier near '%s'\n", params); + pkg_free(h); return E_CFG; } params++; @@ -1434,6 +1435,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) if(!h->val_types) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: no field param modifier " "specified\n"); + pkg_free(h); return E_CFG; } } else {

1 0

git:5.3:c44bd17c: tm: skip resuming suspended transactions put on wait
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: c44bd17c79bc0119ae201b826d84b9514700eda9 URL: https://github.com/kamailio/kamailio/commit/c44bd17c79bc0119ae201b826d84b95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T18:48:40+02:00 tm: skip resuming suspended transactions put on wait - transaction is expired in that moment, pending its destroy process - GH #2055 (cherry picked from commit 52afc7b70f8e4abfb347c84872ab7daa202a6a24) --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/c44bd17c79bc0119ae201b826d84b95… Patch: https://github.com/kamailio/kamailio/commit/c44bd17c79bc0119ae201b826d84b95… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index b1182a9e71..510599f742 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1568,11 +1568,12 @@ int t_get_canceled_ident(struct sip_msg* msg, unsigned int* hash_index, * 0). * @param hash_index - searched transaction hash_index (part of the ident). * @param label - searched transaction label (part of the ident). + * @param filter - if 1, skip transaction put on-wait (terminated state). * @return -1 on error/not found, 1 on success (found) * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). */ -int t_lookup_ident(struct cell ** trans, unsigned int hash_index, - unsigned int label) +int t_lookup_ident_filter(struct cell ** trans, unsigned int hash_index, + unsigned int label, int filter) { struct cell* p_cell; struct entry* hash_bucket; @@ -1590,9 +1591,19 @@ int t_lookup_ident(struct cell ** trans, unsigned int hash_index, #endif hash_bucket=&(get_tm_table()->entries[hash_index]); /* all the transactions from the entry are compared */ - clist_foreach(hash_bucket, p_cell, next_c){ + clist_foreach(hash_bucket, p_cell, next_c) { prefetch_loc_r(p_cell->next_c, 1); - if(p_cell->label == label){ + if(p_cell->label == label) { + if(filter==1) { + if(t_on_wait(p_cell)) { + /* transaction in terminated state */ + UNLOCK_HASH(hash_index); + set_t(0, T_BR_UNDEFINED); + *trans=NULL; + LM_DBG("transaction in terminated phase - skipping\n"); + return -1; + } + } REF_UNSAFE(p_cell); UNLOCK_HASH(hash_index); set_t(p_cell, T_BR_UNDEFINED); @@ -1604,14 +1615,27 @@ int t_lookup_ident(struct cell ** trans, unsigned int hash_index, UNLOCK_HASH(hash_index); set_t(0, T_BR_UNDEFINED); - *trans=p_cell; + *trans=NULL; LM_DBG("transaction not found\n"); return -1; } - +/** lookup a transaction based on its identifier (hash_index:label). + * @param trans - double pointer to cell structure, that will be filled + * with the result (a pointer to an existing transaction or + * 0). + * @param hash_index - searched transaction hash_index (part of the ident). + * @param label - searched transaction label (part of the ident). + * @return -1 on error/not found, 1 on success (found) + * Side-effects: sets T and T_branch (T_branch always to T_BR_UNDEFINED). + */ +int t_lookup_ident(struct cell ** trans, unsigned int hash_index, + unsigned int label) +{ + return t_lookup_ident_filter(trans, hash_index, label, 0); +} /** check if a transaction is local or not. * Check if the transaction corresponding to the current message diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index 347d088d48..2a5e67d3de 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -92,6 +92,8 @@ typedef int (*tset_fr_f)(struct sip_msg*, unsigned int, unsigned int); int t_is_local(struct sip_msg*); int t_get_trans_ident(struct sip_msg* p_msg, unsigned int* hash_index, unsigned int* label); int t_lookup_ident(struct cell** trans, unsigned int hash_index, unsigned int label); +int t_lookup_ident_filter(struct cell ** trans, unsigned int hash_index, + unsigned int label, int filter); /* lookup a transaction by callid and cseq */ int t_lookup_callid(struct cell** trans, str callid, str cseq); diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index be7b0a6842..949340f1ce 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -187,9 +187,9 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, backup_T = get_t(); backup_T_branch = get_t_branch(); - if (t_lookup_ident(&t, hash_index, label) < 0) { + if (t_lookup_ident_filter(&t, hash_index, label, 1) < 0) { set_t(backup_T, backup_T_branch); - LM_ERR("transaction not found\n"); + LM_ERR("active transaction not found\n"); return -1; }

1 0

git:5.3:fc9ca0fc: avp: free allocated variable in case of error
by Daniel-Constantin Mierla 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.3 Commit: fc9ca0fcdff7ebc5399374038bc6a0aa02207229 URL: https://github.com/kamailio/kamailio/commit/fc9ca0fcdff7ebc5399374038bc6a0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-09T18:48:27+02:00 avp: free allocated variable in case of error (cherry picked from commit 5a18155c0fe661e7488f75afa7b0ea7638932943) --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/fc9ca0fcdff7ebc5399374038bc6a0a… Patch: https://github.com/kamailio/kamailio/commit/fc9ca0fcdff7ebc5399374038bc6a0a… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index f597086d92..f11d56baeb 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -1380,7 +1380,7 @@ static int attr_hdr_body2attrs2(struct sip_msg* msg, char* header_, char* prefix static int attr_hdr_body2attrs_fixup(void **param, int param_no) { char *c, *params; - hdr_name_t *h; + hdr_name_t *h = NULL; int n; str *s; if(param_no == 1) { @@ -1427,6 +1427,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) LOG(L_ERR, "attr_hdr_body2attrs_fixup: bad field param " "modifier near '%s'\n", params); + pkg_free(h); return E_CFG; } params++; @@ -1434,6 +1435,7 @@ static int attr_hdr_body2attrs_fixup(void **param, int param_no) if(!h->val_types) { LOG(L_ERR, "attr_hdr_body2attrs_fixup: no field param modifier " "specified\n"); + pkg_free(h); return E_CFG; } } else {

1 0

git:5.1:f7b7ef94: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 09 Oct '19

09 Oct '19

Module: kamailio Branch: 5.1 Commit: f7b7ef940083fc53228c3de1c091496daaefaaf8 URL: https://github.com/kamailio/kamailio/commit/f7b7ef940083fc53228c3de1c091496… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-09T18:01:43+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/f7b7ef940083fc53228c3de1c091496… Patch: https://github.com/kamailio/kamailio/commit/f7b7ef940083fc53228c3de1c091496… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 60b458d189..f68ae5a9f2 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -92,6 +92,10 @@ Chapter 1. Admin Guide routing block configurations. It adds new features similar to the textops module (textops eXtentions). + Note: If you add or remove message parts (header, body etc..) it may be + required to execute msg_apply_changes() from this module if there are + other operations done on the SIP message later on. + 2. Functions 2.1. msg_apply_changes()

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2019