sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

git:3.1: permissions(k): do not check db con in child init
by Daniel-Constantin Mierla 18 Jan '11

18 Jan '11

Module: sip-router Branch: 3.1 Commit: 021ae26451bcb80d817f6ef069a77c1830625782 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=021ae26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 18 20:16:31 2011 +0100 permissions(k): do not check db con in child init - proper connection is returned by comparison of pids (cherry picked from commit be92c6713c2b7c7cb04320758a346ba6a1324982) --- modules_k/permissions/address.c | 2 +- modules_k/permissions/trusted.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 469e21a..8aa6b81 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -287,7 +287,7 @@ error: */ int mi_init_addresses(void) { - if (!db_url.s || db_handle) return 0; + if (!db_url.s) return 0; db_handle = perm_dbf.init(&db_url); if (!db_handle) { LM_ERR("unable to connect database\n"); diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 33cae33..1f8a106 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -235,7 +235,7 @@ int init_child_trusted(int rank) if ((rank <= 0) && (rank != PROC_RPC) && (rank != PROC_UNIXSOCK)) return 0; - if (!db_url.s || db_handle) { + if (!db_url.s) { return 0; } @@ -261,7 +261,7 @@ int init_child_trusted(int rank) */ int mi_init_trusted(void) { - if (!db_url.s || db_handle) return 0; + if (!db_url.s) return 0; db_handle = perm_dbf.init(&db_url); if (!db_handle) { LM_ERR("unable to connect database\n");

1 0

git:mariuszbihlei/p_usrloc: modules/p_usrloc Fixed mode WRITE_THROUGH ( and WRITE_BACK) (crash)
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 0cc01cc1b0b9a19072b97e874e4ad7007e43d3d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0cc01cc… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 17:09:06 2011 +0200 modules/p_usrloc Fixed mode WRITE_THROUGH (and WRITE_BACK) (crash) TODO: list of domains is kept in private mem, not shared. (!) --- modules_k/p_usrloc/dlist.c | 14 +++++++++++++- modules_k/p_usrloc/ucontact.c | 1 - modules_k/p_usrloc/ul_db_layer.c | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules_k/p_usrloc/dlist.c b/modules_k/p_usrloc/dlist.c index 23b9c50..a2687b2 100644 --- a/modules_k/p_usrloc/dlist.c +++ b/modules_k/p_usrloc/dlist.c @@ -71,7 +71,7 @@ static inline struct domain_list_item * find_dlist (str *name) { static inline struct domain_list_item * add_to_dlist (str *name, int type) { struct domain_list_item *item; - + int i; item = (struct domain_list_item *) pkg_malloc (sizeof (struct domain_list_item)); if (item == NULL) { @@ -90,6 +90,18 @@ static inline struct domain_list_item * add_to_dlist (str *name, int type) { memset (&item->domain, 0, sizeof (struct udomain)); item->domain.name = &item->name; item->domain.dbt = type; + + item->domain.table = (hslot_t*)pkg_malloc(sizeof(hslot_t) * ul_hash_size); + if (!item->domain.table) { + LM_ERR("no memory left 2\n"); + return NULL; + } + + for(i = 0; i < ul_hash_size; i++) { + init_slot(&item->domain, &(item->domain.table[i]), i); + } + + item->domain.size = ul_hash_size; /* Everything else is not useful for now. */ item->next = domain_list; diff --git a/modules_k/p_usrloc/ucontact.c b/modules_k/p_usrloc/ucontact.c index 859408f..b97f0f1 100644 --- a/modules_k/p_usrloc/ucontact.c +++ b/modules_k/p_usrloc/ucontact.c @@ -399,7 +399,6 @@ int db_insert_ucontact(ucontact_t* _c) if(register_udomain(_c->domain->s, &_d) < 0){ return -1; } - keys[0] = &user_col; keys[1] = &contact_col; keys[2] = &expires_col; diff --git a/modules_k/p_usrloc/ul_db_layer.c b/modules_k/p_usrloc/ul_db_layer.c index 2731201..474db5d 100644 --- a/modules_k/p_usrloc/ul_db_layer.c +++ b/modules_k/p_usrloc/ul_db_layer.c @@ -213,7 +213,7 @@ int ul_db_layer_free_result(udomain_t * domain, db1_res_t * res) { int ul_add_domain_db(str * d, int t, str * url) { ul_domain_db_list_t * new_d = NULL; - LM_DBG("%.*s, type: %s\n", d->len, d->s, + LM_ERR("%.*s, type: %s\n", d->len, d->s, t==DB_TYPE_SINGLE ? "SINGLE" : "CLUSTER"); if((new_d = pkg_malloc(sizeof(ul_domain_db_list_t))) == NULL) { return -1;

1 0

git:mariuszbihlei/p_usrloc: modules/usrloc Refactoring of usrloc: Moved interface declaration/definitions to one common header (usrloc.h)
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 9b75b8d0da994d3f27a2b756fe944c3f1cdccfd8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b75b8d… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:06:17 2011 +0200 modules/usrloc Refactoring of usrloc: Moved interface declaration/definitions to one common header (usrloc.h) Before, mostly every header was included when using usrloc, thus the private parts were not hidden to user. Added a udomain_head_t data type which contains the first member of the udomain_t structure (this structure is different between p_usrloc and usrloc) --- modules_k/usrloc/dlist.h | 56 +-------- modules_k/usrloc/ucontact.h | 79 +------------ modules_k/usrloc/udomain.h | 53 +-------- modules_k/usrloc/ul_callback.h | 11 +- modules_k/usrloc/ul_mod.h | 4 - modules_k/usrloc/urecord.h | 76 +------------ modules_k/usrloc/usrloc.h | 262 +++++++++++++++++++++++++++++++++++++++- 7 files changed, 269 insertions(+), 272 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9b7…

1 0

git:mariuszbihlei/p_usrloc: modules/ p_usrloc Module implement the API of usrloc module.
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: e1dd94c2d5e67577ab04eb68ee1300f1592a892a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1dd94c… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:11:12 2011 +0200 modules/p_usrloc Module implement the API of usrloc module. --- modules_k/p_usrloc/dlist.h | 19 +------- modules_k/p_usrloc/p_usrloc_mod.c | 9 ++- modules_k/p_usrloc/p_usrloc_mod.h | 7 +-- modules_k/p_usrloc/ucontact.c | 2 +- modules_k/p_usrloc/ucontact.h | 69 +-------------------------- modules_k/p_usrloc/udomain.h | 51 +------------------- modules_k/p_usrloc/ul_callback.c | 4 +- modules_k/p_usrloc/ul_callback.h | 95 ------------------------------------- modules_k/p_usrloc/ul_db_layer.c | 2 +- modules_k/p_usrloc/ul_db_layer.h | 4 +- modules_k/p_usrloc/urecord.c | 5 +- modules_k/p_usrloc/urecord.h | 76 +----------------------------- modules_k/p_usrloc/usrloc.c | 2 +- 13 files changed, 23 insertions(+), 322 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e1d…

1 0

git:mariuszbihlei/p_usrloc: modules/registrar : changes caused by usrloc refactoring
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: b27f9a1881185b55743dc7b3fda9397249732f00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b27f9a1… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:09:16 2011 +0200 modules/registrar : changes caused by usrloc refactoring --- modules_k/registrar/reg_mod.c | 2 +- modules_k/registrar/regpv.c | 2 +- modules_k/registrar/save.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules_k/registrar/reg_mod.c b/modules_k/registrar/reg_mod.c index 239447e..8ef3cfc 100644 --- a/modules_k/registrar/reg_mod.c +++ b/modules_k/registrar/reg_mod.c @@ -67,7 +67,7 @@ #include "../../socket_info.h" #include "../../pvar.h" #include "../../lib/kcore/km_ut.h" -#include "../usrloc/ul_mod.h" +#include "../../lib/kcore/statistics.h" #include "../../modules/sl/sl.h" #include "../../mod_fix.h" diff --git a/modules_k/registrar/regpv.c b/modules_k/registrar/regpv.c index 60e8c1f..7f5f8ec 100644 --- a/modules_k/registrar/regpv.c +++ b/modules_k/registrar/regpv.c @@ -442,7 +442,7 @@ int pv_fetch_contacts(struct sip_msg* msg, char* table, char* uri, } memcpy(rpp->aor.s, aor.s, aor.len); rpp->aor.len = aor.len; - rpp->domain = *((udomain_t*)table)->name; + rpp->domain = *((udomain_head_t*)table)->name; rpp->flags = 1; /* copy contacts */ diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c index 9955034..efe0961 100644 --- a/modules_k/registrar/save.c +++ b/modules_k/registrar/save.c @@ -59,6 +59,7 @@ #include "../../dset.h" #include "../../mod_fix.h" #include "../../lib/kcore/cmpapi.h" +#include "../../lib/kcore/statistics.h" #ifdef USE_TCP #include "../../tcp_server.h" #endif

1 0

git:mariuszbihlei/p_usrloc: modules/ usrloc Some refactoring of usrloc to allow both usrloc and p_usrloc to coexist and share structs , code etc.
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 0ea2d47311f4655714853a567bdd07609af4575f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ea2d47… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 15:03:29 2011 +0200 modules/usrloc Some refactoring of usrloc to allow both usrloc and p_usrloc to coexist and share structs, code etc. First commit contains changes to code (.c files) Module interface (exported to registrar) is now in a common file "usrloc.h" which is used by every user of user location modules. P_usrloc also uses that header so changes to usrloc also affect it(changes to interface) --- modules_k/p_usrloc/usrloc.h | 69 ---------------------------------------- modules_k/usrloc/ucontact.c | 2 +- modules_k/usrloc/udomain.c | 2 +- modules_k/usrloc/ul_callback.c | 2 +- modules_k/usrloc/ul_mi.c | 2 +- modules_k/usrloc/urecord.c | 2 +- 6 files changed, 5 insertions(+), 74 deletions(-) diff --git a/modules_k/p_usrloc/usrloc.h b/modules_k/p_usrloc/usrloc.h deleted file mode 100644 index 5077b52..0000000 --- a/modules_k/p_usrloc/usrloc.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * $Id: usrloc.h 5193 2008-11-13 10:21:53Z henningw $ - * - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of Kamailio, a free SIP server. - * - * Kamailio is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * Kamailio is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/*! \file - * \brief USRLOC - module API exports interface - * \ingroup usrloc - */ - -#ifndef USRLOC_H -#define USRLOC_H - - -#include "dlist.h" -#include "udomain.h" -#include "urecord.h" -#include "ucontact.h" -#include "ul_callback.h" - - -/*! usrloc API export structure */ -typedef struct usrloc_api { - int use_domain; /*! use_domain module parameter */ - int db_mode; /*! db_mode module parameter */ - unsigned int nat_flag; /*! nat_flag module parameter */ - - register_udomain_t register_udomain; - get_all_ucontacts_t get_all_ucontacts; - - insert_urecord_t insert_urecord; - delete_urecord_t delete_urecord; - get_urecord_t get_urecord; - lock_udomain_t lock_udomain; - unlock_udomain_t unlock_udomain; - - release_urecord_t release_urecord; - insert_ucontact_t insert_ucontact; - delete_ucontact_t delete_ucontact; - get_ucontact_t get_ucontact; - - update_ucontact_t update_ucontact; - - register_ulcb_t register_ulcb; -} usrloc_api_t; - - -/*! usrloc API export bind function */ -typedef int (*bind_usrloc_t)(usrloc_api_t* api); - - -#endif diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index 170ce00..3f9639e 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -45,7 +45,7 @@ #include "ul_callback.h" #include "urecord.h" #include "ucontact.h" - +#include "usrloc.h" /*! * \brief Create a new contact structure diff --git a/modules_k/usrloc/udomain.c b/modules_k/usrloc/udomain.c index 8f21e0f..58c89d7 100644 --- a/modules_k/usrloc/udomain.c +++ b/modules_k/usrloc/udomain.c @@ -46,7 +46,7 @@ #include "../../lib/kcore/hash_func.h" #include "ul_mod.h" /* usrloc module parameters */ #include "utime.h" - +#include "usrloc.h" #ifdef STATISTICS static char *build_stat_name( str* domain, char *var_name) diff --git a/modules_k/usrloc/ul_callback.c b/modules_k/usrloc/ul_callback.c index 91c4d5e..0519919 100644 --- a/modules_k/usrloc/ul_callback.c +++ b/modules_k/usrloc/ul_callback.c @@ -38,7 +38,7 @@ #include "../../error.h" #include "../../mem/shm_mem.h" #include "ul_callback.h" - +#include "ucontact.h" struct ulcb_head_list* ulcb_list = 0; diff --git a/modules_k/usrloc/ul_mi.c b/modules_k/usrloc/ul_mi.c index bb7d50a..62d8017 100644 --- a/modules_k/usrloc/ul_mi.c +++ b/modules_k/usrloc/ul_mi.c @@ -44,7 +44,7 @@ #include "udomain.h" #include "utime.h" #include "ul_mod.h" - +#include "usrloc.h" /*! CSEQ nr used */ #define MI_UL_CSEQ 1 diff --git a/modules_k/usrloc/urecord.c b/modules_k/usrloc/urecord.c index e0ff894..5ce2813 100644 --- a/modules_k/usrloc/urecord.c +++ b/modules_k/usrloc/urecord.c @@ -43,7 +43,7 @@ #include "ul_mod.h" #include "utime.h" #include "ul_callback.h" - +#include "usrloc.h" /*! contact matching mode */ int matching_mode = CONTACT_ONLY;

1 0

git:mariuszbihlei/p_usrloc: test/unit Update p_usrloc test ( it executes correctly now and performs cleaning)
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 74546cd9f98da0a1d945c735a2dc9dbece2121f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74546cd… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 12:47:55 2011 +0200 test/unit Update p_usrloc test (it executes correctly now and performs cleaning) --- test/unit/50.cfg | 2 +- test/unit/50.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/unit/50.cfg b/test/unit/50.cfg index 5970842..a23dc08 100644 --- a/test/unit/50.cfg +++ b/test/unit/50.cfg @@ -31,7 +31,7 @@ modparam("p_usrloc", "alg_location", 1) modparam("p_usrloc", "reg_db_table", "locdb") loadmodule "registrar" -modparam("registrar", "min_expires", 5) +modparam("registrar", "min_expires", 60) modparam("p_usrloc", "timer_interval", 2) #------------------------- request routing logic ------------------- diff --git a/test/unit/50.sh b/test/unit/50.sh index 0b9fd4d..5c0979a 100755 --- a/test/unit/50.sh +++ b/test/unit/50.sh @@ -40,9 +40,9 @@ sleep 1 # register two contacts echo "adding new contacts" -sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null -sipsak -U -C sip:foobar1@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null -sipsak -U -C sip:foobar2@localhost -s sip:49721123456790@localhost -H localhost &> /dev/null +sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost -x 30 &> /dev/null +sipsak -U -C sip:foobar1@localhost -s sip:49721123456789@localhost -H localhost -x 30 &> /dev/null +sipsak -U -C sip:foobar2@localhost -s sip:49721123456790@localhost -H localhost -x 30 &> /dev/null ret=$? if [ ! "$ret" -eq 0 ]; then @@ -71,7 +71,6 @@ if [ "$ret" -eq 0 ]; then fi; fi; - if [ "$ret" -eq 0 ]; then echo "check if the contact is registered" sipsak -U -C empty -s sip:49721123456789@127.0.0.1 -H localhost -q "Contact: <sip:foobar@localhost>" #&> /dev/null

1 0

git:mariuszbihlei/p_usrloc: test/unit improved p_usrloc test
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: mariuszbihlei/p_usrloc Commit: 65a1229cb3a77eb2162bd7efddc15f92974fafd1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65a1229… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 12:24:17 2011 +0200 test/unit improved p_usrloc test --- test/unit/50.cfg | 3 +- test/unit/50.sh | 109 +++++++++++++++++++++-------------------------------- 2 files changed, 44 insertions(+), 68 deletions(-) diff --git a/test/unit/50.cfg b/test/unit/50.cfg index 7a414a9..5970842 100644 --- a/test/unit/50.cfg +++ b/test/unit/50.cfg @@ -21,7 +21,6 @@ modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") loadmodule "p_usrloc" modparam("p_usrloc", "db_mode", 3) -modparam("p_usrloc", "db_url", "mysql://ser:ser@localhost/ser") modparam("p_usrloc", "read_db_url", "mysql://ser:ser@localhost/ser") modparam("p_usrloc", "write_db_url", "mysql://ser:ser@localhost/ser") @@ -71,7 +70,7 @@ route{ sl_send_reply("404", "Not Found"); exit; } - append_hf("P-hint: usrloc applied\r\n"); + append_hf("P-hint: p_usrloc applied\r\n"); } route(1); diff --git a/test/unit/50.sh b/test/unit/50.sh index 5865794..0b9fd4d 100755 --- a/test/unit/50.sh +++ b/test/unit/50.sh @@ -29,9 +29,11 @@ if ! (check_sipsak && check_kamailio && check_module "db_mysql" && check_mysql); exit 0 fi ; +MYSQL_LOC_A="mysql loc_a --show-warnings --batch --user=ser --password=ser -e" +MYSQL_LOC_B="mysql loc_b --show-warnings --batch --user=ser --password=ser -e" cp $CFG $CFG.bak -#$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG #> /dev/null ret=$? sleep 1 @@ -40,84 +42,97 @@ sleep 1 echo "adding new contacts" sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null sipsak -U -C sip:foobar1@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null +sipsak -U -C sip:foobar2@localhost -s sip:49721123456790@localhost -H localhost &> /dev/null ret=$? -sleep 100 +if [ ! "$ret" -eq 0 ]; then + echo "registration failed" +fi if [ "$ret" -eq 0 ]; then - $CTL ul show | grep "AOR:: 49721123456789" &> /dev/null - ret=$? + TMP=`$MYSQL_LOC_A "select COUNT(*) from location where username='49721123456789';" | tail -n 1` + if [ "$TMP" -eq 0 ] ; then + TMP=`$MYSQL_LOC_B "select COUNT(*) from location where username='49721123456789';" | tail -n 1` + if [ "$TMP" -eq 0 ] ; then + echo "User 49721123456789 was NOT saved to either loc_a or loc_b" + ret=1 + fi + fi; fi; if [ "$ret" -eq 0 ]; then - TMP=`$MYSQL "select COUNT(*) from location where username='49721123456789';" | tail -n 1` + TMP=`$MYSQL_LOC_A "select COUNT(*) from location where username='49721123456790';" | tail -n 1` if [ "$TMP" -eq 0 ] ; then - ret=1 + TMP=`$MYSQL_LOC_B "select COUNT(*) from location where username='49721123456790';" | tail -n 1` + if [ "$TMP" -eq 0 ] ; then + echo "User 49721123456790 was NOT saved to either loc_a or loc_b" + ret=1 + fi fi; fi; + if [ "$ret" -eq 0 ]; then - # check if the contact is registered - sipsak -U -C empty -s sip:49721123456789@127.0.0.1 -H localhost -q "Contact: <sip:foobar@localhost>" &> /dev/null + echo "check if the contact is registered" + sipsak -U -C empty -s sip:49721123456789@127.0.0.1 -H localhost -q "Contact: <sip:foobar@localhost>" #&> /dev/null ret=$? + echo "sipsak exited with status $ret" fi; if [ "$ret" -eq 0 ]; then - # update the registration + echo "update the registration" sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # check if we get a hint when we try to unregister a non-existent conctact + echo "check if we get a hint when we try to unregister a non-existent conctact" sipsak -U -C "sip:foobar2@localhost" -s sip:49721123456789@127.0.0.1 -H localhost -x 0 -q "Contact: <sip:foobar@localhost>" &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # unregister the contact + echo " unregister the contact" sipsak -U -C "sip:foobar@localhost" -s sip:49721123456789@127.0.0.1 -H localhost -x 0 &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # unregister the user again should not fail - sipsak -U -C "sip:foobar@localhost" -s sip:49721123456789@127.0.0.1 -H localhost -x 0 &> /dev/null + echo "unregister the user again should not fail" + sipsak -U -C "sip:foobar@localhost" -s sip:49721123456789@127.0.0.1 -H localhost -x 0 #&> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # check if the other contact is still registered + echo "check if the other contact is still registered" sipsak -U -C empty -s sip:49721123456789@127.0.0.1 -H localhost -q "Contact: <sip:foobar1@localhost>" &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # register the other again + echo " register the other again" sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - # unregister all contacts + echo " unregister all contacts" sipsak -U -C "*" -s sip:49721123456789@127.0.0.1 -H localhost -x 0 &> /dev/null ret=$? fi; if [ "$ret" -eq 0 ]; then - $CTL ul show | grep "AOR:: 49721123456789" > /dev/null - ret=$? - if [ "$ret" -eq 0 ]; then - ret=1 - else - ret=0 + executed=1 + ret=`$MYSQL_LOC_A "select COUNT(*) from location where username='49721123456789';" | tail -n 1` + if [ "$TMP" -eq 0 ] ; then + ret=`$MYSQL_LOC_B "select COUNT(*) from location where username='49721123456789';" | tail -n 1` fi; -fi ; - -if [ "$ret" -eq 0 ]; then - ret=`$MYSQL "select COUNT(*) from location where username='49721123456789';" | tail -n 1` fi; +if [ "x$executed" == "x1" ]; then + echo "After un-registration user has $ret contacts " +fi + if [ "$ret" -eq 0 ]; then # test min_expires functionality sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost -x 2 &> /dev/null @@ -136,48 +151,10 @@ if [ "$ret" -eq 0 ]; then sipsak -U -e 9 -s sip:49721123456789@localhost -H localhost &> /dev/null fi; -if [ "$ret" -eq 0 ]; then - # let the timer cleanup the previous registrations - sleep 3 - # and check - TMP=`$MYSQL "select COUNT(*) from location where username like '49721123456789%';" | tail -n 1` - if [ "$TMP" -eq 10 ] ; then - ret=0 - else - ret=1 - fi; -fi; - -$MYSQL "delete from location where username like '49721123456789%';" -if [ "$ret" -eq 0 ]; then - # register again - sipsak -U -C sip:foobar@localhost -s sip:49721123456789@localhost -H localhost &> /dev/null - ret=$? -fi; - -$KILL - -# restart to test preload_udomain functionality -$BIN -w . -f $CFG > /dev/null -ret=$? - -sleep 1 - -if [ "$ret" -eq 0 ]; then - # check if the contact is still registered - sipsak -U -C empty -s sip:49721123456789@127.0.0.1 -H localhost -q "Contact: <sip:foobar@localhost>" &> /dev/null - ret=$? -fi; - -# check if the methods value is correct -if [ "$ret" -eq 0 ]; then - $CTL ul show | grep "Methods:: 4294967295" &> /dev/null - ret=$? -fi; +$MYSQL_LOC_A "delete from location where username like '497211234567%';" +$MYSQL_LOC_B "delete from location where username like '497211234567%';" -# cleanup -$MYSQL "delete from location where username like '49721123456789%';" $KILL

1 0

git:master: db_postgres: reconnect tuning in submit query
by Daniel-Constantin Mierla 18 Jan '11

18 Jan '11

Module: sip-router Branch: master Commit: 7c10eae7255450b6a176dc03d0d5f516a6dacc10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c10eae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 18 11:49:12 2011 +0100 db_postgres: reconnect tuning in submit query - don't attempt to reconnect if the connection state is ok upon submitting query, the error might be something else and will be reported when fetching the result --- modules/db_postgres/km_dbase.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 1558e49..c01d37a 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -151,14 +151,15 @@ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) /* exec the query */ if (PQsendQuery(CON_CONNECTION(_con), _s->s)) { pqresult = PQresultStatus(CON_RESULT(_con)); - if(pqresult!=PGRES_FATAL_ERROR) + if((pqresult!=PGRES_FATAL_ERROR) + || (PQstatus(CON_CONNECTION(_con))==CONNECTION_OK)) { LM_DBG("sending query ok: %p (%d) - [%.*s]\n", _con, pqresult, _s->len, _s->s); return 0; } - LM_WARN("postgres result check failed with code %d (%s)\n", pqresult, - PQresStatus(pqresult)); + LM_WARN("postgres result check failed with code %d (%s)\n", + pqresult, PQresStatus(pqresult)); } LM_WARN("postgres query command failed, connection status %d," " error [%s]\n", PQstatus(CON_CONNECTION(_con)),

1 0

git:master: modules_k/textops: Fixed memcpy problem
by Marius Zbihlei 18 Jan '11

18 Jan '11

Module: sip-router Branch: master Commit: 958df5cda2af963b893ab7d8af6ce4f4a00cb228 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=958df5c… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 18 12:27:08 2011 +0200 modules_k/textops: Fixed memcpy problem The commit 4b6cfe30 did nothing. --- modules_k/textops/textops.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index f5da969..6b8fa42 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -1475,12 +1475,13 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, len=s0.len; if (str2) len+= str2->len + REQ_LINE(msg).uri.len; - if (likely(len>0)){ - s = (char*)pkg_malloc(len); - if (!s) { - LM_ERR("no pkg memory left\n"); - return -1; - } + s = (char*)pkg_malloc(len); + if (!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } + + if (likely(s0.len>0)){ memcpy(s, s0.s, s0.len); }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011