sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
376 discussions

Re: [sr-dev] updated patch for dbtext
by Luis Azedo 08 Sep '14

08 Sep '14

Hi Daniel, yes i see this all the time, timers are set to 10 seconds and we get it all the time. available memory is also decreasing. problem is always from Process:: ID=51 PID=7018 Type=slow timer which is the one that has the two registered timers. i believe that this process is sharing the connection for these two timers, right ? Sep 8 19:56:08 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:56:18 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:56:28 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:56:38 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:56:48 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:56:58 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:57:08 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:57:18 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:57:28 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:57:38 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:57:48 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:57:58 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:58:08 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:58:18 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:58:28 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:58:38 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:58:48 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:58:58 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:59:08 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:59:18 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:59:28 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:59:38 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:59:48 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 19:59:58 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 20:00:08 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 20:00:18 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 20:00:28 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 20:00:38 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 20:00:48 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure Sep 8 20:00:58 sipproxy-03 kamailio[7018]: ERROR: db_text [dbt_base.c:150]: dbt_free_result(): unable to free internal structure

2 1

git:master: pv: new variable $su to return source address in uri format
by Daniel-Constantin Mierla 08 Sep '14

08 Sep '14

Module: sip-router Branch: master Commit: 9a46452cf724457edeea2cd0fd88a6652d22a61d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a46452… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 8 18:45:52 2014 +0200 pv: new variable $su to return source address in uri format - $su is expanded "sip:$si:$sp;transport=$pr" - example: "sip:127.0.0.1:5060;transport=udp" --- modules/pv/pv.c | 3 ++ modules/pv/pv_core.c | 91 ++++++++++++++++++++++++++++++++++--------------- modules/pv/pv_core.h | 3 ++ 3 files changed, 69 insertions(+), 28 deletions(-) diff --git a/modules/pv/pv.c b/modules/pv/pv.c index 02726e2..53edc38 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -373,6 +373,9 @@ static pv_export_t mod_pvs[] = { {{"sp", (sizeof("sp")-1)}, /* */ PVT_OTHER, pv_get_srcport, 0, 0, 0, 0, 0}, + {{"su", (sizeof("su")-1)}, /* */ + PVT_OTHER, pv_get_srcaddr_uri, 0, + 0, 0, 0, 0}, {{"td", (sizeof("td")-1)}, /* */ PVT_OTHER, pv_get_to_attr, pv_set_to_domain, 0, 0, pv_init_iname, 3}, diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index c0943e8..724ceb8 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -112,6 +112,37 @@ int pv_get_return_code(struct sip_msg *msg, pv_param_t *param, } */ +int pv_get_known_proto_string(int proto, str *sproto) +{ + switch(proto) { + case PROTO_UDP: + sproto->s = "udp"; + sproto->len = 3; + return 0; + case PROTO_TCP: + sproto->s = "tcp"; + sproto->len = 3; + return 0; + case PROTO_TLS: + sproto->s = "tls"; + sproto->len = 3; + return 0; + case PROTO_SCTP: + sproto->s = "sctp"; + sproto->len = 4; + return 0; + case PROTO_WS: + sproto->s = "ws"; + sproto->len = 2; + return 0; + case PROTO_WSS: + sproto->s = "wss"; + sproto->len = 3; + return 0; + } + return -1; +} + int pv_get_pid(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -660,6 +691,35 @@ int pv_get_srcport(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, msg->rcv.src_port); } +int pv_get_srcaddr_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + str sip; + str sproto; + str sr; + + if(msg==NULL) + return -1; + + if(pv_get_known_proto_string(msg->rcv.proto, &sproto)<0) + return pv_get_null(msg, param, res); + + sip.s = ip_addr2a(&msg->rcv.src_ip); + sip.len = strlen(sip.s); + if (sip.len + sproto.len + 32 >= pv_get_buffer_size()) + { + LM_ERR("local buffer size exceeded\n"); + return pv_get_null(msg, param, res); + } + + sr.s = pv_get_buffer(); + sr.len = snprintf(sr.s, pv_get_buffer_size(), + "sip:%.*s:%d;transport=%.*s", sip.len, sip.s, + msg->rcv.src_port, sproto.len, sproto.s); + + return pv_get_strval(msg, param, res, &sr); +} + int pv_get_rcvip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -1040,35 +1100,10 @@ int pv_get_proto(struct sip_msg *msg, pv_param_t *param, if(msg==NULL) return -1; - switch(msg->rcv.proto) + if(pv_get_known_proto_string(msg->rcv.proto, &s)<0) { - case PROTO_UDP: - s.s = "udp"; - s.len = 3; - break; - case PROTO_TCP: - s.s = "tcp"; - s.len = 3; - break; - case PROTO_TLS: - s.s = "tls"; - s.len = 3; - break; - case PROTO_SCTP: - s.s = "sctp"; - s.len = 4; - break; - case PROTO_WS: - s.s = "ws"; - s.len = 2; - break; - case PROTO_WSS: - s.s = "wss"; - s.len = 3; - break; - default: - s.s = "NONE"; - s.len = 4; + s.s = "NONE"; + s.len = 4; } return pv_get_strintval(msg, param, res, &s, (int)msg->rcv.proto); diff --git a/modules/pv/pv_core.h b/modules/pv/pv_core.h index a444ffe..9f2c6fc 100644 --- a/modules/pv/pv_core.h +++ b/modules/pv/pv_core.h @@ -132,6 +132,9 @@ int pv_get_srcip(struct sip_msg *msg, pv_param_t *param, int pv_get_srcport(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_srcaddr_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_rcvip(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master: dispatcher: reset whitespaces to tabs for identation
by Daniel-Constantin Mierla 08 Sep '14

08 Sep '14

Module: sip-router Branch: master Commit: 3ea4bc0b15414e0bf4b57d1f7a563ad38347d938 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ea4bc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 8 18:57:37 2014 +0200 dispatcher: reset whitespaces to tabs for identation --- modules/dispatcher/dispatch.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index 120dcdd..5538c94 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -1585,7 +1585,7 @@ static inline int ds_update_dst(struct sip_msg *msg, str *uri, int mode) */ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) { - return ds_select_dst_limit(msg, set, alg, 0, mode); + return ds_select_dst_limit(msg, set, alg, 0, mode); } int ds_select_dst_limit(struct sip_msg *msg, int set, int alg, unsigned int limit, int mode) @@ -1609,10 +1609,10 @@ int ds_select_dst_limit(struct sip_msg *msg, int set, int alg, unsigned int limi if (limit==0) { - LM_DBG("Limit set to 0 - forcing to unlimited\n"); - limit = 0xffffffff; + LM_DBG("Limit set to 0 - forcing to unlimited\n"); + limit = 0xffffffff; } - --limit; /* reserving 1 slot for selected dst */ + --limit; /* reserving 1 slot for selected dst */ if((mode==0) && (ds_force_dst==0) && (msg->dst_uri.s!=NULL || msg->dst_uri.len>0))

1 0

updated patch for dbtext
by Luis Azedo 08 Sep '14

08 Sep '14

Hi Daniel, presence seems to share the db connection on the clean functions. this leads to messages like [dbt_base.c:150]: dbt_free_result(): unable to free internal structure here is mod_init of in presence.c if(clean_period>0) { register_timer(msg_presentity_clean, 0, clean_period); register_timer(msg_watchers_clean, 0, clean_period); } i included a updated patch tested against master. please consider including it. Best

2 1

git:master: htable: documented sht_reset(...)
by Elena-Ramona Modroiu 08 Sep '14

08 Sep '14

Module: sip-router Branch: master Commit: 309b25afb335444c11d6a86efc997fc4b88fdfb4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=309b25a… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Mon Sep 8 18:43:35 2014 +0200 htable: documented sht_reset(...) --- modules/htable/README | 44 +++++++++++++++++++++++----------- modules/htable/doc/htable_admin.xml | 20 ++++++++++++++++ 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/modules/htable/README b/modules/htable/README index 31e6821..7a7c3cf 100644 --- a/modules/htable/README +++ b/modules/htable/README @@ -58,8 +58,9 @@ Ovidiu Sas 4.1. sht_print() 4.2. sht_rm_name_re(htable=>regexp) 4.3. sht_rm_value_re(htable=>regexp) - 4.4. sht_lock(htable=>key) - 4.5. sht_unlock(htable=>key) + 4.4. sht_reset(htable) + 4.5. sht_lock(htable=>key) + 4.6. sht_unlock(htable=>key) 5. Exported pseudo-variables 6. MI Commands @@ -105,8 +106,9 @@ Ovidiu Sas 1.17. sht_print usage 1.18. sht_rm_name_re usage 1.19. sht_rm_value_re usage - 1.20. sht_lock usage - 1.21. sht_unlock usage + 1.20. sht_reset usage + 1.21. sht_lock usage + 1.22. sht_unlock usage Chapter 1. Admin Guide @@ -140,8 +142,9 @@ Chapter 1. Admin Guide 4.1. sht_print() 4.2. sht_rm_name_re(htable=>regexp) 4.3. sht_rm_value_re(htable=>regexp) - 4.4. sht_lock(htable=>key) - 4.5. sht_unlock(htable=>key) + 4.4. sht_reset(htable) + 4.5. sht_lock(htable=>key) + 4.6. sht_unlock(htable=>key) 5. Exported pseudo-variables 6. MI Commands @@ -445,8 +448,8 @@ $ kamcmd htable.dump htable ... modparam("htable", "htable", "a=>size=4;autoexpire=7200;dbtable=htable_a;") modparam("htable", "htable", "b=>size=5;") -modparam("htable", "htable", "c=>size=4;autoexpire=7200;initval=1;dmqreplicate= -1;") +modparam("htable", "htable", "c=>size=4;autoexpire=7200;initval=1;dmqreplicate=1 +;") ... 3.2. db_url (str) @@ -600,8 +603,9 @@ modparam("htable", "enable_dmq", 1) 4.1. sht_print() 4.2. sht_rm_name_re(htable=>regexp) 4.3. sht_rm_value_re(htable=>regexp) - 4.4. sht_lock(htable=>key) - 4.5. sht_unlock(htable=>key) + 4.4. sht_reset(htable) + 4.5. sht_lock(htable=>key) + 4.6. sht_unlock(htable=>key) 4.1. sht_print() @@ -642,24 +646,36 @@ sht_rm_name_re("ha=>.*"); sht_rm_value_re("ha=>.*"); ... -4.4. sht_lock(htable=>key) +4.4. sht_reset(htable) + + Delete all entries in the htable. The name of the hash table can be a + dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.20. sht_reset usage +... +sht_reset("ha$var(x)"); +... + +4.5. sht_lock(htable=>key) Lock the slot in htable corespoding to the key item. This function can be used from ANY_ROUTE. - Example 1.20. sht_lock usage + Example 1.21. sht_lock usage ... sht_lock("ha=>test"); ... -4.5. sht_unlock(htable=>key) +4.6. sht_unlock(htable=>key) Unlock the slot in htable corespoding to the key item. This function can be used from ANY_ROUTE. - Example 1.21. sht_unlock usage + Example 1.22. sht_unlock usage ... sht_lock("ha=>test"); $sht(ha=>test) = $sht(ha=>test) + 10; diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index 4cabff9..6427a28 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -710,6 +710,26 @@ sht_rm_value_re("ha=>.*"); </programlisting> </example> </section> + <section id="htable.f.sht_reset"> + <title> + <function moreinfo="none">sht_reset(htable)</function> + </title> + <para> + Delete all entries in the htable. The name of the hash table + can be a dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_reset</function> usage</title> + <programlisting format="linespecific"> +... +sht_reset("ha$var(x)"); +... +</programlisting> + </example> + </section> <section id="htable.f.sht_lock"> <title> <function moreinfo="none">sht_lock(htable=>key)</function>

1 0

git:master: htable: new config function sht_reset("tname")
by Elena-Ramona Modroiu 08 Sep '14

08 Sep '14

Module: sip-router Branch: master Commit: fcd13777bab83eeedc7628145b8e4f7430668372 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fcd1377… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Mon Sep 8 18:39:36 2014 +0200 htable: new config function sht_reset("tname") - remove all items in the hash table --- modules/htable/ht_api.c | 32 ++++++++++++++++++++++++++++++++ modules/htable/ht_api.h | 1 + modules/htable/htable.c | 30 +++++++++++++++++++++++++++--- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/modules/htable/ht_api.c b/modules/htable/ht_api.c index 2bd049d..af227c0 100644 --- a/modules/htable/ht_api.c +++ b/modules/htable/ht_api.c @@ -1148,6 +1148,38 @@ int ht_rm_cell_re(str *sre, ht_t *ht, int mode) return 0; } +int ht_reset_content(ht_t *ht) +{ + ht_cell_t *it; + ht_cell_t *it0; + int i; + + if(ht==NULL) + return -1; + + for(i=0; i<ht->htsize; i++) + { + /* free entries */ + lock_get(&ht->entries[i].lock); + it = ht->entries[i].first; + while(it) + { + it0 = it->next; + if(it->prev==NULL) + ht->entries[i].first = it->next; + else + it->prev->next = it->next; + if(it->next) + it->next->prev = it->prev; + ht->entries[i].esize--; + ht_cell_free(it); + it = it0; + } + lock_release(&ht->entries[i].lock); + } + return 0; +} + int ht_count_cells_re(str *sre, ht_t *ht, int mode) { ht_cell_t *it; diff --git a/modules/htable/ht_api.h b/modules/htable/ht_api.h index e1024dc..924b4b2 100644 --- a/modules/htable/ht_api.h +++ b/modules/htable/ht_api.h @@ -102,5 +102,6 @@ int ht_get_cell_expire(ht_t *ht, str *name, unsigned int *val); int ht_rm_cell_re(str *sre, ht_t *ht, int mode); int ht_count_cells_re(str *sre, ht_t *ht, int mode); ht_t *ht_get_root(void); +int ht_reset_content(ht_t *ht); #endif diff --git a/modules/htable/htable.c b/modules/htable/htable.c index 0dfdcda..563773e 100644 --- a/modules/htable/htable.c +++ b/modules/htable/htable.c @@ -1,7 +1,5 @@ /** - * $Id$ - * - * Copyright (C) 2008 Elena-Ramona Modroiu (asipto.com) + * Copyright (C) 2008-2014 Elena-Ramona Modroiu (asipto.com) * * This file is part of Kamailio, a free SIP server. * @@ -33,6 +31,7 @@ #include "../../route.h" #include "../../dprint.h" #include "../../hashes.h" +#include "../../mod_fix.h" #include "../../ut.h" #include "../../rpc.h" #include "../../rpc_lookup.h" @@ -66,6 +65,7 @@ static int ht_rm_name_re(struct sip_msg* msg, char* key, char* foo); static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo); static int ht_slot_lock(struct sip_msg* msg, char* key, char* foo); static int ht_slot_unlock(struct sip_msg* msg, char* key, char* foo); +static int ht_reset(struct sip_msg* msg, char* htname, char* foo); int ht_param(modparam_t type, void* val); @@ -111,6 +111,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"sht_unlock", (cmd_function)ht_slot_unlock, 1, fixup_ht_key, 0, ANY_ROUTE}, + {"sht_reset", (cmd_function)ht_reset, 1, fixup_spve_null, 0, + ANY_ROUTE}, {"bind_htable", (cmd_function)bind_htable, 0, 0, 0, ANY_ROUTE}, {0,0,0,0,0,0} @@ -356,6 +358,28 @@ static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo) return 1; } +static int ht_reset(struct sip_msg* msg, char* htname, char* foo) +{ + ht_t *ht; + str sname; + + if(fixup_get_svalue(msg, (gparam_t*)htname, &sname)<0 || sname.len<=0) + { + LM_ERR("cannot get hash table name\n"); + return -1; + } + ht = ht_get_table(&sname); + if(ht==NULL) + { + LM_ERR("cannot get hash table [%.*s]\n", sname.len, sname.s); + return -1; + } + if(ht_reset_content(ht)<0) + return -1; + return 1; +} + + /** * lock the slot for a given key in a hash table */

1 0

presence notify less log
by Luis Azedo 08 Sep '14

08 Sep '14

Hi, notify.c in presence module is too intrusive in log. this changes from LM_INFO to LM_DBG Best

1 0

Re: [sr-dev] dispatcher module changes
by Luis Azedo 08 Sep '14

08 Sep '14

Hi Daniel, updated doc/dispatcher_admin.xml in the patch Best

2 1

git:master: dispatcher: regenerated readme file
by Daniel-Constantin Mierla 08 Sep '14

08 Sep '14

Module: sip-router Branch: master Commit: a39e8db53e6a99545385c6b8d4bfc77217f788c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a39e8db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 8 17:15:34 2014 +0200 dispatcher: regenerated readme file --- modules/dispatcher/README | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/dispatcher/README b/modules/dispatcher/README index a6dd931..a25a3df 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -72,7 +72,7 @@ Carsten Bock 4.3. ds_next_dst() 4.4. ds_next_domain() 4.5. ds_mark_dst([state]) - 4.6. ds_is_from_list([groupid [, uri, mode] ]) + 4.6. ds_is_from_list([groupid [, mode [, uri] ] ]) 4.7. ds_load_update() 4.8. ds_load_unset() @@ -188,7 +188,7 @@ Chapter 1. Admin Guide 4.3. ds_next_dst() 4.4. ds_next_domain() 4.5. ds_mark_dst([state]) - 4.6. ds_is_from_list([groupid [, uri, mode] ]) + 4.6. ds_is_from_list([groupid [, mode [, uri] ] ]) 4.7. ds_load_update() 4.8. ds_load_unset() @@ -695,7 +695,7 @@ Note 4.3. ds_next_dst() 4.4. ds_next_domain() 4.5. ds_mark_dst([state]) - 4.6. ds_is_from_list([groupid [, uri, mode] ]) + 4.6. ds_is_from_list([groupid [, mode [, uri] ] ]) 4.7. ds_load_update() 4.8. ds_load_unset() @@ -834,7 +834,7 @@ failure_route[tryagain] { } ... -4.6. ds_is_from_list([groupid [, uri, mode] ]) +4.6. ds_is_from_list([groupid [, mode [, uri] ] ]) This function returns true, if there is a match of source address or uri with an address in the given group of the dispatcher-list; @@ -846,6 +846,12 @@ failure_route[tryagain] { the matching will be done only against the addresses in the specific group id. The parameter can be an integer or a variable holding an integer value. + * mode - (optional) - a bitmask to specify how the matching should be + done. If is 0, all ip, port and proto are matched. If bit one is + set, then port is ignored. If bit two is set, then protocol is + ignored. The parameter can be an integer or a variable holding an + integer value. It must be provided if the uri parameter is + provided. * uri (optional) - if is empty or missing, the matching is done against source IP, port and protocol. Otherwise the value has to be a valid SIP URI, used to match against addresses in the dispatcher @@ -853,12 +859,6 @@ failure_route[tryagain] { parameters are ignored. The parameter can be a static or dynamic (with variables) string. The domain part of the URI can be an IP address or a hostname. - * mode - (optional) - a bitmask to specify how the matching should be - done. If is 0, all ip, port and proto are matched. If bit one is - set, then port is ignored. If bit two is set, then protocol is - ignored. The parameter can be an integer or a variable holding an - integer value. It must be provided if the uri parameter is - provided. Upon a match, the variable specified by 'setid_pvname' parameter will be set to groupid of matching address and the attributes will be set in

1 0

git:master: dispatcher: swap the order between uri and mode parameters in the new ds_is_from_list( ...)
by Daniel-Constantin Mierla 08 Sep '14

08 Sep '14

Module: sip-router Branch: master Commit: 121cb0f4feb2cc1a670d17432593ff7e025d65a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=121cb0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 8 17:13:12 2014 +0200 dispatcher: swap the order between uri and mode parameters in the new ds_is_from_list(...) - allow to have ds_is_from_list() only with group id and mode, uri is the last parameter, still optional - patch provided by Luis Azedo <luis.azedo(a)factorlusitano.com> --- modules/dispatcher/dispatcher.c | 41 +++++++++++++++++++++------ modules/dispatcher/doc/dispatcher_admin.xml | 24 ++++++++-------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index 5356f2e..13f3f56 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -159,8 +159,9 @@ static int w_ds_load_update(struct sip_msg*, char*, char*); static int w_ds_is_from_list0(struct sip_msg*, char*, char*); static int w_ds_is_from_list1(struct sip_msg*, char*, char*); +static int w_ds_is_from_list2(struct sip_msg*, char*, char*); static int w_ds_is_from_list3(struct sip_msg*, char*, char*, char*); -static int fixup_ds_is_from_list3(void** param, int param_no); +static int fixup_ds_is_from_list(void** param, int param_no); static void destroy(void); @@ -192,8 +193,10 @@ static cmd_export_t cmds[]={ 0, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE}, {"ds_is_from_list", (cmd_function)w_ds_is_from_list1, 1, fixup_igp_null, 0, ANY_ROUTE}, + {"ds_is_from_list", (cmd_function)w_ds_is_from_list2, 2, + fixup_ds_is_from_list, 0, ANY_ROUTE}, {"ds_is_from_list", (cmd_function)w_ds_is_from_list3, 3, - fixup_ds_is_from_list3, 0, ANY_ROUTE}, + fixup_ds_is_from_list, 0, ANY_ROUTE}, {"ds_load_unset", (cmd_function)w_ds_load_unset, 0, 0, 0, ANY_ROUTE}, {"ds_load_update", (cmd_function)w_ds_load_update, 0, @@ -844,20 +847,34 @@ static int w_ds_is_from_list1(struct sip_msg *msg, char *set, char *str2) return ds_is_from_list(msg, s); } -static int w_ds_is_from_list3(struct sip_msg *msg, char *set, char *uri, char *mode) +static int w_ds_is_from_list2(struct sip_msg *msg, char *set, char *mode) { int vset; int vmode; - str suri; if(fixup_get_ivalue(msg, (gparam_t*)set, &vset)!=0) { LM_ERR("cannot get set id value\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)uri, &suri)!=0) + if(fixup_get_ivalue(msg, (gparam_t*)mode, &vmode)!=0) { - LM_ERR("cannot get uri value\n"); + LM_ERR("cannot get mode value\n"); + return -1; + } + + return ds_is_addr_from_list(msg, vset, NULL, vmode); +} + +static int w_ds_is_from_list3(struct sip_msg *msg, char *set, char *mode, char *uri) +{ + int vset; + int vmode; + str suri; + + if(fixup_get_ivalue(msg, (gparam_t*)set, &vset)!=0) + { + LM_ERR("cannot get set id value\n"); return -1; } if(fixup_get_ivalue(msg, (gparam_t*)mode, &vmode)!=0) @@ -865,15 +882,21 @@ static int w_ds_is_from_list3(struct sip_msg *msg, char *set, char *uri, char *m LM_ERR("cannot get mode value\n"); return -1; } + if(fixup_get_svalue(msg, (gparam_t*)uri, &suri)!=0) + { + LM_ERR("cannot get uri value\n"); + return -1; + } return ds_is_addr_from_list(msg, vset, &suri, vmode); } -static int fixup_ds_is_from_list3(void** param, int param_no) + +static int fixup_ds_is_from_list(void** param, int param_no) { - if(param_no==1 || param_no==3) + if(param_no==1 || param_no==2) return fixup_igp_null(param, 1); - if(param_no==2) + if(param_no==3) return fixup_spve_null(param, 1); return 0; } diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 5177a12..11c75ce 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -994,7 +994,7 @@ failure_route[tryagain] { </section> <section id="dispatcher.f.ds_is_from_list"> <title> - <function moreinfo="none">ds_is_from_list([groupid [, uri, mode] ])</function> + <function moreinfo="none">ds_is_from_list([groupid [, mode [, uri] ] ])</function> </title> <para> This function returns true, if there is a match of source address or uri @@ -1011,17 +1011,6 @@ failure_route[tryagain] { </para> </listitem> <listitem> - <para><emphasis>uri</emphasis> (optional) - if is empty or missing, - the matching is done against source IP, port and protocol. - Otherwise the value has to be a valid SIP URI, used to match - against addresses in the dispatcher list. Only IP, port and - protocol are matches, any additional parameters are ignored. - The parameter can be a static or dynamic (with variables) - string. The domain part of the URI can be an IP address or - a hostname. - </para> - </listitem> - <listitem> <para><emphasis>mode</emphasis> - (optional) - a bitmask to specify how the matching should be done. If is 0, all ip, port and proto are matched. If bit one is set, then port is ignored. @@ -1030,6 +1019,17 @@ failure_route[tryagain] { It must be provided if the uri parameter is provided. </para> </listitem> + <listitem> + <para><emphasis>uri</emphasis> (optional) - if is empty or missing, + the matching is done against source IP, port and protocol. + Otherwise the value has to be a valid SIP URI, used to match + against addresses in the dispatcher list. Only IP, port and + protocol are matches, any additional parameters are ignored. + The parameter can be a static or dynamic (with variables) + string. The domain part of the URI can be an IP address or + a hostname. + </para> + </listitem> </itemizedlist> <para>

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014