sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
149 discussions

git:master: modules_k/pua: Fixed bugs with expiry value in update_( dialog|record)_puadb()
by Peter Dunkley 30 Mar '12

30 Mar '12

Module: sip-router Branch: master Commit: 7339273c4e96908408aedc4c3c1be6bd2815fe8a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7339273… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 30 17:17:06 2012 +0100 modules_k/pua: Fixed bugs with expiry value in update_(dialog|record)_puadb() - I forgot to add (int) time(NULL) to the expiry value before updating the DB --- modules_k/pua/pua_db.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index 6a5d0d8..4209918 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -950,7 +950,7 @@ int update_record_puadb(ua_pres_t *pres, int expires, str *etag) u_cols[n_update_cols] = &str_expires_col; u_vals[n_update_cols].type = DB1_INT; u_vals[n_update_cols].nul = 0; - u_vals[n_update_cols].val.int_val = expires; + u_vals[n_update_cols].val.int_val = expires + (int) time(NULL); n_update_cols++; if (etag) @@ -1327,7 +1327,7 @@ int update_dialog_puadb(ua_pres_t *pres, int expires, str *contact) u_cols[n_update_cols] = &str_expires_col; u_vals[n_update_cols].type = DB1_INT; u_vals[n_update_cols].nul = 0; - u_vals[n_update_cols].val.int_val = expires; + u_vals[n_update_cols].val.int_val = expires + (int) time(NULL); n_update_cols++; u_cols[n_update_cols] = &str_cseq_col;

1 0

git:master: modules_k/rls: RLS NOTIFY requests now trickled out instead of in one big batch on timeout
by Peter Dunkley 30 Mar '12

30 Mar '12

Module: sip-router Branch: master Commit: 3bb02db14ed4861e1c30422ba26204f2ac233dee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bb02db… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 30 12:48:33 2012 +0100 modules_k/rls: RLS NOTIFY requests now trickled out instead of in one big batch on timeout - New modparam: notifier_poll_rate (default 10 per second) can be used to set how often the notifier process should check for work. Each time the notifier process does something it should send (if the hash works evenly) 1/(waitn_time * notifier_poll_rate) sets of RLS NOTIFY requests. - RLS NOTIFY requests will still come out within waitn_time seconds of the back-end NOTIFY. - Corrected the the default value of waitn_time. It is now 5 seconds which matches the documentation and the RFC. - Fixed a whitespace/indentation inconsistency and a typo in one of the diagnostic messages. --- modules_k/rls/README | 190 +++++++++++++++++++++------------------ modules_k/rls/doc/rls_admin.xml | 30 ++++++- modules_k/rls/resource_notify.c | 8 ++- modules_k/rls/rls.c | 80 ++++++++++------- modules_k/rls/rls.h | 1 + 5 files changed, 187 insertions(+), 122 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3bb…

1 0

git:master: dispatcher(k): enable ds_reload also for rpc interface
by Daniel-Constantin Mierla 30 Mar '12

30 Mar '12

