sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
299 discussions

git:4.0: tls: the pointer of cfg structure
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.0 Commit: dfc8d544f7435e39771f8a39f349b969ba730944 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfc8d54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 11:57:23 2014 +0100 tls: the pointer of cfg structure - synchronize when updating the list of tls configs and their reference count - with parts from patch by Ding Ma, FS#380, contributed under BSD license - backport of 208934d47ac1585d42029234267bcceab40ae218 --- modules/tls/tls_cfg.c | 2 +- modules/tls/tls_cfg.h | 2 +- modules/tls/tls_domain.c | 1 + modules/tls/tls_domain.h | 2 +- modules/tls/tls_mod.c | 2 +- modules/tls/tls_rpc.c | 2 ++ modules/tls/tls_server.c | 9 +++------ modules/tls/tls_util.c | 11 +++++++---- 8 files changed, 17 insertions(+), 14 deletions(-) diff --git a/modules/tls/tls_cfg.c b/modules/tls/tls_cfg.c index d1253af..dc118d8 100644 --- a/modules/tls/tls_cfg.c +++ b/modules/tls/tls_cfg.c @@ -74,7 +74,7 @@ struct cfg_group_tls default_tls_cfg = { 0 /* send_close_notify (off by default)*/ }; -void* tls_cfg = &default_tls_cfg; +volatile void* tls_cfg = &default_tls_cfg; /* if *to<0 to=default_val, else if to>max_val to=max_val */ diff --git a/modules/tls/tls_cfg.h b/modules/tls/tls_cfg.h index 86b8816..6064182 100644 --- a/modules/tls/tls_cfg.h +++ b/modules/tls/tls_cfg.h @@ -101,7 +101,7 @@ struct cfg_group_tls { extern struct cfg_group_tls default_tls_cfg; -extern void* tls_cfg; +extern volatile void* tls_cfg; extern cfg_def_t tls_cfg_def[]; diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index 2d49969..c06892c 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -118,6 +118,7 @@ void tls_free_cfg(tls_domains_cfg_t* cfg) } if (cfg->srv_default) tls_free_domain(cfg->srv_default); if (cfg->cli_default) tls_free_domain(cfg->cli_default); + shm_free(cfg); } diff --git a/modules/tls/tls_domain.h b/modules/tls/tls_domain.h index e4d1319..2f5c72a 100644 --- a/modules/tls/tls_domain.h +++ b/modules/tls/tls_domain.h @@ -92,7 +92,7 @@ typedef struct tls_domains_cfg { tls_domain_t* srv_list; /**< Server domain list */ tls_domain_t* cli_list; /**< Client domain list */ struct tls_domains_cfg* next; /**< Next element in the garbage list */ - int ref_count; /**< How many connections use this configuration */ + volatile int ref_count; /**< How many connections use this configuration */ } tls_domains_cfg_t; diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 69967da..bb5d3ad 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -300,7 +300,7 @@ static int mod_init(void) } /* declare configuration */ if (cfg_declare("tls", tls_cfg_def, &default_tls_cfg, - cfg_sizeof(tls), &tls_cfg)) { + cfg_sizeof(tls), (void **)&tls_cfg)) { ERR("failed to register the configuration\n"); return -1; } diff --git a/modules/tls/tls_rpc.c b/modules/tls/tls_rpc.c index 12a0711..b7b0a3c 100644 --- a/modules/tls/tls_rpc.c +++ b/modules/tls/tls_rpc.c @@ -81,8 +81,10 @@ static void tls_reload(rpc_t* rpc, void* ctx) } DBG("TLS configuration successfuly loaded"); + lock_get(tls_domains_cfg_lock); cfg->next = (*tls_domains_cfg); *tls_domains_cfg = cfg; + lock_release(tls_domains_cfg_lock); return; error: diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index f71956d..353e4e9 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -151,13 +151,9 @@ static int tls_complete_init(struct tcp_connection* c) goto error2; } /* Get current TLS configuration and increase reference - * count immediately. There is no need to lock the structure - * here, because it does not get deleted immediately. When - * SER reloads TLS configuration it will put the old configuration - * on a garbage queue and delete it later, so we know here that - * the pointer we get from *tls_domains_cfg will be valid for a while, - * at least by the time this function finishes + * count immediately. */ + lock_get(tls_domains_cfg_lock); cfg = *tls_domains_cfg; /* Increment the reference count in the configuration structure, this @@ -165,6 +161,7 @@ static int tls_complete_init(struct tcp_connection* c) * not get deleted if there are still connection referencing its SSL_CTX */ cfg->ref_count++; + lock_release(tls_domains_cfg_lock); if (c->flags & F_CONN_PASSIVE) { state=S_TLS_ACCEPTING; diff --git a/modules/tls/tls_util.c b/modules/tls/tls_util.c index a0897fc..8ec8892 100644 --- a/modules/tls/tls_util.c +++ b/modules/tls/tls_util.c @@ -74,7 +74,7 @@ int shm_asciiz_dup(char** dest, char* val) */ void collect_garbage(void) { - tls_domains_cfg_t* prev, *cur; + tls_domains_cfg_t* prev, *cur, *next; /* Make sure we do not run two garbage collectors * at the same time @@ -88,14 +88,17 @@ void collect_garbage(void) cur = (*tls_domains_cfg)->next; while(cur) { + next = cur->next; if (cur->ref_count == 0) { - /* Not referenced by any existing connection */ + /* Not referenced by any existing connection */ prev->next = cur->next; tls_free_cfg(cur); + } else { + /* Only update prev if we didn't remove cur */ + prev = cur; } - prev = cur; - cur = cur->next; + cur = next; } lock_release(tls_domains_cfg_lock);

