sr-dev February 2012

sr-dev@lists.kamailio.org

24 participants
116 discussions

git:master: modules_k/presence Fixed DB Storage Modes
by Anca Vamanu 27 Mar '12

27 Mar '12

Module: sip-router Branch: master Commit: ae86ca3611398ce365ac4a1776ff0c7e95476bbe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae86ca3… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Wed Feb 15 13:39:55 2012 +0200 modules_k/presence Fixed DB Storage Modes - removed db_mode and fallback2db parameters and added two new parameters: subs_db_mode and publ_cache - fixed and extended the storage modes for subscriptions: Memory Only, Write Through, Write Back, DB Only - publ_cache parameter offers the possibility to disable publish cache - some other fixes: - delete subscription only for 481 or 408 reply for Notify - call child_init also for main process (no shutdown DB flush was being performed) --- modules_k/presence/README | 190 ++++++----- modules_k/presence/bind_presence.c | 4 +- modules_k/presence/bind_presence.h | 4 +- modules_k/presence/doc/presence_admin.xml | 127 +++++--- modules_k/presence/doc/presence_devel.xml | 2 +- modules_k/presence/event_list.c | 2 +- modules_k/presence/event_list.h | 2 +- modules_k/presence/hash.c | 25 +-- modules_k/presence/hash.h | 2 +- modules_k/presence/notify.c | 253 ++++++--------- modules_k/presence/notify.h | 2 +- modules_k/presence/presence.c | 108 +++---- modules_k/presence/presence.h | 19 +- modules_k/presence/presentity.c | 30 +-- modules_k/presence/presentity.h | 2 +- modules_k/presence/publish.c | 52 ++-- modules_k/presence/publish.h | 2 +- modules_k/presence/subscribe.c | 495 +++++++++++++++++++---------- modules_k/presence/subscribe.h | 7 +- modules_k/presence/utils_func.c | 2 +- modules_k/presence/utils_func.h | 2 +- modules_k/pua/hash.h | 1 + 22 files changed, 736 insertions(+), 597 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ae8…

5 26

dbcassa_base.cpp:35:34: error fatal: boost/lexical_cast.hpp not found
by Iñaki Baz Castillo 29 Feb '12

29 Feb '12

Hi, "make modules" in master branch gives me this error: dbcassa_base.cpp:35:34: error fatal: boost/lexical_cast.hpp not found Since I don't know which exact boos-dev library I need, I've installed libboost1.46-all-dev (Debian/Ubuntu package) but this requires downloading 32 MB's in different boost-xxxx-dev packages!). After that I get this new error: dbcassa_base.cpp:36:38: error fatal: protocol/TBinaryProtocol.h Now I'm lost. What must I install? BTW: should these development libraries existence be checked before compiling? -- Iñaki Baz Castillo <ibc(a)aliax.net>

2 5

git:master: kamailio.cfg: add colon before the port for voicemail server
by Daniel-Constantin Mierla 29 Feb '12

29 Feb '12

Module: sip-router Branch: master Commit: 0e3f1ff9507a578d95d02d615d333ef24fe42d87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e3f1ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 29 19:08:31 2012 +0100 kamailio.cfg: add colon before the port for voicemail server --- etc/kamailio.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index b7e469d..284cea3 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -884,7 +884,7 @@ route[TOVOICEMAIL] { return; $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip) - + $sel(cfg_get.voicemail.srv_port); + + ":" + $sel(cfg_get.voicemail.srv_port); route(RELAY); exit; #!endif

1 0

[tracker] Task opened: dialog doesn't clear calls that were re-INVITEd shortly after ACK (Attachment added)
by sip-router 29 Feb '12

