sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
382 discussions

git:master: msilo minor doc updates, add section ID's
by Olle E. Johansson 05 Oct '14

05 Oct '14

Module: sip-router Branch: master Commit: c1c285b30844eedea9b0390bf4a603fd30d641df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1c285b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 5 20:03:59 2014 +0200 msilo minor doc updates, add section ID's --- modules/msilo/README | 14 ++++--- modules/msilo/doc/msilo_admin.xml | 72 ++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 42 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c1c…

1 0

git:master: diversion minor doc updates, adding section ID's
by Olle E. Johansson 05 Oct '14

05 Oct '14

Module: sip-router Branch: master Commit: 5236f6e6623057e959ef79ff7f1f61cfa2dbb096 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5236f6e… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 5 19:25:07 2014 +0200 diversion minor doc updates, adding section ID's --- modules/diversion/README | 20 ++++++++++---------- modules/diversion/doc/diversion_admin.xml | 18 ++++++++---------- modules/diversion/doc/diversion_devel.xml | 6 +++--- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/modules/diversion/README b/modules/diversion/README index ff9d75d..c4c5a85 100644 --- a/modules/diversion/README +++ b/modules/diversion/README @@ -60,15 +60,15 @@ Chapter 1. Admin Guide 1. Overview - The module implements the Diversion extensions as per - draft-levy-sip-diversion-08. The diversion extensions are useful in - various scenarios involving call forwarding. Typically one needs to - communicate the original recipient of the call to the PSTN gateway and - this is what the diversion extensions can be used for. + The module implements the Diversion extensions as per RFC 5806. The + diversion extensions are useful in various scenarios involving call + forwarding. Typically one needs to communicate the original recipient + of the call to the PSTN gateway and this is what the diversion + extensions can be used for. Warning - The draft-levy-sip-diversion-08 is expired!! See IETF I-D tracker. + Note that RFC 5806 has historic status. 2. Dependencies @@ -158,12 +158,12 @@ Content-Length: 0 Chapter 2. Developer Guide - According to the specification new Diversion header field should be + According to the specification a new "Diversion" header field should be inserted as the topmost Diversion header field in the message, that means before any other existing Diversion header field in the message. - In addition to that, add_diversion function can be called several times - and each time it should insert the new Diversion header field as the - topmost one. + In addition to that, the add_diversion function can be called several + times and each time it should insert the new Diversion header field as + the topmost one. In order to implement this, add_diversion function creates the anchor in data_lump lists as a static variable to ensure that the next call of diff --git a/modules/diversion/doc/diversion_admin.xml b/modules/diversion/doc/diversion_admin.xml index 81cb428..4650ccc 100644 --- a/modules/diversion/doc/diversion_admin.xml +++ b/modules/diversion/doc/diversion_admin.xml @@ -13,19 +13,17 @@ <title>&adminguide;</title> - <section> + <section id="diversion.overview"> <title>Overview</title> <para> The module implements the Diversion extensions as per - draft-levy-sip-diversion-08. The - diversion extensions are useful in various scenarios involving call - forwarding. Typically one needs to communicate the original recipient - of the call to the PSTN gateway and this is what the diversion - extensions can be used for. + RFC 5806. The diversion extensions are useful in various + scenarios involving call forwarding. Typically one needs to communicate + the original recipient of the call to the PSTN gateway and this is what + the diversion extensions can be used for. </para> <warning><para> - The draft-levy-sip-diversion-08 is expired!! See - <ulink url="https://datatracker.ietf.org/public/idindex.cgi?command=id_detail&and;i…"> IETF I-D tracker</ulink>. + Note that RFC 5806 has historic status. </para></warning> </section> @@ -52,7 +50,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="diversion.p.suffix"> <title><varname>suffix</varname> (string)</title> <para> The suffix to be appended to the end of the header field. You can use @@ -72,7 +70,7 @@ modparam("diversion", "suffix", ";privacy=full") </section> <section> <title>Functions</title> - <section> + <section id="diversion.f.add_diversion"> <title><function moreinfo="none">add_diversion(reason [, uri])</function></title> <para> The function adds a new diversion header field before any other diff --git a/modules/diversion/doc/diversion_devel.xml b/modules/diversion/doc/diversion_devel.xml index 0a39585..739555d 100644 --- a/modules/diversion/doc/diversion_devel.xml +++ b/modules/diversion/doc/diversion_devel.xml @@ -13,9 +13,9 @@ <title>&develguide;</title> <para> - According to the specification new Diversion header field should be inserted as the topmost - Diversion header field in the message, that means before any other existing Diversion header - field in the message. In addition to that, <function + According to the specification a new <quote>Diversion</quote> header field should be inserted + as the topmost Diversion header field in the message, that means before any other existing + Diversion header field in the message. In addition to that, the <function moreinfo="none">add_diversion</function> function can be called several times and each time it should insert the new Diversion header field as the topmost one. </para>

1 0

git:master: regex Minor doc updates
by Olle E. Johansson 05 Oct '14

05 Oct '14

