sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: app_lua: Added sr.xavp.get_keys function.
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: master Commit: 0c866d07dd2124b92329106c1cea19bef6ccca9a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c866d0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 22 10:48:08 2013 +0200 app_lua: Added sr.xavp.get_keys function. --- modules/app_lua/app_lua_sr.c | 80 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 78 insertions(+), 2 deletions(-) diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index b5a6a6c..6b9dae6 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -39,6 +39,7 @@ #include "../../dset.h" #include "../../parser/parse_uri.h" #include "../../lib/kcore/cmpapi.h" +#include "../../xavp.h" #include "app_lua_api.h" #include "app_lua_sr.h" @@ -1122,6 +1123,82 @@ static const luaL_reg _sr_pv_Map [] = { {NULL, NULL} }; + +/** + * creates and push a table to the lua stack with + * the elements of the list + */ +static int lua_sr_push_str_list_table(lua_State *L, struct str_list *list) { + lua_Number i = 1; + struct str_list *k = list; + + lua_newtable(L); + while(k!=NULL){ + lua_pushnumber(L, i); + lua_pushlstring(L, k->s.s, k->s.len); + lua_settable(L, -3); + i++; + k = k->next; + } + return 1; +} + +/** + * puts a table with the list of keys of the xavp + */ +static int lua_sr_xavp_get_keys (lua_State *L) +{ + str xavp_name; + int indx = 0; + sr_lua_env_t *env_L; + sr_xavp_t *avp; + struct str_list *keys, *k; + + env_L = sr_lua_env_get(); + + if(lua_gettop(L)<2) + { + LM_ERR("to few parameters [%d]\n",lua_gettop(L)); + return 0; + } + + if(!lua_isnumber(L, -1)) + { + LM_ERR("invalid int parameter\n"); + return 0; + } + indx = lua_tointeger(L, -1); + + xavp_name.s = (char*)lua_tostring(L, -2); + if(xavp_name.s==NULL || env_L->msg==NULL) + return 0; + xavp_name.len = strlen(xavp_name.s); + + avp = xavp_get_by_index(&xavp_name, indx, NULL); + if(avp==NULL){ + LM_ERR("can't get xavp:%.*s index:%d\n", xavp_name.len, xavp_name.s, indx); + lua_pushnil(L); + return 1; + } + keys = xavp_get_list_key_names(avp); + lua_sr_push_str_list_table(L, keys); + // free list + while(keys!=NULL){ + k = keys; + keys = k->next; + pkg_free(k); + } + return 1; +} + +/** + * + */ +static const luaL_reg _sr_xavp_Map [] = { + {"get_keys", lua_sr_xavp_get_keys}, + {NULL, NULL} +}; + /** * */ @@ -1130,6 +1207,5 @@ void lua_sr_core_openlibs(lua_State *L) luaL_openlib(L, "sr", _sr_core_Map, 0); luaL_openlib(L, "sr.hdr", _sr_hdr_Map, 0); luaL_openlib(L, "sr.pv", _sr_pv_Map, 0); + luaL_openlib(L, "sr.xavp", _sr_xavp_Map, 0); } - -

1 0

