sr-dev September 2012

sr-dev@lists.kamailio.org

32 participants
173 discussions

git:master: ldap(k): updates for usage of pv cache for pv_elem_t
by Daniel-Constantin Mierla 28 Sep '12

28 Sep '12

Module: sip-router Branch: master Commit: aea31fcdebe13004dbcea3afeabe4a045fefcc9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aea31fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 28 23:40:01 2012 +0200 ldap(k): updates for usage of pv cache for pv_elem_t --- modules_k/ldap/ldap_exp_fn.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/ldap/ldap_exp_fn.c b/modules_k/ldap/ldap_exp_fn.c index 436b299..6e425c6 100644 --- a/modules_k/ldap/ldap_exp_fn.c +++ b/modules_k/ldap/ldap_exp_fn.c @@ -71,7 +71,7 @@ int ldap_search_impl( LM_ERR("empty ldap_url\n"); return -2; } - if ( _ldap_url->spec.getf!=NULL) { + if ( _ldap_url->spec!=NULL && _ldap_url->spec->getf!=NULL) { if (pv_printf_s( _msg, _ldap_url, &ldap_url)!=0 || ldap_url.len<=0) { LM_ERR("pv_printf_s failed\n"); return -2;

1 0

git:master: carrierroute: updates for usage of pv cache in pv_elem_t
by Daniel-Constantin Mierla 28 Sep '12

28 Sep '12

Module: sip-router Branch: master Commit: 111bb96a0f18a3a1366e60deed54a4bd54ba865b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=111bb96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 28 23:31:50 2012 +0200 carrierroute: updates for usage of pv cache in pv_elem_t --- modules/carrierroute/cr_fixup.c | 6 +++--- modules/carrierroute/cr_func.c | 38 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/carrierroute/cr_fixup.c b/modules/carrierroute/cr_fixup.c index 0659907..0477e28 100644 --- a/modules/carrierroute/cr_fixup.c +++ b/modules/carrierroute/cr_fixup.c @@ -186,9 +186,9 @@ static int avp_name_fixup(void ** param) { LM_ERR("could not fixup parameter"); return -1; } - if (((gparam_p)(*param))->v.pve->spec.type == PVT_AVP && - ((gparam_p)(*param))->v.pve->spec.pvp.pvn.u.isname.name.s.len == 0 && - ((gparam_p)(*param))->v.pve->spec.pvp.pvn.u.isname.name.s.s == 0) { + if (((gparam_p)(*param))->v.pve->spec->type == PVT_AVP && + ((gparam_p)(*param))->v.pve->spec->pvp.pvn.u.isname.name.s.len == 0 && + ((gparam_p)(*param))->v.pve->spec->pvp.pvn.u.isname.name.s.s == 0) { LM_ERR("malformed or non AVP type definition\n"); return -1; } diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 2b9a85f..3cda514 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -85,16 +85,16 @@ static inline int cr_gp2id(struct sip_msg *_msg, gparam_t *gp, struct name_map_t break; case GPARAM_TYPE_PVE: /* does this PV hold an AVP? */ - if (gp->v.pve->spec.type==PVT_AVP) { - avp = search_first_avp(gp->v.pve->spec.pvp.pvn.u.isname.type, - gp->v.pve->spec.pvp.pvn.u.isname.name, &avp_val, 0); + if (gp->v.pve->spec->type==PVT_AVP) { + avp = search_first_avp(gp->v.pve->spec->pvp.pvn.u.isname.type, + gp->v.pve->spec->pvp.pvn.u.isname.name, &avp_val, 0); if (!avp) { - if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_STR) - LM_ERR("cannot find AVP '%.*s'\n", gp->v.pve->spec.pvp.pvn.u.isname.name.s.len, - gp->v.pve->spec.pvp.pvn.u.isname.name.s.s); - else if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_RE) + if(gp->v.pve->spec->pvp.pvn.u.isname.type & AVP_NAME_STR) + LM_ERR("cannot find AVP '%.*s'\n", gp->v.pve->spec->pvp.pvn.u.isname.name.s.len, + gp->v.pve->spec->pvp.pvn.u.isname.name.s.s); + else if(gp->v.pve->spec->pvp.pvn.u.isname.type & AVP_NAME_RE) LM_ERR("cannot find AVP regex\n"); - else LM_ERR("cannot find AVP '%d'\n", gp->v.pve->spec.pvp.pvn.u.isname.name.n); + else LM_ERR("cannot find AVP '%d'\n", gp->v.pve->spec->pvp.pvn.u.isname.name.n); return -1; } if ((avp->flags&AVP_VAL_STR)==0) { @@ -102,12 +102,12 @@ static inline int cr_gp2id(struct sip_msg *_msg, gparam_t *gp, struct name_map_t } else { id = map_name2id(map, size, &avp_val.s); if (id < 0) { - if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_STR) - LM_ERR("cannot map carrier with id %.*s from AVP '%.*s'\n", avp_val.s.len, avp_val.s.s, gp->v.pve->spec.pvp.pvn.u.isname.name.s.len, - gp->v.pve->spec.pvp.pvn.u.isname.name.s.s); - else if(gp->v.pve->spec.pvp.pvn.u.isname.type & AVP_NAME_RE) + if(gp->v.pve->spec->pvp.pvn.u.isname.type & AVP_NAME_STR) + LM_ERR("cannot map carrier with id %.*s from AVP '%.*s'\n", avp_val.s.len, avp_val.s.s, gp->v.pve->spec->pvp.pvn.u.isname.name.s.len, + gp->v.pve->spec->pvp.pvn.u.isname.name.s.s); + else if(gp->v.pve->spec->pvp.pvn.u.isname.type & AVP_NAME_RE) LM_ERR("cannot map carrier with id %.*s from AVP regex\n", avp_val.s.len, avp_val.s.s); - else LM_ERR("cannot map carrier with id %.*s from AVP '%d'\n", avp_val.s.len, avp_val.s.s, gp->v.pve->spec.pvp.pvn.u.isname.name.n); + else LM_ERR("cannot map carrier with id %.*s from AVP '%d'\n", avp_val.s.len, avp_val.s.s, gp->v.pve->spec->pvp.pvn.u.isname.name.n); return -1; } return id; @@ -187,8 +187,8 @@ static int set_next_domain_on_rule(struct failure_route_rule *frr_head, ((rr->host.len == 0) || (str_strcmp(host, &rr->host)==0)) && (reply_code_matcher(&(rr->reply_code), reply_code)==0)) { avp_val.n = rr->next_domain; - if (add_avp(dstavp->v.pve->spec.pvp.pvn.u.isname.type, - dstavp->v.pve->spec.pvp.pvn.u.isname.name, avp_val)<0) { + if (add_avp(dstavp->v.pve->spec->pvp.pvn.u.isname.type, + dstavp->v.pve->spec->pvp.pvn.u.isname.name, avp_val)<0) { LM_ERR("set AVP failed\n"); return -1; } @@ -354,8 +354,8 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, if (descavp) { avp_val.s = rs->comment; - if (add_avp(AVP_VAL_STR | descavp->v.pve->spec.pvp.pvn.u.isname.type, - descavp->v.pve->spec.pvp.pvn.u.isname.name, avp_val)<0) { + if (add_avp(AVP_VAL_STR | descavp->v.pve->spec->pvp.pvn.u.isname.type, + descavp->v.pve->spec->pvp.pvn.u.isname.name, avp_val)<0) { LM_ERR("set AVP failed\n"); return -1; } @@ -639,8 +639,8 @@ int cr_load_user_carrier(struct sip_msg * _msg, gparam_t *_user, gparam_t *_doma return -1; } else { /* set avp */ - if (add_avp(_dstavp->v.pve->spec.pvp.pvn.u.isname.type, - _dstavp->v.pve->spec.pvp.pvn.u.isname.name, avp_val)<0) { + if (add_avp(_dstavp->v.pve->spec->pvp.pvn.u.isname.type, + _dstavp->v.pve->spec->pvp.pvn.u.isname.name, avp_val)<0) { LM_ERR("add AVP failed\n"); return -1; }

1 0

git:pd/outbound: Merge branch 'master' into outbound
by Peter Dunkley 28 Sep '12

28 Sep '12

Module: sip-router Branch: pd/outbound Commit: b60d3f76cb4d13a28cc38efabe1cebbf00d18d23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b60d3f7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Sep 28 21:50:16 2012 +0100 Merge branch 'master' into outbound Conflicts: pkg/kamailio/fedora/16/kamailio.spec ---

1 0

DB accounting missing if t_newtran() is called explicitly
by Andrew Pogrebennyk 28 Sep '12

28 Sep '12

Hi, I have found recently that in order to detect retransmits I have to create a transaction explicitly when the request comes in: force_rport(); if(!t_check_trans()) t_newtran(); sl_send_reply("100", "Trying"); xlog("L_INFO", "New request - $ci\n"); it appears like there are carriers or UAs that do not honor the T1 retransmission interval retransmit the INVITE sooner than proxy creates a transaction in t_relay(). And since we are counting concurrent calls, we count the same call multiple times, which is not good. But with this patch we've faced another sporadic problem - if the transaction is created beforehand the accounting record is lost.. we use acc_db mode and set flag to account the transaction. And there are no errors in kamailio log but no insert into acc in mysql binlog either. I wasn't successful reproducing it in the lab systems with identical setup. Is anybody here perhaps aware of some limitation in acc module or callbacks which makes a transaction created beforehand not accountable? On a related note, it could make sense to create a transaction implicitly if dlg_manage() is called to avoid counting same call many times, I just don't know yet how common this issue is in real life.

2 4

SRV record in via header not resolving.
by Jijo 28 Sep '12

28 Sep '12

Hello, I'm observing that Via Header domain name of type SRV is resolving as DNS A. I looked at the code and it does support only A. It is basically setting to default SIP port check_via_address which is causing DNS A query. Is there any specific reason to do so? I changed the code to support SRV as below and working fine. static int check_via_address(struct ip_addr* ip, str *name, unsigned short port, *short proto*, int resolver) { : : //if (port==0) port=SIP_PORT; if (resolver&DO_DNS){ DBG("check_via_address: doing dns lookup\n"); /* try all names ips */ he=sip_resolvehost(name, &port, *(char *) &proto*); /* don't use naptr */ if (he && ip->af==he->h_addrtype){ for(i=0;he && he->h_addr_list[i];i++){ if ( memcmp(&he->h_addr_list[i], ip->u.addr, ip->len)==0) return 0; } } } : : : } /* check if IP address in Via != source IP address of signaling */ int received_test( struct sip_msg *msg ) { int rcvd; rcvd=msg->via1->received || check_via_address(&msg->rcv.src_ip, &msg->via1->host, msg->via1->port,* msg->via1->proto*, received_dns); return rcvd; } Thanks Jijo

2 2

git:master: app_mono: fixed c&p typo names in examples
by Daniel-Constantin Mierla 28 Sep '12

28 Sep '12

Module: sip-router Branch: master Commit: f71d76c0f39f2c6b0e070e1246f371f17b45b2dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f71d76c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 28 14:38:42 2012 +0200 app_mono: fixed c&p typo names in examples --- modules/app_mono/README | 16 ++++++++-------- modules/app_mono/doc/app_mono_admin.xml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/app_mono/README b/modules/app_mono/README index cdee991..a2ca72c 100644 --- a/modules/app_mono/README +++ b/modules/app_mono/README @@ -16,7 +16,7 @@ Alex Balashov <abalashov(a)evaristesys.com> - Copyright © 2012 Daniel-Constantin Mierla (asipto.com) + Copyright � 2012 Daniel-Constantin Mierla (asipto.com) __________________________________________________________________ Table of Contents @@ -43,8 +43,8 @@ Alex Balashov List of Examples 1.1. Set load parameter - 1.2. lua_dofile usage - 1.3. lua_run usage + 1.2. mono_exec usage + 1.3. mono_run usage Chapter 1. Admin Guide @@ -113,7 +113,7 @@ Chapter 1. Admin Guide Set the path to the Mono assembly to be loaded at startup. You can use mono_run(param) to execute the assembly at runtime. - Default value is “null”. + Default value is "null". Example 1.1. Set load parameter ... @@ -125,7 +125,7 @@ modparam("app_mono", "load", "/usr/local/etc/kamailio/mono/myscript.exe") 4.1. mono_exec(path [, param]) 4.2. mono_run([param]) -4.1. mono_exec(path [, param]) +4.1. mono_exec(path [, param]) Execute the managed code assembly stored in 'path'. The path can be a string with pseudo-variables evaluated at runtime. A second parameter @@ -135,12 +135,12 @@ modparam("app_mono", "load", "/usr/local/etc/kamailio/mono/myscript.exe") change to it is immediately live. This function cannot be used if 'load' parameter is set. - Example 1.2. lua_dofile usage + Example 1.2. mono_exec usage ... mono_exec("/usr/local/etc/kamailio/mono/myscript.exe"); ... -4.2. mono_run([param]) +4.2. mono_run([param]) Execute the assembly specified by 'load' module parameter. The assembly is loaded at startup, so changes to it will be effective only after @@ -150,7 +150,7 @@ mono_exec("/usr/local/etc/kamailio/mono/myscript.exe"); assembly. It can be a string with pseudo-variables; these will be evaluated at runtime. - Example 1.3. lua_run usage + Example 1.3. mono_run usage ... if(!mono_run("myparam")) { diff --git a/modules/app_mono/doc/app_mono_admin.xml b/modules/app_mono/doc/app_mono_admin.xml index 5cadea7..01f0b6c 100644 --- a/modules/app_mono/doc/app_mono_admin.xml +++ b/modules/app_mono/doc/app_mono_admin.xml @@ -111,7 +111,7 @@ modparam("app_mono", "load", "/usr/local/etc/kamailio/mono/myscript.exe") parameter is set. </para> <example> - <title><function>lua_dofile</function> usage</title> + <title><function>mono_exec</function> usage</title> <programlisting format="linespecific"> ... mono_exec("/usr/local/etc/kamailio/mono/myscript.exe"); @@ -135,7 +135,7 @@ mono_exec("/usr/local/etc/kamailio/mono/myscript.exe"); evaluated at runtime. </para> <example> - <title><function>lua_run</function> usage</title> + <title><function>mono_run</function> usage</title> <programlisting format="linespecific"> ... if(!mono_run("myparam"))

1 0

External Nat Ping / no 2nd via found
by Brandon Armstead 28 Sep '12

28 Sep '12

Hello, Would it be advised to simply comment out this error when doing nat-pinging externally to Kamailio? It seems the error is a result of Kamailio receiving a reply where no transaction is found (which is because the OPTIONS request and or "nat pinging" is being handled external to Kamailio). Which results in quite a bit of logging for each non transaction matching reply. Thoughts? Solutions? Thanks as always in advance! Sincerely, Brandon Armstead

1 0

git:master: usrloc(k): table version increased internally
by Daniel-Constantin Mierla 28 Sep '12

28 Sep '12

Module: sip-router Branch: master Commit: 505f157c2777fa5e62815ccb4ef68ceb0ab7a023 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=505f157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 28 11:02:04 2012 +0200 usrloc(k): table version increased internally - it was done only in db schema by commit 78dae896127ce6762e3fa7c2541e1b5f9b8a9023 - reported by siklub --- modules_k/usrloc/ul_mod.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/usrloc/ul_mod.h b/modules_k/usrloc/ul_mod.h index e10b2c8..b81b26f 100644 --- a/modules_k/usrloc/ul_mod.h +++ b/modules_k/usrloc/ul_mod.h @@ -43,7 +43,7 @@ */ -#define UL_TABLE_VERSION 5 +#define UL_TABLE_VERSION 6 extern str ruid_col; extern str user_col;

1 0

presence pua crash when using db_cluster
by Juha Heinanen 27 Sep '12

27 Sep '12

i tried to use db_cluster with presence server and got crash: core was generated by `/usr/sbin/pres-serv -f /etc/pres-serv/pres-serv.cfg -P /var/run/pres-serv/pres-'. Program terminated with signal 11, Segmentation fault. #0 0x00007f39f3c13b13 in db_do_query_internal (_h=0x7f39f53b5708, _k=0x7fff811b8c90, _op=0x7fff811b8c50, _v=0x7fff811b8c60, _c=0x0, _n=1, _nc=0, _o=0x0, _r=0x0, val2str=0x7f39f4c31cbc <db_mysql_val2str>, submit_query=0x7f39f4c2b615 <db_mysql_submit_query>, store_result=0x7f39f4c2bb9c <db_mysql_store_result>, _l=0) at db_query.c:83 83 db_query.c: No such file or directory. (gdb) where #0 0x00007f39f3c13b13 in db_do_query_internal (_h=0x7f39f53b5708, _k=0x7fff811b8c90, _op=0x7fff811b8c50, _v=0x7fff811b8c60, _c=0x0, _n=1, _nc=0, _o=0x0, _r=0x0, val2str=0x7f39f4c31cbc <db_mysql_val2str>, submit_query=0x7f39f4c2b615 <db_mysql_submit_query>, store_result=0x7f39f4c2bb9c <db_mysql_store_result>, _l=0) at db_query.c:83 #1 0x00007f39f3c14303 in db_do_query (_h=0x7f39f53b5708, _k=0x7fff811b8c90, _op=0x7fff811b8c50, _v=0x7fff811b8c60, _c=0x0, _n=1, _nc=0, _o=0x0, _r=0x0, val2str=0x7f39f4c31cbc <db_mysql_val2str>, submit_query=0x7f39f4c2b615 <db_mysql_submit_query>, store_result=0x7f39f4c2bb9c <db_mysql_store_result>) at db_query.c:156 #2 0x00007f39f4c2c727 in db_mysql_query (_h=0x7f39f53b5708, _k=0x7fff811b8c90, _op=0x7fff811b8c50, _v=0x7fff811b8c60, _c=0x0, _n=1, _nc=0, _o=0x0, _r=0x0) at km_dbase.c:261 #3 0x00007f39f1abec8e in db_cluster_query (_h=0x7f39f53b4788, _k=0x7fff811b8c90, _op=0x7fff811b8c50, _v=0x7fff811b8c60, _c=0x0, _n=1, _nc=0, _o=0x0, _r=0x0) at dbcl_api.c:300 #4 0x00007f39f3c1651f in db_fetch_query_internal (dbf=0x7f39f03cec20, frows=500, _h=0x7f39f53b4788, _k=0x7fff811b8c90, _op=0x7fff811b8c50, _v=0x7fff811b8c60, _c=0x0, _n=1, _nc=0, _o=0x0, _r=0x7fff811b8c88, _query=0x7f39f1abe854 <db_cluster_query>) at db_query.c:427 #5 0x00007f39f3c169cc in db_fetch_query (dbf=0x7f39f03cec20, frows=500, _h=0x7f39f53b4788, _k=0x7fff811b8c90, _op=0x7fff811b8c50, _v=0x7fff811b8c60, _c=0x0, _n=1, _nc=0, _o=0x0, _r=0x7fff811b8c88) at db_query.c:466 #6 0x00007f39f01aab1f in clean_puadb (update_period=30, min_expires=0) at pua_db.c:171 #7 0x00007f39f01a60a2 in hashT_clean (ticks=95327236, param=0x0) at pua.c:685 #8 0x0000000000525839 in compat_old_handler (ti=1525235788, tl=0x7f39ecc03a90, data=0x7f39ecc03a90) at timer.c:1017 #9 0x0000000000525da1 in slow_timer_main () at timer.c:1151 #10 0x00000000004656f0 in main_loop () at main.c:1692 #11 0x00000000004685f8 in main (argc=16, argv=0x7fff811b9088) at main.c:2563 i don't know why gdb complains about missing db_query.c. this is with latest master. -- juha

3 11

git:master: modules_k/pua: always use_table before making db queries
by admin＠sip-router.org 27 Sep '12

27 Sep '12

Module: sip-router Branch: master Commit: 83cdd718fab4e244c5362df5102481ce32f75ae1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83cdd71… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Sep 27 19:16:47 2012 +0300 modules_k/pua: always use_table before making db queries --- modules_k/pua/pua.c | 2 +- modules_k/pua/pua.h | 1 + modules_k/pua/pua_db.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/modules_k/pua/pua.c b/modules_k/pua/pua.c index 8734d35..900e582 100644 --- a/modules_k/pua/pua.c +++ b/modules_k/pua/pua.c @@ -63,7 +63,7 @@ extern int bind_pua(pua_api_t* api); int min_expires= 0; int default_expires=3600; static str db_url = str_init(DEFAULT_DB_URL); -static str db_table= str_init("pua"); +str db_table= str_init("pua"); int update_period= 100; str outbound_proxy = {0, 0}; int check_remote_contact = 1; diff --git a/modules_k/pua/pua.h b/modules_k/pua/pua.h index 34e2135..eef362f 100644 --- a/modules_k/pua/pua.h +++ b/modules_k/pua/pua.h @@ -59,5 +59,6 @@ extern db_func_t pua_dbf; extern db1_con_t *pua_db; extern int pua_fetch_rows; +extern str db_table; #endif diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index 8d72a96..b37fed2 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -168,6 +168,11 @@ int clean_puadb( int update_period, int min_expires ) q_vals[0].val.int_val = now+update_period; q_ops[0] = OP_LT; + if (pua_dbf.use_table(pua_db, &db_table) < 0) { + LM_ERR("error in use_table pua\n"); + return(-1); + } + if(db_fetch_query(&pua_dbf, pua_fetch_rows, pua_db, q_cols, q_ops, q_vals, NULL, 1, 0, 0, &res) < 0) { @@ -279,6 +284,11 @@ int is_dialog_puadb(ua_pres_t *pres) return(-1); } + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(-1); + } if(pua_dbf.query(pua_db, q_cols, 0, q_vals, res_cols,n_query_cols,n_res_cols,0,&res) < 0) @@ -367,6 +377,12 @@ int get_record_id_puadb(ua_pres_t *pres, str **rec_id ) return(-1); } + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(-1); + } + if(pua_dbf.query(pua_db, q_cols, 0, q_vals, res_cols,n_query_cols,n_res_cols,0,&res) < 0) { @@ -614,7 +630,11 @@ int convert_temporary_dialog_puadb(ua_pres_t *pres) query_vals[n_query_cols].val.str_val.len = 0; n_query_cols++; - + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(-1); + } if (pua_dbf.replace != NULL) { @@ -843,6 +863,12 @@ ua_pres_t *get_record_puadb(str pres_id, str *etag, ua_pres_t *result, db1_res_t return(NULL); } + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(NULL); + } + if(query_fn(pua_db, q_cols, 0, q_vals, NULL,n_query_cols,0,0,&res) < 0) { @@ -919,6 +945,12 @@ int delete_record_puadb(ua_pres_t *pres) return(-1); } + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(-1); + } + if (pua_dbf.delete(pua_db, q_cols, 0, q_vals, n_query_cols) < 0) { LM_ERR("deleting record\n"); @@ -985,6 +1017,12 @@ int update_record_puadb(ua_pres_t *pres, int expires, str *etag) return(-1); } + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(-1); + } + if (pua_dbf.update(pua_db, q_cols, 0, q_vals, u_cols, u_vals, n_query_cols, n_update_cols) < 0) { @@ -1192,6 +1230,12 @@ ua_pres_t *get_dialog_puadb(str pres_id, str *pres_uri, ua_pres_t *result, db1_r return(NULL); } + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(NULL); + } + if(query_fn(pua_db, q_cols, 0, q_vals, NULL,n_query_cols,0,0,&res) < 0) { @@ -1278,6 +1322,12 @@ int delete_dialog_puadb(ua_pres_t *pres) return(-1); } + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(-1); + } + if (pua_dbf.delete(pua_db, q_cols, 0, q_vals, n_query_cols) < 0) { LM_ERR("deleting record\n"); @@ -1350,6 +1400,12 @@ int update_dialog_puadb(ua_pres_t *pres, int expires, str *contact) return(-1); } + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(-1); + } + if (pua_dbf.update(pua_db, q_cols, 0, q_vals, u_cols, u_vals, n_query_cols, n_update_cols) < 0) { @@ -1409,6 +1465,12 @@ int update_contact_puadb(ua_pres_t *pres, str *contact) return(-1); } + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(-1); + } + if(pua_dbf.update(pua_db, q_cols, 0, q_vals, db_cols,db_vals,n_query_cols,n_update_cols) < 0) { @@ -1467,6 +1529,12 @@ int update_version_puadb(ua_pres_t *pres) return(-1); } + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(-1); + } + if(pua_dbf.update(pua_db, q_cols, 0, q_vals, db_cols,db_vals,n_query_cols,n_update_cols) < 0) @@ -1505,6 +1573,12 @@ list_entry_t *get_subs_list_puadb(str *did) return list; } + if (pua_dbf.use_table(pua_db, &db_table) < 0) + { + LM_ERR("error in use_table pua\n"); + return(list); + } + if(db_fetch_query(&pua_dbf, pua_fetch_rows, pua_db, q_cols, 0, q_vals, res_cols, n_query_cols, n_res_cols, 0, &res) < 0) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2012