29 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Andrew Pogrebennyk (marduk) Attached to Project - sip-router Summary - dialog doesn't clear calls that were re-INVITEd shortly after ACK Task Type - Bug Report Category - dialog Status - Assigned Assigned To - Timo Reimann Operating System - All Severity - Low Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - We had a lot of already terminated calls hanging in dialog with state=4. The kamailio version is 3.1.5, I'm aware of certain limitations of dialog module in this version (must use stateless replies, create dialog after 407), but this is something rather new. In kamailio config I'm using dlg_manage() for initial INVITEs and BYE/CANCEL and in-dialog requests are loose-routed, so nothing finicky. The call scenario is: A calls B, B answers the call, A immediately after sending ACK for the 200 OK issues re-INVITE. After some seconds A hangs up, and the dialog stays in memory in state=4, e.g.: dialog:: hash=3304:623200556 state:: 4 ref_count:: 2 timestart:: 1329938667 timeout:: 78590167 callid:: MGExMjRiYzMzN2Q5YWU4YjRiMjFjYTYwYWZlMGFlMzY. from_uri:: sip:sipwise-user1@67.202.62.202 from_tag:: 4207e429 caller_contact:: sip:sipwise-user1@80.108.64.151:46420 caller_cseq:: 3 caller_route_set:: <sip:127.0.0.1:5060;lr;r2=on>,<sip:67.202.62.202:5060;lr;r2=on> caller_bind_addr:: udp:127.0.0.1:5062 callee_bind_addr:: udp:127.0.0.1:5062 to_uri:: sip:43991002@67.202.62.202 to_tag:: 6C8F89E9-4F4540EA0001F575-AC557700 callee_contact:: sip:sipwise-user2@127.0.0.1:5080 callee_cseq:: 11 callee_route_set:: When I set dlg_match_mode=1 the problem goes away. I'd want to know why the dialog fails to clear in default mode (DID_ONLY), because the dialog cookie seems to be there in all in-dialog requests, preserved properly. There is nothing in the debug log and trace attached that catches my eye. In trace file the proxy address is 127.0.0.1:5062. You may notice that the actual signaling flow is a little bit more complicated, I will gladly answer any questions about it. For this test I've used two lines in the eyeBeam softphone, when one line answers the other is automatically put on hold which is what I want. Then I un-hold the callee and clear the call. The customer was reporting multiple stale calls when re-INVITE is sent by Cirpack PSTN gw immediately after call connect, which is basically the same call flow I am talking about, I just couldn't get the debug log from that system. But since I've switched to dlg_match_mode=1 though the problem didn't reoccur. Is it a bug? One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=206 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] Assignee added: dialog doesn't clear calls that were re-INVITEd shortly after ACK
by sip-router 29 Feb '12

29 Feb '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#206 - dialog doesn't clear calls that were re-INVITEd shortly after ACK User who did this - Andrew Pogrebennyk (marduk) http://sip-router.org/tracker/index.php?do=details&task_id=206 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

Re: [sr-dev] git:3.2: [regex_mod] Fix a double freeing in free_shared_memory() function.
by Henning Westerholt 29 Feb '12

29 Feb '12

On Wednesday 29 February 2012, Iñaki Baz Castillo wrote: > I expected that the commit to 3.2 branch would refer the original > master commit "2e96a72c3b16ccf7a1854eb83be3c779474bee3b" in some way, > but it has become a new commit > "7f2e9173caf0da18bbd2fbad76f855c6bf5703bf". Hi Iñaki, normally it should be visible in the commit log, the cherry-pick cmd should inserts the old log msg + a reference to the original commit id. That the cherry-picked commit in the stable branch gets a new commit id is the normal behaviour of git. Viele Grüße/ best regards, Henning Westerholt

1 0

git:master: modules/sdpops, parser/sdp: Added new exported function to give access to the raw SDP within the config file
by Peter Dunkley 29 Feb '12

29 Feb '12