git:master: core[xavp]: Added helper function to get a list of keys from a xavp variable.
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: master Commit: 288e2739da28251e12086b52358c3a0d18e91fa5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=288e273… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 22 10:46:17 2013 +0200 core[xavp]: Added helper function to get a list of keys from a xavp variable. --- xavp.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xavp.h | 2 ++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/xavp.c b/xavp.c index 6c8566d..adce5d1 100644 --- a/xavp.c +++ b/xavp.c @@ -27,6 +27,7 @@ #include <stdio.h> #include <string.h> +#include "mem/mem.h" #include "mem/shm_mem.h" #include "dprint.h" #include "hashes.h" @@ -538,6 +539,67 @@ void xavp_print_list(sr_xavp_t **head) } /** + * returns a list of str with key names. + * Example: + * If we have this structure + * $xavp(test=>one) = 1 + * $xavp(test[0]=>two) = "2" + * $xavp(test[0]=>three) = 3 + * $xavp(test[0]=>four) = $xavp(whatever) + * + * xavp_get_list_keys_names(test[0]) returns + * {"one", "two", "three", "four"} + */ +struct str_list *xavp_get_list_key_names(sr_xavp_t *xavp) +{ + sr_xavp_t *avp = NULL; + struct str_list *result = NULL; + struct str_list *r = NULL; + int total = 0; + + if(xavp==NULL){ + LM_ERR("xavp is NULL\n"); + return 0; + } + + if(xavp->val.type!=SR_XTYPE_XAVP){ + LM_ERR("%s not xavp?\n", xavp->name.s); + return 0; + } + + avp = xavp->val.v.xavp; + + if (avp) + { + result = (struct str_list*)pkg_malloc(sizeof(struct str_list)); + if (result==NULL) { + PKG_MEM_ERROR; + return 0; + } + r = result; + r->s.s = avp->name.s; + r->s.len = avp->name.len; + r->next = NULL; + avp = avp->next; + } + + while(avp) + { + r = append_str_list(avp->name.s, avp->name.len, &r, &total); + if(r==NULL){ + while(result){ + r = result; + result = result->next; + pkg_free(r); + } + return 0; + } + avp = avp->next; + } + return result; +} + +/** * clone the xavp without values that are custom data * - only one list level is cloned, other sublists are ignored */ diff --git a/xavp.h b/xavp.h index b581c08..7d5d517 100644 --- a/xavp.h +++ b/xavp.h @@ -29,6 +29,7 @@ #include <time.h> #include "str.h" +#include "str_list.h" struct _sr_xavp; @@ -95,6 +96,7 @@ void xavp_destroy_list(sr_xavp_t **head); void xavp_reset_list(void); sr_xavp_t **xavp_set_list(sr_xavp_t **head); sr_xavp_t **xavp_get_crt_list(void); +struct str_list *xavp_get_list_key_names(sr_xavp_t *xavp); int xavp_insert(sr_xavp_t *xavp, int idx, sr_xavp_t **list); sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list);

1 0

[tracker] Comment added: usrloc module stops updating some records in db_mode 2
by sip-router 25 Apr '13

