sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
302 discussions

git:4.2:2862a721: kex: fix some pkg.stats value for PROC_NOCHLDINIT rank
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: 2862a7213b6ae5b76b610af707833a61aff1d304 URL: https://github.com/kamailio/kamailio/commit/2862a7213b6ae5b76b610af707833a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:29:11+02:00 kex: fix some pkg.stats value for PROC_NOCHLDINIT rank - initialization of stats cannot be executed in child_init() for such case, do it with first rpc request (cherry picked from commit 6fc4065f56d2d7929494f0e6f3dfcdb80ef0a4ec) (cherry picked from commit b63dd52685970914e11c670bae5ac6b2191595f1) --- Modified: modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/2862a7213b6ae5b76b610af707833a6… Patch: https://github.com/kamailio/kamailio/commit/2862a7213b6ae5b76b610af707833a6… --- diff --git a/modules/kex/pkg_stats.c b/modules/kex/pkg_stats.c index 9e87c42..035d528 100644 --- a/modules/kex/pkg_stats.c +++ b/modules/kex/pkg_stats.c @@ -33,6 +33,7 @@ #include "../../dprint.h" #include "../../ut.h" #include "../../pt.h" +#include "../../sr_module.h" #include "../../events.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" @@ -234,6 +235,11 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Internal error creating rpc"); return; } + if(_pkg_proc_stats_list[i].pid==0) { + _pkg_proc_stats_list[i].pid = pt[i].pid; + _pkg_proc_stats_list[i].total_size = _pkg_proc_stats_list[0].total_size; + _pkg_proc_stats_list[i].rank = PROC_NOCHLDINIT; + } if(rpc->struct_add(th, "dddddddd", "entry", i, "pid", _pkg_proc_stats_list[i].pid,

1 0

git:4.2:6f9168a7: usrloc: use domain for testing db if use_domain parameter is set
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.2 Commit: 6f9168a7859edd260465253cbfa7b0ad4b04c19b URL: https://github.com/kamailio/kamailio/commit/6f9168a7859edd260465253cbfa7b0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:27:52+02:00 usrloc: use domain for testing db if use_domain parameter is set - rework from the patch by Erik Davidson, GH#161 (cherry picked from commit 7afe76191e9757770d2933e8c26f305c6ed388a3) --- Modified: modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/6f9168a7859edd260465253cbfa7b0a… Patch: https://github.com/kamailio/kamailio/commit/6f9168a7859edd260465253cbfa7b0a… --- diff --git a/modules/usrloc/udomain.c b/modules/usrloc/udomain.c index dca72cd..fb165ac 100644 --- a/modules/usrloc/udomain.c +++ b/modules/usrloc/udomain.c @@ -887,23 +887,30 @@ int db_timer_udomain(udomain_t* _d) */ int testdb_udomain(db1_con_t* con, udomain_t* d) { - db_key_t key[1], col[1]; - db_val_t val[1]; + db_key_t key[2], col[1]; + db_val_t val[2]; db1_res_t* res = NULL; - if (ul_dbf.use_table(con, d->name) < 0) { + if(ul_dbf.use_table(con, d->name) < 0) { LM_ERR("failed to change table\n"); return -1; } key[0] = &user_col; + key[1] = &domain_col; col[0] = &user_col; + VAL_TYPE(val) = DB1_STRING; VAL_NULL(val) = 0; VAL_STRING(val) = "dummy_user"; - if (ul_dbf.query( con, key, 0, val, col, 1, 1, 0, &res) < 0) { + VAL_TYPE(val+1) = DB1_STRING; + VAL_NULL(val+1) = 0; + VAL_STRING(val+1) = "dummy_domain"; + + if(ul_dbf.query(con, key, 0, val, col, (use_domain)?2:1, 1, 0, &res)<0) { + if(res) ul_dbf.free_result( con, res); LM_ERR("failure in db_query\n"); return -1; }

1 0

