sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

[tracker] Comment added: zombie dialogs in state 5
by sip-router 15 Sep '14

15 Sep '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#424 - zombie dialogs in state 5 User who did this - Ovidiu Sas (osas) ---------- Using the latest master, if a transaction is created before handling the BYE, then the dialog is properly terminated. If there's no manual creation of a transaction, then the zombie dialog still exists: <FIRST BYE HANDLING> Sep 15 11:48:20 centos k[26769]: INFO: <script>: [4] BYE sip:4165552222@192.168.2.97:5064 From:sip:1234@192.168.2.62,tag=as684b0b1a To:sip:4165552222@192.168.2.62,tag=3364246b1869c93eo4 Call-ID:387521af-e5594cca@192.168.2.97 Contact:<null> <192.168.2.2:5060->udp:192.168.2.62:5060> Sep 15 11:48:20 centos k[26769]: DEBUG: dialog [dlg_handlers.c:1158]: dlg_onroute(): route param is '3d7.9cc' (len=7) Sep 15 11:48:20 centos k[26769]: DEBUG: dialog [dlg_hash.c:654]: dlg_lookup(): ref dlg 0x7f891503c118 with 1 -> 3 Sep 15 11:48:20 centos k[26769]: DEBUG: dialog [dlg_hash.c:656]: dlg_lookup(): dialog id=3273 found on entry 2003 Sep 15 11:48:20 centos k[26769]: DEBUG: dialog [dlg_profile.c:514]: set_current_dialog(): setting current dialog [2003:3273] Sep 15 11:48:20 centos k[26769]: DEBUG: dialog [dlg_hash.c:1066]: next_state_dlg(): dialog 0x7f891503c118 changed from state 4 to state 5, due event 7 (ref 3) Sep 15 11:48:20 centos k[26769]: DEBUG: dialog [dlg_hash.c:854]: dlg_ref(): ref dlg 0x7f891503c118 with 1 -> 4 Sep 15 11:48:20 centos k[26769]: DEBUG: dialog [dlg_handlers.c:1544]: dlg_run_event_route(): executing event_route 1 on state 5 Sep 15 11:48:20 centos k[26769]: INFO: <script>: [4] entering event_route[dialog:end] </FIRST BYE HANDLING> <SECOND BYE HANDLING> Sep 15 11:48:21 centos k[26768]: INFO: <script>: [5] BYE sip:4165552222@192.168.2.97:5064 From:sip:1234@192.168.2.62,tag=as684b0b1a To:sip:4165552222@192.168.2.62,tag=3364246b1869c93eo4 Call-ID:387521af-e5594cca@192.168.2.97 Contact:<null> <192.168.2.2:5060->udp:192.168.2.62:5060> Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_handlers.c:1158]: dlg_onroute(): route param is '3d7.9cc' (len=7) Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_hash.c:654]: dlg_lookup(): ref dlg 0x7f891503c118 with 1 -> 5 Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_hash.c:656]: dlg_lookup(): dialog id=3273 found on entry 2003 Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_profile.c:514]: set_current_dialog(): setting current dialog [2003:3273] Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_hash.c:1066]: next_state_dlg(): dialog 0x7f891503c118 changed from state 5 to state 5, due event 7 (ref 5) Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_hash.c:872]: dlg_unref(): unref dlg 0x7f891503c118 with 1 -> 4 Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_lookup.c:1373]: t_newtran(): DEBUG: t_newtran: msg id=5 , global msg id=3 , T on entrance=0xffffffffffffffff Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_lookup.c:527]: t_lookup_request(): t_lookup_request: start searching: hash=18082, isACK=0 Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_lookup.c:485]: matching_3261(): DEBUG: RFC3261 transaction matching failed Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_lookup.c:709]: t_lookup_request(): DEBUG: t_lookup_request: no transaction found Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_hooks.c:374]: run_reqin_callbacks_internal(): DBG: trans=0x7f891503c3c8, callback type 1, id 0 entered Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_hooks.c:374]: run_reqin_callbacks_internal(): DBG: trans=0x7f891503c3c8, callback type 1, id 0 entered Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_funcs.c:394]: t_relay_to(): SER: new transaction fwd'ed Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_hash.c:654]: dlg_lookup(): ref dlg 0x7f891503c118 with 1 -> 5 Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_hash.c:656]: dlg_lookup(): dialog id=3273 found on entry 2003 Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_hash.c:872]: dlg_unref(): unref dlg 0x7f891503c118 with 1 -> 4 Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_lookup.c:1072]: t_check_msg(): DEBUG: t_check_msg: msg id=6 global id=5 T start=0xffffffffffffffff Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_lookup.c:949]: t_reply_matching(): DEBUG: t_reply_matching: hash 18082 label 0 branch 0 Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_lookup.c:1004]: t_reply_matching(): DEBUG: t_reply_matching: reply matched (T=0x7f891503c3c8)! Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_hooks.c:288]: run_trans_callbacks_internal(): DBG: trans=0x7f891503c3c8, callback type 2, id 0 entered Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_hash.c:654]: dlg_lookup(): ref dlg 0x7f891503c118 with 1 -> 5 Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_hash.c:656]: dlg_lookup(): dialog id=3273 found on entry 2003 Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_profile.c:514]: set_current_dialog(): setting current dialog [2003:3273] Sep 15 11:48:21 centos k[26768]: DEBUG: dialog [dlg_hash.c:872]: dlg_unref(): unref dlg 0x7f891503c118 with 1 -> 4 Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_lookup.c:1141]: t_check_msg(): DEBUG: t_check_msg: msg id=6 global id=6 T end=0x7f891503c3c8 Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_reply.c:2210]: reply_received(): DEBUG: reply_received: org. status uas=0, uac[0]=0 local=0 is_invite=0) Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_reply.c:1304]: t_should_relay_response(): ->>>>>>>>> T_code=0, new_code=200 Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_reply.c:1822]: relay_reply(): DEBUG: relay_reply: branch=0, save=0, relay=0 icode=0 Sep 15 11:48:21 centos k[26768]: DEBUG: tm [t_reply.c:1663]: cleanup_uac_timers(): DEBUG: cleanup_uac_timers: RETR/FR timers reset Sep 15 11:48:21 centos k[26769]: INFO: <script>: [4] exiting event_route[dialog:end] Sep 15 11:48:21 centos k[26769]: DEBUG: dialog [dlg_hash.c:872]: dlg_unref(): unref dlg 0x7f891503c118 with 1 -> 3 Sep 15 11:48:21 centos k[26769]: DEBUG: dialog [dlg_hash.c:854]: dlg_ref(): ref dlg 0x7f891503c118 with 1 -> 4 Sep 15 11:48:21 centos k[26769]: DEBUG: dialog [dlg_handlers.c:1280]: dlg_onroute(): BYE successfully processed Sep 15 11:48:21 centos k[26769]: DEBUG: dialog [dlg_hash.c:872]: dlg_unref(): unref dlg 0x7f891503c118 with 2 -> 2 Sep 15 11:48:21 centos k[26769]: DEBUG: dialog [dlg_hash.c:872]: dlg_unref(): unref dlg 0x7f891503c118 with 1 -> 1 Sep 15 11:48:21 centos k[26769]: DEBUG: tm [t_lookup.c:1373]: t_newtran(): DEBUG: t_newtran: msg id=4 , global msg id=3 , T on entrance=(nil) Sep 15 11:48:21 centos k[26769]: DEBUG: tm [t_lookup.c:527]: t_lookup_request(): t_lookup_request: start searching: hash=18082, isACK=0 Sep 15 11:48:21 centos k[26769]: DEBUG: tm [t_lookup.c:470]: matching_3261(): DEBUG: RFC3261 transaction matched, tid=1f8b3c1c Sep 15 11:48:21 centos k[26769]: DEBUG: tm [t_lookup.c:726]: t_lookup_request(): DEBUG: t_lookup_request: transaction found (T=0x7f891503c3c8) Sep 15 11:48:21 centos k[26769]: DEBUG: tm [t_reply.c:1623]: t_retransmit_reply(): DEBUG: reply retransmitted. buf=0x7f890fefb840: SIP/2.0 2..., shmem=0x7f891503fb10: SIP/2.0 2 </SECOND BYE HANDLING> Sep 15 11:48:26 centos k[26772]: DEBUG: dialog [dlg_handlers.c:324]: dlg_iuid_sfree(): freeing dlg iuid [2003:3273] (0x7f891503ee10) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=424#comment1622 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