25 Apr '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#278 - usrloc module stops updating some records in db_mode 2 User who did this - Jordan (jordan) ---------- I am on the latest 3.3 stable in production. Will you be backporting the patch to 3.3? ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=278#comment858 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:4.0: modules/*: README regenerated for updates to db_url and wiki
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: 4.0 Commit: 2c290ee29696f9c0c44fcaf04b8abd91d10c04a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c290ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Apr 25 09:55:16 2013 +0200 modules/*: README regenerated for updates to db_url and wiki --- modules/alias_db/README | 2 +- modules/auth/README | 17 ++-- modules/auth_db/README | 48 ++++---- modules/blst/README | 16 ++-- modules/corex/README | 10 +- modules/counters/README | 22 ++-- modules/ctl/README | 22 ++-- modules/db_flatstore/README | 2 +- modules/db_text/README | 2 +- modules/debugger/README | 8 +- modules/dispatcher/README | 32 +++--- modules/dmq/README | 8 +- modules/domain/README | 2 +- modules/domainpolicy/README | 2 +- modules/drouting/README | 130 ++++++++++---------- modules/group/README | 4 +- modules/htable/README | 24 ++-- modules/imc/README | 8 +- modules/ipops/README | 40 +++--- modules/kex/README | 20 ++-- modules/malloc_test/README | 26 ++-- modules/mangler/README | 10 +- modules/matrix/README | 6 +- modules/mediaproxy/README | 16 ++-- modules/mqueue/README | 8 +- modules/msilo/README | 2 +- modules/msrp/README | 22 ++-- modules/mtree/README | 10 +- modules/nathelper/README | 64 +++++----- modules/p_usrloc/README | 10 +- modules/path/README | 52 ++++---- modules/pdt/README | 2 +- modules/permissions/README | 46 ++++---- modules/pike/README | 6 +- modules/pipelimit/README | 44 ++++---- modules/print/README | 4 +- modules/ratelimit/README | 22 ++-- modules/registrar/README | 12 ++- modules/rr/README | 286 ++++++++++++++++++++++++++---------------- modules/rtpproxy/README | 84 ++++++------ modules/sanity/README | 2 +- modules/sca/README | 4 +- modules/sdpops/README | 24 ++-- modules/seas/README | 28 ++-- modules/sipcapture/README | 4 +- modules/siptrace/README | 6 +- modules/sqlops/README | 8 +- modules/statistics/README | 3 +- modules/timer/README | 8 +- modules/tm/README | 106 ++++++++-------- modules/tmrec/README | 2 +- modules/tmx/README | 50 ++++---- modules/uac/README | 66 +++++----- modules/uri_db/README | 2 +- modules/userblacklist/README | 2 +- modules/usrloc/README | 63 ++++++---- modules/xhttp_rpc/README | 4 +- modules/xprint/README | 22 ++-- 58 files changed, 825 insertions(+), 730 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2c2…

1 0

git:4.0: usrloc: update call-id value in db when matching record by ruid
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: 4.0 Commit: 88a0733ed03ecd2f16aa32ba00d146d8b395a8f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88a0733… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 17:26:15 2013 +0200 usrloc: update call-id value in db when matching record by ruid (cherry picked from commit 0125cdf0e75271a8478a3eadacc54ea1c1eb4da0) --- modules/usrloc/ucontact.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index c50e8b4..35dfa0d 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -838,6 +838,11 @@ int db_update_ucontact_ruid(ucontact_t* _c) return 0; } + if(_c->ruid.len<=0) { + LM_ERR("updating record in database failed - empty ruid\n"); + return -1; + } + n1 = 0; keys1[n1] = &ruid_col; vals1[n1].type = DB1_STR; @@ -928,15 +933,10 @@ int db_update_ucontact_ruid(ucontact_t* _c) vals2[n2].val.time_val = _c->last_modified; n2++; - keys2[n2] = &ruid_col; - if(_c->ruid.len>0) - { - vals2[n2].type = DB1_STR; - vals2[n2].nul = 0; - vals2[n2].val.str_val = _c->ruid; - } else { - vals2[n2].nul = 1; - } + keys2[n2] = &callid_col; + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->callid; n2++; keys2[n2] = &instance_col; @@ -1101,8 +1101,7 @@ int db_delete_ucontact_ruid(ucontact_t* _c) return 0; } - if(_c->ruid.len<=0) - { + if(_c->ruid.len<=0) { LM_ERR("deleting from database failed - empty ruid\n"); return -1; }

1 0

git:4.0: usrloc: documented db_ops_ruid parameter
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: 4.0 Commit: d87b33178e432726819e2b4c73a032d67d4a1d82 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d87b331… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 15:41:34 2013 +0200 usrloc: documented db_ops_ruid parameter (cherry picked from commit e66842c2fc34d8dc8980efa821f7039685edef87) --- modules/usrloc/doc/usrloc_admin.xml | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index 32d8baa..1997434 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -844,6 +844,28 @@ modparam("usrloc", "xavp_contact", "ulattrs") </example> </section> + <section id="usrloc.p.db_obs_ruid"> + <title><varname>db_obs_ruid</varname> (string)</title> + <para> + If set to 1, database queries for update or delete are done using + ruid value. If it is set to 0, the old style using aor, contact and + call-id is done. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>db_obs_ruid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "db_obs_ruid", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:4.0: usrloc: option to do db update/delete ops using ruid
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: 4.0 Commit: 102a1108b9e3ed9415e4b25d45542faa2643329d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=102a110… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 15:34:16 2013 +0200 usrloc: option to do db update/delete ops using ruid - new parameter db_obs_ruid - if set to 1, db update/delete operations are done using ruid value - if paramter set to 0 (default) the old style using aor, contact and call-id is done (cherry picked from commit 61e08282c905c2ee03a2be618b1e700fc0acbdeb) --- modules/usrloc/ucontact.c | 260 ++++++++++++++++++++++++++++++++++++++++++++- modules/usrloc/ul_mod.c | 3 + modules/usrloc/ul_mod.h | 1 + 3 files changed, 260 insertions(+), 4 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index c265580..c50e8b4 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -624,11 +624,11 @@ int db_insert_ucontact(ucontact_t* _c) /*! - * \brief Update contact in the database + * \brief Update contact in the database by address * \param _c updated contact * \return 0 on success, -1 on failure */ -int db_update_ucontact(ucontact_t* _c) +int db_update_ucontact_addr(ucontact_t* _c) { char* dom; db_key_t keys1[4]; @@ -816,13 +816,212 @@ int db_update_ucontact(ucontact_t* _c) return 0; } +/*! + * \brief Update contact in the database by ruid + * \param _c updated contact + * \return 0 on success, -1 on failure + */ +int db_update_ucontact_ruid(ucontact_t* _c) +{ + str auser; + str adomain; + db_key_t keys1[1]; + db_val_t vals1[1]; + int n1; + + db_key_t keys2[14]; + db_val_t vals2[14]; + int n2; + + + if (_c->flags & FL_MEM) { + return 0; + } + + n1 = 0; + keys1[n1] = &ruid_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = _c->ruid; + n1++; + + n2 = 0; + keys2[n2] = &expires_col; + vals2[n2].type = DB1_DATETIME; + vals2[n2].nul = 0; + vals2[n2].val.time_val = _c->expires; + n2++; + + keys2[n2] = &q_col; + vals2[n2].type = DB1_DOUBLE; + vals2[n2].nul = 0; + vals2[n2].val.double_val = q2double(_c->q); + n2++; + + keys2[n2] = &cseq_col; + vals2[n2].type = DB1_INT; + vals2[n2].nul = 0; + vals2[n2].val.int_val = _c->cseq; + n2++; + + keys2[n2] = &flags_col; + vals2[n2].type = DB1_INT; + vals2[n2].nul = 0; + vals2[n2].val.bitmap_val = _c->flags; + n2++; + + keys2[n2] = &cflags_col; + vals2[n2].type = DB1_INT; + vals2[n2].nul = 0; + vals2[n2].val.bitmap_val = _c->cflags; + n2++; + + keys2[n2] = &user_agent_col; + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->user_agent; + n2++; + + keys2[n2] = &received_col; + vals2[n2].type = DB1_STR; + if (_c->received.s == 0) { + vals2[n2].nul = 1; + } else { + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->received; + } + n2++; + + keys2[n2] = &path_col; + vals2[n2].type = DB1_STR; + if (_c->path.s == 0) { + vals2[n2].nul = 1; + } else { + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->path; + } + n2++; + + keys2[n2] = &sock_col; + vals2[n2].type = DB1_STR; + if (_c->sock) { + vals2[n2].val.str_val = _c->sock->sock_str; + vals2[n2].nul = 0; + } else { + vals2[n2].nul = 1; + } + n2++; + + keys2[n2] = &methods_col; + vals2[n2].type = DB1_BITMAP; + if (_c->methods == 0xFFFFFFFF) { + vals2[n2].nul = 1; + } else { + vals2[n2].val.bitmap_val = _c->methods; + vals2[n2].nul = 0; + } + n2++; + + keys2[n2] = &last_mod_col; + vals2[n2].type = DB1_DATETIME; + vals2[n2].nul = 0; + vals2[n2].val.time_val = _c->last_modified; + n2++; + + keys2[n2] = &ruid_col; + if(_c->ruid.len>0) + { + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->ruid; + } else { + vals2[n2].nul = 1; + } + n2++; + + keys2[n2] = &instance_col; + if(_c->instance.len>0) + { + vals2[n2].type = DB1_STR; + vals2[n2].nul = 0; + vals2[n2].val.str_val = _c->instance; + } else { + vals2[n2].nul = 1; + } + n2++; + + keys2[n2] = &reg_id_col; + vals2[n2].type = DB1_INT; + vals2[n2].nul = 0; + vals2[n2].val.int_val = (int)_c->reg_id; + n2++; + + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { + LM_ERR("sql use_table failed\n"); + return -1; + } + + if (ul_dbf.update(ul_dbh, keys1, 0, vals1, keys2, vals2, n1, n2) < 0) { + LM_ERR("updating database failed\n"); + return -1; + } + + if (ul_db_check_update==1 && ul_dbf.affected_rows) { + /* supposed to be an UPDATE, but if affected rows is 0, then try + * to do an INSERT */ + if(ul_dbf.affected_rows(ul_dbh)==0) { + LM_DBG("affected rows by UPDATE was 0, doing an INSERT\n"); + if(db_insert_ucontact(_c)<0) + return -1; + } + } + + /* delete old db attrs and add the current list */ + auser = *_c->aor; + if (use_domain) { + adomain.s = memchr(_c->aor->s, '@', _c->aor->len); + if (adomain.s==0) { + auser.len = 0; + adomain = *_c->aor; + } else { + auser.len = adomain.s - _c->aor->s; + adomain.s++; + adomain.len = _c->aor->s + _c->aor->len - adomain.s; + } + + uldb_delete_attrs(_c->domain, &auser, + &adomain, &_c->ruid); + uldb_insert_attrs(_c->domain, &auser, + &adomain, &_c->ruid, _c->xavp); + } else { + uldb_delete_attrs(_c->domain, &auser, + NULL, &_c->ruid); + uldb_insert_attrs(_c->domain, &auser, + NULL, &_c->ruid, _c->xavp); + } + + return 0; +} /*! - * \brief Delete contact from the database + * \brief Update contact in the database + * \param _c updated contact + * \return 0 on success, -1 on failure + */ +int db_update_ucontact(ucontact_t* _c) +{ + if(ul_db_ops_ruid==0) + return db_update_ucontact_addr(_c); + else + return db_update_ucontact_ruid(_c); +} + +/*! + * \brief Delete contact from the database by address * \param _c deleted contact * \return 0 on success, -1 on failure */ -int db_delete_ucontact(ucontact_t* _c) +int db_delete_ucontact_addr(ucontact_t* _c) { char* dom; db_key_t keys[4]; @@ -887,6 +1086,59 @@ int db_delete_ucontact(ucontact_t* _c) return 0; } +/*! + * \brief Delete contact from the database by ruid + * \param _c deleted contact + * \return 0 on success, -1 on failure + */ +int db_delete_ucontact_ruid(ucontact_t* _c) +{ + db_key_t keys[1]; + db_val_t vals[1]; + int n; + + if (_c->flags & FL_MEM) { + return 0; + } + + if(_c->ruid.len<=0) + { + LM_ERR("deleting from database failed - empty ruid\n"); + return -1; + } + + n = 0; + keys[n] = &ruid_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = _c->ruid; + n++; + + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { + LM_ERR("sql use_table failed\n"); + return -1; + } + + if (ul_dbf.delete(ul_dbh, keys, 0, vals, n) < 0) { + LM_ERR("deleting from database failed\n"); + return -1; + } + + return 0; +} + +/*! + * \brief Delete contact from the database + * \param _c deleted contact + * \return 0 on success, -1 on failure + */ +int db_delete_ucontact(ucontact_t* _c) +{ + if(ul_db_ops_ruid==0) + return db_delete_ucontact_addr(_c); + else + return db_delete_ucontact_ruid(_c); +} /*! * \brief Remove a contact from list belonging to a certain record diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index bbaa996..77a2a40 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -118,6 +118,8 @@ int ul_timer_procs = 0; int ul_db_check_update = 0; int ul_keepalive_timeout = 0; +int ul_db_ops_ruid = 0; + str ul_xavp_contact_name = {0}; /* sruid to get internal uid for mi/rpc commands */ @@ -217,6 +219,7 @@ static param_export_t params[] = { {"timer_procs", INT_PARAM, &ul_timer_procs}, {"db_check_update", INT_PARAM, &ul_db_check_update}, {"xavp_contact", STR_PARAM, &ul_xavp_contact_name.s}, + {"db_ops_ruid", INT_PARAM, &ul_db_ops_ruid}, {0, 0, 0} }; diff --git a/modules/usrloc/ul_mod.h b/modules/usrloc/ul_mod.h index 5ddf7df..2435b5e 100644 --- a/modules/usrloc/ul_mod.h +++ b/modules/usrloc/ul_mod.h @@ -105,5 +105,6 @@ extern db_func_t ul_dbf; extern int matching_mode; +extern int ul_db_ops_ruid; #endif /* UL_MOD_H */