1 0

[tracker] Task closed: Unmet dependency for kamailio-perl-modules
by sip-router 06 Mar '14

06 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#361 - Unmet dependency for kamailio-perl-modules User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=361 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: Unmet dependency for kamailio-perl-modules
by sip-router 06 Mar '14

06 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#361 - Unmet dependency for kamailio-perl-modules User who did this - Daniel-Constantin Mierla (miconda) ---------- I guess this is fixed, new build system is in place. If not, reopen. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=361#comment1339 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: bulk regeneration of README files
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.0 Commit: fe9c6ddd1d36ac7fabb303605e6a11dcd84fff1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe9c6dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 6 11:35:26 2014 +0100 modules: bulk regeneration of README files - some modules had xml files updated, but no refresh for README files --- modules/acc/README | 4 +- modules/dialog/README | 208 ++++++++++---------- modules/dialog_ng/README | 250 ++++++++++++------------ modules/ims_auth/README | 28 ++-- modules/ims_icscf/README | 4 +- modules/ims_isc/README | 4 +- modules/ims_qos/README | 4 +- modules/ims_usrloc_pcscf/README | 36 ++-- modules/iptrtpproxy/README | 411 +++++++++++++++++++-------------------- modules/ndb_redis/README | 8 +- modules/timer/README | 53 +++--- 11 files changed, 503 insertions(+), 507 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=fe9…

1 0

git:4.0: acc: added note about MySQL InnoDB not supporting INSERT DELAYED
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.0 Commit: 9db02c00c7e821b3640dd2fa9161a60bcb0a1f44 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9db02c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 3 10:04:39 2014 +0100 acc: added note about MySQL InnoDB not supporting INSERT DELAYED - reported by Daniel Tryba (cherry picked from commit d26eff22c8a543c63a40cd7d91bb3c70f04aabc6) (cherry picked from commit 4ac82cdf92ae6c0e2ff9c1238bfe28cfcefea99c) --- modules/acc/doc/acc_admin.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index a60ba34..5e4e726 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -1029,7 +1029,9 @@ modparam("acc", "db_extra", "ct=$hdr(Content-type); email=$avp(s:email)") <para> If set to 1, use INSERT DELAYED to add records to accounting tables when the DB driver has support for it. If no INSERT DELAYED support - is offered by DB driver, then standard INSERT is used. + is offered by DB driver, then standard INSERT is used. Beware that + MySQL InnoDB engine doesn't support INSERT DELAYED, thus be sure + the acc tables are defined with different type (e.g., MyISAM). </para> <para> Default value is 0 (no INSERT DELAYED).

1 0