Nits in 4.1
by James Cloos 15 Sep '14

15 Sep '14

I just noticed that db showg tries to use mysql’s \G method for expanded output even with other db engines. The dnssec module, at least in the version in debian sid, failes to load with: 0(23381) ERROR: <core> [sr_module.c:599]: load_module(): ERROR: load_module: could not open module </usr/lib/x86_64-linux-gnu/kamailio/modules/dnssec.so>: /usr/lib/x86_64-linux-gnu/libval-threads.so.14: undefined symbol: SSL_get_SSL_CTX My impression is that it should link against -lval_shim rather than directly against -lval-threads. app_perl gives this error: NOTICE: <core> [sr_module.c:654]: load_module(): /usr/lib/x86_64-linux-gnu/kamailio/modules/app_perl.so: exports dlflags interface is deprecated and it will not be supported in newer versions; consider using mod_register() instead -JimC -- James Cloos <cloos(a)jhcloos.com> OpenPGP: 0x997A9F17ED7DAEA6

2 1

git:master: usrloc: db_ops_ruid default value to 1
by Daniel-Constantin Mierla 15 Sep '14

15 Sep '14

Module: sip-router Branch: master Commit: 6a0201d83a4d441c0e3b74bd64d3a6557c4a1fe3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a0201d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 15 10:47:04 2014 +0200 usrloc: db_ops_ruid default value to 1 --- modules/usrloc/README | 4 ++-- modules/usrloc/doc/usrloc_admin.xml | 4 ++-- modules/usrloc/ul_mod.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/usrloc/README b/modules/usrloc/README index 7275236..688b2d9 100644 --- a/modules/usrloc/README +++ b/modules/usrloc/README @@ -773,11 +773,11 @@ modparam("usrloc", "xavp_contact", "ulattrs") value. If it is set to 0, the old style using aor, contact and call-id is done. - Default value is "0". + Default value is "1". Example 1.32. Set db_ops_ruid parameter ... -modparam("usrloc", "db_ops_ruid", 1) +modparam("usrloc", "db_ops_ruid", 0) ... 3.33. handle_lost_tcp (int) diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index ce2f693..a256e7a 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -862,14 +862,14 @@ modparam("usrloc", "xavp_contact", "ulattrs") </para> <para> <emphasis> - Default value is <quote>0</quote>. + Default value is <quote>1</quote>. </emphasis> </para> <example> <title>Set <varname>db_ops_ruid</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("usrloc", "db_ops_ruid", 1) +modparam("usrloc", "db_ops_ruid", 0) ... </programlisting> </example> diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index e307273..d3a1021 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -118,7 +118,7 @@ int ul_timer_procs = 0; int ul_db_check_update = 0; int ul_keepalive_timeout = 0; -int ul_db_ops_ruid = 0; +int ul_db_ops_ruid = 1; int ul_expires_type = 0; int ul_db_raw_fetch_type = 0;