Module: sip-router Branch: master Commit: 110f03f861b21323868256f160c047adaeefa6e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=110f03f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 5 19:09:55 2014 +0200 regex Minor doc updates --- modules/regex/README | 49 ++++++++++++++++++------------------- modules/regex/doc/regex_admin.xml | 26 ++++++++++---------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/modules/regex/README b/modules/regex/README index 3834e45..941b432 100644 --- a/modules/regex/README +++ b/modules/regex/README @@ -1,16 +1,16 @@ Regex Module -Iñaki Baz Castillo +I�aki Baz Castillo <ibc(a)aliax.net> Edited by -Iñaki Baz Castillo +I�aki Baz Castillo <ibc(a)aliax.net> - Copyright © 2009 Iñaki Baz Castillo + Copyright � 2009 I�aki Baz Castillo __________________________________________________________________ Table of Contents @@ -98,14 +98,14 @@ Chapter 1. Admin Guide 1. Overview - This module offers matching operations against regular expressions - using the powerful PCRE library. + This module offers matching operations using regular expressions based + on the powerful PCRE library. A text file containing regular expressions categorized in groups is - compiled when the module is loaded, storing the compiled PCRE objects - in an array. A function to match a string or pseudo-variable against - any of these groups is provided. The text file can be modified and - reloaded at any time via a MI command. The module also offers a + compiled when the module is loaded, the resulting PCRE objects are + stored in an array. A function to match a string or pseudo-variable + against any of these groups is provided. The text file can be modified + and reloaded at any time via a MI command. The module also offers a function to perform a PCRE matching operation against a regular expression provided as function parameter. @@ -142,7 +142,7 @@ Chapter 1. Admin Guide Text file containing the regular expression groups. It must be set in order to enable the group matching function. - Default value is “NULL”. + Default value is "NULL". Example 1.1. Set file parameter ... @@ -153,7 +153,7 @@ modparam("regex", "file", "/etc/kamailio/regex_groups") Max number of regular expression groups in the text file. - Default value is “20”. + Default value is "20". Example 1.2. Set max_groups parameter ... @@ -164,7 +164,7 @@ modparam("regex", "max_groups", 40) Max content size of a group in the text file. - Default value is “8192”. + Default value is "8192". Example 1.3. Set group_max_size parameter ... @@ -177,7 +177,7 @@ modparam("regex", "group_max_size", 16384) Perl's /i option, and it can be changed within a pattern by a (?i) or (?-i) option setting. - Default value is “0”. + Default value is "0". Example 1.4. Set pcre_caseless parameter ... @@ -200,7 +200,7 @@ modparam("regex", "pcre_caseless", 1) are no newlines in a subject string, or no occurrences of ^ or $ in a pattern, setting this option has no effect. - Default value is “0”. + Default value is "0". Example 1.5. Set pcre_multiline parameter ... @@ -215,7 +215,7 @@ modparam("regex", "pcre_multiline", 1) is equivalent to Perl's /s option, and it can be changed within a pattern by a (?s) or (?-s) option setting. - Default value is “0”. + Default value is "0". Example 1.6. Set pcre_dotall parameter ... @@ -232,7 +232,7 @@ modparam("regex", "pcre_dotall", 1) /x option, and it can be changed within a pattern by a (?x) or (?-x) option setting. - Default value is “0”. + Default value is "0". Example 1.7. Set pcre_extended parameter ... @@ -244,7 +244,7 @@ modparam("regex", "pcre_extended", 1) 4.1. pcre_match (string, pcre_regex) 4.2. pcre_match_group (string [, group]) -4.1. pcre_match (string, pcre_regex) +4.1. pcre_match (string, pcre_regex) Matches the given string parameter against the regular expression pcre_regex, which is compiled in runtime into a PCRE object. Returns @@ -261,24 +261,24 @@ modparam("regex", "pcre_extended", 1) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. - Example 1.8. pcre_match usage (forcing case insensitive) + Example 1.8. pcre_match usage (forcing case insensitive) ... if (pcre_match("$ua", "(?i)^twinkle")) { xlog("L_INFO", "User-Agent matches\n"); } ... - Example 1.9. pcre_match usage (using "end of line" symbol) + Example 1.9. pcre_match usage (using "end of line" symbol) ... if (pcre_match("$rU", "^user[1234]$$")) { # Will be converted to "^user[1234]$" xlog("L_INFO", "RURI username matches\n"); } ... -4.2. pcre_match_group (string [, group]) +4.2. pcre_match_group (string [, group]) Tries to match the given string against a specific group in the text - file (see Section 6.1, “File format”). Returns TRUE if it matches, + file (see Section 6.1, "File format"). Returns TRUE if it matches, FALSE otherwise. Meaning of the parameters is as follows: @@ -290,15 +290,14 @@ if (pcre_match("$rU", "^user[1234]$$")) { # Will be converted to "^user[1234]$" This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. - Example 1.10. pcre_match_group usage + Example 1.10. pcre_match_group usage ... if (pcre_match_group("$rU", "2")) { xlog("L_INFO", "RURI username matches group 2\n"); } ... - Example 1.11. pcre_match_group usage (using a pseudo-variable as - group) + Example 1.11. pcre_match_group usage (using a pseudo-variable as group) ... $avp(i:10) = 5; # Maybe got from a DB query. if (pcre_match_group("$ua", "$avp(i:10)")) { @@ -310,7 +309,7 @@ if (pcre_match_group("$ua", "$avp(i:10)")) { 5.1. regex_reload -5.1. regex_reload +5.1. regex_reload Causes regex module to re-read the content of the text file and re-compile the regular expressions. The number of groups in the file diff --git a/modules/regex/doc/regex_admin.xml b/modules/regex/doc/regex_admin.xml index 334b8a7..567d0a8 100644 --- a/modules/regex/doc/regex_admin.xml +++ b/modules/regex/doc/regex_admin.xml @@ -13,18 +13,18 @@ <title>&adminguide;</title> - <section> + <section id="regex.overview"> <title>Overview</title> <para> - This module offers matching operations against regular expressions using the + This module offers matching operations using regular expressions based on the powerful <ulink url="http://www.pcre.org/">PCRE</ulink> library. </para> <para> A text file containing regular expressions categorized in groups is compiled - when the module is loaded, storing the compiled PCRE objects in an array. A + when the module is loaded, the resulting PCRE objects are stored in an array. A function to match a string or pseudo-variable against any of these groups is provided. The text file can be modified and reloaded at any time via a MI command. The module also offers a function to perform a PCRE matching operation against a @@ -76,7 +76,7 @@ <section> <title>Parameters</title> - <section> + <section id="regex.p.file"> <title><varname>file</varname> (string)</title> <para> Text file containing the regular expression groups. It must be set in order @@ -95,7 +95,7 @@ modparam("regex", "file", "/etc/kamailio/regex_groups") </example> </section> - <section> + <section id="regex.p.max_groups"> <title><varname>max_groups</varname> (int)</title> <para> Max number of regular expression groups in the text file. @@ -113,7 +113,7 @@ modparam("regex", "max_groups", 40) </example> </section> - <section> + <section id="regex.p.group_max_size"> <title><varname>group_max_size</varname> (int)</title> <para> Max content size of a group in the text file. @@ -131,7 +131,7 @@ modparam("regex", "group_max_size", 16384) </example> </section> - <section> + <section id="regex.p.pcre_caseless"> <title><varname>pcre_caseless</varname> (int)</title> <para> If this options is set, matching is done caseless. It is equivalent to @@ -151,7 +151,7 @@ modparam("regex", "pcre_caseless", 1) </example> </section> - <section> + <section id="regex.p.pcre_multiline"> <title><varname>pcre_multiline</varname> (int)</title> <para> By default, PCRE treats the subject string as consisting of a single line @@ -181,7 +181,7 @@ modparam("regex", "pcre_multiline", 1) </example> </section> - <section> + <section id="regex.p.pcre_dotall"> <title><varname>pcre_dotall</varname> (int)</title> <para> If this option is set, a dot metacharater in the pattern matches all characters, @@ -202,7 +202,7 @@ modparam("regex", "pcre_dotall", 1) </example> </section> - <section> + <section id="regex.p.pcre_extended"> <title><varname>pcre_extended</varname> (int)</title> <para> If this option is set, whitespace data characters in the pattern are totally @@ -230,7 +230,7 @@ modparam("regex", "pcre_extended", 1) <section> <title>Functions</title> - <section> + <section id="regex.p.pcre_match"> <title> <function moreinfo="none">pcre_match (string, pcre_regex)</function> </title> @@ -294,7 +294,7 @@ if (pcre_match("$rU", "^user[1234]$$")) { # Will be converted to "^user[1234]$" </section> - <section> + <section id="regex.p.pcre_match_group"> <title> <function moreinfo="none">pcre_match_group (string [, group])</function> </title> @@ -361,7 +361,7 @@ if (pcre_match_group("$ua", "$avp(i:10)")) { <section> <title>MI Commands</title> - <section> + <section id="regex.m.regex_reload"> <title> <function moreinfo="none">regex_reload</function> </title>

1 0

git:master: pua_xmpp Minor doc updates
by Olle E. Johansson 05 Oct '14

05 Oct '14

Module: sip-router Branch: master Commit: 5ac8ebafe7fb88663a163b2139001bca2e8571a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ac8eba… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 5 19:16:53 2014 +0200 pua_xmpp Minor doc updates --- modules/pua_xmpp/README | 12 ++++++------ modules/pua_xmpp/doc/pua_xmpp_admin.xml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/pua_xmpp/README b/modules/pua_xmpp/README index 7459ed2..357764b 100644 --- a/modules/pua_xmpp/README +++ b/modules/pua_xmpp/README @@ -21,11 +21,11 @@ Anca-Maria Vamanu 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Exported Parameters + 3. Parameters 3.1. server_address(str) - 4. Exported Functions + 4. Functions 4.1. pua_xmpp_notify() 4.2. pua_xmpp_req_winfo(request_uri, expires) @@ -50,11 +50,11 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. Exported Parameters + 3. Parameters 3.1. server_address(str) - 4. Exported Functions + 4. Functions 4.1. pua_xmpp_notify() 4.2. pua_xmpp_req_winfo(request_uri, expires) @@ -86,7 +86,7 @@ Chapter 1. Admin Guide running Kamailio with this module loaded: * libxml. -3. Exported Parameters +3. Parameters 3.1. server_address(str) @@ -99,7 +99,7 @@ Chapter 1. Admin Guide modparam("pua_xmpp", "server_address", "sip:160.23.23.10") ... -4. Exported Functions +4. Functions 4.1. pua_xmpp_notify() 4.2. pua_xmpp_req_winfo(request_uri, expires) diff --git a/modules/pua_xmpp/doc/pua_xmpp_admin.xml b/modules/pua_xmpp/doc/pua_xmpp_admin.xml index ed4a82f..72550ff 100644 --- a/modules/pua_xmpp/doc/pua_xmpp_admin.xml +++ b/modules/pua_xmpp/doc/pua_xmpp_admin.xml @@ -66,7 +66,7 @@ <section> <title>Parameters</title> - <section> + <section id="pua_xmpp.p.server_address"> <title><varname>server_address</varname>(str)</title> <para> The SIP URI specifying the address of the SIP server. @@ -87,7 +87,7 @@ modparam("pua_xmpp", "server_address", "sip:160.23.23.10") <para> Functions exported to be used in configuration file. </para> - <section> + <section id="pua_xmpp.f.pua_xmpp_notify"> <title> <function moreinfo="none">pua_xmpp_notify()</function> </title> @@ -115,7 +115,7 @@ modparam("pua_xmpp", "server_address", "sip:160.23.23.10") </example> </section> - <section> + <section id="pua_xmpp.f.pua_xmpp_req_winfo"> <title> <function moreinfo="none">pua_xmpp_req_winfo(request_uri, expires)</function> </title>

1 0

git:master: usr_avp.c: logging: convert LOG to LM_*
by Ovidiu Sas 04 Oct '14

04 Oct '14

Module: sip-router Branch: master Commit: 9143a2e0e4bf85e3547dbf0d4287a2a80d99de0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9143a2e… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 23:15:54 2014 -0400 usr_avp.c: logging: convert LOG to LM_* --- usr_avp.c | 64 +++++++++++++++++++++++++++++------------------------------- 1 files changed, 31 insertions(+), 33 deletions(-) diff --git a/usr_avp.c b/usr_avp.c index 37b1a58..94e6a36 100644 --- a/usr_avp.c +++ b/usr_avp.c @@ -101,7 +101,7 @@ int init_avps(void) def_glist = (avp_list_t*)shm_malloc(sizeof(avp_list_t)); crt_glist = (avp_list_t**)shm_malloc(sizeof(avp_list_t*)); if (!def_glist || !crt_glist) { - LOG(L_ERR, "ERROR: No memory to allocate default global AVP list\n"); + LM_ERR("No memory to allocate default global AVP list\n"); return -1; } *def_glist = 0; @@ -161,7 +161,7 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) int len; if (name.s.s == 0 && name.s.len == 0) { - LOG(L_ERR,"ERROR:avp:add_avp: 0 ID or NULL NAME AVP!"); + LM_ERR("0 ID or NULL NAME AVP!"); goto error; } @@ -169,7 +169,7 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) len = sizeof(struct usr_avp); if (flags&AVP_NAME_STR) { if ( name.s.s==0 || name.s.len==0) { - LOG(L_ERR,"ERROR:avp:add_avp: EMPTY NAME AVP!"); + LM_ERR("EMPTY NAME AVP!"); goto error; } if (flags&AVP_VAL_STR) { @@ -186,7 +186,7 @@ avp_t *create_avp (avp_flags_t flags, avp_name_t name, avp_value_t val) avp = (struct usr_avp*)shm_malloc( len ); if (avp==0) { - LOG(L_ERR,"ERROR:avp:add_avp: no more shm mem\n"); + LM_ERR("no more shm mem\n"); return 0; } @@ -287,7 +287,7 @@ int add_avp_before(avp_t *avp, avp_flags_t flags, avp_name_t name, avp_value_t v if ((flags & AVP_TRACK_ALL) == 0) flags |= (avp->flags & AVP_TRACK_ALL); if ((avp->flags & (AVP_CLASS_ALL|AVP_TRACK_ALL)) != (flags & (AVP_CLASS_ALL|AVP_TRACK_ALL))) { - ERR("add_avp_before:Source and target AVPs have different CLASS/TRACK\n"); + LM_ERR("Source and target AVPs have different CLASS/TRACK\n"); return -1; } if ((new_avp=create_avp(flags, name, val))) { @@ -321,8 +321,7 @@ inline str* get_avp_name(avp_t *avp) return &ssd->name; } - LOG(L_ERR,"BUG:avp:get_avp_name: unknown avp type (name&val) %d\n", - avp->flags&(AVP_NAME_STR|AVP_VAL_STR)); + LM_ERR("unknown avp type (name&val) %d\n", avp->flags&(AVP_NAME_STR|AVP_VAL_STR)); return 0; } @@ -434,7 +433,7 @@ avp_t *search_avp (avp_ident_t ident, avp_value_t* val, struct search_state* sta avp_list_t* list; if (ident.name.s.s==0 && ident.name.s.len == 0) { - LOG(L_ERR,"ERROR:avp:search_first_avp: 0 ID or NULL NAME AVP!"); + LM_ERR("0 ID or NULL NAME AVP!"); return 0; } @@ -488,7 +487,7 @@ avp_t *search_next_avp(struct search_state* s, avp_value_t *val ) avp_list_t *list; if (s == 0) { - LOG(L_ERR, "search_next:avp: Invalid parameter value\n"); + LM_ERR("Invalid parameter value\n"); return 0; } @@ -754,24 +753,24 @@ int add_avp_galias(str *alias, int type, int_str avp_name) if ((type&AVP_NAME_STR && (!avp_name.s.s || !avp_name.s.len)) ||!alias || !alias->s || !alias->len ){ - LOG(L_ERR, "ERROR:add_avp_galias: null params received\n"); + LM_ERR("null params received\n"); goto error; } if (check_avp_galias(alias,type,avp_name)!=0) { - LOG(L_ERR, "ERROR:add_avp_galias: duplicate alias/avp entry\n"); + LM_ERR("duplicate alias/avp entry\n"); goto error; } ga = (struct avp_galias*)pkg_malloc( sizeof(struct avp_galias) ); if (ga==0) { - LOG(L_ERR, "ERROR:add_avp_galias: no more pkg memory\n"); + LM_ERR("no more pkg memory\n"); goto error; } ga->alias.s = (char*)pkg_malloc( alias->len+1 ); if (ga->alias.s==0) { - LOG(L_ERR, "ERROR:add_avp_galias: no more pkg memory\n"); + LM_ERR("no more pkg memory\n"); goto error1; } memcpy( ga->alias.s, alias->s, alias->len); @@ -782,7 +781,7 @@ int add_avp_galias(str *alias, int type, int_str avp_name) if (type&AVP_NAME_STR) { ga->avp.name.s.s = (char*)pkg_malloc( avp_name.s.len+1 ); if (ga->avp.name.s.s==0) { - LOG(L_ERR, "ERROR:add_avp_galias: no more pkg memory\n"); + LM_ERR("no more pkg memory\n"); goto error2; } ga->avp.name.s.len = avp_name.s.len; @@ -828,7 +827,7 @@ int lookup_avp_galias(str *alias, int *type, int_str *avp_name) /* parsing functions */ #define ERR_IF_CONTAINS(name,chr) \ if (memchr(name->s,chr,name->len)) { \ - ERR("Unexpected control character '%c' in AVP name\n", chr); \ + LM_ERR("Unexpected control character '%c' in AVP name\n", chr); \ goto error; \ } @@ -887,7 +886,7 @@ int parse_avp_ident( str *name, avp_ident_t* attr) str s; if (name==0 || name->s==0 || name->len==0) { - ERR("NULL name or name->s or name->len\n"); + LM_ERR("NULL name or name->s or name->len\n"); goto error; } @@ -908,15 +907,14 @@ int parse_avp_ident( str *name, avp_ident_t* attr) case 'i': case 'I': attr->flags = 0; if (str2int( name, &id)!=0) { - ERR("invalid ID " - "<%.*s> - not a number\n", name->len, name->s); + LM_ERR("invalid ID <%.*s> - not a number\n", + name->len, name->s); goto error; } attr->name.n = (int)id; break; default: - ERR("unsupported type " - "[%c]\n", c); + LM_ERR("unsupported type [%c]\n", c); goto error; } } else if ((p=memchr(name->s, '.', name->len))) { @@ -929,11 +927,11 @@ int parse_avp_ident( str *name, avp_ident_t* attr) name->s +=3; name->len -=3; } else { - ERR("AVP unknown class prefix '%.*s'\n", name->len, name->s); + LM_ERR("AVP unknown class prefix '%.*s'\n", name->len, name->s); goto error; } if (name->len==0) { - ERR("AVP name not specified after the prefix separator\n"); + LM_ERR("AVP name not specified after the prefix separator\n"); goto error; } switch (id) { @@ -966,15 +964,15 @@ int parse_avp_ident( str *name, avp_ident_t* attr) break; default: if (id < 1<<8) - ERR("AVP unknown class prefix '%c'\n", id); + LM_ERR("AVP unknown class prefix '%c'\n", id); else - ERR("AVP unknown class prefix '%c%c'\n", id>>8,id); + LM_ERR("AVP unknown class prefix '%c%c'\n", id>>8,id); goto error; } if (name->s[name->len-1]==']') { p=memchr(name->s, '[', name->len); if (!p) { - ERR("missing '[' for AVP index\n"); + LM_ERR("missing '[' for AVP index\n"); goto error; } s.s=p+1; @@ -989,7 +987,7 @@ int parse_avp_ident( str *name, avp_ident_t* attr) attr->flags |= AVP_INDEX_FORWARD; } if ((str2int(&s, &id) != 0)||(id==0)) { - ERR("Invalid AVP index '%.*s'\n", s.len, s.s); + LM_ERR("Invalid AVP index '%.*s'\n", s.len, s.s); goto error; } attr->index = id; @@ -1074,7 +1072,7 @@ int parse_avp_spec( str *name, int *type, int_str *avp_name, int *index) if (name->s[0]==GALIAS_CHAR_MARKER) { /* it's an avp alias */ if (name->len==1) { - LOG(L_ERR,"ERROR:parse_avp_spec: empty alias\n"); + LM_ERR("empty alias\n"); return -1; } alias.s = name->s+1; @@ -1142,21 +1140,20 @@ int add_avp_galias_str(char *alias_definition) } if (parse_avp_name( &name, &type, &avp_name, &index)!=0) { - LOG(L_ERR, "ERROR:add_avp_galias_str: <%.*s> not a valid AVP " - "name\n", name.len, name.s); + LM_ERR("<%.*s> not a valid AVP name\n", name.len, name.s); goto error; } if (add_avp_galias( &alias, type, avp_name)!=0) { - LOG(L_ERR, "ERROR:add_avp_galias_str: add global alias failed\n"); + LM_ERR("add global alias failed\n"); goto error; } } /*end while*/ return 0; parse_error: - LOG(L_ERR, "ERROR:add_avp_galias_str: parse error in <%s> around " - "pos %ld\n", alias_definition, (long)(s-alias_definition)); + LM_ERR("parse error in <%s> around pos %ld\n", + alias_definition, (long)(s-alias_definition)); error: return -1; } @@ -1200,7 +1197,8 @@ avp_flags_t register_avpflag(char* name) { ret = get_avpflag_no(name); if (ret == 0) { if (registered_avpflags_no >= MAX_AVPFLAG) { - LOG(L_ERR, "register_avpflag: cannot register new avp flag ('%s'), max.number of flags (%d) reached\n", name, MAX_AVPFLAG); + LM_ERR("cannot register new avp flag ('%s'), max.number of flags (%d) reached\n", + name, MAX_AVPFLAG); return -1; } ret = 1<<(AVP_CUSTOM_FLAGS+registered_avpflags_no);

1 0

git:master: udp_server.c: logging: convert LOG to LM_*
by Ovidiu Sas 04 Oct '14

04 Oct '14

Module: sip-router Branch: master Commit: 7540a139ac60dbb751593a45863bc041c8303313 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7540a13… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 23:08:46 2014 -0400 udp_server.c: logging: convert LOG to LM_* --- udp_server.c | 101 ++++++++++++++++++++++++--------------------------------- 1 files changed, 43 insertions(+), 58 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=754…

1 0

git:master: tcp_read.c: logging: convert LOG to LM_*
by Ovidiu Sas 04 Oct '14

04 Oct '14

Module: sip-router Branch: master Commit: 8a1f2eded885cb7f2d73ebb1ea46f3a320efa742 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a1f2ed… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 22:53:34 2014 -0400 tcp_read.c: logging: convert LOG to LM_* --- tcp_read.c | 70 ++++++++++++++++++++++++----------------------------------- 1 files changed, 29 insertions(+), 41 deletions(-) diff --git a/tcp_read.c b/tcp_read.c index 925bd99..768f17c 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -191,7 +191,7 @@ int tcp_http11_continue(struct tcp_connection *c) { init_dst_from_rcv(&dst, &c->rcv); if (tcp_send(&dst, 0, HTTP11CONTINUE, HTTP11CONTINUE_LEN) < 0) { - LOG(L_ERR, "HTTP/1.1 continue failed\n"); + LM_ERR("HTTP/1.1 continue failed\n"); } } /* check for Transfer-Encoding header */ @@ -337,7 +337,7 @@ int tcp_read(struct tcp_connection *c, int* flags) bytes_free=r->b_size- (int)(r->pos - r->buf); if (unlikely(bytes_free==0)){ - LOG(L_ERR, "ERROR: tcp_read: buffer overrun, dropping\n"); + LM_ERR("buffer overrun, dropping\n"); r->error=TCP_REQ_OVERRUN; return -1; } @@ -798,7 +798,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) case ' ': case '\t': /* FIXME: check if line contains only WS */ if(r->content_len<0) { - LOG(L_ERR, "bad Content-Length header value %d in" + LM_ERR("bad Content-Length header value %d in" " state %d\n", r->content_len, r->state); r->content_len=0; r->error=TCP_REQ_BAD_LEN; @@ -810,7 +810,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) case '\n': /* end of line, parse successful */ if(r->content_len<0) { - LOG(L_ERR, "bad Content-Length header value %d in" + LM_ERR("bad Content-Length header value %d in" " state %d\n", r->content_len, r->state); r->content_len=0; r->error=TCP_REQ_BAD_LEN; @@ -820,8 +820,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) r->flags|=F_TCP_REQ_HAS_CLEN; break; default: - LOG(L_ERR, "ERROR: tcp_read_headers: bad " - "Content-Length header value, unexpected " + LM_ERR("bad Content-Length header value, unexpected " "char %c in state %d\n", *p, r->state); r->state=H_SKIP; /* try to find another?*/ } @@ -990,8 +989,7 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) #endif default: - LOG(L_CRIT, "BUG: tcp_read_headers: unexpected state %d\n", - r->state); + LM_CRIT("unexpected state %d\n", r->state); abort(); } } @@ -1296,10 +1294,10 @@ again: } } if (unlikely(req->error!=TCP_REQ_OK)){ - LOG(L_ERR,"ERROR: tcp_read_req: bad request, state=%d, error=%d " - "buf:\n%.*s\nparsed:\n%.*s\n", req->state, req->error, - (int)(req->pos-req->buf), req->buf, - (int)(req->parsed-req->start), req->start); + LM_ERR("bad request, state=%d, error=%d buf:\n%.*s\nparsed:\n%.*s\n", + req->state, req->error, + (int)(req->pos-req->buf), req->buf, + (int)(req->parsed-req->start), req->start); DBG("- received from: port %d\n", con->rcv.src_port); print_ip("- received from: ip ",&con->rcv.src_ip, "\n"); resp=CONN_ERROR; @@ -1321,8 +1319,7 @@ again: }else{ if (cfg_get(tcp, tcp_cfg, accept_no_cl)==0) { req->error=TCP_REQ_BAD_LEN; - LOG(L_ERR, "ERROR: tcp_read_req: content length not present or" - " unparsable\n"); + LM_ERR("content length not present or unparsable\n"); resp=CONN_ERROR; goto end_req; } @@ -1353,7 +1350,7 @@ again: init_dst_from_rcv(&dst, &con->rcv); if (tcp_send(&dst, 0, CRLF, CRLF_LEN) < 0) { - LOG(L_ERR, "CRLF ping: tcp_send() failed\n"); + LM_ERR("CRLF ping: tcp_send() failed\n"); } ret = 0; } else if (unlikely(req->state==H_STUN_END)) { @@ -1447,7 +1444,7 @@ void release_tcpconn(struct tcp_connection* c, long state, int unix_sock) response[1]=state; if (tsend_stream(unix_sock, (char*)response, sizeof(response), -1)<=0) - LOG(L_ERR, "ERROR: release_tcpconn: tsend_stream failed\n"); + LM_ERR("tsend_stream failed\n"); } @@ -1465,7 +1462,7 @@ static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data) } /* if conn->state is ERROR or BAD => force timeout too */ if (unlikely(io_watch_del(&io_w, c->fd, -1, IO_FD_CLOSING)<0)){ - LOG(L_ERR, "ERROR: tcpconn_read_timeout: io_watch_del failed for %p" + LM_ERR("io_watch_del failed for %p" " id %d fd %d, state %d, flags %x, main fd %d\n", c, c->id, c->fd, c->state, c->flags, c->s); } @@ -1514,37 +1511,33 @@ again: break; }else if (errno == EINTR) goto again; else{ - LOG(L_CRIT,"BUG: tcp_receive: handle_io: read_fd: %s \n", - strerror(errno)); + LM_CRIT("read_fd: %s \n", strerror(errno)); abort(); /* big error*/ } } if (unlikely(n==0)){ - LOG(L_ERR, "WARNING: tcp_receive: handle_io: 0 bytes read\n"); + LM_ERR("0 bytes read\n"); goto error; } if (unlikely(con==0)){ - LOG(L_CRIT, "BUG: tcp_receive: handle_io null pointer\n"); + LM_CRIT("null pointer\n"); goto error; } con->fd=s; if (unlikely(s==-1)) { - LOG(L_ERR, "ERROR: tcp_receive: handle_io: read_fd:" - "no fd read\n"); + LM_ERR("read_fd: no fd read\n"); goto con_error; } con->reader_pid=my_pid(); if (unlikely(con==tcp_conn_lst)){ - LOG(L_CRIT, "BUG: tcp_receive: handle_io: duplicate" - " connection received: %p, id %d, fd %d, refcnt %d" + LM_CRIT("duplicate connection received: %p, id %d, fd %d, refcnt %d" " state %d (n=%d)\n", con, con->id, con->fd, atomic_get(&con->refcnt), con->state, n); goto con_error; break; /* try to recover */ } if (unlikely(con->state==S_CONN_BAD)){ - LOG(L_WARN, "WARNING: tcp_receive: handle_io: received an" - " already bad connection: %p id %d refcnt %d\n", + LM_WARN("received an already bad connection: %p id %d refcnt %d\n", con, con->id, atomic_get(&con->refcnt)); goto con_error; } @@ -1584,8 +1577,7 @@ repeat_1st_read: local_timer_add(&tcp_reader_ltimer, &con->timer, S_TO_TICKS(TCP_CHILD_TIMEOUT), t); if (unlikely(io_watch_add(&io_w, s, POLLIN, F_TCPCONN, con)<0)){ - LOG(L_CRIT, "ERROR: tcpconn_receive: handle_io: io_watch_add " - "failed for %p id %d fd %d, state %d, flags %x," + LM_CRIT("io_watch_add failed for %p id %d fd %d, state %d, flags %x," " main fd %d, refcnt %d\n", con, con->id, con->fd, con->state, con->flags, con->s, atomic_get(&con->refcnt)); @@ -1599,8 +1591,7 @@ repeat_1st_read: if (unlikely(con->state==S_CONN_BAD)){ resp=CONN_ERROR; if (!(con->send_flags.f & SND_F_CON_CLOSE)) - LOG(L_WARN, "WARNING: tcp_receive: handle_io: F_TCPCONN" - " connection marked as bad: %p id %d refcnt %d\n", + LM_WARN("F_TCPCONN connection marked as bad: %p id %d refcnt %d\n", con, con->id, atomic_get(&con->refcnt)); goto read_error; } @@ -1620,8 +1611,7 @@ read_error: ret=-1; /* some error occured */ if (unlikely(io_watch_del(&io_w, con->fd, idx, IO_FD_CLOSING) < 0)){ - LOG(L_CRIT, "ERROR: tcpconn_receive: handle_io: " - "io_watch_del failed for %p id %d fd %d," + LM_CRIT("io_watch_del failed for %p id %d fd %d," " state %d, flags %x, main fd %d, refcnt %d\n", con, con->id, con->fd, con->state, con->flags, con->s, atomic_get(&con->refcnt)); @@ -1645,12 +1635,12 @@ read_error: } break; case F_NONE: - LOG(L_CRIT, "BUG: handle_io: empty fd map %p (%d): " - "{%d, %d, %p}\n", fm, (int)(fm-io_w.fd_hash), + LM_CRIT("empty fd map %p (%d): {%d, %d, %p}\n", + fm, (int)(fm-io_w.fd_hash), fm->fd, fm->type, fm->data); goto error; default: - LOG(L_CRIT, "BUG: handle_io: uknown fd type %d\n", fm->type); + LM_CRIT("uknown fd type %d\n", fm->type); goto error; } @@ -1690,8 +1680,7 @@ void tcp_receive_loop(int unix_sock) goto error; /* add the unix socket */ if (io_watch_add(&io_w, tcpmain_sock, POLLIN, F_TCPMAIN, 0)<0){ - LOG(L_CRIT, "ERROR: tcp_receive_loop: init: failed to add socket " - " to the fd list\n"); + LM_CRIT("failed to add socket to the fd list\n"); goto error; } @@ -1753,14 +1742,13 @@ void tcp_receive_loop(int unix_sock) break; #endif default: - LOG(L_CRIT, "BUG: tcp_receive_loop: no support for poll method " - " %s (%d)\n", + LM_CRIT("no support for poll method %s (%d)\n", poll_method_name(io_w.poll_method), io_w.poll_method); goto error; } error: destroy_io_wait(&io_w); - LOG(L_CRIT, "ERROR: tcp_receive_loop: exiting..."); + LM_CRIT("exiting..."); exit(-1); }

1 0

git:master: tcp_main.c: logging: convert LOG to LM_*
by Ovidiu Sas 04 Oct '14

04 Oct '14

Module: sip-router Branch: master Commit: 3a82f963a2d6032cd9180d053091d637fca51ef8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a82f96… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 22:42:25 2014 -0400 tcp_main.c: logging: convert LOG to LM_* --- tcp_main.c | 440 ++++++++++++++++++++++++------------------------------------ 1 files changed, 173 insertions(+), 267 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3a8…

1 0

git:master: switch.c: logging: convert LOG to LM_*
by Ovidiu Sas 04 Oct '14

04 Oct '14

Module: sip-router Branch: master Commit: 14839f0692498e9e6ba30ae14c815c990978465d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14839f0… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 21:50:19 2014 -0400 switch.c: logging: convert LOG to LM_* --- switch.c | 60 +++++++++++++++++++++++++----------------------------------- 1 files changed, 25 insertions(+), 35 deletions(-) diff --git a/switch.c b/switch.c index c1feabc..2958a75 100644 --- a/switch.c +++ b/switch.c @@ -197,19 +197,16 @@ int fix_switch(struct action* t) for (c=(struct case_stms*)t->val[1].u.data; c; c=c->next){ if (c->ct_rve){ if (c->type!=MATCH_INT){ - LOG(L_ERR, "ERROR: fix_switch: wrong case type %d (int" - "expected)\n", c->type); + LM_ERR("wrong case type %d (int expected)\n", c->type); return E_UNSPEC; } if (!rve_is_constant(c->ct_rve)){ - LOG(L_ERR, "ERROR: fix_switch: non constant " - "expression in case\n"); + LM_ERR("non constant expression in case\n"); return E_BUG; } if (rval_expr_eval_int(0, 0, &c->label.match_int, c->ct_rve) <0){ - LOG(L_ERR, "ERROR: fix_switch: case expression" - " (%d,%d) has non-interger type\n", + LM_ERR("case expression (%d,%d) has non-interger type\n", c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col); return E_BUG; @@ -218,7 +215,7 @@ int fix_switch(struct action* t) n++; /* count only non-default cases */ }else{ if (default_found){ - LOG(L_ERR, "ERROR: fix_switch: more then one \"default\""); + LM_ERR("more then one \"default\""); return E_UNSPEC; } default_found=1; @@ -246,8 +243,7 @@ int fix_switch(struct action* t) } DBG("SWITCH: default only switch with side-effect...\n"); }else{ - LOG(L_CRIT, "BUG: fix_switch: empty switch not expected at this" - " point\n"); + LM_CRIT("empty switch not expected at this point\n"); ret=E_BUG; goto error; } @@ -255,7 +251,7 @@ int fix_switch(struct action* t) cond=pkg_malloc(sizeof(cond[0])*n); jmp_bm=pkg_malloc(sizeof(jmp_bm[0])*n); if (cond==0 || jmp_bm==0){ - LOG(L_ERR, "ERROR: fix_switch: memory allocation failure\n"); + LM_ERR("memory allocation failure\n"); ret=E_OUT_OF_MEM; goto error; } @@ -280,7 +276,7 @@ int fix_switch(struct action* t) } else { for (j=0; j<n; j++){ if (cond[j]==c->label.match_int){ - LOG(L_ERR, "ERROR: fix_switch: duplicate case (%d,%d)\n", + LM_ERR("duplicate case (%d,%d)\n", c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col); ret=E_UNSPEC; goto error; @@ -298,8 +294,7 @@ int fix_switch(struct action* t) if ( (scr_opt_lev>=2) && !rve_has_side_effects(sw_rve) && rve_is_constant(sw_rve)){ if (rval_expr_eval_int(0, 0, &val, sw_rve) <0){ - LOG(L_ERR, "ERROR: fix_switch: wrong type for switch(...) " - "expression (%d,%d)\n", + LM_ERR("wrong type for switch(...) expression (%d,%d)\n", sw_rve->fpos.s_line, sw_rve->fpos.s_col); ret=E_UNSPEC; goto error; @@ -355,7 +350,7 @@ int fix_switch(struct action* t) with a n-best_hits normal switch table */ jmp=mk_switch_jmp_table(end-start+1, n-best_hits); if (jmp==0){ - LOG(L_ERR, "ERROR: fix_switch: memory allocation error\n"); + LM_ERR("memory allocation error\n"); ret=E_OUT_OF_MEM; goto error; } @@ -385,7 +380,7 @@ int fix_switch(struct action* t) }else{ sct=mk_switch_cond_table(n); if (sct==0){ - LOG(L_ERR, "ERROR: fix_switch: memory allocation error\n"); + LM_ERR("memory allocation error\n"); ret=E_OUT_OF_MEM; goto error; } @@ -468,26 +463,24 @@ static int fix_match(struct action* t) for (c=(struct case_stms*)t->val[1].u.data; c; c=c->next){ if (c->ct_rve){ if (c->type!=MATCH_STR && c->type!=MATCH_RE){ - LOG(L_ERR, "ERROR: fix_match: wrong case type %d (string" + LM_ERR("wrong case type %d (string" "or RE expected)\n", c->type); return E_UNSPEC; } if (!rve_is_constant(c->ct_rve)){ - LOG(L_ERR, "ERROR: fix_match: non constant " - "expression in case\n"); + LM_ERR("non constant expression in case\n"); ret=E_BUG; goto error; } if ((rv=rval_expr_eval(0, 0, c->ct_rve)) == 0 ){ - LOG(L_ERR, "ERROR: fix_match: bad case expression" - " (%d,%d)\n", + LM_ERR("bad case expression (%d,%d)\n", c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col); ret=E_BUG; goto error; } if (rval_get_str(0, 0, &s, rv, 0)<0){ - LOG(L_ERR, "ERROR: fix_match (%d,%d): out of memory?\n", + LM_ERR("(%d,%d): out of memory?\n", c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col); ret=E_BUG; @@ -495,7 +488,7 @@ static int fix_match(struct action* t) } if (c->type==MATCH_RE){ if ((regex=pkg_malloc(sizeof(regex_t))) == 0){ - LOG(L_ERR, "ERROR: fix_match: out of memory\n"); + LM_ERR("out of memory\n"); ret=E_OUT_OF_MEM; goto error; } @@ -503,8 +496,7 @@ static int fix_match(struct action* t) REG_EXTENDED | REG_NOSUB | c->re_flags) !=0){ pkg_free(regex); regex=0; - LOG(L_ERR, "ERROR: fix_match (%d, %d): bad regular" - " expression %.*s\n", + LM_ERR("(%d, %d): bad regular expression %.*s\n", c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col, s.len, ZSW(s.s)); @@ -518,7 +510,7 @@ static int fix_match(struct action* t) s.s=0; s.len=0; }else{ - LOG(L_CRIT, "BUG: fix_match (%d,%d): wrong case type %d\n", + LM_CRIT("(%d,%d): wrong case type %d\n", c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col, c->type); ret=E_BUG; @@ -536,8 +528,7 @@ static int fix_match(struct action* t) } }else{ if (default_found){ - LOG(L_ERR, "ERROR: fix_match: more then one \"default\"" - " label found (%d, %d)\n", + LM_ERR("more then one \"default\" label found (%d, %d)\n", (c->ct_rve)?c->ct_rve->fpos.s_line:0, (c->ct_rve)?c->ct_rve->fpos.s_col:0); ret=E_UNSPEC; @@ -567,8 +558,7 @@ static int fix_match(struct action* t) } DBG("MATCH: default only switch with side-effect...\n"); }else{ - LOG(L_CRIT, "BUG: fix_match: empty switch not expected at this" - " point\n"); + LM_CRIT("empty switch not expected at this point\n"); ret=E_BUG; goto error; } @@ -577,7 +567,7 @@ static int fix_match(struct action* t) match=pkg_malloc(sizeof(match[0])*n); jmp_bm=pkg_malloc(sizeof(jmp_bm[0])*n); if (match==0 || jmp_bm==0){ - LOG(L_ERR, "ERROR: fix_match: memory allocation failure\n"); + LM_ERR("memory allocation failure\n"); ret=E_OUT_OF_MEM; goto error; } @@ -607,8 +597,8 @@ static int fix_match(struct action* t) match[j].l.s.len == c->label.match_str.len && memcmp(match[j].l.s.s, c->label.match_str.s, match[j].l.s.len) == 0 ){ - LOG(L_ERR, "ERROR: fix_match: duplicate case" - " (%d,%d)\n", c->ct_rve->fpos.s_line, + LM_ERR("duplicate case (%d,%d)\n", + c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col); ret=E_UNSPEC; goto error; @@ -634,13 +624,13 @@ static int fix_match(struct action* t) if ( (scr_opt_lev>=2) && !rve_has_side_effects(m_rve) && rve_is_constant(m_rve)){ if ((rv=rval_expr_eval(0, 0, m_rve)) == 0){ - LOG(L_ERR, "ERROR: fix_match: bad expression (%d,%d)\n", + LM_ERR("bad expression (%d,%d)\n", m_rve->fpos.s_line, m_rve->fpos.s_col); ret=E_UNSPEC; goto error; } if (rval_get_str(0, 0, &s, rv, 0) < 0 ){ - LOG(L_ERR, "ERROR: fix_match (%d,%d): bad string expression\n", + LM_ERR("(%d,%d): bad string expression\n", m_rve->fpos.s_line, m_rve->fpos.s_col); ret=E_UNSPEC; @@ -678,7 +668,7 @@ static int fix_match(struct action* t) } mct=mk_match_cond_table(n); if (mct==0){ - LOG(L_ERR, "ERROR: fix_match: memory allocation error\n"); + LM_ERR("memory allocation error\n"); ret=E_OUT_OF_MEM; goto error; }

1 0

git:master: sr_module.c: logging: convert LOG to LM_*
by Ovidiu Sas 04 Oct '14

04 Oct '14

Module: sip-router Branch: master Commit: 153ab772ce2285d2522c7a1913ae53acd111d76f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=153ab77… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Oct 3 21:44:56 2014 -0400 sr_module.c: logging: convert LOG to LM_* --- sr_module.c | 126 ++++++++++++++++++++++++++-------------------------------- 1 files changed, 57 insertions(+), 69 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=153…

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014