sr-dev February 2014

sr-dev@lists.kamailio.org

38 participants
236 discussions

git:4.1: presence: bugfix: Add option to disable per-Table lock for database layer
by Carsten Bock 10 Feb '14

10 Feb '14

Module: sip-router Branch: 4.1 Commit: f6dfa8d5e91b287ceccb84659448ee1aadbfc486 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6dfa8d… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu Jan 30 21:55:11 2014 +0100 presence: bugfix: Add option to disable per-Table lock for database layer (causes trouble with MySQL in DB_ONLY mode) --- modules/presence/doc/presence_admin.xml | 22 ++++++++++++++++++++++ modules/presence/notify.c | 6 +++--- modules/presence/presence.c | 7 +++++++ modules/presence/presence.h | 2 ++ modules/presence/presentity.c | 4 ++-- modules/presence/subscribe.c | 4 ++-- 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/modules/presence/doc/presence_admin.xml b/modules/presence/doc/presence_admin.xml index 02b3562..8b18174 100644 --- a/modules/presence/doc/presence_admin.xml +++ b/modules/presence/doc/presence_admin.xml @@ -575,6 +575,28 @@ modparam("presence", "fetch_rows", 1000) </programlisting> </example> </section> + <section> + <title><varname>db_table_lock_type</varname> (integer)</title> + <para> + Enable (=1) or disable (=0) the Locks for table during an transaction. + Locking only the "current" table causes problems with a MySQL-Databases + in "DB-Only" mode. + </para> + <para> + <emphasis> + Default value is 1 (Write Lock for the Tables). + </emphasis> + </para> + <example> + <title>Set <varname>db_table_lock_type</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("presence", "db_table_lock_type", 0) +... +</programlisting> + </example> + </section> + </section> diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 0a7ffb2..402aacc 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -1335,7 +1335,7 @@ int publ_notify_notifier(str pres_uri, pres_ev_t *event) if (pa_dbf.start_transaction) { - if (pa_dbf.start_transaction(pa_db, DB_LOCKING_WRITE) < 0) + if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) { LM_ERR("in start_transaction\n"); goto error; @@ -2701,7 +2701,7 @@ int process_dialogs(int round, int presence_winfo) if (pa_dbf.start_transaction) { - if (pa_dbf.start_transaction(pa_db, DB_LOCKING_WRITE) < 0) + if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) { LM_ERR("in start_transaction\n"); goto error; @@ -2810,7 +2810,7 @@ int process_dialogs(int round, int presence_winfo) if (pa_dbf.start_transaction) { - if (pa_dbf.start_transaction(pa_db, DB_LOCKING_WRITE) < 0) + if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) { LM_ERR("in start_transaction\n"); goto error; diff --git a/modules/presence/presence.c b/modules/presence/presence.c index 067a1e1..6a87776 100644 --- a/modules/presence/presence.c +++ b/modules/presence/presence.c @@ -149,6 +149,9 @@ int pres_waitn_time = 5; int pres_notifier_poll_rate = 10; int pres_notifier_processes = 1; +int db_table_lock_type = 1; +db_locking_t db_table_lock = DB_LOCKING_WRITE; + int *pres_notifier_id = NULL; int phtable_size= 9; @@ -199,6 +202,7 @@ static param_export_t params[]={ { "timeout_rm_subs", INT_PARAM, &timeout_rm_subs}, { "send_fast_notify", INT_PARAM, &send_fast_notify}, { "fetch_rows", INT_PARAM, &pres_fetch_rows}, + { "db_table_lock_type", INT_PARAM, &db_table_lock_type}, {0,0,0} }; @@ -401,6 +405,9 @@ static int mod_init(void) register_basic_timers(pres_notifier_processes); } + if (db_table_lock_type != 1) + db_table_lock = DB_LOCKING_NONE; + pa_dbf.close(pa_db); pa_db = NULL; diff --git a/modules/presence/presence.h b/modules/presence/presence.h index e064bb2..b94e4dc 100644 --- a/modules/presence/presence.h +++ b/modules/presence/presence.h @@ -94,6 +94,8 @@ extern int pres_notifier_processes; extern int phtable_size; extern phtable_t* pres_htable; +extern db_locking_t db_table_lock; + int update_watchers_status(str pres_uri, pres_ev_t* ev, str* rules_doc); int pres_auth_status(struct sip_msg* msg, str watcher_uri, str presentity_uri); diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index 47a828a..6d7ffd5 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -426,7 +426,7 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, if (pa_dbf.start_transaction) { - if (pa_dbf.start_transaction(pa_db, DB_LOCKING_WRITE) < 0) + if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) { LM_ERR("in start_transaction\n"); goto error; @@ -1195,7 +1195,7 @@ int mark_presentity_for_delete(presentity_t *pres) if (pa_dbf.start_transaction) { - if (pa_dbf.start_transaction(pa_db, DB_LOCKING_WRITE) < 0) + if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) { LM_ERR("in start_transaction\n"); goto error; diff --git a/modules/presence/subscribe.c b/modules/presence/subscribe.c index aff55f3..75e0c9c 100644 --- a/modules/presence/subscribe.c +++ b/modules/presence/subscribe.c @@ -863,7 +863,7 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) LM_ERR("unsuccessful use_table sql operation\n"); goto error; } - if (pa_dbf.start_transaction(pa_db, DB_LOCKING_WRITE) < 0) + if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) { LM_ERR("in start_transaction\n"); goto error; @@ -1662,7 +1662,7 @@ void update_db_subs_timer_notifier(void) if (pa_dbf.start_transaction) { - if (pa_dbf.start_transaction(pa_db, DB_LOCKING_WRITE) < 0) + if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) { LM_ERR("in start_transaction\n"); goto error;

2 4

crash with 4.0.4 - st_delete_ucontact()
by Dragos Oancea 10 Feb '14

10 Feb '14

Hello Everyone, Kamailio 4.0.4 crashes for us once a few weeks, apparently in the same point: #0 st_delete_ucontact (_c=0x3a746361746e6f43) at ucontact.c:358 #1 0x00007f2c7a9b3836 in delete_ucontact (_r=0x7f2c37e1be40, _c=0x3a746361746e6f43) at urecord.c:509 #2 0x00007f2c7a373d52 in update_contacts (_m=0x7f2c7bc7e930, _r=0x7f2c37e1be40, _mode=1) at save.c:697 #3 0x00007f2c7a375782 in add_contacts (_m=0x7f2c7bc7e930, _d=0x7f2c35fbae20, _cflags=5, _uri=<value optimized out>) at save.c:800 #4 save (_m=0x7f2c7bc7e930, _d=0x7f2c35fbae20, _cflags=5, _uri=<value optimized out>) at save.c:876 #5 0x0000000000414ebf in do_action (h=0x7fff7c928790, a=0x7f2c7bb52e70, msg=0x7f2c7bc7e930) at action.c:1086 #6 0x000000000041c6e6 in run_actions (h=0x7fff7c928790, a=0x7f2c7bb52e70, msg=0x7f2c7bc7e930) at action.c:1573 #7 0x000000000041cdd4 in run_actions_safe (h=0x7fff7c92aaf0, a=<value optimized out>, msg=<value optimized out>) at action.c:1637 #8 0x00000000004be90d in rval_get_int (h=0x7fff7c92aaf0, msg=<value optimized out>, i=0x7fff7c928b8c, rv=<value optimized out>, cache=<value optimized out>) at rvalue.c:920 #9 0x00000000004c3074 in rval_expr_eval_int (h=0x7fff7c92aaf0, msg=0x7f2c7bc7e930, res=0x7fff7c928b8c, rve=0x7f2c7bb53790) at rvalue.c:1914 #10 0x00000000004c3139 in rval_expr_eval_int (h=0x7fff7c92aaf0, msg=0x7f2c7bc7e930, res=0x7fff7c928ff8, rve=0x7f2c7bb53010) at rvalue.c:1922 #11 0x0000000000415662 in do_action (h=0x7fff7c92aaf0, a=0x7f2c7bb54df0, msg=0x7f2c7bc7e930) at action.c:1050 #12 0x000000000041c6e6 in run_actions (h=0x7fff7c92aaf0, a=0x7f2c7bb32980, msg=0x7f2c7bc7e930) at action.c:1573 #13 0x00000000004174fa in do_action (h=0x7fff7c92aaf0, a=0x7f2c7bb60090, msg=0x7f2c7bc7e930) at action.c:1069 #14 0x000000000041c6e6 in run_actions (h=0x7fff7c92aaf0, a=0x7f2c7bb21c00, msg=0x7f2c7bc7e930) at action.c:1573 #15 0x00000000004174fa in do_action (h=0x7fff7c92aaf0, a=0x7f2c7bb60190, msg=0x7f2c7bc7e930) at action.c:1069 #16 0x000000000041c6e6 in run_actions (h=0x7fff7c92aaf0, a=0x7f2c7bb1a990, msg=0x7f2c7bc7e930) at action.c:1573 #17 0x00000000004174fa in do_action (h=0x7fff7c92aaf0, a=0x7f2c7bb60290, msg=0x7f2c7bc7e930) at action.c:1069 #18 0x000000000041c6e6 in run_actions (h=0x7fff7c92aaf0, a=0x7f2c7bb60290, msg=0x7f2c7bc7e930) at action.c:1573 #19 0x000000000041581a in do_action (h=0x7fff7c92aaf0, a=0x7f2c7bafbcb0, msg=0x7f2c7bc7e930) at action.c:690 #20 0x000000000041c6e6 in run_actions (h=0x7fff7c92aaf0, a=0x7f2c7bafbb10, msg=0x7f2c7bc7e930) at action.c:1573 #21 0x00000000004156bb in do_action (h=0x7fff7c92aaf0, a=0x7f2c7bafc050, msg=0x7f2c7bc7e930) at action.c:1065 #22 0x000000000041c6e6 in run_actions (h=0x7fff7c92aaf0, a=0x7f2c7badc5d0, msg=0x7f2c7bc7e930) at action.c:1573 #23 0x000000000041cd60 in run_top_route (a=0x7f2c7badc5d0, msg=0x7f2c7bc7e930, c=<value optimized out>) at action.c:1658 #24 0x000000000049f51e in receive_msg (buf=<value optimized out>, len=<value optimized out>, rcv_info=<value optimized out>) at receive.c:211 #25 0x0000000000532306 in udp_rcv_loop () at udp_server.c:557 #26 0x0000000000467a7a in main_loop () at main.c:1638 #27 0x000000000046a912 in main (argc=<value optimized out>, argv=<value optimized out>) at main.c:2566 (gdb) flags: STATS: Off, USE_IPV6, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 4MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 14:47:59 Dec 9 2013 with gcc 4.4.7 Output of `bt full` here: http://pastebin.com/3qY8B1eC Will upgrading to 4.0.5 solve this issue ? Regards, Dragos

1 0

git:master: modules/sctp: reverted accidental commit on sctp module while committing
by Juha Heinanen 09 Feb '14

09 Feb '14

Module: sip-router Branch: master Commit: 5e5377bc0f4f30b84cfdd2ac50813f82a6b52870 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e5377b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Feb 9 11:07:08 2014 +0200 modules/sctp: reverted accidental commit on sctp module while committing lcr changes --- modules/sctp/sctp_mod.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/modules/sctp/sctp_mod.c b/modules/sctp/sctp_mod.c index 9b33177..1469e6d 100644 --- a/modules/sctp/sctp_mod.c +++ b/modules/sctp/sctp_mod.c @@ -37,9 +37,7 @@ MODULE_VERSION static int mod_init(void); -#ifdef USE_SCTP static int sctp_mod_pre_init(void); -#endif static cmd_export_t cmds[]={ @@ -124,7 +122,6 @@ static int mod_init(void) #endif /* USE_SCTP */ } -#ifdef USE_SCTP static int sctp_mod_pre_init(void) { sctp_srapi_t api; @@ -146,4 +143,3 @@ static int sctp_mod_pre_init(void) } return 0; } -#endif

1 0

git:master: modules/lcr: added capability to inactive a faulty gateway and re-activate
by Juha Heinanen 09 Feb '14

09 Feb '14

Module: sip-router Branch: master Commit: 85fdd590ca7b8e29c9fb7b8385d534418da05cf1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85fdd59… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Feb 9 10:58:48 2014 +0200 modules/lcr: added capability to inactive a faulty gateway and re-activate it automatically by successful response to OPTIONS ping --- modules/lcr/README | 205 +++++++++++++++----- modules/lcr/doc/lcr.xml | 2 +- modules/lcr/doc/lcr_admin.xml | 162 +++++++++++++++ modules/lcr/lcr_mod.c | 439 +++++++++++++++++++++++++++++++---------- modules/lcr/lcr_mod.h | 19 ++- modules/lcr/lcr_rpc.c | 39 +--- modules/sctp/sctp_mod.c | 4 + 7 files changed, 690 insertions(+), 180 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=85f…

1 0

Kamailio Pacemaker RA Script Issue?
by Sherwood McGowan 09 Feb '14

09 Feb '14

Ladies & Gentlemen, I was recently given the Kamailio Pacemaker RA script as posted in: http://lists.sip-router.org/pipermail/sr-dev/2014-January/022639.html Via the Pacemaker mailing list. I wanted to inquire if anyone else has had issues with monitoring portion of the script. I have manually verified that the sipsak command does in fact work from the command line as the user that pacemaker is running as, but for some reason I am not seeing the monitoring command being run. I added the appropriate portion of call routing code to the configuration: if (is_method("OPTIONS") && ($ru=~"sip:monitor@.*")) { xlog("L_INFO", "Kamailio Monitoring Request"); sl_send_reply("200", "Kamailio is alive"); exit; } Unfortunately, when I parse my logs, I never see the log entry, nor do I see any entry in syslog about kamailio monitoring being performed (even though I see MySQL and everything being tested) Furthermore, when I kill the kamailio process, Pacemaker does not "notice" this happening and continues on as if Kamailio is running properly. Has anyone else used this script (I'm on Ubuntu 12.04 LTS 64bit, and adapted the RA script to specifically run /bin/bash due to Ubuntu using /bin/dash) and run into this issue? Thank you, Sherwood McGowan VOIP Solutions Consultant

1 0

[tracker] Task closed: send_reply() bug when called from branch route
by sip-router 08 Feb '14

08 Feb '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#362 - send_reply() bug when called from branch route User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Readme was updated a while ago to reflect where send_reply() can be used. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=362 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

[tracker] Comment added: dlg_end_dlg on a two-armed proxy only sends bye to one party
by sip-router 08 Feb '14

08 Feb '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#382 - dlg_end_dlg on a two-armed proxy only sends bye to one party User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you try with mhomed=1 in kamailio.cfg? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=382#comment1293 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

Problem with Registration on pcscf
by Paul Pankhurst 07 Feb '14

07 Feb '14

I've noticed a problem with registrations on the pcscf when doing some testing with sipp If I send in a REGISTER with SIPP followed by an INVITE calls go through my system no problem. If I then stop the sipp script and run it again, I find that although the registration succeeds, subsequent INVITES are rejected telling me that I have not registered! If I unregister at the end of my script everything is fine, and the problem goes away after the original REGISTRATION times out, so this led me to think that we had a problem with multiple registrations entries in the system. The problem seems to be a result of the fact that sipp always places the same ip address and port number on the contact line when using tcp connections. I've had a look through the code and believe that we are getting multiple entries in the usrloc hash table in this scenario, and ul_get_pcontact only ever returns the first one which causes pcscf_is_registered to incorrectly report that the UE is not registered. Paul

4 7

[tracker] Comment added: fixes for memory leak in TLS module
by sip-router 06 Feb '14

06 Feb '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#380 - fixes for memory leak in TLS module User who did this - Ding Ma (mading087) ---------- Reviewed the code and agreed with most of your changes: - the removal of the history parts is fine - using lock on the config updates is a lot better than locking around the loading of tls config file However, think the lock around decrementing the reference count may be needed when the -- operation is not atomic. Based on Intel document: INC and DEC belong to the family of instructions that can read, modify, and write a data value in memory. Thus, their operation is not guaranteed to be atomic unless the LOCK prefix is used for these instructions (when referencing a location in memory). The XCHG instruction automatically causes the LOCK behavior to occur regardless of whether the prefix is used or not. Here is an example of race condition for the ref_count decrement in tls_h_tcpconn_clean(). Assuming 2 threads are trying to tear down two connections, the correct way would be thread1 (ref_count 2->1), then thread2 (ref_count 1->0) But if thread2 reads the ref_count before thread1 writes, you'd get thread1 (ref_count 2->1) and thread2 (ref_count 2->1). The result would be wrong, and could cause dangling memory block. Realistically, this would be a rare case, but can still happen. Volatile just tells the compiler not to optimize the ref_count, won't guarantee atomicity. Think your suggestion of using atomic_t type and atomic ops for the ref_count is the absolute right fix. The potential issue with atomic_t is that it would cause some extra work when porting kamailio to non-linux or linux with older kernel. The other alternative would be to use lock around the ref_count decrement, which would have impact on performance when there are a large number of IP phones in the system. If you agree with my assessment, I can take a shoot at changing the ref_count to atomic_t, and provide that as another patch on top of your changes. Or you can make this change and give me a patch, which I can test for you in a real system. let me know whichever way works for you. If possible, wonder if it would be better to merge the current patch plus your changes to the stable main line. This would address the original memory leak issue for 99.9% of the cases. The atomic_t change can come later. Thanks. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=380#comment1292 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:master: db_cassandra: clone key in a zero-termniated local buffer
by Daniel-Constantin Mierla 06 Feb '14

06 Feb '14

Module: sip-router Branch: master Commit: 3cde37cf10795b4eb785ffd141a8b28e64864f5d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3cde37c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 6 16:03:27 2014 +0100 db_cassandra: clone key in a zero-termniated local buffer - rework from a patch by Jay Binks --- modules/db_cassandra/dbcassa_base.cpp | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index ffa9e3b..1a721bb 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -440,6 +440,7 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, int key_len=0, seckey_len = 0; int no_kc, no_sec_kc; dbcassa_table_p tbc; + char pk[256]; /** Lock table schema and construct primary and secondary key **/ if(_k) { @@ -496,7 +497,14 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, } else { /* the table doesn't have any secondary key defined */ if(_c) { for(int i=0; i< _nc; i++) { - sp.column_names.push_back(_c[i]->s); + /*sp.column_names.push_back(_c[i]->s);*/ + if(_c[i]->len>255) { + LM_ERR("column key is too long [%.*s]\n", _c[i]->len, _c[i]->s); + return ColumnVecPtr(NULL); + } + memcpy(pk, _c[i]->s, _c[i]->len); + pk[_c[i]->len] = '\0'; + sp.column_names.push_back(pk); LM_DBG("Query col: %s\n", _c[i]->s); } LM_DBG("get %d columns\n", _nc);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2014