Module: sip-router Branch: master Commit: b5aafda14737467590c6324cb1ba2cb88a2531a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5aafda… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 29 15:18:04 2012 +0000 modules/sdpops, parser/sdp: Added new exported function to give access to the raw SDP within the config file - Feature added by Andrew Miller @ Crocodile RCS --- modules/sdpops/sdpops_mod.c | 61 ++++++++++++++++++++++++++++++++++++++++++ parser/sdp/sdp.c | 14 ++++++--- parser/sdp/sdp.h | 1 + parser/sdp/sdp_helpr_funcs.c | 45 +++++++++++------------------- 4 files changed, 88 insertions(+), 33 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index c2d9e9f..402ca30 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -48,6 +48,7 @@ static int w_sdp_with_codecs_by_id(sip_msg_t* msg, char* codec, char *bar); static int w_sdp_with_codecs_by_name(sip_msg_t* msg, char* codec, char *bar); static int w_sdp_remove_media(sip_msg_t* msg, char* media, char *bar); static int w_sdp_print(sip_msg_t* msg, char* level, char *bar); +static int w_get_sdp(sip_msg_t* msg, char *bar); static int mod_init(void); @@ -74,6 +75,8 @@ static cmd_export_t cmds[] = { 1, fixup_spve_null, 0, ANY_ROUTE}, {"sdp_print", (cmd_function)w_sdp_print, 1, fixup_igp_null, 0, ANY_ROUTE}, + {"sdp_get", (cmd_function)w_get_sdp, + 1, 0, 0, ANY_ROUTE}, {"bind_sdpops", (cmd_function)bind_sdpops, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -928,6 +931,64 @@ static int w_sdp_print(sip_msg_t* msg, char* level, char *bar) return 1; } + +/** + * + */ +static int w_get_sdp(sip_msg_t* msg, char *avp) +{ + sdp_info_t *sdp = NULL; + int_str avp_val; + int_str avp_name; + static unsigned short avp_type = 0; + str s; + pv_spec_t avp_spec; + int sdp_missing=1; + + s.s = avp; s.len = strlen(s.s); + if (pv_parse_spec(&s, &avp_spec)==0 + || avp_spec.type!=PVT_AVP) { + LM_ERR("malformed or non AVP %s AVP definition\n", avp); + return -1; + } + + if(pv_get_avp_name(0, &avp_spec.pvp, &avp_name, &avp_type)!=0) + { + LM_ERR("[%s]- invalid AVP definition\n", avp); + return -1; + } + + sdp_missing = parse_sdp(msg); + if(sdp_missing < 0) { + LM_ERR("Unable to parse sdp\n"); + return -1; + } + sdp = (sdp_info_t*)msg->body; + + if (sdp_missing) { + avp_val.s.s = NULL; + avp_val.s.len = 0; + LM_DBG("No SDP\n"); + } else { + avp_val.s.s = pkg_malloc(sdp->raw_sdp.len); + avp_val.s.len = sdp->raw_sdp.len; + if (avp_val.s.s == NULL) + { + LM_ERR("Failed to alloc memory for SDP"); + return -1; + } + memcpy(avp_val.s.s, sdp->raw_sdp.s, avp_val.s.len); + LM_DBG("Found SDP %.*s\n", sdp->raw_sdp.len, sdp->raw_sdp.s); + } + if (add_avp(AVP_VAL_STR | avp_type, avp_name, avp_val) != 0) + { + LM_ERR("Failed to add SDP avp"); + return -1; + } + + return 1; +} + /** * */ diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 30de265..db9003a 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -591,7 +591,7 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) char *d1p, *d2p; char *ret, *end; unsigned int mime; - str sdp_body, cnt_disp; + str cnt_disp; int session_num; struct hdr_field hf; @@ -659,10 +659,11 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) } /* end of while */ /* and now we need to parse the content */ if (start_parsing) { - sdp_body.s = rest; - sdp_body.len = d2p-rest; - /* LM_DBG("we need to check session %d: <%.*s>\n", session_num, sdp_body.len, sdp_body.s); */ - res = parse_sdp_session(&sdp_body, session_num, &cnt_disp, _sdp); + while (('\n' == *rest) || ('\r' == *rest) || ('\t' == *rest)|| (' ' == *rest)) rest++; /* Skip any whitespace */ + _sdp->raw_sdp.s = rest; + _sdp->raw_sdp.len = d2p-rest; + /* LM_DBG("we need to check session %d: <%.*s>\n", session_num, _sdp.raw_sdp.len, _sdp.raw_sdp.s); */ + res = parse_sdp_session(&_sdp->raw_sdp, session_num, &cnt_disp, _sdp); if (res != 0) { LM_DBG("free_sdp\n"); free_sdp((sdp_info_t**)(void*)&(_sdp)); @@ -721,6 +722,9 @@ int parse_sdp(struct sip_msg* _m) LM_DBG("free_sdp\n"); free_sdp((sdp_info_t**)(void*)&_m->body); } + /* The whole body is SDP */ + ((sdp_info_t*)_m->body)->raw_sdp.s = body.s; + ((sdp_info_t*)_m->body)->raw_sdp.len = body.len; return res; break; default: diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index a1fa8ce..3afc50e 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -104,6 +104,7 @@ typedef struct sdp_info { str text; /**< link to start of sdp and its length */ int sessions_num; /**< number of SDP sessions */ int streams_num; /**< total number of streams for all SDP sessions */ + str raw_sdp; /* Pointer to the Raw SDP (Might be embedded in multipart body) */ struct sdp_session_cell *sessions; } sdp_info_t; diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index 13d1ca9..32e9eb4 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -652,35 +652,24 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) goto error; } - /* if header-field well-known, parse it, find its end otherwise ; - * after leaving the hdr->type switch, tmp should be set to the - * next header field - */ - switch(hdr->type){ - case HDR_CONTENTTYPE_T: - case HDR_CONTENTDISPOSITION_T: - /* just skip over it */ - hdr->body.s=tmp; - /* find end of header */ - /* find lf */ - do{ - match=memchr(tmp, '\n', end-tmp); - if (match){ - match++; - }else { - LM_ERR("bad body for <%s>(%d)\n", hdr->name.s, hdr->type); - tmp=end; - goto error; - } - tmp=match; - }while( match<end &&( (*match==' ')||(*match=='\t') ) ); - tmp=match; - hdr->body.len=match-hdr->body.s; - break; - default: - LM_CRIT("unknown header type %d\n", hdr->type); + /* just skip over it */ + hdr->body.s=tmp; + /* find end of header */ + /* find lf */ + do{ + match=memchr(tmp, '\n', end-tmp); + if (match){ + match++; + }else { + LM_ERR("bad body for <%s>(%d)\n", hdr->name.s, hdr->type); + tmp=end; goto error; - } + } + tmp=match; + }while( match<end &&( (*match==' ')||(*match=='\t') ) ); + tmp=match; + hdr->body.len=match-hdr->body.s; + /* jku: if \r covered by current length, shrink it */ trim_r( hdr->body ); hdr->len=tmp-hdr->name.s;