git:master:eba5c3b8: modules: regenerated the readme from docbook for several modules
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: master Commit: eba5c3b8c30ef1409e3cc183538e9da3f9600288 URL: https://github.com/kamailio/kamailio/commit/eba5c3b8c30ef1409e3cc183538e9da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:17:39+02:00 modules: regenerated the readme from docbook for several modules --- Modified: modules/debugger/README Modified: modules/dispatcher/README Modified: modules/p_usrloc/README Modified: modules/pdb/README Modified: modules/permissions/README Modified: modules/rtpengine/README Modified: modules/smsops/README Modified: modules/tmx/README --- Diff: https://github.com/kamailio/kamailio/commit/eba5c3b8c30ef1409e3cc183538e9da… Patch: https://github.com/kamailio/kamailio/commit/eba5c3b8c30ef1409e3cc183538e9da…

1 0

git:4.3:4717b5bd: tm: readme regenerated
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.3 Commit: 4717b5bdf9701bbe39a315cfe9ea6cf57a2f4ebd URL: https://github.com/kamailio/kamailio/commit/4717b5bdf9701bbe39a315cfe9ea6cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:16:40+02:00 tm: readme regenerated --- Modified: modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/4717b5bdf9701bbe39a315cfe9ea6cf… Patch: https://github.com/kamailio/kamailio/commit/4717b5bdf9701bbe39a315cfe9ea6cf…

1 0

git:4.3:03faa73e: pv: readme regenerated
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.3 Commit: 03faa73eff6c341b0f49989a11478ec0b92b611e URL: https://github.com/kamailio/kamailio/commit/03faa73eff6c341b0f49989a11478ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:16:23+02:00 pv: readme regenerated --- Modified: modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/03faa73eff6c341b0f49989a11478ec… Patch: https://github.com/kamailio/kamailio/commit/03faa73eff6c341b0f49989a11478ec… --- diff --git a/modules/pv/README b/modules/pv/README index 9cab590..ae85063 100644 --- a/modules/pv/README +++ b/modules/pv/README @@ -45,6 +45,7 @@ Daniel-Constantin Mierla 4.7. sbranch_set_ruri() 4.8. sbranch_append() 4.9. sbranch_reset() + 4.10. pv_xavp_print() 5. MI Commands @@ -70,8 +71,9 @@ Daniel-Constantin Mierla 1.10. sbranch_set_ruri() usage 1.11. sbranch_append() usage 1.12. sbranch_append() usage - 1.13. shv_set usage - 1.14. shv_get usage + 1.13. pv_xavp_print() usage + 1.14. shv_set usage + 1.15. shv_get usage Chapter 1. Admin Guide @@ -100,6 +102,7 @@ Chapter 1. Admin Guide 4.7. sbranch_set_ruri() 4.8. sbranch_append() 4.9. sbranch_reset() + 4.10. pv_xavp_print() 5. MI Commands @@ -203,6 +206,7 @@ modparam("pv","avp_aliases","email=s:email_addr;tmp=i:100") 4.7. sbranch_set_ruri() 4.8. sbranch_append() 4.9. sbranch_reset() + 4.10. pv_xavp_print() 4.1. pv_isset(pvar) @@ -352,6 +356,17 @@ sbranch_append(); sbranch_reset(); ... +4.10. pv_xavp_print() + + Print all XAVPs to the syslog using INFO log level. + + Function can be used from ANY_ROUTE. + + Example 1.13. pv_xavp_print() usage +... +pv_xavp_print(); +... + 5. MI Commands 5.1. shv_set @@ -375,7 +390,7 @@ sbranch_reset(); _value_ _empty_line_ - Example 1.13. shv_set usage + Example 1.14. shv_set usage ... $ kamctl fifo shv_set debug int 0 ... @@ -393,7 +408,7 @@ $ kamctl fifo shv_set debug int 0 _name_ _empty_line_ - Example 1.14. shv_get usage + Example 1.15. shv_get usage ... $ kamctl fifo shv_get debug $ kamctl fifo shv_get

