sr-dev September 2012

sr-dev@lists.kamailio.org

32 participants
173 discussions

git:master: modules/websocket: Updated documentation and fixed typo in configuration file example
by Peter Dunkley 27 Sep '12

27 Sep '12

Module: sip-router Branch: master Commit: a24ce948f9f1758440b58d328eb8654efabfbbea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a24ce94… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Sep 27 16:29:03 2012 +0100 modules/websocket: Updated documentation and fixed typo in configuration file example --- modules/websocket/README | 25 +++++++++++++++++++------ modules/websocket/doc/websocket_admin.xml | 25 +++++++++++++++++++------ modules/websocket/example/kamailio.cfg | 2 +- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/modules/websocket/README b/modules/websocket/README index 5a34e3a..9f55bb0 100644 --- a/modules/websocket/README +++ b/modules/websocket/README @@ -135,7 +135,12 @@ event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); - if ($Rp != 80 && $Rp != 443) { + if ($Rp != 80 +#!ifdef WITH_TLS + && $Rp != 443 +#!endif + ) { + xlog("L_WARN", "HTTP request received on $Rp\n"); xhttp_reply("403", "Forbidden", "", ""); exit; @@ -146,17 +151,25 @@ event_route[xhttp:request] { if ($hdr(Upgrade)=~"websocket" && $hdr(Connection)=~"Upgrade" && $rm=~"GET") { - xlog("L_DBG", "WebSocket\n"); - xlog("L_DBG", " Host: $hdr(Host)\n"); - xlog("L_DBG", " Origin: $hdr(Origin)\n"); - if ($hdr(Host) == $null || !is_myself($hdr(Host))) { + # Validate Host - make sure the client is using the correct + # alias for WebSockets + if ($hdr(Host) == $null || !is_myself("sip:" + $hdr(Host))) { xlog("L_WARN", "Bad host $hdr(Host)\n"); xhttp_reply("403", "Forbidden", "", ""); exit; } - # Optional... validate Origin + # Optional... validate Origin - make sure the client is from an + # authorised website. For example, + # + # if ($hdr(Origin) != "http://communicator.MY_DOMAIN" + # && $hdr(Origin) != "https://communicator.MY_DOMAIN") { + # xlog("L_WARN", "Unauthorised client $hdr(Origin)\n"); + # xhttp_reply("403", "Forbidden", "", ""); + # exit; + # } + # Optional... perform HTTP authentication # ws_handle_handshake() exits (no further configuration file diff --git a/modules/websocket/doc/websocket_admin.xml b/modules/websocket/doc/websocket_admin.xml index 6609275..7dcdc13 100644 --- a/modules/websocket/doc/websocket_admin.xml +++ b/modules/websocket/doc/websocket_admin.xml @@ -51,7 +51,12 @@ event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); - if ($Rp != 80 && $Rp != 443) { + if ($Rp != 80 +#!ifdef WITH_TLS + && $Rp != 443 +#!endif + ) { + xlog("L_WARN", "HTTP request received on $Rp\n"); xhttp_reply("403", "Forbidden", "", ""); exit; @@ -62,17 +67,25 @@ event_route[xhttp:request] { if ($hdr(Upgrade)=~"websocket" && $hdr(Connection)=~"Upgrade" && $rm=~"GET") { - xlog("L_DBG", "WebSocket\n"); - xlog("L_DBG", " Host: $hdr(Host)\n"); - xlog("L_DBG", " Origin: $hdr(Origin)\n"); - if ($hdr(Host) == $null || !is_myself($hdr(Host))) { + # Validate Host - make sure the client is using the correct + # alias for WebSockets + if ($hdr(Host) == $null || !is_myself("sip:" + $hdr(Host))) { xlog("L_WARN", "Bad host $hdr(Host)\n"); xhttp_reply("403", "Forbidden", "", ""); exit; } - # Optional... validate Origin + # Optional... validate Origin - make sure the client is from an + # authorised website. For example, + # + # if ($hdr(Origin) != "http://communicator.MY_DOMAIN" + # && $hdr(Origin) != "https://communicator.MY_DOMAIN") { + # xlog("L_WARN", "Unauthorised client $hdr(Origin)\n"); + # xhttp_reply("403", "Forbidden", "", ""); + # exit; + # } + # Optional... perform HTTP authentication # ws_handle_handshake() exits (no further configuration file diff --git a/modules/websocket/example/kamailio.cfg b/modules/websocket/example/kamailio.cfg index 17ae075..f4b4c12 100644 --- a/modules/websocket/example/kamailio.cfg +++ b/modules/websocket/example/kamailio.cfg @@ -355,7 +355,7 @@ event_route[xhttp:request] { # processing of the request) when complete. if (ws_handle_handshake()) { - # Optional... cache some information abou the + # Optional... cache some information about the # successful connection exit; }

1 0

git:master: core/mem: moved safety check for null before range check in *free()
by Daniel-Constantin Mierla 27 Sep '12

27 Sep '12

Module: sip-router Branch: master Commit: 927a8a1aa705438d210fc244066a8c5a5b84a746 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=927a8a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 27 14:57:51 2012 +0200 core/mem: moved safety check for null before range check in *free() - affects only when memory debug is enabled at compilation - apparently libssl has some free(0) which makes it not possible to work with memory debugging (reported on irc channel) --- mem/f_malloc.c | 11 +++++++---- mem/q_malloc.c | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index e3edf54..e9cbc0b 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -507,18 +507,21 @@ 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); +#endif + if (p==0) { + LOG(L_WARN, "WARNING:fm_free: free(0) called\n"); + return; + } +#ifdef DBG_F_MALLOC if (p>(void*)qm->last_frag || p<(void*)qm->first_frag){ 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(); + else return; } #endif - if (p==0) { - LOG(L_WARN, "WARNING:fm_free: free(0) called\n"); - return; - } f=(struct fm_frag*) ((char*)p-sizeof(struct fm_frag)); #ifdef DBG_F_MALLOC MDBG("fm_free: freeing block alloc'ed from %s: %s(%ld)\n", diff --git a/mem/q_malloc.c b/mem/q_malloc.c index fd93edb..4649474 100644 --- a/mem/q_malloc.c +++ b/mem/q_malloc.c @@ -435,18 +435,25 @@ void qm_free(struct qm_block* qm, void* p) #ifdef DBG_QM_MALLOC MDBG("qm_free(%p, %p), called from %s: %s(%d)\n", qm, p, file, func, line); +#endif + + if (p==0) { + LOG(L_WARN, "WARNING:qm_free: free(0) called\n"); + return; + } + +#ifdef DBG_QM_MALLOC if (p>(void*)qm->last_frag_end || p<(void*)qm->first_frag){ LOG(L_CRIT, "BUG: qm_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(); + else return; } #endif - if (p==0) { - LOG(L_WARN, "WARNING:qm_free: free(0) called\n"); - return; - } + f=(struct qm_frag*) ((char*)p-sizeof(struct qm_frag)); + #ifdef DBG_QM_MALLOC qm_debug_frag(qm, f); if (f->u.is_free){ @@ -455,6 +462,7 @@ void qm_free(struct qm_block* qm, void* p) p, file, func, line, f->file, f->func, f->line); if(likely(cfg_get(core, core_cfg, mem_safety)==0)) abort(); + else return; } MDBG("qm_free: freeing frag. %p alloc'ed from %s: %s(%ld)\n", f, f->file, f->func, f->line);

1 0

[ openser-Feature Requests-3572080 ] DIyFcT <a href="http://ugqgaqbemzxp.com/">ugqgaqbemzxp</a>,
by SourceForge.net 27 Sep '12

27 Sep '12

Feature Requests item #3572080, was opened at 2012-09-26 17:11 Message generated for change (Tracker Item Submitted) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=3572080&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: DIyFcT <a href="http://ugqgaqbemzxp.com/">ugqgaqbemzxp</a>, Initial Comment: DIyFcT <a href="http://ugqgaqbemzxp.com/">ugqgaqbemzxp</a>, [url=http://icwkozwynemh.com/]icwkozwynemh[/url], [link=http://klowtcfuhmuu.com/]klowtcfuhmuu[/link], http://ighyahmbruzk.com/ ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=3572080&group_…

1 0

Kamailio load stat
by Jason Penton 26 Sep '12

26 Sep '12

Hey Guys, Does anyone know of a stat that indicates load in Kamailio. Here I am specifically looking to see how loaded my children are, whether they be UDP, TCP or SCTP, etc. A cool stat would be something like in the last t seconds children were busy 95% of the time on average., etc. Having a look at the udp receover code we could just time the processing loop for each process. I'm sure this would be similar for TCP/SCTP. Any stats like this already exist? or should I go ahead? cheers Jason

2 2

git:master: core/fixups: updates to reflect usage of pv cache for pv_elem_t
by Elena-Ramona Modroiu 26 Sep '12

26 Sep '12

Module: sip-router Branch: master Commit: 2895dbdc0ba7c86b855fdffce178e3ca072a631a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2895dbd… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Wed Sep 26 12:09:10 2012 +0200 core/fixups: updates to reflect usage of pv cache for pv_elem_t --- mod_fix.c | 3 ++- sr_module.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index 0f66437..9064442 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -484,7 +484,8 @@ int fixup_free_igp_pvar_pvar(void** param, int param_no) return E_UNSPEC; \ } else{ \ fp=(fparam_t*)*param; \ - if ((ret==0) && (fp->v.pve->spec.getf==0)){ \ + if ((ret==0) && (fp->v.pve->spec==0 \ + || fp->v.pve->spec->getf==0)){ \ fparam_free_restore(param); \ return fix_param_types(FPARAM_STR, param); \ } else if (ret==1) \ diff --git a/sr_module.c b/sr_module.c index 172b400..485f975 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1410,7 +1410,7 @@ int fixup_var_pve_12(void** param, int param_no) If the resulting PVE is static (normal string), discard it and use the normal string fixup (faster at runtime) */ fp = (fparam_t*)*param; - if (fp->v.pve->spec.getf == 0) + if (fp->v.pve->spec == 0 || fp->v.pve->spec->getf == 0) fparam_free_restore(param); /* fallback to STR below */ else return ret; /* dynamic PVE => return */ @@ -1452,7 +1452,7 @@ int fixup_var_pve_str_12(void** param, int param_no) If the resulting PVE is static (normal string), discard it and use the normal string fixup (faster at runtime) */ fp = (fparam_t*)*param; - if (fp->v.pve->spec.getf == 0) + if (fp->v.pve->spec == 0 || fp->v.pve->spec->getf == 0) fparam_free_restore(param); /* fallback to STR below */ else return ret; /* dynamic PVE => return */

1 0

git:master: core/pv: use pv cache for pv_elem_t
by Elena-Ramona Modroiu 26 Sep '12

26 Sep '12

Module: sip-router Branch: master Commit: bd5353dff6e955830b816fe2f3d2bfedd02bf83b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd5353d… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Wed Sep 26 12:07:19 2012 +0200 core/pv: use pv cache for pv_elem_t - reduces use of private memory for repetitive PVs --- pvapi.c | 44 +++++++++++++++++++++++++++++++++++++++++--- pvar.h | 3 ++- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/pvapi.c b/pvapi.c index 957086f..209d835 100644 --- a/pvapi.c +++ b/pvapi.c @@ -356,6 +356,40 @@ pv_spec_t* pv_cache_get(str *name) /** * */ +pv_spec_t* pv_spec_lookup(str *name, int *len) +{ + pv_spec_t *pvs; + str tname; + + if(len!=NULL) + *len = 0; + if(name->s==NULL || name->len==0) + { + LM_ERR("invalid parameters\n"); + return NULL; + } + + tname.s = name->s; + tname.len = pv_locate_name(name); + + if(tname.len < 0) + return NULL; + + if(len!=NULL) + *len = tname.len; + + pvs = pv_cache_lookup(&tname); + + if(pvs!=NULL) + return pvs; + + LM_DBG("PV <%.*s> is not in cache\n", tname.len, tname.s); + return pv_cache_add(&tname); +} + +/** + * + */ int register_pvars_mod(char *mod_name, pv_export_t *items) { int ret; @@ -943,6 +977,7 @@ int pv_parse_format(str *in, pv_elem_p *el) int n = 0; pv_elem_p e, e0; str s; + int len; if(in==NULL || in->s==NULL || el==NULL) return -1; @@ -985,7 +1020,10 @@ int pv_parse_format(str *in, pv_elem_p *el) break; s.s = p; s.len = in->s+in->len-p; - p0 = pv_parse_spec(&s, &e->spec); + e->spec = pv_spec_lookup(&s, &len); + if(e->spec==NULL) + goto error; + p0 = p + len; if(p0==NULL) goto error; @@ -1250,8 +1288,8 @@ int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) } } /* put the value of the specifier */ - if(it->spec.type!=PVT_NONE - && pv_get_spec_value(msg, &(it->spec), &tok)==0) + if(it->spec!=NULL && it->spec->type!=PVT_NONE + && pv_get_spec_value(msg, it->spec, &tok)==0) { if(tok.flags&PV_VAL_NULL) tok.rs = pv_str_null; diff --git a/pvar.h b/pvar.h index eaa7556..f6d6318 100644 --- a/pvar.h +++ b/pvar.h @@ -164,7 +164,7 @@ typedef struct _pv_export { typedef struct _pv_elem { str text; - pv_spec_t spec; + pv_spec_t *spec; struct _pv_elem *next; } pv_elem_t, *pv_elem_p; @@ -188,6 +188,7 @@ int pv_parse_format(str *in, pv_elem_p *el); int pv_parse_index(pv_spec_p sp, str *in); int pv_init_iname(pv_spec_p sp, int param); int pv_printf_s(struct sip_msg* msg, pv_elem_p list, str *s); +pv_spec_t* pv_spec_lookup(str *name, int *len); typedef struct _pvname_list { pv_spec_t sname;

1 0

git:master: auth_db(k): load_credentials is using the cache for pvs
by Elena-Ramona Modroiu 26 Sep '12

26 Sep '12

Module: sip-router Branch: master Commit: 0420d14dc23ae63a043650da0fa82654aab82bb6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0420d14… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Wed Sep 26 12:10:23 2012 +0200 auth_db(k): load_credentials is using the cache for pvs - results in less used private memory --- modules_k/auth_db/authdb_mod.c | 7 ++----- modules_k/auth_db/authorize.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules_k/auth_db/authdb_mod.c b/modules_k/auth_db/authdb_mod.c index 5a1e2ef..03d1721 100644 --- a/modules_k/auth_db/authdb_mod.c +++ b/modules_k/auth_db/authdb_mod.c @@ -352,11 +352,8 @@ int parse_aaa_pvs(char *definition, pv_elem_t **pv_def, int *cnt) /* create a pv spec */ LM_DBG("column: %.*s pv: %.*s\n", pve->text.len, pve->text.s, pv.len, pv.s); - if (pv_parse_spec(&pv, &pve->spec) == 0) { - LM_ERR("malformed PV definition: %.*s\n", pv.len, pv.s); - goto parse_error;; - } - if(pve->spec.setf == NULL) { + pve->spec = pv_spec_lookup(&pv, NULL); + if(pve->spec==NULL || pve->spec->setf == NULL) { LM_ERR("PV is not writeable: %.*s\n", pv.len, pv.s); goto parse_error; } diff --git a/modules_k/auth_db/authorize.c b/modules_k/auth_db/authorize.c index 909365c..1252687 100644 --- a/modules_k/auth_db/authorize.c +++ b/modules_k/auth_db/authorize.c @@ -140,7 +140,7 @@ static int generate_avps(struct sip_msg* msg, db1_res_t* db_res) int i; for (cred=credentials, i=1; cred; cred=cred->next, i++) { - if (db_val2pv_spec(msg, &RES_ROWS(db_res)[0].values[i], &cred->spec) != 0) { + if (db_val2pv_spec(msg, &RES_ROWS(db_res)[0].values[i], cred->spec) != 0) { LM_ERR("Failed to convert value for column %.*s\n", RES_NAMES(db_res)[i]->len, RES_NAMES(db_res)[i]->s); return -1;

1 0

git:master: userblacklist: updates for new pv_elem_t structure
by Elena-Ramona Modroiu 26 Sep '12

26 Sep '12

Module: sip-router Branch: master Commit: cbeb136c60d4890599d39665a2d27d865ae29b76 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbeb136… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Wed Sep 26 12:11:36 2012 +0200 userblacklist: updates for new pv_elem_t structure - safety checks to detect dynamic vs static string parameters --- modules_k/userblacklist/userblacklist.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_k/userblacklist/userblacklist.c b/modules_k/userblacklist/userblacklist.c index 4433064..134db25 100644 --- a/modules_k/userblacklist/userblacklist.c +++ b/modules_k/userblacklist/userblacklist.c @@ -190,9 +190,9 @@ static int check_user_blacklist_fixup(void** param, int param_no) return E_UNSPEC; } - if(!model->spec.getf) { + if(model->spec==NULL || model->spec->getf==NULL) { if(param_no == 1) { - if(str2int(&s, (unsigned int*)&model->spec.pvp.pvn.u.isname.name.n) != 0) { + if(str2int(&s, (unsigned int*)&model->spec->pvp.pvn.u.isname.name.n) != 0) { LM_ERR("wrong value [%.*s] for parameter %d\n", s.len, s.s, param_no); return E_UNSPEC; } @@ -227,21 +227,21 @@ static int check_user_list(struct sip_msg *msg, char* str1, char* str2, char* st char req_number[MAXNUMBERLEN+1]; /* user */ - if(((pv_elem_p)str1)->spec.getf) { + if(((pv_elem_p)str1)->spec!=NULL && ((pv_elem_p)str1)->spec->getf!=NULL) { if(pv_printf_s(msg, (pv_elem_p)str1, &user) != 0) { LM_ERR("cannot print user pseudo-variable\n"); return -1; } } /* domain */ - if(((pv_elem_p)str2)->spec.getf) { + if(((pv_elem_p)str2)->spec!=NULL && ((pv_elem_p)str2)->spec->getf) { if(pv_printf_s(msg, (pv_elem_p)str2, &domain) != 0) { LM_ERR("cannot print domain pseudo-variable\n"); return -1; } } /* source number */ - if(str3 != NULL && ((pv_elem_p)str3)->spec.getf) { + if(str3 != NULL && ((pv_elem_p)str3)->spec!=NULL && ((pv_elem_p)str3)->spec->getf!=NULL) { if(pv_printf_s(msg, (pv_elem_p)str3, &number) != 0) { LM_ERR("cannot print number pseudo-variable\n"); return -1;

1 0

git:master: xlog: use the function from core to get term color codes
by Elena-Ramona Modroiu 26 Sep '12

26 Sep '12

Module: sip-router Branch: master Commit: c79dffa959b325da2c579b2dce94511beac83f00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c79dffa… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Wed Sep 26 10:20:11 2012 +0200 xlog: use the function from core to get term color codes --- modules_k/xlog/xlog.c | 122 ++----------------------------------------------- 1 files changed, 4 insertions(+), 118 deletions(-) diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index 2ebd4e9..8a9b8c2 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -587,134 +587,20 @@ error: return -1; } -#define COL_BUF 10 - -#define append_sstring(p, end, s) \ - do{\ - if ((p)+(sizeof(s)-1)<=(end)){\ - memcpy((p), s, sizeof(s)-1); \ - (p)+=sizeof(s)-1; \ - }else{ \ - /* overflow */ \ - LM_ERR("append_sstring overflow\n"); \ - goto error;\ - } \ - } while(0) - - static int pv_get_color(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - static char color[COL_BUF]; - char* p; - char* end; - str s; + str s = {"", 0}; if(log_stderr==0 && force_color==0) { - s.s = ""; - s.len = 0; + LM_DBG("ignoring colors\n"); return pv_get_strval(msg, param, res, &s); } - p = color; - end = p + COL_BUF; - - /* excape sequenz */ - append_sstring(p, end, "\033["); - - if(param->pvn.u.isname.name.s.s[0]!='_') - { - if (islower((int)param->pvn.u.isname.name.s.s[0])) - { - /* normal font */ - append_sstring(p, end, "0;"); - } else { - /* bold font */ - append_sstring(p, end, "1;"); - param->pvn.u.isname.name.s.s[0] += 32; - } - } - - /* foreground */ - switch(param->pvn.u.isname.name.s.s[0]) - { - case 'x': - append_sstring(p, end, "39;"); - break; - case 's': - append_sstring(p, end, "30;"); - break; - case 'r': - append_sstring(p, end, "31;"); - break; - case 'g': - append_sstring(p, end, "32;"); - break; - case 'y': - append_sstring(p, end, "33;"); - break; - case 'b': - append_sstring(p, end, "34;"); - break; - case 'p': - append_sstring(p, end, "35;"); - break; - case 'c': - append_sstring(p, end, "36;"); - break; - case 'w': - append_sstring(p, end, "37;"); - break; - default: - LM_ERR("invalid foreground\n"); - return pv_get_null(msg, param, res); - } - - /* background */ - switch(param->pvn.u.isname.name.s.s[1]) - { - case 'x': - append_sstring(p, end, "49"); - break; - case 's': - append_sstring(p, end, "40"); - break; - case 'r': - append_sstring(p, end, "41"); - break; - case 'g': - append_sstring(p, end, "42"); - break; - case 'y': - append_sstring(p, end, "43"); - break; - case 'b': - append_sstring(p, end, "44"); - break; - case 'p': - append_sstring(p, end, "45"); - break; - case 'c': - append_sstring(p, end, "46"); - break; - case 'w': - append_sstring(p, end, "47"); - break; - default: - LM_ERR("invalid background\n"); - return pv_get_null(msg, param, res); - } - - /* end */ - append_sstring(p, end, "m"); - - s.s = color; - s.len = p-color; + dprint_term_color(param->pvn.u.isname.name.s.s[0], + param->pvn.u.isname.name.s.s[1], &s); return pv_get_strval(msg, param, res, &s); - -error: - return -1; } /**

1 0

git:master: core: exported dprint_term_color() function
by Elena-Ramona Modroiu 26 Sep '12

26 Sep '12

Module: sip-router Branch: master Commit: b6642a1af48b3d00ca55d5d7712c842efd2f384a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6642a1… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Wed Sep 26 10:19:51 2012 +0200 core: exported dprint_term_color() function --- dprint.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dprint.h b/dprint.h index cddb490..4a9fdbf 100644 --- a/dprint.h +++ b/dprint.h @@ -141,6 +141,7 @@ void dprint_color(int level); void dprint_color_reset(void); void dprint_color_update(int level, char f, char b); void dprint_init_colors(void); +void dprint_term_color(char f, char b, str *obuf); /** @brief * General logging macros

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2012