1 0

git:4.0: registrar: added debug message to print generated ruid for contact
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: 4.0 Commit: 744a6dc1c93c8b16750f4ab25deb57a02889f1d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=744a6dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 13:36:08 2013 +0200 registrar: added debug message to print generated ruid for contact - formatted condition to fit 80 char long line (cherry picked from commit 735f83d6346c97d6f7b1da26a2fee1b6270872b1) --- modules/registrar/save.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index 7596c6a..cd637c3 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -374,6 +374,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, if(sruid_next(&_reg_sruid)<0) goto error; ci.ruid = _reg_sruid.uid; + LM_DBG("generated ruid is: %.*s\n", ci.ruid.len, ci.ruid.s); } return &ci; @@ -444,8 +445,9 @@ static inline int insert_contacts(struct sip_msg* _m, udomain_t* _d, str* _a) flags = mem_only; #ifdef USE_TCP - if ( (_m->flags&tcp_persistent_flag) && - (_m->rcv.proto==PROTO_TCP||_m->rcv.proto==PROTO_TLS||_m->rcv.proto==PROTO_WS||_m->rcv.proto==PROTO_WSS)) { + if ( (_m->flags&tcp_persistent_flag) + && (_m->rcv.proto==PROTO_TCP||_m->rcv.proto==PROTO_TLS + ||_m->rcv.proto==PROTO_WS||_m->rcv.proto==PROTO_WSS)) { e_max = 0; tcp_check = 1; } else {