1 0

git:master: db_mongodb: proper handling for null values in insert
by Daniel-Constantin Mierla 15 Sep '14

15 Sep '14

Module: sip-router Branch: master Commit: d6489cab8ca8a0b96074ed6e26054517a1547cbf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6489ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 15 09:35:09 2014 +0200 db_mongodb: proper handling for null values in insert --- modules/db_mongodb/mongodb_dbase.c | 49 +++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 22 deletions(-) diff --git a/modules/db_mongodb/mongodb_dbase.c b/modules/db_mongodb/mongodb_dbase.c index ba8f0f3..2752ce5 100644 --- a/modules/db_mongodb/mongodb_dbase.c +++ b/modules/db_mongodb/mongodb_dbase.c @@ -57,13 +57,23 @@ void db_mongodb_close(db1_con_t* _h) db_do_close(_h, db_mongodb_free_connection); } -int db_mongodb_bson_add(bson_t *doc, int vtype, const db_key_t _k, const db_val_t *_v, int idx) +int db_mongodb_bson_add(bson_t *doc, const db_key_t _k, const db_val_t *_v, int idx) { + int vtype; + + vtype = VAL_TYPE(_v); + if(VAL_NULL(_v)) { + if(!bson_append_null(doc, _k->s, _k->len)) { + LM_ERR("failed to append int to bson doc %.*s = %d [%d]\n", + _k->len, _k->s, VAL_INT(_v), idx); + goto error; + } + goto done; + } switch(vtype) { case DB1_INT: if(!bson_append_int32(doc, _k->s, _k->len, - VAL_INT(_v))) - { + VAL_INT(_v))) { LM_ERR("failed to append int to bson doc %.*s = %d [%d]\n", _k->len, _k->s, VAL_INT(_v), idx); goto error; @@ -72,8 +82,7 @@ int db_mongodb_bson_add(bson_t *doc, int vtype, const db_key_t _k, const db_val_ case DB1_BIGINT: if(!bson_append_int64(doc, _k->s, _k->len, - VAL_BIGINT(_v ))) - { + VAL_BIGINT(_v ))) { LM_ERR("failed to append bigint to bson doc %.*s = %lld [%d]\n", _k->len, _k->s, VAL_BIGINT(_v), idx); goto error; @@ -82,8 +91,7 @@ int db_mongodb_bson_add(bson_t *doc, int vtype, const db_key_t _k, const db_val_ case DB1_DOUBLE: if(!bson_append_double(doc, _k->s, _k->len, - VAL_DOUBLE(_v))) - { + VAL_DOUBLE(_v))) { LM_ERR("failed to append double to bson doc %.*s = %f [%d]\n", _k->len, _k->s, VAL_DOUBLE(_v), idx); goto error; @@ -92,8 +100,7 @@ int db_mongodb_bson_add(bson_t *doc, int vtype, const db_key_t _k, const db_val_ case DB1_STRING: if(!bson_append_utf8(doc, _k->s, _k->len, - VAL_STRING(_v), strlen(VAL_STRING(_v))) ) - { + VAL_STRING(_v), strlen(VAL_STRING(_v))) ) { LM_ERR("failed to append string to bson doc %.*s = %s [%d]\n", _k->len, _k->s, VAL_STRING(_v), idx); goto error; @@ -101,9 +108,9 @@ int db_mongodb_bson_add(bson_t *doc, int vtype, const db_key_t _k, const db_val_ break; case DB1_STR: + if(!bson_append_utf8(doc, _k->s, _k->len, - VAL_STR(_v).s, VAL_STR(_v).len) ) - { + VAL_STR(_v).s, VAL_STR(_v).len) ) { LM_ERR("failed to append str to bson doc %.*s = %.*s [%d]\n", _k->len, _k->s, VAL_STR(_v).len, VAL_STR(_v).s, idx); goto error; @@ -112,8 +119,7 @@ int db_mongodb_bson_add(bson_t *doc, int vtype, const db_key_t _k, const db_val_ case DB1_DATETIME: if(!bson_append_time_t(doc, _k->s, _k->len, - VAL_TIME(_v))) - { + VAL_TIME(_v))) { LM_ERR("failed to append time to bson doc %.*s = %ld [%d]\n", _k->len, _k->s, VAL_TIME(_v), idx); goto error; @@ -123,8 +129,7 @@ int db_mongodb_bson_add(bson_t *doc, int vtype, const db_key_t _k, const db_val_ case DB1_BLOB: if(!bson_append_binary(doc, _k->s, _k->len, BSON_SUBTYPE_BINARY, - (const uint8_t *)VAL_BLOB(_v).s, VAL_BLOB(_v).len) ) - { + (const uint8_t *)VAL_BLOB(_v).s, VAL_BLOB(_v).len) ) { LM_ERR("failed to append blob to bson doc %.*s = [bin] [%d]\n", _k->len, _k->s, idx); goto error; @@ -133,8 +138,7 @@ int db_mongodb_bson_add(bson_t *doc, int vtype, const db_key_t _k, const db_val_ case DB1_BITMAP: if(!bson_append_int32(doc, _k->s, _k->len, - VAL_INT(_v))) - { + VAL_INT(_v))) { LM_ERR("failed to append bitmap to bson doc %.*s = %d [%d]\n", _k->len, _k->s, VAL_INT(_v), idx); goto error; @@ -146,6 +150,7 @@ int db_mongodb_bson_add(bson_t *doc, int vtype, const db_key_t _k, const db_val_ return -1; } +done: return 0; error: return -1; @@ -713,7 +718,7 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op } for(i = 0; i < _n; i++) { - if(db_mongodb_bson_add(seldoc, VAL_TYPE(_v + i), _k[i], _v+i, i)<0) + if(db_mongodb_bson_add(seldoc, _k[i], _v+i, i)<0) goto error; } if(is_printable(L_DBG)) { @@ -858,7 +863,7 @@ int db_mongodb_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _ } for(i = 0; i < _n; i++) { - if(db_mongodb_bson_add(doc, VAL_TYPE(_v + i), _k[i], _v+i, i)<0) + if(db_mongodb_bson_add(doc, _k[i], _v+i, i)<0) goto error; } if(is_printable(L_DBG)) { @@ -934,7 +939,7 @@ int db_mongodb_delete(const db1_con_t* _h, const db_key_t* _k, } for(i = 0; i < _n; i++) { - if(db_mongodb_bson_add(doc, VAL_TYPE(_v + i), _k[i], _v+i, i)<0) + if(db_mongodb_bson_add(doc, _k[i], _v+i, i)<0) goto error; } @@ -1020,12 +1025,12 @@ int db_mongodb_update(const db1_con_t* _h, const db_key_t* _k, } for(i = 0; i < _un; i++) { - if(db_mongodb_bson_add(udoc, VAL_TYPE(_uv + i), _uk[i], _uv+i, i)<0) + if(db_mongodb_bson_add(udoc, _uk[i], _uv+i, i)<0) goto error; } for(i = 0; i < _n; i++) { - if(db_mongodb_bson_add(mdoc, VAL_TYPE(_v + i), _k[i], _v+i, i)<0) + if(db_mongodb_bson_add(mdoc, _k[i], _v+i, i)<0) goto error; }

1 0

git:master: db_mongodb: log query content in debug level
by Daniel-Constantin Mierla 15 Sep '14

15 Sep '14

Module: sip-router Branch: master Commit: a6f3d41f5bb23f2a153ca481b495110339c9cb45 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a6f3d41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 15 00:05:28 2014 +0200 db_mongodb: log query content in debug level --- modules/db_mongodb/mongodb_dbase.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules/db_mongodb/mongodb_dbase.c b/modules/db_mongodb/mongodb_dbase.c index c6998f9..ba8f0f3 100644 --- a/modules/db_mongodb/mongodb_dbase.c +++ b/modules/db_mongodb/mongodb_dbase.c @@ -824,6 +824,7 @@ int db_mongodb_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _ bson_error_t error; bson_t *doc = NULL; char *cname; + char *jstr; char b1; mgcon = MONGODB_CON(_h); @@ -860,6 +861,11 @@ int db_mongodb_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _ if(db_mongodb_bson_add(doc, VAL_TYPE(_v + i), _k[i], _v+i, i)<0) goto error; } + if(is_printable(L_DBG)) { + jstr = bson_as_json (doc, NULL); + LM_DBG("insert document: %s\n", jstr); + bson_free (jstr); + } if (!mongoc_collection_insert (collection, MONGOC_INSERT_NONE, doc, NULL, &error)) { LM_ERR("failed to insert in collection: %s\n", error.message); @@ -893,6 +899,7 @@ int db_mongodb_delete(const db1_con_t* _h, const db_key_t* _k, bson_error_t error; bson_t *doc = NULL; char *cname; + char *jstr; char b1; mgcon = MONGODB_CON(_h); @@ -931,6 +938,11 @@ int db_mongodb_delete(const db1_con_t* _h, const db_key_t* _k, goto error; } + if(is_printable(L_DBG)) { + jstr = bson_as_json (doc, NULL); + LM_DBG("delete filter document: %s\n", jstr); + bson_free (jstr); + } if (!mongoc_collection_remove (collection, MONGOC_REMOVE_NONE, doc, NULL, &error)) { LM_ERR("failed to delete in collection: %s\n", error.message);

1 0

git:master: usrloc: option to control if the null fields should be in insert statement
by Daniel-Constantin Mierla 14 Sep '14

14 Sep '14

Module: sip-router Branch: master Commit: c1edef1f89894a9382ef424a43aefabe0fb10443 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1edef1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 15 00:01:36 2014 +0200 usrloc: option to control if the null fields should be in insert statement - ammeds previous patch 1e84aeb91cf8e7a79a9ac9091ed993be944a667b that introduced skipping adding the null fields - while it was more optimal for sql backends, for non-sql that doesn't have a schema auto-default could break the rows - default is to skip the null fields --- modules/usrloc/README | 16 ++++++++++++++++ modules/usrloc/doc/usrloc_admin.xml | 22 ++++++++++++++++++++++ modules/usrloc/ucontact.c | 34 +++++++++++++++++++++++++++++++++- modules/usrloc/ul_mod.c | 2 ++ 4 files changed, 73 insertions(+), 1 deletions(-) diff --git a/modules/usrloc/README b/modules/usrloc/README index ed9df55..7275236 100644 --- a/modules/usrloc/README +++ b/modules/usrloc/README @@ -71,6 +71,7 @@ Bogdan-Andrei Iancu 3.33. handle_lost_tcp (int) 3.34. expires_type (int) 3.35. db_raw_fetch_type (int) + 3.36. db_insert_null (int) 4. Functions 5. MI Commands @@ -163,6 +164,7 @@ Bogdan-Andrei Iancu 1.33. Set handle_lost_tcp parameter 1.34. Set expires_type parameter 1.35. Set db_raw_fetch_type parameter + 1.36. Set db_insert_null parameter Chapter 1. Admin Guide @@ -214,6 +216,7 @@ Chapter 1. Admin Guide 3.33. handle_lost_tcp (int) 3.34. expires_type (int) 3.35. db_raw_fetch_type (int) + 3.36. db_insert_null (int) 4. Functions 5. MI Commands @@ -337,6 +340,7 @@ Chapter 1. Admin Guide 3.33. handle_lost_tcp (int) 3.34. expires_type (int) 3.35. db_raw_fetch_type (int) + 3.36. db_insert_null (int) 3.1. nat_bflag (integer) @@ -818,6 +822,18 @@ modparam("usrloc", "expires_type", 1) modparam("usrloc", "db_raw_fetch_type", 1) ... +3.36. db_insert_null (int) + + If set to 1, the insert operation to database will add null values in + the sql statement. + + Default value is "0" (don't add null fields in insert statement). + + Example 1.36. Set db_insert_null parameter +... +modparam("usrloc", "db_insert_null", 1) +... + 4. Functions There are no exported functions that could be used in scripts. diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index 6520b49..ce2f693 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -945,6 +945,28 @@ modparam("usrloc", "db_raw_fetch_type", 1) </example> </section> + <section id="usrloc.p.db_insert_null"> + <title><varname>db_insert_null</varname> (int)</title> + <para> + If set to 1, the insert operation to database will add null values + in the sql statement. + </para> + <para> + <emphasis> + Default value is <quote>0</quote> (don't add null fields in insert + statement). + </emphasis> + </para> + <example> + <title>Set <varname>db_insert_null</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "db_insert_null", 1) +... +</programlisting> + </example> + </section> + </section> <section> diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index e16cee3..5360e3d 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -48,6 +48,8 @@ #include "ucontact.h" #include "usrloc.h" +extern int ul_db_insert_null; + static int ul_xavp_contact_clone = 1; void ul_set_xavp_contact_clone(int v) @@ -531,13 +533,18 @@ int db_insert_ucontact(ucontact_t* _c) nr_cols = 9; - if (_c->received.s ) { + if (_c->received.s) { keys[nr_cols] = &received_col; vals[nr_cols].type = DB1_STR; vals[nr_cols].nul = 0; vals[nr_cols].val.str_val.s = _c->received.s; vals[nr_cols].val.str_val.len = _c->received.len; nr_cols++; + } else if(ul_db_insert_null!=0) { + keys[nr_cols] = &received_col; + vals[nr_cols].type = DB1_STR; + vals[nr_cols].nul = 1; + nr_cols++; } if (_c->path.s) { @@ -547,6 +554,11 @@ int db_insert_ucontact(ucontact_t* _c) vals[nr_cols].val.str_val.s = _c->path.s; vals[nr_cols].val.str_val.len = _c->path.len; nr_cols++; + } else if(ul_db_insert_null!=0) { + keys[nr_cols] = &path_col; + vals[nr_cols].type = DB1_STR; + vals[nr_cols].nul = 1; + nr_cols++; } if (_c->sock) { @@ -555,6 +567,11 @@ int db_insert_ucontact(ucontact_t* _c) vals[nr_cols].val.str_val = _c->sock->sock_str; vals[nr_cols].nul = 0; nr_cols++; + } else if(ul_db_insert_null!=0) { + keys[nr_cols] = &sock_col; + vals[nr_cols].type = DB1_STR; + vals[nr_cols].nul = 1; + nr_cols++; } if (_c->methods != 0xFFFFFFFF) { @@ -563,6 +580,11 @@ int db_insert_ucontact(ucontact_t* _c) vals[nr_cols].val.bitmap_val = _c->methods; vals[nr_cols].nul = 0; nr_cols++; + } else if(ul_db_insert_null!=0) { + keys[nr_cols] = &methods_col; + vals[nr_cols].type = DB1_BITMAP; + vals[nr_cols].nul = 1; + nr_cols++; } keys[nr_cols] = &last_mod_col; @@ -578,6 +600,11 @@ int db_insert_ucontact(ucontact_t* _c) vals[nr_cols].nul = 0; vals[nr_cols].val.str_val = _c->ruid; nr_cols++; + } else if(ul_db_insert_null!=0) { + keys[nr_cols] = &ruid_col; + vals[nr_cols].type = DB1_STR; + vals[nr_cols].nul = 1; + nr_cols++; } if(_c->instance.len>0) @@ -587,6 +614,11 @@ int db_insert_ucontact(ucontact_t* _c) vals[nr_cols].nul = 0; vals[nr_cols].val.str_val = _c->instance; nr_cols++; + } else if(ul_db_insert_null!=0) { + keys[nr_cols] = &instance_col; + vals[nr_cols].type = DB1_STR; + vals[nr_cols].nul = 1; + nr_cols++; } keys[nr_cols] = &reg_id_col; diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index a8a0b91..e307273 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -167,6 +167,7 @@ int handle_lost_tcp = 0; /*!< By default do not remove contacts before expira int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ int ul_hash_size = 9; +int ul_db_insert_null = 0; /* flags */ unsigned int nat_bflag = (unsigned int)-1; @@ -226,6 +227,7 @@ static param_export_t params[] = { {"db_ops_ruid", INT_PARAM, &ul_db_ops_ruid}, {"expires_type", PARAM_INT, &ul_expires_type}, {"db_raw_fetch_type", PARAM_INT, &ul_db_raw_fetch_type}, + {"db_insert_null", PARAM_INT, &ul_db_insert_null}, {0, 0, 0} };

1 0

force send socket/tcp send problem
by Juha Heinanen 14 Sep '14

14 Sep '14

while doing some tests with close to latest master version, i noticed that forcing send socket does not match wiki $fs description (or i have misunderstood it): $fs - reference to the forced socket for message sending (if any) in the form proto:ip:port It is R/W variable (you can assign values to it directly in configuration file). Transport proto can be omitted when assigning value, in which case it is taken from destination URI of the message. in config i execute: xlog("L_INFO", "**** du = <$du>\n"); $fs = "192.98.101.20:5060"; xlog("L_INFO", "**** fs = <$fs>\n"); and i get to syslog: Sep 14 20:49:18 lohi /usr/bin/sip-proxy[6610]: INFO: **** du = <sip:192.98.102.10;transport=tcp> Sep 14 20:49:18 lohi /usr/bin/sip-proxy[6610]: INFO: **** fs = <udp:192.98.101.20:5060> Sep 14 20:49:18 lohi /usr/bin/sip-proxy[6610]: ERROR: tm [../../forward.h:223]: msg_send(): msg_send: ERROR: tcp_send failed it shows that even when transport of $du is tcp, transport proto of fs is udp. another weird thing is that when i add proto to the assignment: $fs = "tcp:192.98.101.20:5060"; i still get the same tcp_send failed error. my proxy is definitely listening on tcp:192.98.101.20:5060 and 'telnet 192.98.102.10 5060' shows that tcp connection succeeds. the only explanation that comes to mind is if i have called set_forward_no_connect(), but i have not found such a call. is there a function call to revert set_forward_no_connect()? is it somehow possible to find out why tcp_send fails? -- juha

1 1

git:master: db_mongodb: proper result conversion to DB APIv1
by Daniel-Constantin Mierla 14 Sep '14

14 Sep '14

Module: sip-router Branch: master Commit: 666ffd55f4d2a14d89bbe7d18f75a9e2d398420b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=666ffd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 14 14:54:28 2014 +0200 db_mongodb: proper result conversion to DB APIv1 --- modules/db_mongodb/db_mongodb_mod.c | 6 +- modules/db_mongodb/mongodb_dbase.c | 413 ++++++++++++++++++++++++++++++++++- 2 files changed, 405 insertions(+), 14 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=666…

1 0

git:master: lib/srdb1: helper function to reallocate the index for result rows
by Daniel-Constantin Mierla 14 Sep '14

14 Sep '14

Module: sip-router Branch: master Commit: fea60616b97d49f50cc1b00e8f67e2889de5116c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fea6061… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 14 14:32:05 2014 +0200 lib/srdb1: helper function to reallocate the index for result rows - useful for db connectors that don't know in advance the number of rows in result --- lib/srdb1/db_res.c | 33 +++++++++++++++++++++++++++++++++ lib/srdb1/db_res.h | 8 ++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_res.c b/lib/srdb1/db_res.c index 95976a0..1a775ca 100644 --- a/lib/srdb1/db_res.c +++ b/lib/srdb1/db_res.c @@ -186,3 +186,36 @@ int db_allocate_rows(db1_res_t* _res) return 0; } + +/** + * Reallocate memory for rows. + * \param _res result set + * \param _nsize new number of rows in result set + * \return zero on success, negative on errors + */ +int db_reallocate_rows(db1_res_t* _res, int _nsize) +{ + int len; + int osize; + db_row_t *orows; + + orows = RES_ROWS(_res); + osize = RES_ROW_N(_res); + + RES_ROW_N(_res) = _nsize; + len = sizeof(db_row_t) * RES_ROW_N(_res); + RES_ROWS(_res) = (struct db_row*)pkg_malloc(len); + if (!RES_ROWS(_res)) { + LM_ERR("no private memory left\n"); + return -1; + } + LM_DBG("allocate %d bytes for rows at %p\n", len, RES_ROWS(_res)); + memset(RES_ROWS(_res), 0, len); + + if(orows==NULL) + return 0; + memcpy(RES_ROWS(_res), orows, + ((osize<_nsize)?osize:_nsize)*sizeof(db_row_t)); + pkg_free(orows); + return 0; +} diff --git a/lib/srdb1/db_res.h b/lib/srdb1/db_res.h index 9a26325..39f4e21 100644 --- a/lib/srdb1/db_res.h +++ b/lib/srdb1/db_res.h @@ -131,4 +131,12 @@ int db_allocate_columns(db1_res_t* _r, const unsigned int cols); */ int db_allocate_rows(db1_res_t* _res); +/** + * Reallocate memory for rows. + * \param _res result set + * \param _nsize new number of rows in result set + * \return zero on success, negative on errors + */ +int db_reallocate_rows(db1_res_t* _res, int _nsize); + #endif /* DB1_RES_H */

1 0

git:master: db_mongodb: build proper initial result structure
by Daniel-Constantin Mierla 14 Sep '14

14 Sep '14

Module: sip-router Branch: master Commit: 199891c536e357b95b101b623f70527a4f57b70e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=199891c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Sep 14 09:33:44 2014 +0200 db_mongodb: build proper initial result structure --- modules/db_mongodb/mongodb_connection.h | 11 ++- modules/db_mongodb/mongodb_dbase.c | 202 ++++++++++++++++++++++++++----- 2 files changed, 182 insertions(+), 31 deletions(-) diff --git a/modules/db_mongodb/mongodb_connection.h b/modules/db_mongodb/mongodb_connection.h index 6b721ad..6a6eaa0 100644 --- a/modules/db_mongodb/mongodb_connection.h +++ b/modules/db_mongodb/mongodb_connection.h @@ -31,10 +31,15 @@ typedef struct km_mongodb_con { struct db_id* id; /*!< Connection identifier */ - unsigned int ref; /*!< Reference count */ - struct pool_con* next; /*!< Next connection in the pool */ + unsigned int ref; /*!< Reference count */ + struct pool_con* next; /*!< Next connection in the pool */ - mongoc_client_t *con; /*!< Connection representation */ + mongoc_client_t *con; /*!< Connection representation */ + mongoc_collection_t *collection; /*!< Collection link */ + mongoc_cursor_t *cursor; /*!< Cursor link */ + + bson_t *colsdoc; /*!< Names of columns */ + int nrcols; /*!< Nunmber of columns */ } km_mongodb_con_t; #define MONGODB_CON(db_con) ((km_mongodb_con_t*)((db_con)->tail)) diff --git a/modules/db_mongodb/mongodb_dbase.c b/modules/db_mongodb/mongodb_dbase.c index 03f875f..a15e5ee 100644 --- a/modules/db_mongodb/mongodb_dbase.c +++ b/modules/db_mongodb/mongodb_dbase.c @@ -27,6 +27,14 @@ #include "mongodb_connection.h" #include "mongodb_dbase.h" +typedef struct db_mongodb_result { + mongoc_collection_t *collection; /*!< Collection link */ + mongoc_cursor_t *cursor; /*!< Cursor link */ + bson_t *rdoc; + int idx; + bson_t *colsdoc; + int nrcols; +} db_mongodb_result_t; /* * Initialize database module @@ -139,14 +147,77 @@ int db_mongodb_bson_add(bson_t *doc, int vtype, const db_key_t _k, const db_val_ error: return -1; } + +db1_res_t* db_mongodb_new_result(void) +{ + db1_res_t* obj; + + obj = db_new_result(); + if (!obj) + return NULL; + RES_PTR(obj) = pkg_malloc(sizeof(db_mongodb_result_t)); + if (!RES_PTR(obj)) { + db_free_result(obj); + return NULL; + } + memset(RES_PTR(obj), 0, sizeof(db_mongodb_result_t)); + return obj; +} /* * Retrieve result set */ static int db_mongodb_store_result(const db1_con_t* _h, db1_res_t** _r) { - if(_r) *_r = NULL; + km_mongodb_con_t *mgcon; + db_mongodb_result_t *mgres; + const bson_t *itdoc; + char *jstr; + + mgcon = MONGODB_CON(_h); + if(!_r) { + LM_ERR("invalid result parameter\n"); + return -1; + } + *_r = db_mongodb_new_result(); + if (!*_r) { + LM_ERR("no memory left for result \n"); + goto error; + } + mgres = (db_mongodb_result_t*)RES_PTR(*_r); + mgres->collection = mgcon->collection; + mgcon->collection = NULL; + mgres->cursor = mgcon->cursor; + mgcon->cursor = NULL; + mgres->colsdoc = mgcon->colsdoc; + mgcon->colsdoc = NULL; + mgres->nrcols = mgcon->nrcols; + mgcon->nrcols = 0; + while (mongoc_cursor_more (mgres->cursor) + && mongoc_cursor_next (mgres->cursor, &itdoc)) { + if(is_printable(L_DBG)) { + jstr = bson_as_json (itdoc, NULL); + LM_DBG("selected document: %s\n", jstr); + bson_free (jstr); + } + } return 0; + +error: + if(mgcon->colsdoc) { + bson_destroy (mgcon->colsdoc); + mgcon->colsdoc = NULL; + } + mgcon->nrcols = 0; + if(mgcon->cursor) { + mongoc_cursor_destroy (mgcon->cursor); + mgcon->cursor = NULL; + } + if(mgcon->collection) { + mongoc_collection_destroy (mgcon->collection); + mgcon->collection = NULL; + } + return -1; } /* @@ -154,6 +225,29 @@ static int db_mongodb_store_result(const db1_con_t* _h, db1_res_t** _r) */ int db_mongodb_free_result(db1_con_t* _h, db1_res_t* _r) { + if(!_r) + return -1; + if(RES_PTR(_r)) { + if(((db_mongodb_result_t*)RES_PTR(_r))->rdoc) { + bson_destroy(((db_mongodb_result_t*)RES_PTR(_r))->rdoc); + ((db_mongodb_result_t*)RES_PTR(_r))->rdoc = NULL; + } + if(((db_mongodb_result_t*)RES_PTR(_r))->colsdoc) { + bson_destroy (((db_mongodb_result_t*)RES_PTR(_r))->colsdoc); + ((db_mongodb_result_t*)RES_PTR(_r))->colsdoc = NULL; + } + ((db_mongodb_result_t*)RES_PTR(_r))->nrcols = 0; + if(((db_mongodb_result_t*)RES_PTR(_r))->cursor) { + mongoc_cursor_destroy (((db_mongodb_result_t*)RES_PTR(_r))->cursor); + ((db_mongodb_result_t*)RES_PTR(_r))->cursor = NULL; + } + if(((db_mongodb_result_t*)RES_PTR(_r))->collection) { + mongoc_collection_destroy (((db_mongodb_result_t*)RES_PTR(_r))->collection); + ((db_mongodb_result_t*)RES_PTR(_r))->collection = NULL; + } + pkg_free(RES_PTR(_r)); + } + db_free_result(_r); return 0; } @@ -175,10 +269,7 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op int i; km_mongodb_con_t *mgcon; mongoc_client_t *client; - mongoc_collection_t *collection = NULL; - bson_t *doc = NULL; - const bson_t *itdoc; - mongoc_cursor_t *cursor = NULL; + bson_t *seldoc = NULL; char *cname; char b1; char *jstr; @@ -188,57 +279,112 @@ int db_mongodb_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op LM_ERR("connection to server is null\n"); return -1; } + if(mgcon->collection) { + mongoc_collection_destroy (mgcon->collection); + mgcon->collection = NULL; + } + if(mgcon->cursor) { + mongoc_cursor_destroy (mgcon->cursor); + mgcon->cursor = NULL; + } + if(mgcon->colsdoc) { + bson_destroy (mgcon->colsdoc); + mgcon->colsdoc = NULL; + } + mgcon->nrcols = 0; client = mgcon->con; if(CON_TABLE(_h)->s==NULL) { LM_ERR("collection (table) name not set\n"); return -1; } + + if(_r) *_r = NULL; + b1 = '\0'; if(CON_TABLE(_h)->s[CON_TABLE(_h)->len]!='\0') { b1 = CON_TABLE(_h)->s[CON_TABLE(_h)->len]; CON_TABLE(_h)->s[CON_TABLE(_h)->len] = '\0'; } cname = CON_TABLE(_h)->s; - collection = mongoc_client_get_collection(client, mgcon->id->database, cname); - if(collection==NULL) { + LM_DBG("query to collection [%s]\n", cname); + mgcon->collection = mongoc_client_get_collection(client, mgcon->id->database, cname); + if(mgcon->collection==NULL) { LM_ERR("cannot get collection (table): %s\n", cname); if(b1 != '\0') CON_TABLE(_h)->s[CON_TABLE(_h)->len] = b1; return -1; } if(b1 != '\0') CON_TABLE(_h)->s[CON_TABLE(_h)->len] = b1; - doc = bson_new(); - if(doc==NULL) { - LM_ERR("cannot initialize bson document\n"); + seldoc = bson_new(); + if(seldoc==NULL) { + LM_ERR("cannot initialize query bson document\n"); goto error; } for(i = 0; i < _n; i++) { - if(db_mongodb_bson_add(doc, VAL_TYPE(_v + i), _k[i], _v+i, i)<0) + if(db_mongodb_bson_add(seldoc, VAL_TYPE(_v + i), _k[i], _v+i, i)<0) goto error; } - - cursor = mongoc_collection_find (collection, MONGOC_QUERY_NONE, 0, 0, 0, - doc, NULL, NULL); - while (mongoc_cursor_more (cursor) && mongoc_cursor_next (cursor, &itdoc)) { - jstr = bson_as_json (itdoc, NULL); - LM_DBG("selected document: %s\n", jstr); - if(db_mongodb_store_result(_h, _r)<0) { - LM_ERR("failed to store result\n"); - bson_free (jstr); + if(is_printable(L_DBG)) { + jstr = bson_as_json (seldoc, NULL); + LM_DBG("query filter: %s\n", jstr); + bson_free (jstr); + } + if(_nc > 0) { + mgcon->colsdoc = bson_new(); + if(mgcon->colsdoc==NULL) { + LM_ERR("cannot initialize columns bson document\n"); goto error; } - bson_free (jstr); + for(i = 0; i < _n; i++) { + if(!bson_append_int32(mgcon->colsdoc, _c[i]->s, _c[i]->len, 1)) + { + LM_ERR("failed to append int to columns bson %.*s = %d [%d]\n", + _c[i]->len, _c[i]->s, 1, i); + goto error; + } + } + if(is_printable(L_DBG)) { + jstr = bson_as_json (mgcon->colsdoc, NULL); + LM_DBG("query filter: %s\n", jstr); + bson_free (jstr); + } + mgcon->nrcols = _nc; } - mongoc_cursor_destroy (cursor); - bson_destroy (doc); - mongoc_collection_destroy (collection); - + mgcon->cursor = mongoc_collection_find (mgcon->collection, + MONGOC_QUERY_NONE, 0, 0, 0, + seldoc, mgcon->colsdoc, NULL); + + if(!_r) { + goto done; + } + + if(db_mongodb_store_result(_h, _r)<0) { + LM_ERR("failed to store result\n"); + goto error; + } + +done: + bson_destroy (seldoc); return 0; + error: - if(cursor) mongoc_cursor_destroy (cursor); - if(doc) bson_destroy (doc); - if(collection) mongoc_collection_destroy (collection); + LM_ERR("failed to do the query\n"); + if(seldoc) bson_destroy (seldoc); + if(mgcon->colsdoc) { + bson_destroy (mgcon->colsdoc); + mgcon->colsdoc = NULL; + } + mgcon->nrcols = 0; + if(mgcon->collection) { + mongoc_collection_destroy (mgcon->collection); + mgcon->collection = NULL; + } + if(mgcon->cursor) { + mongoc_cursor_destroy (mgcon->cursor); + mgcon->cursor = NULL; + } + if(_r && *_r) { db_mongodb_free_result((db1_con_t*)_h, *_r); *_r = NULL; } return -1; }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
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