git:4.0: tm: exported set_t() and get_t_branch() viam tm api
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.0 Commit: 6121e8ee902d6b40bb50f20f0ce0a1315ede3500 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6121e8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 24 16:05:49 2013 +0100 tm: exported set_t() and get_t_branch() viam tm api - allows to backup and restore pointers to T and branch (cherry picked from commit 777dd5e28ff6b4fcc3b1c44e841eb415c974075f) (cherry picked from commit 09fb0aae62761ce4f251ab22c6ab9cde55e2c663) --- modules/tm/t_lookup.h | 3 +++ modules/tm/tm_load.c | 2 ++ modules/tm/tm_load.h | 2 ++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_lookup.h b/modules/tm/t_lookup.h index 32a9e8a..cced995 100644 --- a/modules/tm/t_lookup.h +++ b/modules/tm/t_lookup.h @@ -86,10 +86,13 @@ int t_check_msg(struct sip_msg* , int *branch ); typedef struct cell * (*tgett_f)(void); struct cell *get_t(void); + +typedef int (*tgett_branch_f)(void); int get_t_branch(void); /* use carefully or better not at all -- current transaction is * primarily set by lookup functions */ +typedef void (*tsett_f)(struct cell *t, int branch); void set_t(struct cell *t, int branch); diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index 5a0c936..1b422c5 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -105,6 +105,8 @@ int load_tm( struct tm_binds *tmb) tmb->free_dlg = free_dlg; tmb->print_dlg = print_dlg; tmb->t_gett = get_t; + tmb->t_gett_branch = get_t_branch; + tmb->t_sett = set_t; tmb->calculate_hooks = w_calculate_hooks; tmb->t_uac = t_uac; tmb->t_uac_with_ids = t_uac_with_ids; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 1c43d41..0c4ece9 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -82,6 +82,8 @@ struct tm_binds { free_dlg_f free_dlg; print_dlg_f print_dlg; tgett_f t_gett; + tgett_branch_f t_gett_branch; + tsett_f t_sett; calculate_hooks_f calculate_hooks; t_uac_t t_uac; t_uac_with_ids_t t_uac_with_ids;

1 0

git:4.0: core: added function to check if counters have been initialized
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.0 Commit: 1208d0ac3890539f06ad6372cd11d5048cf572dd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1208d0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 3 23:38:08 2013 +0100 core: added function to check if counters have been initialized (cherry picked from commit 8161152b320f3b430523ea08e86a56f79405c2f4) (cherry picked from commit a165fa668378da5c312a0c268aaf158ff583127f) --- counters.c | 10 +++++++++- counters.h | 1 + 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/counters.c b/counters.c index 6e5ffbb..3bfe542 100644 --- a/counters.c +++ b/counters.c @@ -89,12 +89,20 @@ static int grp_no; /* number of groups */ /** counters array. a[proc_no][counter_id] => _cnst_vals[proc_no*cnts_no+counter_id] */ -counter_array_t* _cnts_vals; +counter_array_t* _cnts_vals = 0; int _cnts_row_len; /* number of elements per row */ static int cnts_no; /* number of registered counters */ static int cnts_max_rows; /* set to 0 if not yet fully init */ +int counters_initialized(void) +{ + if (unlikely(_cnts_vals == 0)) { + /* not init yet */ + return 0; + } + return 1; +} /** init the coutner hash table(s). * @return 0 on success, -1 on error. diff --git a/counters.h b/counters.h index ea16e28..9fd7c32 100644 --- a/counters.h +++ b/counters.h @@ -87,6 +87,7 @@ extern int _cnts_row_len; /* number of elements per row */ +int counters_initialized(void); int init_counters(void); void destroy_counters(void); int counters_prefork_init(int max_process_no);

1 0

git:4.0: core: don' t increment failed dns query counter for reverse dns lookup at startup
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.0 Commit: fbf78b84eaf9b7c8e2924db996807cd6851a3a00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fbf78b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 3 23:38:41 2013 +0100 core: don't increment failed dns query counter for reverse dns lookup at startup - it can happen before counters are intialized, thus check that before - reported by Hugh Waite, FS#375 (cherry picked from commit 89c6d73dd51eb9b96f50d3f04219612fa7725224) (cherry picked from commit a3169d02d7527110941fab8de25ba75aae759ce1) --- dns_cache.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 5690cb6..4e97ac1 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -2624,7 +2624,8 @@ struct hostent* dns_resolvehost(char* name) ret = _resolvehost(name); if(unlikely(!ret)){ /* increment dns error counter */ - counter_inc(dns_cnts_h.failed_dns_req); + if(counters_initialized()) + counter_inc(dns_cnts_h.failed_dns_req); } return ret; }

1 0

git:4.0: tmx: backup and restore existing T and branch pointers for t_cancel_callid()
by Daniel-Constantin Mierla 06 Mar '14

06 Mar '14

Module: sip-router Branch: 4.0 Commit: 211348ae0fa62282fb437fc97beeab6b10a1dbed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=211348a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 24 16:06:41 2013 +0100 tmx: backup and restore existing T and branch pointers for t_cancel_callid() - reported and initial patch by Guillaume Bour (cherry picked from commit 60372d613544af1f8f06122eb77fa2a9636a6c3a) (cherry picked from commit f7ed69d75746dc55e5a48a7a18602124e73cd3cd) --- modules/tmx/tmx_mod.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/tmx/tmx_mod.c b/modules/tmx/tmx_mod.c index c559f40..8837a58 100644 --- a/modules/tmx/tmx_mod.c +++ b/modules/tmx/tmx_mod.c @@ -331,6 +331,8 @@ static int fixup_cancel_callid(void** param, int param_no) static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *flag) { struct cell *trans; + struct cell *bkt; + int bkb; struct cancel_info cancel_data; str cseq_s; str callid_s; @@ -356,6 +358,8 @@ static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *fla return -1; } + bkt = _tmx_tmb.t_gett(); + bkb = _tmx_tmb.t_gett_branch(); if( _tmx_tmb.t_lookup_callid(&trans, callid_s, cseq_s) < 0 ) { DBG("Lookup failed - no transaction\n"); return -1; @@ -370,6 +374,7 @@ static int t_cancel_callid(struct sip_msg* msg, char *cid, char *cseq, char *fla _tmx_tmb.cancel_uacs(trans, &cancel_data, 0); //_tmx_tmb.unref_cell(trans); + _tmx_tmb.t_sett(bkt, bkb); return 1; }

1 0

Re: [sr-dev] dialog module with DB Backend
by jay binks 06 Mar '14

06 Mar '14

So poking round the code for the dialog module.... Im not sure what im missing here. get_profile_size dosnt care bout the state of a dialog... so you get ALL dialogs that are in the hash table. ( which is interesting if you want to use dialog module to enforce channel limits etc ) So you go... OK... kamailio only expects to have "ACTIVE" dialogs in the hash table... kewl.. lets assume that to be the case. but then in dlg_db_handler.c , load_dialog_info_from_db loads all dialogs from the DB, regardless of state. so all dialogs in the DB ( ones that didnt get deleted yet... but were in state 5 ) get re-created in kamailio upon startup. what this means is... ( assume starting with empty DB ) I start kamailio, make some calls... they get synced to the DB. I end the calls, kamailio removes from dialogs module internal hash, but the sync to DB hasnt happened yet. I kill kamailio ( or crash .. whatever ).... restart kamailio and it re-loads all those dialogs and thinks they are still active calls. Im SURE Im missing something here, because it seems to be VERY common to use dialogs for channel limiting.. maybe not so much using cassandra db behind the scenes, but as of yet ... Im still yet to find anything that makes me thing this is db_cassandra mis-behaving. if im wrong, please point me in the right direction. Jay On 24 February 2014 17:54, jay binks <jaybinks(a)gmail.com> wrote: > Am I REALLY the only person who has ever run into this !? > > > On 19 February 2014 14:08, jay binks <jaybinks(a)gmail.com> wrote: > >> Hi all, im using the dialog module with db_cassandra backend.. >> I dont believe this issue is related to cassandra, but its worth >> mentioning anyways. >> >> so... I run kamailio, make calls, see dialogs in the DB.. >> and I Can use "kamctl mi dlg_list" and see that dialogs go away when I >> hangup a call.. >> >> When I query the DB Backend, I still see the queries, but they have a >> state of 5. >> I Initially thought this was a bug, but it seems dialogs in state 5 get >> cleaned up after a period. >> so I moved on. >> >> now , lets restart kamailio.. >> kamailio loads all dialogs on startup, after kamailio starts I call >> "kamctl mi dlg_list" again, and it shows all my dialogs from the DB. they >> DO show as "State 5" >> but for some reason, these dialogs appear to stick around for a long >> time, and the bigger issue it causes me is that my channel limiting ( >> using get_profile_size ) seems to consider these dialogs ( in state 5 ) as >> being active calls. >> >> Please someone point me in the right direction... :) >> >> what am I doing wrong ? >> ( or is this a bug somewhere ) >> >> Sincerely >> >> Jay >> > > > > -- > Sincerely > > Jay > -- Sincerely Jay

3 10

← Newer
1
...
19
20
21
22
23
24
25
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2014