Module: sip-router Branch: master Commit: 289dd5e992126a757f761b273e6e9036cf4691a2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=289dd5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 30 13:29:13 2012 +0200 dispatcher(k): enable ds_reload also for rpc interface - previous commit took the changes for mi --- modules_k/dispatcher/dispatcher.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 2ef1af4..4757c64 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -928,13 +928,6 @@ static const char* dispatcher_rpc_reload_doc[2] = { */ static void dispatcher_rpc_reload(rpc_t* rpc, void* ctx) { - if(dstid_avp_name.n!=0) { - LM_ERR("No reload support when call load dispatching is enabled." - " Do not set dstid_avp param if you do not use alg 10.\n"); - rpc->fault(ctx, 500, "Command disabled"); - return ; - } - if(!ds_db_url.s) { if (ds_load_list(dslistfile)!=0) { rpc->fault(ctx, 500, "Reload Failed");

1 0

git:master: dispatcher(k): removed constraint for ds_reload and alg 10
by Daniel-Constantin Mierla 30 Mar '12

30 Mar '12

Module: sip-router Branch: master Commit: 86646d0d512be27b61a821f297aba53178563e2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86646d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 30 13:24:03 2012 +0200 dispatcher(k): removed constraint for ds_reload and alg 10 - ds_reload can be executed even when using call load distribution - old list of active calls is destroyed, the module starts counting from 0 with the next new call calls --- modules_k/dispatcher/README | 8 +++--- modules_k/dispatcher/dispatch.c | 15 +++++++++---- modules_k/dispatcher/dispatcher.c | 6 ----- modules_k/dispatcher/doc/dispatcher_admin.xml | 9 ++++--- modules_k/dispatcher/ds_ht.c | 26 +++++++++++++++++++++++++ modules_k/dispatcher/ds_ht.h | 1 + 6 files changed, 46 insertions(+), 19 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index cffcc6d..e68a2a8 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -909,10 +909,10 @@ onreply_route { 5.3. ds_reload - It reloads the groups and included destinations. The command is - disabled for call load based dispatching (algorithm 10) since removal - of destinations may leave the list of active calls with broken - references. + It reloads the groups and included destinations. For algorithm 10 (call + load distribution), old internal list of active calls is destroyed + (because it is bould to the previous list of gateways), meaning that + the module is starting to count active calls again from 0. Name: ds_reload diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 2196992..ae0c51b 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -595,9 +595,10 @@ next_line: fclose(f); f = NULL; - /* Update list */ + /* Update list - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; + ds_ht_clear_slots(_dsht_load); ds_print_sets(); return 0; @@ -774,9 +775,10 @@ int ds_load_db(void) goto err2; } - /*update data*/ + /* update data - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; + ds_ht_clear_slots(_dsht_load); ds_print_sets(); @@ -1327,7 +1329,8 @@ int ds_load_replace(struct sip_msg *msg, str *duid) ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - idx->dlist[olddst].dload--; + if(idx->dlist[olddst].dload>0) + idx->dlist[olddst].dload--; if(ds_load_add(msg, idx, set, newdst)<0) { @@ -1384,7 +1387,8 @@ int ds_load_remove(struct sip_msg *msg) ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - idx->dlist[olddst].dload--; + if(idx->dlist[olddst].dload>0) + idx->dlist[olddst].dload--; return 0; } @@ -1423,7 +1427,8 @@ int ds_load_remove_byid(int set, str *duid) return -1; } - idx->dlist[olddst].dload--; + if(idx->dlist[olddst].dload>0) + idx->dlist[olddst].dload--; return 0; } diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index e376bb6..2ef1af4 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -772,12 +772,6 @@ static struct mi_root* ds_mi_list(struct mi_root* cmd_tree, void* param) static struct mi_root* ds_mi_reload(struct mi_root* cmd_tree, void* param) { - if(dstid_avp_name.n!=0) { - LM_ERR("No reload support when call load dispatching is enabled." - " Do not set dstid_avp param if you do not use alg 10.\n"); - return init_mi_tree(500, MI_ERR_DSLOAD, MI_ERR_DSLOAD_LEN); - } - if(!ds_db_url.s) { if (ds_load_list(dslistfile)!=0) return init_mi_tree(500, MI_ERR_RELOAD, MI_ERR_RELOAD_LEN); diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index 83f6c70..3453210 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -1111,10 +1111,11 @@ onreply_route { <function moreinfo="none">ds_reload</function> </title> <para> - It reloads the groups and included destinations. The command is - disabled for call load based dispatching (algorithm 10) since - removal of destinations may leave the list of active - calls with broken references. + It reloads the groups and included destinations. For algorithm 10 + (call load distribution), old internal list of active calls is + destroyed (because it is bould to the previous list of gateways), + meaning that the module is starting to count active calls again + from 0. </para> <para> Name: <emphasis>ds_reload</emphasis> diff --git a/modules_k/dispatcher/ds_ht.c b/modules_k/dispatcher/ds_ht.c index 8322f50..1599fa4 100644 --- a/modules_k/dispatcher/ds_ht.c +++ b/modules_k/dispatcher/ds_ht.c @@ -149,6 +149,32 @@ int ds_ht_destroy(ds_ht_t *dsht) return 0; } +int ds_ht_clear_slots(ds_ht_t *dsht) +{ + int i; + ds_cell_t *it, *it0; + + if(dsht==NULL) + return -1; + + for(i=0; i<dsht->htsize; i++) + { + lock_get(&dsht->entries[i].lock); + /* free entries */ + it = dsht->entries[i].first; + while(it) + { + it0 = it; + it = it->next; + ds_cell_free(it0); + } + dsht->entries[i].first = NULL; + dsht->entries[i].esize = 0; + lock_destroy(&dsht->entries[i].lock); + } + return 0; +} + int ds_add_cell(ds_ht_t *dsht, str *cid, str *duid, int dset) { diff --git a/modules_k/dispatcher/ds_ht.h b/modules_k/dispatcher/ds_ht.h index f705889..8bfc02f 100644 --- a/modules_k/dispatcher/ds_ht.h +++ b/modules_k/dispatcher/ds_ht.h @@ -69,5 +69,6 @@ int ds_unlock_cell(ds_ht_t *dsht, str *cid); int ds_ht_dbg(ds_ht_t *dsht); int ds_cell_free(ds_cell_t *cell); +int ds_ht_clear_slots(ds_ht_t *dsht); #endif

1 0

RLS performance
by Peter Dunkley 30 Mar '12

30 Mar '12

Hello, When under load RLS performs in a "lumpy" manner. I believe this is (at least in part) because of the waitn_timer for sending NOTIFY requests. This timer is needed because, as the RFCs point out, it is important to buffer up RLS NOTIFY requests so as not to flood the network and client. However, I was wondering if a small change might help smooth out the lumps. What I was thinking of is: - Change the updated flag to be a number between 1 and the value of waitn_time (0 means no update) - Set the flag number based to the core_hash(did, NULL, waitn_time-1)+1 when the rls_presentity record is updated/inserted - Have RLS NOTIFY requests sent each second. After the first second records with the updated flag of value 1 are sent. After the second second records with the updated flag of value 2 are sent. Wrapping back to 1 after waitn_time seconds. This should help smooth out the sending of NOTIFY requests from RLS while still making sure they are buffered and take at most waitn_time seconds to come out. Can anybody see any reason why this won't work? Would there be any objections to me making this change? Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

4 3

git:master: core: mem - use mem_safety for f_malloc when DBG_F_MALLOC defined
by Daniel-Constantin Mierla 30 Mar '12

30 Mar '12

Module: sip-router Branch: master Commit: 1124b8cb29b942172c4aab38119f4a3c5f6e45f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1124b8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 30 09:29:18 2012 +0200 core: mem - use mem_safety for f_malloc when DBG_F_MALLOC defined - added helper function to join a fragment with the next one when both are free, controlled by define MEM_JOIN_FREE and mem_join parameter --- mem/f_malloc.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 3 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 7beb3e2..4888b6e 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -445,6 +445,49 @@ found: } +#ifdef MEM_JOIN_FREE +/** + * join fragment f with next one (if it is free) + */ +static void fm_join_frag(struct fm_block* qm, struct fm_frag* f) +{ + int hash; + struct fm_frag **pf; + struct fm_frag* n; + + n=FRAG_NEXT(f); + /* check if valid and if in free list */ + if (((char*)n >= (char*)qm->last_frag) || (n->u.nxt_free==NULL)) + return; + + /* detach n from the free list */ + hash=GET_HASH(n->size); + pf=&(qm->free_hash[hash].first); + /* find it */ + for(;(*pf)&&(*pf!=n); pf=&((*pf)->u.nxt_free)); /*FIXME slow */ + if (*pf==0){ + /* not found, bad! */ + LM_WARN("could not find %p in free list (hash=%ld)\n", n, GET_HASH(n->size)); + return; + } + /* detach */ + *pf=n->u.nxt_free; + qm->free_hash[hash].no--; +#ifdef F_MALLOC_HASH_BITMAP + if (qm->free_hash[hash].no==0) + fm_bmp_reset(qm, hash); +#endif /* F_MALLOC_HASH_BITMAP */ + /* join */ + f->size+=n->size+FRAG_OVERHEAD; +#if defined(DBG_F_MALLOC) || defined(MALLOC_STATS) + qm->real_used-=FRAG_OVERHEAD; +#ifdef MALLOC_STATS + sr_event_exec(SREV_PKG_SET_REAL_USED, (void*)qm->real_used); +#endif /* MALLOC_STATS */ +#endif /* DBG_F_MALLOC || MALLOC_STATS*/ +} +#endif /*MEM_JOIN_FREE*/ + /** * \brief Main memory manager free function * @@ -465,9 +508,11 @@ void fm_free(struct fm_block* qm, void* p) #ifdef DBG_F_MALLOC MDBG("fm_free(%p, %p), called from %s: %s(%d)\n", qm, p, file, func, line); if (p>(void*)qm->last_frag || p<(void*)qm->first_frag){ - LOG(L_CRIT, "BUG: fm_free: bad pointer %p (out of memory block!) - " - "aborting\n", p); - abort(); + LOG(L_CRIT, "BUG: fm_free: bad pointer %p (out of memory block!)," + " called from %s: %s(%d) - aborting\n", p, + file, func, line); + if(likely(cfg_get(core, core_cfg, mem_safety)==0)) + abort(); } #endif if (p==0) { @@ -493,6 +538,10 @@ void fm_free(struct fm_block* qm, void* p) f->func=func; f->line=line; #endif +#ifdef MEM_JOIN_FREE + if(unlikely(cfg_get(core, core_cfg, mem_join)!=0)) + fm_join_frag(qm, f); +#endif /*MEM_JOIN_FREE*/ fm_insert_free(qm, f); }

2 1

alphabetic indexes for devel version
by Daniel-Constantin Mierla 30 Mar '12

30 Mar '12

Hello, I generated alphabetic indexes for module parameters, functions, mi commands and statistics: - https://www.kamailio.org/wiki/start#alphabetic_indexes If any of you find errors or missing items, report back to the lists. A note for developers, if you have to use '[[' in the __title__ of the sections for these components, add a space between them otherwise will conflict with wiki syntax and break the indexing (such '[' is commonly used for optional parameters). Cheers, Daniel -- Daniel-Constantin Mierla Kamailio Advanced Training, April 23-26, 2012, Berlin, Germany http://www.asipto.com/index.php/kamailio-advanced-training/

1 0

git:master: xlog: added space beteen [[ in titles
by Daniel-Constantin Mierla 30 Mar '12

30 Mar '12

Module: sip-router Branch: master Commit: 0c2320074eb2d60db690ec8c93cc3abe5fca6bfc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c23200… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 30 09:28:27 2012 +0200 xlog: added space beteen [[ in titles - otherwise they break dokuwiki alphabetic indexes --- modules_k/xlog/README | 16 ++++++++-------- modules_k/xlog/doc/xlog_admin.xml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules_k/xlog/README b/modules_k/xlog/README index efb41fb..cafb535 100644 --- a/modules_k/xlog/README +++ b/modules_k/xlog/README @@ -37,9 +37,9 @@ Elena-Ramona Modroiu 5. Functions - 5.1. xlog([[facility,] level,] format) + 5.1. xlog([ [facility,] level,] format) 5.2. xdbg(format) - 5.3. xlogl([[facility,] level,] format) + 5.3. xlogl([ [facility,] level,] format) 5.4. xdbgl(format) List of Examples @@ -73,9 +73,9 @@ Chapter 1. Admin Guide 5. Functions - 5.1. xlog([[facility,] level,] format) + 5.1. xlog([ [facility,] level,] format) 5.2. xdbg(format) - 5.3. xlogl([[facility,] level,] format) + 5.3. xlogl([ [facility,] level,] format) 5.4. xdbgl(format) 1. Overview @@ -186,12 +186,12 @@ modparam("xlog", "log_facility", "LOG_DAEMON") 5. Functions - 5.1. xlog([[facility,] level,] format) + 5.1. xlog([ [facility,] level,] format) 5.2. xdbg(format) - 5.3. xlogl([[facility,] level,] format) + 5.3. xlogl([ [facility,] level,] format) 5.4. xdbgl(format) -5.1. xlog([[facility,] level,] format) +5.1. xlog([ [facility,] level,] format) Print a formated message using LOG function. @@ -247,7 +247,7 @@ CAL3\n"); xdbg("time $Cbx[$Tf]$Cxx method ($rm) r-uri ($ru)\n"); ... -5.3. xlogl([[facility,] level,] format) +5.3. xlogl([ [facility,] level,] format) Similar to xlog(), in addition is printing cfg line number at the beginning of message. diff --git a/modules_k/xlog/doc/xlog_admin.xml b/modules_k/xlog/doc/xlog_admin.xml index e36ec046..e52a4e1 100644 --- a/modules_k/xlog/doc/xlog_admin.xml +++ b/modules_k/xlog/doc/xlog_admin.xml @@ -194,7 +194,7 @@ modparam("xlog", "log_facility", "LOG_DAEMON") <title>Functions</title> <section> <title> - <function moreinfo="none">xlog([[facility,] level,] format)</function> + <function moreinfo="none">xlog([ [facility,] level,] format)</function> </title> <para> Print a formated message using LOG function. @@ -324,7 +324,7 @@ xdbg("time $Cbx[$Tf]$Cxx method ($rm) r-uri ($ru)\n"); </section> <section> <title> - <function moreinfo="none">xlogl([[facility,] level,] format)</function> + <function moreinfo="none">xlogl([ [facility,] level,] format)</function> </title> <para> Similar to xlog(), in addition is printing cfg line number

1 0

git:master: xlog(k): fixed wrong xml tag
by Daniel-Constantin Mierla 30 Mar '12

30 Mar '12

Module: sip-router Branch: master Commit: 4bfa0bbc93d89ba0df83d866c97e58cab6fc0716 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bfa0bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 29 18:23:52 2012 +0200 xlog(k): fixed wrong xml tag - readme was regenerated --- modules_k/xlog/README | 36 ++++++++++++++++++++++-------------- modules_k/xlog/doc/xlog_admin.xml | 1 - 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/modules_k/xlog/README b/modules_k/xlog/README index f3400eb..efb41fb 100644 --- a/modules_k/xlog/README +++ b/modules_k/xlog/README @@ -11,9 +11,9 @@ Elena-Ramona Modroiu <ramona(a)rosdev.ro> - Copyright © 2003 FhG FOKUS + Copyright � 2003 FhG FOKUS - Copyright © 2008-2010 Elena-Ramona Modroiu + Copyright � 2008-2010 Elena-Ramona Modroiu __________________________________________________________________ Table of Contents @@ -37,9 +37,9 @@ Elena-Ramona Modroiu 5. Functions - 5.1. xlog([level,] format) + 5.1. xlog([[facility,] level,] format) 5.2. xdbg(format) - 5.3. xlogl([level],format) + 5.3. xlogl([[facility,] level,] format) 5.4. xdbgl(format) List of Examples @@ -73,9 +73,9 @@ Chapter 1. Admin Guide 5. Functions - 5.1. xlog([level,] format) + 5.1. xlog([[facility,] level,] format) 5.2. xdbg(format) - 5.3. xlogl([level],format) + 5.3. xlogl([[facility,] level,] format) 5.4. xdbgl(format) 1. Overview @@ -83,7 +83,7 @@ Chapter 1. Admin Guide This module provides the possibility to print user formatted log or debug messages from Kamailio scripts, similar to the printf function. A C-style printf specifier is replaced with a part of the SIP request or - other variables from system. Section 2, “Implemented Specifiers” shows + other variables from system. Section 2, "Implemented Specifiers" shows what can be printed out. 2. Implemented Specifiers @@ -186,16 +186,21 @@ modparam("xlog", "log_facility", "LOG_DAEMON") 5. Functions - 5.1. xlog([level,] format) + 5.1. xlog([[facility,] level,] format) 5.2. xdbg(format) - 5.3. xlogl([level],format) + 5.3. xlogl([[facility,] level,] format) 5.4. xdbgl(format) -5.1. xlog([level,] format) +5.1. xlog([[facility,] level,] format) Print a formated message using LOG function. Meaning of the parameters are as follows: + * facility - The log facility that will be used for this single log + message. + If this parameter is missing, the implicit facility is either the + facility set with the 'log_facility' module parameter or the core's + log facility. * level - The level that will be used in LOG function. It can be: + L_ALERT - log level -5 + L_BUG - log level -4 @@ -209,7 +214,7 @@ modparam("xlog", "log_facility", "LOG_DAEMON") See above options for valid log levels. If it is not a pseudo-variable, then what really matters is the third letter of the value. If the log level is higher than the - “debug” global parameter, the message is not printed to syslog. + "debug" global parameter, the message is not printed to syslog. If this parameter is missing, the implicit log level is 'L_ERR'. * format - The formatted string to be printed. @@ -224,8 +229,11 @@ xlog("time [$Tf] method ($rm) r-uri ($ru) 2nd via ($hdr(via[1]))\n"); $var(loglevel) = 2; xlog("$var(loglevel)", "time [$Tf] method ($rm) r-uri ($ru)\n"); ... +xlog("LOG_LOCAL3", "L_ERR", "this message will be sent to syslog facility LOG_LO +CAL3\n"); +... -5.2. xdbg(format) +5.2. xdbg(format) Print a formatted message using DBG function. @@ -239,12 +247,12 @@ xlog("$var(loglevel)", "time [$Tf] method ($rm) r-uri ($ru)\n"); xdbg("time $Cbx[$Tf]$Cxx method ($rm) r-uri ($ru)\n"); ... -5.3. xlogl([level],format) +5.3. xlogl([[facility,] level,] format) Similar to xlog(), in addition is printing cfg line number at the beginning of message. -5.4. xdbgl(format) +5.4. xdbgl(format) Similar to xdbg(), in addition is printing cfg line number at the beginning of message. diff --git a/modules_k/xlog/doc/xlog_admin.xml b/modules_k/xlog/doc/xlog_admin.xml index 2cbd363..e36ec046 100644 --- a/modules_k/xlog/doc/xlog_admin.xml +++ b/modules_k/xlog/doc/xlog_admin.xml @@ -205,7 +205,6 @@ modparam("xlog", "log_facility", "LOG_DAEMON") <para><emphasis>facility</emphasis> - The log facility that will be used for this single log message. </para> <para> - <para> If this parameter is missing, the implicit facility is either the facility set with the 'log_facility' module parameter or the core's log facility. </para>

1 0

git:master: modules_k/cfgutils: Added exported function for core_hash()
by Peter Dunkley 29 Mar '12

29 Mar '12

Module: sip-router Branch: master Commit: 8afb4cdfdbb99be12d434a8d0ad2a2c26f0595d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8afb4cd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Mar 29 15:56:25 2012 +0100 modules_k/cfgutils: Added exported function for core_hash() - This means you can calculate hashes on strings within the configuration file. --- modules_k/cfgutils/README | 116 +++++++++++++++++------------ modules_k/cfgutils/cfgutils.c | 45 +++++++++++ modules_k/cfgutils/doc/cfgutils_admin.xml | 32 ++++++++ 3 files changed, 146 insertions(+), 47 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8af…

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2012