sr-dev July 2014

sr-dev@lists.kamailio.org

25 participants
141 discussions

git:master: htable: debug message to show initialization of hash table structures
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: 213ad230a87638bbd0f1591c8b7cefdd4e6b1fd3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=213ad23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 14:43:45 2014 +0200 htable: debug message to show initialization of hash table structures --- modules/htable/ht_api.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/htable/ht_api.c b/modules/htable/ht_api.c index 1acdf50..f5232cb 100644 --- a/modules/htable/ht_api.c +++ b/modules/htable/ht_api.c @@ -276,6 +276,8 @@ int ht_init_tables(void) while(ht) { + LM_DBG("initializing htable [%.*s] with nr. of slots: %d\n", + ht->name.len, ht->name.s, ht->htsize); ht->entries = (ht_entry_t*)shm_malloc(ht->htsize*sizeof(ht_entry_t)); if(ht->entries==NULL) {

1 0

git:master: userblacklist: added check_whitelist function
by Lucian Balaceanu 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: 4b335f6419468d6873ce314221b2b786ae64366a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b335f6… Author: Pawel Kuzak <pawel.kuzak(a)1und1.de> Committer: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: Fri Jul 25 14:28:48 2014 +0300 userblacklist: added check_whitelist function - check_whitelist(string table) finds the longest prefix that matches the request URI for the given table and returns true if the match is set to whitelist --- modules/userblacklist/README | 60 +++++++++++++------- modules/userblacklist/doc/userblacklist_admin.xml | 21 +++++++ modules/userblacklist/userblacklist.c | 47 ++++++++++++++++ 3 files changed, 107 insertions(+), 21 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4b3…

1 0

git:master: nosip: fixed compile warnings related to unused variables
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: adae5dc02c0c1f0537546ec0a855d40e8a75ff10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=adae5dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 13:30:46 2014 +0200 nosip: fixed compile warnings related to unused variables --- modules/nosip/nosip_mod.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/nosip/nosip_mod.c b/modules/nosip/nosip_mod.c index b0c7469..d8c3ad6 100644 --- a/modules/nosip/nosip_mod.c +++ b/modules/nosip/nosip_mod.c @@ -149,8 +149,6 @@ static int pv_get_nosip(sip_msg_t *msg, pv_param_t *param, static int nosip_rcv_msg(void *data) { sip_msg_t* msg; - char* fake_msg; - int fake_msg_len; regmatch_t pmatch; char c; struct run_act_ctx ra_ctx;

1 0

git:master: nosip: removed unused function prototype
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: 0ae40714ef85da45863b5af8409856787501b4c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ae4071… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 13:29:22 2014 +0200 nosip: removed unused function prototype --- modules/nosip/nosip_mod.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/nosip/nosip_mod.c b/modules/nosip/nosip_mod.c index 43fa760..b0c7469 100644 --- a/modules/nosip/nosip_mod.c +++ b/modules/nosip/nosip_mod.c @@ -40,7 +40,6 @@ MODULE_VERSION static int nosip_rcv_msg(void* data); -static int nosip_handler(sip_msg_t* msg); static int mod_init(void); static int pv_get_nosip(struct sip_msg *msg, pv_param_t *param,

1 0

git:master: tm: check the length of uri param for t_replicate
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: 8bde82a2b85d22caf6d0cc36be2a1736ff1aad21 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bde82a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 13:00:16 2014 +0200 tm: check the length of uri param for t_replicate - if emtpty string is given, then parameter is ignored and address of next hop is taken from r-uri or dst-uri --- modules/tm/tm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 48076f3..5b92055 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -1610,7 +1610,7 @@ int t_replicate_uri(struct sip_msg *msg, str *suri) struct sip_uri turi; int r = -1; - if (suri != NULL && suri->s != NULL) + if (suri != NULL && suri->s != NULL && suri->len > 0) { memset(&turi, 0, sizeof(struct sip_uri)); if(parse_uri(suri->s, suri->len, &turi)!=0)

1 0

[tracker] Comment added: PARAM_STR vs STR_PARAM
by sip-router 25 Jul '14

25 Jul '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#453 - PARAM_STR vs STR_PARAM User who did this - Daniel-Constantin Mierla (miconda) ---------- Thanks, going to take care of them very soon! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=453#comment1558 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: auth_db: proper condition for caller id skip check flag
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: bb1a5ba30b3d6ba98696844899a61b7df3bc0cc4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb1a5ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 12:41:52 2014 +0200 auth_db: proper condition for caller id skip check flag --- modules/auth_db/authorize.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/auth_db/authorize.c b/modules/auth_db/authorize.c index 95a8a3e..b3700f2 100644 --- a/modules/auth_db/authorize.c +++ b/modules/auth_db/authorize.c @@ -506,10 +506,10 @@ int auth_check(struct sip_msg* _m, char* _realm, char* _table, char *_flags) } else { uri = furi; } - if((iflags&AUTH_CHECK_SKIPFWD_F) + if(!((iflags&AUTH_CHECK_SKIPFWD_F) && (_m->REQ_METHOD==METHOD_INVITE || _m->REQ_METHOD==METHOD_BYE || _m->REQ_METHOD==METHOD_PRACK || _m->REQ_METHOD==METHOD_UPDATE - || _m->REQ_METHOD==METHOD_MESSAGE)) { + || _m->REQ_METHOD==METHOD_MESSAGE))) { if(srealm.len!=uri->user.len || strncmp(srealm.s, uri->user.s, srealm.len)!=0) return AUTH_USER_MISMATCH;

1 0

git:master: auth_db: note about the new flag to skip caller id check for auth_check()
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: b96c2d43c686f64b1fd54c7fc9ba01f8a1a2ad37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b96c2d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 12:29:50 2014 +0200 auth_db: note about the new flag to skip caller id check for auth_check() --- modules/auth_db/README | 52 +++++++++++++++++---------------- modules/auth_db/doc/auth_db_admin.xml | 4 ++- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/modules/auth_db/README b/modules/auth_db/README index 4076d19..657ab58 100644 --- a/modules/auth_db/README +++ b/modules/auth_db/README @@ -24,9 +24,9 @@ Jan Janak <jan(a)iptel.org> - Copyright © 2002, 2003 FhG FOKUS + Copyright � 2002, 2003 FhG FOKUS - Copyright © 2005 Voice Sistem SRL + Copyright � 2005 Voice Sistem SRL __________________________________________________________________ Table of Contents @@ -154,7 +154,7 @@ Chapter 1. Admin Guide For dbtext module (which stores data in plaintext files) it is directory in which the database resides. - Default value is “mysql://kamailioro:kamailioro@localhost/kamailio”. + Default value is "mysql://kamailioro:kamailioro@localhost/kamailio". Example 1.1. db_url parameter usage ... @@ -166,7 +166,7 @@ modparam("auth_db", "db_url", "dbdriver://username:password@dbhost/dbname") This is the name of the column holding usernames. Default value is fine for most people. Use the parameter if you really need to change it. - Default value is “username”. + Default value is "username". Example 1.2. user_column parameter usage ... @@ -179,7 +179,7 @@ modparam("auth_db", "user_column", "user") is fine for most people. Use the parameter if you really need to change it. - Default value is “domain”. + Default value is "domain". Example 1.3. domain_column parameter usage ... @@ -194,7 +194,7 @@ modparam("auth_db", "domain_column", "domain") safe because the server doesn't need to know plaintext passwords and they cannot be obtained from HA1 strings. - Default value is “ha1”. + Default value is "ha1". Example 1.4. password_column parameter usage ... @@ -222,16 +222,16 @@ modparam("auth_db", "password_column_2", "ha1_2") HA1 string or plaintext passwords for authentification. If the parameter is set to 0 and the username parameter of credentials - contains also “@domain” (some user agents append the domain to the + contains also "@domain" (some user agents append the domain to the username parameter), then the server will use the HA1 values from the - column specified in the “password_column_2” parameter. If the username + column specified in the "password_column_2" parameter. If the username parameter doesn't contain a domain, the server will use the HA1 values - from the column given in the “password_column”parameter. + from the column given in the "password_column"parameter. If the parameter is set to 1 then the HA1 value will be calculated from - the column specified in the “password_column” parameter. + the column specified in the "password_column" parameter. - The “password_column_2”column contain also HA1 strings but they should + The "password_column_2"column contain also HA1 strings but they should be calculated including the domain in the username parameter (as opposed to password_column which (when containing HA1 strings) should always contains HA1 strings calculated without domain in username. @@ -257,7 +257,7 @@ modparam("auth_db", "calculate_ha1", 1) IMPORTANT: before turning on this parameter, be sure that the domain column in subscriber table is properly populated. - Default value is “0 (false)”. + Default value is "0 (false)". Example 1.7. use_domain parameter usage ... @@ -276,7 +276,7 @@ modparam("auth_db", "use_domain", 1) * credential = (avp_specification '=' column_name) | (column_name) * avp_specification = '$avp(' + 'i:'ID | 's:'NAME | alias + ')' - Default value of this parameter is “rpid”. + Default value of this parameter is "rpid". Example 1.8. load_credentials parameter usage ... @@ -290,7 +290,7 @@ modparam("auth_db", "load_credentials", "$avp(i:123)=rpid;email_address") If set to 0, the module will skip checking the version for subscriber table. - Default value is “1 (check for table version)”. + Default value is "1 (check for table version)". Example 1.9. version_table parameter usage ... @@ -306,7 +306,7 @@ modparam("auth_db", "version_table", 0) 4.5. auth_check(realm, table, flags) 4.6. is_subscriber(uri, dbtable, flags) -4.1. www_authenticate(realm, table [, method]) +4.1. www_authenticate(realm, table [, method]) Name alias: www_authorize(realm, table) @@ -335,7 +335,7 @@ modparam("auth_db", "version_table", 0) * realm - Realm is a opaque string that the user agent should present to the user so he can decide what username and password to use. Usually this is domain of the host the server is running on. - It must not be empty string “”. In case of REGISTER requests To + It must not be empty string "". In case of REGISTER requests To header field domain (e.g., variable $td) can be used (because this header field represents the user being registered), for all other messages From header field domain can be used (e.g., variable $fd). @@ -354,13 +354,13 @@ if (!www_authorize("kamailio.org", "subscriber")) { }; ... -4.2. www_authorize(realm, table) +4.2. www_authorize(realm, table) It is same function as www_authenticate(realm, table). This name is kept for backward compatibility, since it was named this way first time by it actually does user authentication. -4.3. proxy_authenticate(realm, table) +4.3. proxy_authenticate(realm, table) Name alias: proxy_authorize(realm, table) @@ -377,9 +377,9 @@ if (!www_authorize("kamailio.org", "subscriber")) { * realm - Realm is a opaque string that the user agent should present to the user so he can decide what username and password to use. Usually this is domain of the host the server is running on. - It must not be empty string “”. Apart of a static string, typical + It must not be empty string "". Apart of a static string, typical value is From header field domain (e.g., variable $fd). - If an empty string “” is used then the server will generate it from + If an empty string "" is used then the server will generate it from the request. From header field domain will be used as realm. The string may contain pseudo variables. * table - Table to be used to lookup usernames and passwords (usually @@ -394,13 +394,13 @@ if (!proxy_authorize("$fd", "subscriber)) { }; ... -4.4. proxy_authorize(realm, table) +4.4. proxy_authorize(realm, table) It is same function as proxy_authenticate(realm, table). This name is kept for backward compatibility, since it was named this way first time but it actually does user authentication. -4.5. auth_check(realm, table, flags) +4.5. auth_check(realm, table, flags) The function combines the functionalities of www_authenticate and proxy_authenticate, first being exectuted if the SIP request is a @@ -416,7 +416,7 @@ if (!proxy_authorize("$fd", "subscriber)) { * realm - Realm is a opaque string that the user agent should present to the user so he can decide what username and password to use. Usually this is domain of the host the server is running on. - It must not be empty string “”. Apart of a static string, typical + It must not be empty string "". Apart of a static string, typical value is From header field domain (e.g., variable $fd). The string may contain pseudo variables. * table - Table to be used to lookup usernames and passwords (usually @@ -428,7 +428,9 @@ if (!proxy_authorize("$fd", "subscriber)) { requests: From and To must match the authentication user. PUBLISH requests: From, To and Request-URI must match the authentication user. All other requests: From header must match the authentication - user. + user. If bit 2 is set as well (flags==3), the ID check is skipped + for INVITE, BYE, PRACK, UPDATE, MESSAGE - these requests can come + with anonymoys caller id. Additionally all domains in the checked URIs and the realm in the authentication header will be checked to match the provided realm parameter. @@ -444,7 +446,7 @@ if (!auth_check("$fd", "subscriber", "1")) { } ... -4.6. is_subscriber(uri, dbtable, flags) +4.6. is_subscriber(uri, dbtable, flags) The function checks if there is a subscriber corresponding to the AoR in uri parameter. It uses same database connection as for diff --git a/modules/auth_db/doc/auth_db_admin.xml b/modules/auth_db/doc/auth_db_admin.xml index 246d532..88d845a 100644 --- a/modules/auth_db/doc/auth_db_admin.xml +++ b/modules/auth_db/doc/auth_db_admin.xml @@ -527,7 +527,9 @@ if (!proxy_authorize("$fd", "subscriber)) { From header username. REGISTER requests: From and To must match the authentication user. PUBLISH requests: From, To and Request-URI must match the authentication user. All other requests: From header must - match the authentication user. + match the authentication user. If bit 2 is set as well (flags==3), + the ID check is skipped for INVITE, BYE, PRACK, UPDATE, MESSAGE + - these requests can come with anonymoys caller id. </para> <para> Additionally all domains in the checked URIs and the realm in the

1 0

git:master: auth_db: new flag for auth_check() to skip caller id check for forwarding requests
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: 8c98ff6472adf4a1aad986913de86bf3c262810f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c98ff6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 12:25:23 2014 +0200 auth_db: new flag for auth_check() to skip caller id check for forwarding requests - caller id check is skipped for INVITE, BYE, PRACK, UPDATE, MESSAGE -- these requests can come with an anonymous caller id --- modules/auth/api.h | 1 + modules/auth_db/authorize.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/auth/api.h b/modules/auth/api.h index a180155..dadf3b5 100644 --- a/modules/auth/api.h +++ b/modules/auth/api.h @@ -60,6 +60,7 @@ typedef enum auth_cfg_result { * flags for checks in auth functions */ #define AUTH_CHECK_ID_F 1<<0 +#define AUTH_CHECK_SKIPFWD_F 1<<1 /** * return codes to auth API functions diff --git a/modules/auth_db/authorize.c b/modules/auth_db/authorize.c index d99c0bb..95a8a3e 100644 --- a/modules/auth_db/authorize.c +++ b/modules/auth_db/authorize.c @@ -506,9 +506,14 @@ int auth_check(struct sip_msg* _m, char* _realm, char* _table, char *_flags) } else { uri = furi; } - if(srealm.len!=uri->user.len - || strncmp(srealm.s, uri->user.s, srealm.len)!=0) - return AUTH_USER_MISMATCH; + if((iflags&AUTH_CHECK_SKIPFWD_F) + && (_m->REQ_METHOD==METHOD_INVITE || _m->REQ_METHOD==METHOD_BYE + || _m->REQ_METHOD==METHOD_PRACK || _m->REQ_METHOD==METHOD_UPDATE + || _m->REQ_METHOD==METHOD_MESSAGE)) { + if(srealm.len!=uri->user.len + || strncmp(srealm.s, uri->user.s, srealm.len)!=0) + return AUTH_USER_MISMATCH; + } if(_m->REQ_METHOD==METHOD_REGISTER || _m->REQ_METHOD==METHOD_PUBLISH) { /* check from==to */

1 0

git:master: tm: docs - added note about t_replicate() without params
by Daniel-Constantin Mierla 25 Jul '14

25 Jul '14

Module: sip-router Branch: master Commit: 1be7c3ebc9b29046c023290ad580bb83c3e6e44d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1be7c3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 25 12:01:37 2014 +0200 tm: docs - added note about t_replicate() without params --- modules/tm/README | 17 +++++++++-------- modules/tm/doc/functions.xml | 7 ++++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/tm/README b/modules/tm/README index c2a0a2e..5ca25af 100644 --- a/modules/tm/README +++ b/modules/tm/README @@ -115,7 +115,7 @@ Juha Heinanen 5.43. t_set_disable_6xx(0|1) 5.44. t_set_disable_failover(0|1) 5.45. t_set_disable_internal_reply(0|1) - 5.46. t_replicate(params) + 5.46. t_replicate([params]) 5.47. t_relay_to(proxy, flags) 5.48. t_set_no_e2e_cancel_reason(0|1) 5.49. t_is_set(target) @@ -227,7 +227,7 @@ Juha Heinanen 1.82. t_set_disable_failover usage 1.83. t_set_disable_internal_reply usage 1.84. t_replicate usage - 1.85. t_replicate usage + 1.85. t_relay_to usage 1.86. t_set_no_e2e_cancel_reason usage 1.87. t_replicate usage 1.88. t_use_uac_headers usage @@ -335,7 +335,7 @@ Chapter 1. Admin Guide 5.43. t_set_disable_6xx(0|1) 5.44. t_set_disable_failover(0|1) 5.45. t_set_disable_internal_reply(0|1) - 5.46. t_replicate(params) + 5.46. t_replicate([params]) 5.47. t_relay_to(proxy, flags) 5.48. t_set_no_e2e_cancel_reason(0|1) 5.49. t_is_set(target) @@ -1605,7 +1605,7 @@ modparam("tm", "dns_reuse_rcv_socket", 1) 5.43. t_set_disable_6xx(0|1) 5.44. t_set_disable_failover(0|1) 5.45. t_set_disable_internal_reply(0|1) - 5.46. t_replicate(params) + 5.46. t_replicate([params]) 5.47. t_relay_to(proxy, flags) 5.48. t_set_no_e2e_cancel_reason(0|1) 5.49. t_is_set(target) @@ -2547,12 +2547,12 @@ if(!t_relay()) { } ... -5.46. t_replicate(params) +5.46. t_replicate([params]) Replicate the SIP request to a specific address. There are several function prototypes: - * t_replicate(uri), + * t_replicate([uri]), * t_replicate(host, port), * t_replicate_udp(host, port) * t_replicate_tcp(host, port) @@ -2562,7 +2562,8 @@ if(!t_relay()) { Meaning of the parameters is as follows: * uri - SIP URI where the message should be sent. It can be given via - a script variable. + a script variable. It is optional - when missing, the dst-uri or + r-uri are used as next hop address. * host - host address where the message should be sent. * port - port number. * proto - transport protocol to be used. @@ -2603,7 +2604,7 @@ t_replicate_to_udp("1.2.3.4", "5060"); + 0x02 - do not generate reply on internal error. + 0x04 - disable dns failover. - Example 1.85. t_replicate usage + Example 1.85. t_relay_to usage ... # sent to 1.2.3.4:5060 over tcp t_relay_to("tcp:1.2.3.4:5060"); diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index 25d2507..84751cc 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -1490,7 +1490,7 @@ if(!t_relay()) { <section id="tm.f.t_replicate"> <title> - <function>t_replicate(params)</function> + <function>t_replicate([params])</function> </title> <para> Replicate the SIP request to a specific address. @@ -1499,7 +1499,7 @@ if(!t_relay()) { There are several function prototypes: <itemizedlist> <listitem><para> - <function>t_replicate(uri)</function>, + <function>t_replicate([uri])</function>, </para></listitem> <listitem><para> <function>t_replicate(host, port)</function>, @@ -1525,7 +1525,8 @@ if(!t_relay()) { <itemizedlist> <listitem> <para><emphasis>uri</emphasis> - SIP URI where the message should be sent. - It can be given via a script variable. + It can be given via a script variable. It is optional - when missing, the + dst-uri or r-uri are used as next hop address. </para> </listitem> <listitem>

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
15
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 2014