1 0

git:4.3:40a66072: pipelimit: regenerated the readme
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.3 Commit: 40a66072179da324859864af8caee654e5c143e5 URL: https://github.com/kamailio/kamailio/commit/40a66072179da324859864af8caee65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:15:59+02:00 pipelimit: regenerated the readme --- Modified: modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/40a66072179da324859864af8caee65… Patch: https://github.com/kamailio/kamailio/commit/40a66072179da324859864af8caee65…

1 0

git:4.3:4c7e676c: tm: added note in docs for t_set_no_e2e_cancel_reason()
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.3 Commit: 4c7e676cdec3213c27cc689bdb5e6bbb8a9ec1ea URL: https://github.com/kamailio/kamailio/commit/4c7e676cdec3213c27cc689bdb5e6bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:12:17+02:00 tm: added note in docs for t_set_no_e2e_cancel_reason() - it has to be used when processing the INVITE (cherry picked from commit e5f472ca5d8d2e16adb8b5a5a316521a618c8d9f) --- Modified: modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/4c7e676cdec3213c27cc689bdb5e6bb… Patch: https://github.com/kamailio/kamailio/commit/4c7e676cdec3213c27cc689bdb5e6bb… --- diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index 5146d40..217a5a2 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -1665,6 +1665,10 @@ t_relay_to("0x01"); parameter) for the current transaction. </para> <para> + Note: the function has to be used when processing the INVITE + (not when processing the CANCEL). + </para> + <para> See also: <varname>e2e_cancel_reason</varname>. </para> <example>

1 0

git:4.3:64028d65: permissions: check if hash tables exist for address config functions
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.3 Commit: 64028d658a788b74f6f9c71f2e2aa3b0b5a1c803 URL: https://github.com/kamailio/kamailio/commit/64028d658a788b74f6f9c71f2e2aa3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:12:08+02:00 permissions: check if hash tables exist for address config functions - reported by Olle E. Johansson, GH#248 (cherry picked from commit 6fcd35ba5bb71df680b89c2bafceccde0439b6f1) --- Modified: modules/permissions/address.c --- Diff: https://github.com/kamailio/kamailio/commit/64028d658a788b74f6f9c71f2e2aa3b… Patch: https://github.com/kamailio/kamailio/commit/64028d658a788b74f6f9c71f2e2aa3b…

1 0

git:4.3:cb4f55b2: rr: fix detecting next strict router
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.3 Commit: cb4f55b26f51a929b2db08373c1b97a95b8ad6a6 URL: https://github.com/kamailio/kamailio/commit/cb4f55b26f51a929b2db08373c1b97a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:11:51+02:00 rr: fix detecting next strict router - a regression after adding support for sip-outbound - more verbose debug messages - reported by Antonio Real, GH #267 (cherry picked from commit 0c42a848258d475f57ea25458bc75e55dcee948d) --- Modified: modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/cb4f55b26f51a929b2db08373c1b97a… Patch: https://github.com/kamailio/kamailio/commit/cb4f55b26f51a929b2db08373c1b97a… --- diff --git a/modules/rr/loose.c b/modules/rr/loose.c index de06bb3..76204c9 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -757,7 +757,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) int status = RR_DRIVEN; str uri; struct socket_info *si; - int uri_is_myself, next_is_strict; + int uri_is_myself; int use_ob = 0; hdr = _m->route; @@ -768,11 +768,11 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) routed_msg_id = 0; if (parse_uri(uri.s, uri.len, &puri) < 0) { - LM_ERR("failed to parse the first route URI\n"); + LM_ERR("failed to parse the first route URI (%.*s)\n", + uri.len, ZSW(uri.s)); return RR_ERROR; } - next_is_strict = is_strict(&puri.params); routed_params = puri.params; uri_is_myself = is_myself(&puri); @@ -815,7 +815,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) /* double route may occure due different IP and port, so force as * send interface the one advertise in second Route */ if (parse_uri(rt->nameaddr.uri.s,rt->nameaddr.uri.len,&puri)<0) { - LM_ERR("failed to parse the double route URI\n"); + LM_ERR("failed to parse the double route URI (%.*s)\n", + rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); return RR_ERROR; } @@ -852,7 +853,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) uri = rt->nameaddr.uri; if (parse_uri(uri.s, uri.len, &puri) < 0) { - LM_ERR("failed to parse the first route URI\n"); + LM_ERR("failed to parse the next route URI (%.*s)\n", + uri.len, ZSW(uri.s)); return RR_ERROR; } } else { @@ -867,7 +869,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } LM_DBG("URI to be processed: '%.*s'\n", uri.len, ZSW(uri.s)); - if (next_is_strict) { + if (is_strict(&puri.params)) { LM_DBG("Next URI is a strict router\n"); if (handle_sr(_m, hdr, rt) < 0) { LM_ERR("failed to handle strict router\n");