1 0

git:master: modules_k/textops: Fix to in_list to make it skip over whitespace
by Peter Dunkley 29 Feb '12

29 Feb '12

Module: sip-router Branch: master Commit: 73234337d2ea948bf65459bf929e9fdc8c171dc8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7323433… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 29 15:02:09 2012 +0000 modules_k/textops: Fix to in_list to make it skip over whitespace - Fix by Andrew Miller @ Crocodile RCS --- modules_k/textops/textops.c | 75 ++++++++++++++++++++++++++++--------------- 1 files changed, 49 insertions(+), 26 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index 755b4be..0e825c2 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -1911,23 +1911,23 @@ int in_list_f(struct sip_msg* _m, char* _subject, char* _list, char* _sep) { str subject, list; int sep; - char *at, *past, *s; + char *at, *past, *next_sep, *s; if (fixup_get_svalue(_m, (gparam_p)_subject, &subject) != 0) { - LM_ERR("cannot get subject value\n"); - return -1; + LM_ERR("cannot get subject value\n"); + return -1; } else { - if (subject.len == 0) { - LM_ERR("subject cannot be empty string\n"); - return -1; - } + if (subject.len == 0) { + LM_ERR("subject cannot be empty string\n"); + return -1; + } } if (fixup_get_svalue(_m, (gparam_p)_list, &list) != 0) { - LM_ERR("cannot get list value\n"); - return -1; + LM_ERR("cannot get list value\n"); + return -1; } else { - if (list.len == 0) return -1; + if (list.len == 0) return -1; } sep = _sep[0]; @@ -1935,23 +1935,46 @@ int in_list_f(struct sip_msg* _m, char* _subject, char* _list, char* _sep) at = list.s; past = list.s + list.len; - while (at < past) { - s = index(at, sep); - if (s == NULL) { - if ((subject.len == (past - at)) && - strncmp(at, subject.s, subject.len) == 0) { - return 1; - } else { - return -1; - } - } else { - if ((subject.len == (s - at)) && - strncmp(at, subject.s, subject.len) == 0) { - return 1; - } else { - at = s + 1; - } + /* Eat leading white space */ + while ((at < past) && + ((*at == ' ') || (*at == '\t') || (*at == '\r') || (*at == '\n') )) { + at++; } + + while (at < past) { + next_sep = index(at, sep); + s = next_sep; + + if (s == NULL) { + /* Eat trailing white space */ + while ((at < past) && + ((*(past-1) == ' ') || (*(past-1) == '\t') || (*(past-1) == '\r') || (*(past-1) == '\n') )) { + past--; + } + if ((subject.len == (past - at)) && + strncmp(at, subject.s, subject.len) == 0) { + return 1; + } else { + return -1; + } + } else { + /* Eat trailing white space */ + while ((at < s) && + ((*(s-1) == ' ') || (*(s-1) == '\t') || (*(s-1) == '\r') || (*(s-1) == '\n') )) { + s--; + } + if ((subject.len == (s - at)) && + strncmp(at, subject.s, subject.len) == 0) { + return 1; + } else { + at = next_sep + 1; + /* Eat leading white space */ + while ((at < past) && + ((*at == ' ') || (*at == '\t') || (*at == '\r') || (*at == '\n') )) { + at++; + } + } + } } return -1;

1 0

git:master: modules_k/pua, modules_k/rls: Updated rls_update_subs() to remove back-end SUBSCRIBE dialogs when a contact is removed from a resource list
by Peter Dunkley 29 Feb '12

29 Feb '12

Module: sip-router Branch: master Commit: 5c5e969961b7171319ff79e105ce36f660bd1b63 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c5e969… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Feb 29 14:52:23 2012 +0000 modules_k/pua, modules_k/rls: Updated rls_update_subs() to remove back-end SUBSCRIBE dialogs when a contact is removed from a resource list - rls_update_subs() should be called in kamailio.cfg whenever a resource list changes. The initial version just created new back-end SUBSCRIBE dialogs for new contacts. This meant that dialogs for removed contacts would remain until the dialog expired by itself - which means that NOTIFYs for presence changes to contacts that have been removed will continue to be sent (and with some clients displayed) for a while after the contact was deleted. - Working out when a contact has been deleted is a bit more tricky than working out which ones are new. The mechanism used is to build two insert-sorted lists. List one contains the contacts in the contact list, list two contains the active back-end dialogs. You can then pop the top item from list one and search and remove it from list two (it should be near the top of list two as they are both sorted). Once you have been through list one the remaining URIs in list two are those that have been deleted from the contact list. --- modules_k/pua/hash.c | 48 ++++++++++++++++ modules_k/pua/hash.h | 4 ++ modules_k/pua/pua_bind.c | 1 + modules_k/pua/pua_bind.h | 1 + modules_k/pua/pua_db.c | 75 ++++++++++++++++++++++++++ modules_k/pua/pua_db.h | 2 + modules_k/rls/list.h | 131 +++++++++++++++++++++++++++++++++++++++++++++ modules_k/rls/rls.c | 8 +++ modules_k/rls/rls.h | 1 + modules_k/rls/subscribe.c | 67 +++++++++++++++++++++++ 10 files changed, 338 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5c5…

1 0

git:3.2: [regex_mod] Fix a double freeing in free_shared_memory() function.
by Inaki Baz Castillo 29 Feb '12

29 Feb '12

Module: sip-router Branch: 3.2 Commit: 7f2e9173caf0da18bbd2fbad76f855c6bf5703bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f2e917… Author: Iñaki Baz Castillo <ibc(a)aliax.net> Committer: Iñaki Baz Castillo <ibc(a)aliax.net> Date: Tue Feb 28 20:26:18 2012 +0100 [regex_mod] Fix a double freeing in free_shared_memory() function. --- modules_k/regex/regex_mod.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules_k/regex/regex_mod.c b/modules_k/regex/regex_mod.c index bb0241b..d5b2ab0 100644 --- a/modules_k/regex/regex_mod.c +++ b/modules_k/regex/regex_mod.c @@ -177,8 +177,6 @@ struct module_exports exports = { */ static int mod_init(void) { - LM_INFO("initializing module...\n"); - if(register_mi_mod(exports.name, mi_cmds)!=0) { LM_ERR("failed to register MI commands\n"); @@ -233,9 +231,9 @@ static int mod_init(void) } /* Load the pcres */ - LM_NOTICE("loading pcres...\n"); + LM_DBG("loading pcres...\n"); if (load_pcres(START)) { - LM_CRIT("failed to load pcres\n"); + LM_ERR("failed to load pcres\n"); goto err; } } @@ -384,9 +382,9 @@ static int load_pcres(int action) } /* Log the group patterns */ - LM_NOTICE("num groups = %d\n", num_pcres_tmp); + LM_INFO("num groups = %d\n", num_pcres_tmp); for (i=0; i < num_pcres_tmp; i++) { - LM_NOTICE("<group[%d]>%s</group[%d]> (size = %i)\n", i, patterns[i], i, (int)strlen(patterns[i])); + LM_INFO("<group[%d]>%s</group[%d]> (size = %i)\n", i, patterns[i], i, (int)strlen(patterns[i])); } /* Temporal pointer of pcres */ @@ -498,19 +496,23 @@ static void free_shared_memory(void) } } shm_free(pcres); + pcres = NULL; } if (num_pcres) { shm_free(num_pcres); + num_pcres = NULL; } if (pcres_addr) { shm_free(pcres_addr); + pcres_addr = NULL; } if (reload_lock) { lock_destroy(reload_lock); lock_dealloc(reload_lock); + reload_lock = NULL; } } @@ -672,11 +674,11 @@ static struct mi_root* mi_pcres_reload(struct mi_root* cmd, void* param) return init_mi_tree(403, MI_SSTR("Group matching not enabled")); } - LM_NOTICE("reloading pcres...\n"); + LM_INFO("reloading pcres...\n"); if (load_pcres(RELOAD)) { LM_ERR("failed to reload pcres\n"); return init_mi_tree(500, MI_INTERNAL_ERR_S, MI_INTERNAL_ERR_LEN); } - LM_NOTICE("reload success\n"); + LM_INFO("reload success\n"); return init_mi_tree(200, MI_OK_S, MI_OK_LEN); }

1 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2012