1 0

git:4.0: docbook: uptdated wiki link in entities file
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: 4.0 Commit: 484444f4f90c725567a759252e2b3c11d53c8756 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=484444f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 23 11:58:17 2013 +0200 docbook: uptdated wiki link in entities file (cherry picked from commit 2b97e81b281802283ebc665da6f9190f0a9705ab) --- docbook/entities.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docbook/entities.xml b/docbook/entities.xml index e414d32..2498298 100644 --- a/docbook/entities.xml +++ b/docbook/entities.xml @@ -10,7 +10,7 @@ <!ENTITY kamailioname "Kamailio SIP Server Platform"> <!ENTITY kamailioconfig "kamailio.cfg"> -<!ENTITY kamwiki "http://www.kamailio.org/dokuwiki/"> +<!ENTITY kamwiki "http://www.kamailio.org/wiki/"> <!ENTITY kamwikilink "<ulink url='&kamwiki;'>&kamwiki;</ulink>"> <!ENTITY kamailiohome "http://www.kamailio.org/">

1 0

git:4.0: sqlops: use one char buf for empty strings in db results
by Daniel-Constantin Mierla 25 Apr '13

25 Apr '13

Module: sip-router Branch: 4.0 Commit: 17b858ac9b88de8859f9f1cbc76da146d8f125db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17b858a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Apr 24 10:26:49 2013 +0200 sqlops: use one char buf for empty strings in db results - safe for the parts of code that want to access it even for write (cherry picked from commit a74980270b655124c276279e54b8f82965f3f4b8) --- modules/sqlops/sql_api.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/sqlops/sql_api.c b/modules/sqlops/sql_api.c index b5ce758..6528078 100644 --- a/modules/sqlops/sql_api.c +++ b/modules/sqlops/sql_api.c @@ -42,7 +42,7 @@ sql_con_t *_sql_con_root = NULL; sql_result_t *_sql_result_root = NULL; -static str _sql_empty_str = {"", 0}; +static char _sql_empty_buf[1]; sql_con_t* sql_get_connection(str *name) { @@ -67,6 +67,8 @@ int sql_init_con(str *name, str *url) sql_con_t *sc; unsigned int conid; + *_sql_empty_buf = '\0'; + conid = core_case_hash(name, 0, 0); sc = _sql_con_root; @@ -373,16 +375,18 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) LM_ERR("no more memory\n"); goto error; } - db_longlong2str(RES_ROWS(db_res)[i].values[j].val.ll_val, res->vals[i][j].value.s.s, &res->vals[i][j].value.s.len); + db_longlong2str(RES_ROWS(db_res)[i].values[j].val.ll_val, + res->vals[i][j].value.s.s, &res->vals[i][j].value.s.len); break; default: res->vals[i][j].flags = PV_VAL_NULL; } if(res->vals[i][j].flags == PV_VAL_STR && sv.s) { - if(sv.len==0) + if(sv.len<=0) { - res->vals[i][j].value.s = _sql_empty_str; + res->vals[i][j].value.s.s = _sql_empty_buf; + res->vals[i][j].value.s.len = 0; continue; } res->vals[i][j].value.s.s

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013