1 0

git:4.3:5db29ed5: permissions: safety check if hash tables exist for rpc dump commands
by Daniel-Constantin Mierla 29 Jul '15

29 Jul '15

Module: kamailio Branch: 4.3 Commit: 5db29ed56f2a682861e34a455ae76e0d43b4ff4c URL: https://github.com/kamailio/kamailio/commit/5db29ed56f2a682861e34a455ae76e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-29T12:11:59+02:00 permissions: safety check if hash tables exist for rpc dump commands - reported by Olle E. Johansson, GH#248 (cherry picked from commit 56e41533cae52cf5f782064ed23393d2d18aff08) --- Modified: modules/permissions/mi.c --- Diff: https://github.com/kamailio/kamailio/commit/5db29ed56f2a682861e34a455ae76e0… Patch: https://github.com/kamailio/kamailio/commit/5db29ed56f2a682861e34a455ae76e0… --- diff --git a/modules/permissions/mi.c b/modules/permissions/mi.c index 35f2cca..844a86e 100644 --- a/modules/permissions/mi.c +++ b/modules/permissions/mi.c @@ -92,7 +92,7 @@ struct mi_root* mi_trusted_dump(struct mi_root *cmd_tree, void *param) void rpc_trusted_dump(rpc_t* rpc, void* c) { if (hash_table==NULL) { - rpc->fault(c, 500, "Reload failed. No trusted table"); + rpc->fault(c, 500, "No trusted table"); return; } @@ -154,6 +154,10 @@ struct mi_root* mi_address_dump(struct mi_root *cmd_tree, void *param) */ void rpc_address_dump(rpc_t* rpc, void* c) { + if(addr_hash_table==NULL) { + rpc->fault(c, 500, "No address table"); + return; + } if(addr_hash_table_rpc_print(*addr_hash_table, rpc, c) < 0 ) { LM_DBG("failed to print a subnet_table dump\n"); } @@ -185,6 +189,10 @@ struct mi_root* mi_subnet_dump(struct mi_root *cmd_tree, void *param) * RPC function to dump subnet table */ void rpc_subnet_dump(rpc_t* rpc, void* c) { + if(subnet_table==NULL) { + rpc->fault(c, 500, "No subnet table"); + return; + } if(subnet_table_rpc_print(*subnet_table, rpc, c) < 0) { LM_DBG("failed to print a subnet_table dump\n"); } @@ -217,6 +225,10 @@ struct mi_root* mi_domain_name_dump(struct mi_root *cmd_tree, void *param) */ void rpc_domain_name_dump(rpc_t* rpc, void* c) { + if(domain_list_table==NULL) { + rpc->fault(c, 500, "No domain list table"); + return; + } if ( domain_name_table_rpc_print(*domain_list_table, rpc, c) < 0 ) { LM_DBG("failed to print a subnet_table dump\n"); }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2015