sr-dev September 2010

sr-dev@lists.kamailio.org

25 participants
222 discussions

git:master: kamctl: regenerate db creation scripts

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b7d7d1b0821d6b8cc5379399deb15cd311a9f68d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7d7d1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 8 19:44:09 2010 +0200 kamctl: regenerate db creation scripts - lcr and dispatcher had new structure in xml --- utils/kamctl/db_berkeley/kamailio/dispatcher | 4 +- utils/kamctl/db_berkeley/kamailio/version | 12 +----- utils/kamctl/dbtext/kamailio/dispatcher | 2 +- utils/kamctl/dbtext/kamailio/version | 7 +--- utils/kamctl/mysql/dispatcher-create.sql | 3 +- utils/kamctl/mysql/lcr-create.sql | 38 +++++++++++------ utils/kamctl/oracle/dispatcher-create.sql | 3 +- utils/kamctl/oracle/lcr-create.sql | 58 +++++++++++++++++--------- utils/kamctl/postgres/dispatcher-create.sql | 3 +- utils/kamctl/postgres/lcr-create.sql | 38 +++++++++++------ 10 files changed, 97 insertions(+), 71 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b7d…

13 years, 8 months

git:master: improve documentation of is_direction() function

by Klaus Darilion

Module: sip-router Branch: master Commit: a4bdf3c9c951e052b2db1d3967999f662b7438a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4bdf3c… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Sep 8 14:57:48 2010 +0200 improve documentation of is_direction() function --- modules_k/rr/README | 45 +++++++++++++++++++++------------------- modules_k/rr/doc/rr_admin.xml | 20 ++++++++++-------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/modules_k/rr/README b/modules_k/rr/README index d4a7038..11ee6a9 100644 --- a/modules_k/rr/README +++ b/modules_k/rr/README @@ -241,7 +241,7 @@ modparam("rr", "add_username", 1) 5.5. check_route_param(re) 5.6. is_direction(dir) -5.1. loose_route() +5.1. loose_route() The function performs routing of SIP requests which contain a route set. The name is a little bit confusing, as this function also routes @@ -275,7 +275,7 @@ modparam("rr", "add_username", 1) loose_route(); ... -5.2. record_route() and record_route(string) +5.2. record_route() and record_route(string) The function adds a new Record-Route header field. The header field will be inserted in the message before any other Record-Route header @@ -293,7 +293,7 @@ loose_route(); record_route(); ... -5.3. record_route_preset(string) +5.3. record_route_preset(string) This function will put the string into Record-Route, don't use unless you know what you are doing. @@ -310,7 +310,7 @@ record_route(); record_route_preset("1.2.3.4:5090"); ... -5.4. add_rr_param(param) +5.4. add_rr_param(param) Adds a parameter to the Record-Route URI (param must be in ";name=value" format. The function may be called also before or after @@ -329,7 +329,7 @@ record_route_preset("1.2.3.4:5090"); add_rr_param(";nat=yes"); ... -5.5. check_route_param(re) +5.5. check_route_param(re) The function checks if the URI parameters of the local Route header (corresponding to the local server) matches the given regular @@ -348,30 +348,33 @@ if (check_route_param("nat=yes")) { } ... -5.6. is_direction(dir) +5.6. is_direction(dir) - The function checks the flow direction of the request. As for checking - it's used the "ftag" Route header parameter, the append_fromtag (see - Section 4.2, "append_fromtag (integer)" module parameter must be - enabled. Also this must be called only after loose_route() (see - Section 5.1, " loose_route() "). + The function checks the flow direction of in-dialog requests. This + function uses the "ftag" prameter from the Route header, therefore the + append_fromtag (see Section 4.2, "append_fromtag (integer)" module + parameter must be enabled. Also this must be called only after + loose_route() (see Section 5.1, " loose_route() "). The function returns true if the "dir" is the same with the request's flow direction. - The "downstream" (UAC to UAS) direction is relative to the initial - request that created the dialog. + The "downstream" direction means that the request is in the same + direction as the initial request that created the dialog. Meaning of the parameters is as follows: * dir - string containing the direction to be checked. It may be - "upstream" (from UAS to UAC) or "downstream" (UAC to UAS). + "upstream" (from callee to caller) or "downstream" (caller to + callee). This function can be used from REQUEST_ROUTE. Example 1.11. is_direction usage ... -if (is_direction("upstream")) { - xdbg("upstream request ($rm)\n"); +if (is_direction("downstream")) { + xdbg("in-dialog request from caller to callee (downstream) ($rm)\n"); +} else { + xdbg("in-dialog request from callee to caller (upstream) ($rm)\n"); } ... @@ -408,7 +411,7 @@ Chapter 2. Developer Guide 1.4. get_route_param( msg, name, val) 1.5. register_rrcb( callback, param) -1.1. add_rr_param( msg, param) +1.1. add_rr_param( msg, param) Adds a parameter to the requests's Record-Route URI (param must be in ";name=value" format). @@ -421,7 +424,7 @@ Chapter 2. Developer Guide * str* param - parameter to be added to the Record-Route header - it must be in ";name=value" format. -1.2. check_route_param( msg, re) +1.2. check_route_param( msg, re) The function checks for the request "msg" if the URI parameters of the local Route header (corresponding to the local server) matches the @@ -436,7 +439,7 @@ Chapter 2. Developer Guide * regex_t* param - compiled regular expression to be checked against the Route header parameters. -1.3. is_direction( msg, dir) +1.3. is_direction( msg, dir) The function checks the flow direction of the request "msg". As for checking it's used the "ftag" Route header parameter, the @@ -452,7 +455,7 @@ Chapter 2. Developer Guide * int dir - direction to be checked against. It may be "RR_FLOW_UPSTREAM" or "RR_FLOW_DOWNSTREAM". -1.4. get_route_param( msg, name, val) +1.4. get_route_param( msg, name, val) The function search in to the "msg"'s Route header parameters the parameter called "name" and returns its value into "val". It must be @@ -468,7 +471,7 @@ Chapter 2. Developer Guide * str *val - returns the value of the searched Route header parameter if found. It might be empty string if the parameter had no value. -1.5. register_rrcb( callback, param) +1.5. register_rrcb( callback, param) The function register a new callback (along with its parameter). The callback will be called when a loose route will be performed for the diff --git a/modules_k/rr/doc/rr_admin.xml b/modules_k/rr/doc/rr_admin.xml index 296daa4..24dee9b 100644 --- a/modules_k/rr/doc/rr_admin.xml +++ b/modules_k/rr/doc/rr_admin.xml @@ -396,9 +396,9 @@ if (check_route_param("nat=yes")) { <title> <function moreinfo="none">is_direction(dir)</function> </title> - <para>The function checks the flow direction of the request. - As for checking it's used the <quote>ftag</quote> Route header - parameter, the append_fromtag (see <xref linkend="append-fromtag-id"/> + <para>The function checks the flow direction of in-dialog requests. + This function uses the <quote>ftag</quote> prameter from the Route header, + therefore the append_fromtag (see <xref linkend="append-fromtag-id"/> module parameter must be enabled. Also this must be called only after loose_route() (see <xref linkend="loose-route-id"/>). </para> @@ -407,16 +407,16 @@ if (check_route_param("nat=yes")) { the request's flow direction. </para> <para> - The <quote>downstream</quote> (UAC to UAS) direction is relative to the - initial request that created the dialog. + The <quote>downstream</quote> direction means that the request is in the same + direction as the initial request that created the dialog. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para> <emphasis>dir</emphasis> - string containing the direction to be - checked. It may be <quote>upstream</quote> (from UAS to UAC) or - <quote>downstream</quote> (UAC to UAS). + checked. It may be <quote>upstream</quote> (from callee to caller) or + <quote>downstream</quote> (caller to callee). </para> </listitem> </itemizedlist> @@ -427,8 +427,10 @@ if (check_route_param("nat=yes")) { <title><function>is_direction</function> usage</title> <programlisting format="linespecific"> ... -if (is_direction("upstream")) { - xdbg("upstream request ($rm)\n"); +if (is_direction("downstream")) { + xdbg("in-dialog request from caller to callee (downstream) ($rm)\n"); +} else { + xdbg("in-dialog request from callee to caller (upstream) ($rm)\n"); } ... </programlisting>

13 years, 8 months

git via ssh online?

by Klaus Darilion

Hi! I just wanted to clone the repository via ssh: $ git clone ssh://darilion@git.sip-router.org/sip-router ssh: connect to host git.sip-router.org port 22: Connection timed out Were there some changes how git is used over ssh? Thanks Klaus

13 years, 8 months

[tracker] Comment added: make install fails with a bash syntax error (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#87 - make install fails with a bash syntax error User who did this - Dmitry Goncharov (Dmitry) ---------- Hmm, the tracker has spoiled indentation. Find the same in the attachment. ---------- 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=87#comment124 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.

13 years, 8 months

[tracker] Comment added: make install fails with a bash syntax error

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#87 - make install fails with a bash syntax error User who did this - Dmitry Goncharov (Dmitry) ---------- make install-sr-man runs w/o errors. Adding a whitespace between "" and ; makes no difference. The following is a verbose run which produces an error. $ git diff |cat diff --git a/Makefile b/Makefile index 210d277..cdfc687 100644 --- a/Makefile +++ b/Makefile @@ -918,7 +918,7 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) fi; \ fi @# other configs - @for r in $(C_INSTALL_CFGS) ""; do \ + for r in $(C_INSTALL_CFGS) ""; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ n=`basename "$$r"` ; \ $ $ $ make install-cfg Makefile.defs defs skipped for r in ""; do \ if [ -n "$r" ]; then \ if [ -f "$r" ]; then \ n=`basename "$r"` ; \ sed -e "s#/usr/[^:]*lib/kamailio/modules$[:/\"]$#/usr/local/lib/kamailio/modules\1#g" -e "s#/usr/[^:]*lib/kamailio/modules_k$[:/\"]$#/usr/local/lib/kamailio/modules_k\1#g" \ < "$r" \ > "//etc/kamailio/$n.sample" ; \ chmod 644 "//etc/kamailio/$n.sample" ; \ if [ -z "" -a \ ! -f "//etc/kamailio/$n" ]; \ then \ mv -f "//etc/kamailio/$n.sample" \ "//etc/kamailio/$n"; \ fi ; \ else \ echo "ERROR: $r not found" ; \ if [ 1 =hen \; then \ exit 1; \ fi ; \ fi ; \ fi ; \ done; true /bin/sh: -c: line 18: syntax error near unexpected token `fi' /bin/sh: -c: line 18: ` fi ; \' make: *** [install-cfg] Error 1 $ Note, the line "if [ 1 =hen \; then \". This is the syntax error. "hen" is a part of "then". This run with the sed expression moved left a couple of tabs. $ git diff | cat diff --git a/Makefile b/Makefile index 210d277..8ce9429 100644 --- a/Makefile +++ b/Makefile @@ -918,12 +918,12 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) fi; \ fi @# other configs - @for r in $(C_INSTALL_CFGS) ""; do \ + for r in $(C_INSTALL_CFGS) ""; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ n=`basename "$$r"` ; \ sed $(foreach m,$(modules_dirs),\ - -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ + -e "s#/usr/[^:]*lib/$(CFG_NAME)/$(m)$[:/\"]$#$($(m)_target)\1#g") \ < "$$r" \ > "$(cfg_prefix)/$(cfg_dir)$$n.sample" ; \ chmod 644 "$(cfg_prefix)/$(cfg_dir)$$n.sample" ; \ $ $ $ $ make install-cfg Makefile.defs defs skipped for r in ""; do \ if [ -n "$r" ]; then \ if [ -f "$r" ]; then \ n=`basename "$r"` ; \ sed -e "s#/usr/[^:]*lib/kamailio/modules$[:/\"]$#/usr/local/lib/kamailio/modules\1#g" -e "s#/usr/[^:]*lib/kamailio/modules_k$[:/\"]$#/usr/local/lib/kamailio/modules_k\1#g" \ < "$r" \ > "//etc/kamailio/$n.sample" ; \ chmod 644 "//etc/kamailio/$n.sample" ; \ if [ -z "" -a \ ! -f "//etc/kamailio/$n" ]; \ then \ mv -f "//etc/kamailio/$n.sample" \ "//etc/kamailio/$n"; \ fi ; \ else \ echo "ERROR: $r not found" ; \ if [ 1 = then \then \ exit 1; \ fi ; \ fi ; \ fi ; \ done; true /bin/sh: -c: line 18: syntax error near unexpected token `fi' /bin/sh: -c: line 18: ` fi ; \' make: *** [install-cfg] Error 1 $ The offending line is different. "do" moved to the next line. $ git diff | cat diff --git a/Makefile b/Makefile index 210d277..11531bf 100644 --- a/Makefile +++ b/Makefile @@ -918,7 +918,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) fi; \ fi @# other configs - @for r in $(C_INSTALL_CFGS) ""; do \ + for r in $(C_INSTALL_CFGS) ""; \ + do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ n=`basename "$$r"` ; \ $ $ $ make install-cfg Makefile.defs defs skipped for r in ""; \ do \ if [ -n "$r" ]; then \ if [ -f "$r" ]; then \ n=`basename "$r"` ; \ sed -e "s#/usr/[^:]*lib/kamailio/modules$[:/\"]$#/usr/local/lib/kamailio/modules\1#g" -e "s#/usr/[^:]*lib/kamailio/modules_k$[:/\"]$#/usr/local/lib/kamailio/modules_k\1#g" \ < "$r" \ > "//etc/kamailio/$n.sample" ; \ chmod 644 "//etc/kamailio/$n.sample" ; \ if [ -z "" -a \ ! -f "//etc/kamailio/$n" ]; \ then \ mv -f "//etc/kamailio/$n.sample" \ "//etc/kamailio/$n"; \ fi ; \ else \ echo "ERROR: $r not found" ; \ if [ 1 = 1 ] ; then \ exit 1; \ fi ; \ fi ; \ fi ; \ done; true # radius dictionary touch //etc/kamailio//dictionary.kamailio install -m 644 etc/dictionary.kamailio //etc/kamailio/ $ The offending line is okay. Placing a space between , and \ in the sed expression makes the offending line syntactically correct. The issue looks like a buffer overflow. Also tried with bash-3.2.51. The result is the same. HTH ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=87#comment123 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.

13 years, 8 months

git:master: dispatcher(k): updated docs for ds_ping_method

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 35c2d3cd07905fb15faffd289004e1f78c8cc60c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35c2d3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 8 12:30:19 2010 +0200 dispatcher(k): updated docs for ds_ping_method - statement was obsoleted - reported by klaus.lists at inode.at --- modules_k/dispatcher/README | 4 ++-- modules_k/dispatcher/doc/dispatcher_admin.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index b458910..39fb84e 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -431,8 +431,8 @@ Note 3.16. ds_ping_method (string) With this Method you can define, with which method you want to probe - the failed gateways. This method is only available, if compiled with - the probing of failed gateways enabled. + the gateways. Pinging gateways feature depends on ds_ping_interval + parameter. Default value is “OPTIONS”. diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index 592e7f9..90a8044 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -415,8 +415,8 @@ modparam("dispatcher", "force_dst", 1) <section> <title><varname>ds_ping_method</varname> (string)</title> <para> - With this Method you can define, with which method you want to probe the failed gateways. - This method is only available, if compiled with the probing of failed gateways enabled. + With this Method you can define, with which method you want to probe the gateways. + Pinging gateways feature depends on ds_ping_interval parameter. </para> <para> <emphasis>

13 years, 8 months

git:master: xmlrpc: allow chaining with xhttp module

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1a810f97265302a3e7c8033b1b8c5de7c6491fb4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a810f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 8 11:31:31 2010 +0200 xmlrpc: allow chaining with xhttp module - the module was intercepting all HTTP module, without a nice way to dispach HTTP traffic between this module and xhttp - added new parameters that can select which HTTP requests to be handled by xmlrpc based on URL regexp matches - url_skip - if the regexp is matched, then xmlrpc will not handle the request - url_match - if the regexp is matched, then xmlrpc will handle the request - url_skip is checked first - default values are NULL, which means matching all HTTP requests (default behaviour so far) --- modules/xmlrpc/README | 32 +++++++++- modules/xmlrpc/doc/params.xml | 42 +++++++++++++ modules/xmlrpc/xmlrpc.c | 137 ++++++++++++++++++++++++++++------------- 3 files changed, 167 insertions(+), 44 deletions(-) diff --git a/modules/xmlrpc/README b/modules/xmlrpc/README index 7a7b6f7..7d6cba4 100644 --- a/modules/xmlrpc/README +++ b/modules/xmlrpc/README @@ -25,6 +25,8 @@ Jan Janak 1.5.3. escape_cr (integer) 1.5.4. double_lf_to_crlf (integer) 1.5.5. mode (integer) + 1.5.6. url_skip (str) + 1.5.7. url_match (str) 1.6. Functions @@ -578,6 +580,32 @@ modparam("xmlrpc", "double_lf_to_crlf", 1) Example 6. Set the mode parameter modparam("xmlrpc", "mode", 1) +1.5.6. url_skip (str) + + Regular expression to match the HTPP URL. If there is match, then + xmlrpc route is not executed. + + Default value is null (don't skip). + + Example 7. Set url_skip parameter +... +modparam("xhttp", "url_skip", "^/sip") +... + +1.5.7. url_match (str) + + Regular expression to match the HTPP URL. If there is no match, then + xmlrpc route is not executed. This check is done after url_skip, so if + both url_skip and url_match would match then the xmlrpc route is not + executed (url_skip has higher priority). + + Default value is null (match everything). + + Example 8. Set url_match parameter +... +modparam("xhttp", "url_match", "^/RPC2") +... + 1.6. Functions Revision History @@ -599,7 +627,7 @@ modparam("xmlrpc", "mode", 1) function with matching name. If such a function is found then dispatch_rpc() will pass control to the function to handle the request. - Example 7. dispatch_rpc usage + Example 9. dispatch_rpc usage #... modparam("xmlrpc", "route", "XMLRPC"); #... @@ -615,7 +643,7 @@ route[XMLRPC]{ This function can be called from the config script to directly generate an XML-RPC reply. - Example 8. xmlrpc_reply usage + Example 10. xmlrpc_reply usage #... modparam("xmlrpc", "route", "XMLRPC"); #... diff --git a/modules/xmlrpc/doc/params.xml b/modules/xmlrpc/doc/params.xml index 67e7a5f..5cd120a 100644 --- a/modules/xmlrpc/doc/params.xml +++ b/modules/xmlrpc/doc/params.xml @@ -134,6 +134,48 @@ modparam("xmlrpc", "mode", 1) </programlisting> </example> </section> + <section> + <title><varname>url_skip</varname> (str)</title> + <para> + Regular expression to match the HTPP URL. If there is match, + then xmlrpc route is not executed. + </para> + <para> + <emphasis> + Default value is null (don't skip). + </emphasis> + </para> + <example> + <title>Set <varname>url_skip</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xhttp", "url_skip", "^/sip") +... +</programlisting> + </example> + </section> + <section> + <title><varname>url_match</varname> (str)</title> + <para> + Regular expression to match the HTPP URL. If there is no match, + then xmlrpc route is not executed. This check is done after + url_skip, so if both url_skip and url_match would match then + the xmlrpc route is not executed (url_skip has higher priority). + </para> + <para> + <emphasis> + Default value is null (match everything). + </emphasis> + </para> + <example> + <title>Set <varname>url_match</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xhttp", "url_match", "^/RPC2") +... +</programlisting> + </example> + </section> <!-- Obsolete (hardwired on in the rpc core functions, cannot be turned off) diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index b4cee98..90dd397 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -400,6 +400,12 @@ static int lflf2crlf=0; /* default off */ /* do not register for non-sip requests */ static int xmlrpc_mode = 0; +static char* xmlrpc_url_match = NULL; +static regex_t xmlrpc_url_match_regexp; +static char* xmlrpc_url_skip = NULL; +static regex_t xmlrpc_url_skip_regexp; + + /* * Exported functions */ @@ -414,11 +420,13 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"route", PARAM_STRING, &xmlrpc_route}, - {"autoconversion", PARAM_INT, &autoconvert}, - {"escape_cr", PARAM_INT, &escape_cr}, - {"double_lf_to_crlf", PARAM_INT, &lflf2crlf}, - {"mode", PARAM_INT, &xmlrpc_mode}, + {"route", PARAM_STRING, &xmlrpc_route}, + {"autoconversion", PARAM_INT, &autoconvert}, + {"escape_cr", PARAM_INT, &escape_cr}, + {"double_lf_to_crlf", PARAM_INT, &lflf2crlf}, + {"mode", PARAM_INT, &xmlrpc_mode}, + {"url_match", PARAM_STRING, &xmlrpc_url_match}, + {"url_skip", PARAM_STRING, &xmlrpc_url_skip}, {0, 0, 0} }; @@ -2160,50 +2168,78 @@ static int process_xmlrpc(sip_msg_t* msg) int fake_msg_len; unsigned char* method; unsigned int method_len, n_method; + regmatch_t pmatch; + char c; ret=NONSIP_MSG_DROP; - if (IS_HTTP(msg)) { - method = (unsigned char*)msg->first_line.u.request.method.s; - method_len = msg->first_line.u.request.method.len; - /* first line is always > 4, so it's always safe to try to read the - * 1st 4 bytes from method, even if method is shorter*/ - n_method = method[0] + (method[1] << 8) + (method[2] << 16) + + if (IS_HTTP(msg)) + return NONSIP_MSG_PASS; + + if(xmlrpc_url_skip!=NULL || xmlrpc_url_match!=NULL) + { + c = msg->first_line.u.request.uri.s[msg->first_line.u.request.uri.len]; + msg->first_line.u.request.uri.s[msg->first_line.u.request.uri.len] + = '\0'; + if (xmlrpc_url_skip!=NULL && + regexec(&xmlrpc_url_skip_regexp, msg->first_line.u.request.uri.s, + 1, &pmatch, 0)==0) + { + LM_DBG("URL matched skip re\n"); + msg->first_line.u.request.uri.s[msg->first_line.u.request.uri.len] + = c; + return NONSIP_MSG_PASS; + } + if (xmlrpc_url_match!=NULL && + regexec(&xmlrpc_url_match_regexp, msg->first_line.u.request.uri.s, + 1, &pmatch, 0)!=0) + { + LM_DBG("URL not matched\n"); + msg->first_line.u.request.uri.s[msg->first_line.u.request.uri.len] + = c; + return NONSIP_MSG_PASS; + } + msg->first_line.u.request.uri.s[msg->first_line.u.request.uri.len] = c; + } + + method = (unsigned char*)msg->first_line.u.request.method.s; + method_len = msg->first_line.u.request.method.len; + /* first line is always > 4, so it's always safe to try to read the + * 1st 4 bytes from method, even if method is shorter*/ + n_method = method[0] + (method[1] << 8) + (method[2] << 16) + (method[3] << 24); - n_method |= 0x20202020; - n_method &= ((method_len < 4) * (1U << method_len * 8) - 1); - /* accept only GET or POST */ - if ((n_method == N_HTTP_GET) || + n_method |= 0x20202020; + n_method &= ((method_len < 4) * (1U << method_len * 8) - 1); + /* accept only GET or POST */ + if ((n_method == N_HTTP_GET) || ((n_method == N_HTTP_POST) && (method_len == HTTP_POST_LEN))) { - if (msg->via1 == 0){ - /* create a fake sip message */ - fake_msg = http_xmlrpc2sip(msg, &fake_msg_len); - if (fake_msg == 0) { - ERR("xmlrpc: out of memory\n"); - ret=NONSIP_MSG_ERROR; - } else { - /* send it */ - DBG("new fake xml msg created (%d bytes):\n<%.*s>\n", - fake_msg_len, fake_msg_len, fake_msg); - if (em_receive_request(msg, fake_msg, fake_msg_len)<0) - ret=NONSIP_MSG_ERROR; - pkg_free(fake_msg); - } - return ret; /* we "ate" the message, - stop processing */ - } else { /* the message has a via */ - DBG("http xml msg unchanged (%d bytes):\n<%.*s>\n", - msg->len, msg->len, msg->buf); - if (em_receive_request(msg, 0, 0)<0) + if (msg->via1 == 0){ + /* create a fake sip message */ + fake_msg = http_xmlrpc2sip(msg, &fake_msg_len); + if (fake_msg == 0) { + ERR("xmlrpc: out of memory\n"); + ret=NONSIP_MSG_ERROR; + } else { + /* send it */ + DBG("new fake xml msg created (%d bytes):\n<%.*s>\n", + fake_msg_len, fake_msg_len, fake_msg); + if (em_receive_request(msg, fake_msg, fake_msg_len)<0) ret=NONSIP_MSG_ERROR; - return ret; + pkg_free(fake_msg); } - } else { - ERR("xmlrpc: bad HTTP request method: \"%.*s\"\n", - msg->first_line.u.request.method.len, - msg->first_line.u.request.method.s); - /* the message was for us, but it is an error */ - return NONSIP_MSG_ERROR; + return ret; /* we "ate" the message, stop processing */ + } else { /* the message has a via */ + DBG("http xml msg unchanged (%d bytes):\n<%.*s>\n", + msg->len, msg->len, msg->buf); + if (em_receive_request(msg, 0, 0)<0) + ret=NONSIP_MSG_ERROR; + return ret; } + } else { + ERR("xmlrpc: bad HTTP request method: \"%.*s\"\n", + msg->first_line.u.request.method.len, + msg->first_line.u.request.method.s); + /* the message was for us, but it is an error */ + return NONSIP_MSG_ERROR; } return NONSIP_MSG_PASS; /* message not for us, maybe somebody else needs it */ @@ -2395,6 +2431,23 @@ static int mod_init(void) return -1; } } + if(xmlrpc_url_match!=NULL) + { + memset(&xmlrpc_url_match_regexp, 0, sizeof(regex_t)); + if (regcomp(&xmlrpc_url_match_regexp, xmlrpc_url_match, REG_EXTENDED)!=0) { + LM_ERR("bad match re %s\n", xmlrpc_url_match); + return E_BAD_RE; + } + } + if(xmlrpc_url_skip!=NULL) + { + memset(&xmlrpc_url_skip_regexp, 0, sizeof(regex_t)); + if (regcomp(&xmlrpc_url_skip_regexp, xmlrpc_url_skip, REG_EXTENDED)!=0) { + LM_ERR("bad skip re %s\n", xmlrpc_url_skip); + return E_BAD_RE; + } + } + return 0; }

13 years, 8 months

git:master: xhttp: allow chaining with xmlrpc module

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 666c83e9a9245fff666f5aa2111c05dbb4367357 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=666c83e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 8 11:28:27 2010 +0200 xhttp: allow chaining with xmlrpc module - new parameter url_skip to skip execution of xhttp event route if the HTTP URL matches the regexp - e.g., allow to execute all HTTP requests to /RPC2 via xmlrpc module with skip_url="^/RPC2" --- modules/xhttp/README | 36 +++++++++++++++++++++++++++--------- modules/xhttp/doc/xhttp_admin.xml | 24 +++++++++++++++++++++++- modules/xhttp/xhttp_mod.c | 33 +++++++++++++++++++++++++++------ 3 files changed, 77 insertions(+), 16 deletions(-) diff --git a/modules/xhttp/README b/modules/xhttp/README index 1ae565e..a44ee3c 100644 --- a/modules/xhttp/README +++ b/modules/xhttp/README @@ -25,7 +25,8 @@ Daniel-Constantin Mierla 3. Exported Parameters - 3.1. url_match (str) + 3.1. url_skip (str) + 3.2. url_match (str) 4. Exported Functions @@ -33,8 +34,9 @@ Daniel-Constantin Mierla List of Examples - 1.1. Set url_match parameter - 1.2. xhttp_reply usage + 1.1. Set url_skip parameter + 1.2. Set url_match parameter + 1.3. xhttp_reply usage Chapter 1. Admin Guide @@ -48,7 +50,8 @@ Chapter 1. Admin Guide 3. Exported Parameters - 3.1. url_match (str) + 3.1. url_skip (str) + 3.2. url_match (str) 4. Exported Functions @@ -83,16 +86,31 @@ Chapter 1. Admin Guide 3. Exported Parameters - 3.1. url_match (str) + 3.1. url_skip (str) + 3.2. url_match (str) -3.1. url_match (str) +3.1. url_skip (str) + + Regular expression to match the HTPP URL. If there is match, then event + route is not executed. + + Default value is null (don't skip). + + Example 1.1. Set url_skip parameter +... +modparam("xhttp", "url_skip", "^/RPC2") +... + +3.2. url_match (str) Regular expression to match the HTPP URL. If there is no match, then - event route is not executed + event route is not executed. This check is done after url_skip, so if + both url_skip and url_match would match then the event route is not + executed (url_skip has higher priority). Default value is null (match everything). - Example 1.1. Set url_match parameter + Example 1.2. Set url_match parameter ... modparam("xhttp", "url_match", "^/sip/") ... @@ -105,7 +123,7 @@ modparam("xhttp", "url_match", "^/sip/") Send back a reply with content-type and body. - Example 1.2. xhttp_reply usage + Example 1.3. xhttp_reply usage ... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", diff --git a/modules/xhttp/doc/xhttp_admin.xml b/modules/xhttp/doc/xhttp_admin.xml index 395a450..9ca9af8 100644 --- a/modules/xhttp/doc/xhttp_admin.xml +++ b/modules/xhttp/doc/xhttp_admin.xml @@ -61,10 +61,32 @@ <section> <title>Exported Parameters</title> <section> + <title><varname>url_skip</varname> (str)</title> + <para> + Regular expression to match the HTPP URL. If there is match, + then event route is not executed. + </para> + <para> + <emphasis> + Default value is null (don't skip). + </emphasis> + </para> + <example> + <title>Set <varname>url_skip</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xhttp", "url_skip", "^/RPC2") +... +</programlisting> + </example> + </section> + <section> <title><varname>url_match</varname> (str)</title> <para> Regular expression to match the HTPP URL. If there is no match, - then event route is not executed + then event route is not executed. This check is done after + url_skip, so if both url_skip and url_match would match then + the event route is not executed (url_skip has higher priority). </para> <para> <emphasis> diff --git a/modules/xhttp/xhttp_mod.c b/modules/xhttp/xhttp_mod.c index 48ea2be..22ebcc4 100644 --- a/modules/xhttp/xhttp_mod.c +++ b/modules/xhttp/xhttp_mod.c @@ -58,7 +58,9 @@ static int pv_get_huri(struct sip_msg *msg, pv_param_t *param, static int xhttp_route_no=DEFAULT_RT; static char* xhttp_url_match = NULL; -static regex_t xhttp_url_regexp; +static regex_t xhttp_url_match_regexp; +static char* xhttp_url_skip = NULL; +static regex_t xhttp_url_skip_regexp; /** SL API structure */ sl_api_t slb; @@ -80,6 +82,7 @@ static pv_export_t mod_pvs[] = { static param_export_t params[] = { {"url_match", STR_PARAM, &xhttp_url_match}, + {"url_skip", STR_PARAM, &xhttp_url_skip}, {0, 0, 0} }; @@ -138,9 +141,17 @@ static int mod_init(void) if(xhttp_url_match!=NULL) { - memset(&xhttp_url_regexp, 0, sizeof(regex_t)); - if (regcomp(&xhttp_url_regexp, xhttp_url_match, REG_EXTENDED)!=0) { - LM_ERR("bad re %s\n", xhttp_url_match); + memset(&xhttp_url_match_regexp, 0, sizeof(regex_t)); + if (regcomp(&xhttp_url_match_regexp, xhttp_url_match, REG_EXTENDED)!=0) { + LM_ERR("bad match re %s\n", xhttp_url_match); + return E_BAD_RE; + } + } + if(xhttp_url_skip!=NULL) + { + memset(&xhttp_url_skip_regexp, 0, sizeof(regex_t)); + if (regcomp(&xhttp_url_skip_regexp, xhttp_url_skip, REG_EXTENDED)!=0) { + LM_ERR("bad skip re %s\n", xhttp_url_skip); return E_BAD_RE; } } @@ -292,12 +303,22 @@ static int xhttp_handler(sip_msg_t* msg) return NONSIP_MSG_PASS; } - if(xhttp_url_match!=NULL) + if(xhttp_url_skip!=NULL || xhttp_url_match!=NULL) { c = msg->first_line.u.request.uri.s[msg->first_line.u.request.uri.len]; msg->first_line.u.request.uri.s[msg->first_line.u.request.uri.len] = '\0'; - if (regexec(&xhttp_url_regexp, msg->first_line.u.request.uri.s, + if (xhttp_url_skip!=NULL && + regexec(&xhttp_url_skip_regexp, msg->first_line.u.request.uri.s, + 1, &pmatch, 0)==0) + { + LM_DBG("URL matched skip re\n"); + msg->first_line.u.request.uri.s[msg->first_line.u.request.uri.len] + = c; + return NONSIP_MSG_PASS; + } + if (xhttp_url_match!=NULL && + regexec(&xhttp_url_match_regexp, msg->first_line.u.request.uri.s, 1, &pmatch, 0)!=0) { LM_DBG("URL not matched\n");

13 years, 8 months

git:master: kamailio.cfg: removed unused uri_db module

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 911c221ea0dfcab489174599e42bc08f74323f5c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=911c221… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 8 10:28:58 2010 +0200 kamailio.cfg: removed unused uri_db module --- etc/kamailio.cfg | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 9c468a0..0d36eeb 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -182,7 +182,6 @@ loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" -loadmodule "uri_db.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" @@ -251,14 +250,6 @@ modparam("registrar", "method_filtering", 1) #modparam("registrar", "max_contacts", 10) -# ----- uri_db params ----- -/* by default we disable the DB support in the module as we do not need it - in this configuration */ -modparam("uri_db", "use_uri_table", 0) -modparam("uri_db", "db_url", "") -modparam("uri_db", "use_domain", MULTIDOMAIN) - - # ----- acc params ----- /* what special events should be accounted ? */ modparam("acc", "early_media", 0)

13 years, 8 months

git:master: kamailio.cfg: cfg flags values set via defines

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: aa60ed0d344f4fde4484ae4073c179cbf4c2b71d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa60ed0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 8 10:16:02 2010 +0200 kamailio.cfg: cfg flags values set via defines --- etc/kamailio.cfg | 54 +++++++++++++++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 19 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index a7dd259..9c468a0 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -76,6 +76,8 @@ ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT ''; #!endif +####### Defined Values ######### + # *** Value defines - IDs used later in config #!ifdef WITH_MYSQL # - database URL - used to connect to database server by modules such @@ -89,6 +91,17 @@ #!define MULTIDOMAIN 0 #!endif +# - flags +# FLT_ - per transaction (message) flags +# FLB_ - per branch flags +#!define FLT_ACC 1 +#!define FLT_ACCMISSED 2 +#!define FLT_ACCFAILED 3 +#!define FLT_NATS 5 + +#!define FLB_NATB 6 +#!define FLB_NATSIPPING 7 + ####### Global Parameters ######### #!ifdef WITH_DEBUG @@ -256,15 +269,15 @@ modparam("acc", "report_cancels", 0) in "rr" module */ modparam("acc", "detect_direction", 0) /* account triggers (flags) */ -modparam("acc", "failed_transaction_flag", 3) -modparam("acc", "log_flag", 1) -modparam("acc", "log_missed_flag", 2) +modparam("acc", "log_flag", FLT_ACC) +modparam("acc", "log_missed_flag", FLT_ACCMISSED) modparam("acc", "log_extra", "src_user=$fU;src_domain=$fd;dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") +modparam("acc", "failed_transaction_flag", FLT_ACCFAILED) /* enhanced DB accounting */ #!ifdef WITH_ACCDB -modparam("acc", "db_flag", 1) -modparam("acc", "db_missed_flag", 2) +modparam("acc", "db_flag", FLT_ACC) +modparam("acc", "db_missed_flag", FLT_ACCMISSED) modparam("acc", "db_url", DBURL) modparam("acc", "db_extra", "src_user=$fU;src_domain=$fd;dst_ouser=$tU;dst_user=$rU;dst_domain=$rd") @@ -331,10 +344,12 @@ modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") # ----- nathelper params ----- modparam("nathelper", "natping_interval", 30) modparam("nathelper", "ping_nated_only", 1) -modparam("nathelper", "sipping_bflag", 7) +modparam("nathelper", "sipping_bflag", FLB_NATSIPPING) modparam("nathelper", "sipping_from", "sip:pinger@kamailio.org") + +# params needed for NAT traversal in other modules modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") -modparam("usrloc", "nat_bflag", 6) +modparam("usrloc", "nat_bflag", FLB_NATB) #!endif @@ -384,7 +399,7 @@ route { # account only INVITEs if (is_method("INVITE")) { - setflag(1); # do accounting + setflag(FLT_ACC); # do accounting } # dispatch requests to foreign domains @@ -418,9 +433,9 @@ route { route[RELAY] { #!ifdef WITH_NAT if (check_route_param("nat=yes")) { - setbflag("6"); + setbflag(FLB_NATB); } - if (isflagset(5) || isbflagset("6")) { + if (isflagset(FLT_NATS) || isbflagset(FLB_NATB)) { route(RTPPROXY); } #!endif @@ -459,8 +474,8 @@ route[WITHINDLG] { # take the path determined by record-routing if (loose_route()) { if (is_method("BYE")) { - setflag(1); # do accounting ... - setflag(3); # ... even if the transaction fails + setflag(FLT_ACC); # do accounting ... + setflag(FLT_ACCFAILED); # ... even if the transaction fails } route(RELAY); } else { @@ -491,11 +506,11 @@ route[WITHINDLG] { route[REGISTRAR] { if (is_method("REGISTER")) { - if(isflagset(5)) + if(isflagset(FLT_NATS)) { - setbflag("6"); + setbflag(FLB_NATB); # uncomment next line to do SIP NAT pinging - ## setbflag("7"); + ## setbflag(FLB_SIPPING); } if (!save("location")) sl_reply_error(); @@ -528,7 +543,7 @@ route[LOCATION] { # when routing via usrloc, log the missed calls also if (is_method("INVITE")) { - setflag(2); + setflag(FLT_ACCMISSED); } } @@ -640,7 +655,7 @@ route[NAT] { } else { fix_nated_contact(); } - setflag(5); + setflag(FLT_NATS); } #!endif return; @@ -707,7 +722,8 @@ branch_route[BRANCH_ONE] { onreply_route[REPLY_ONE] { xdbg("incoming reply\n"); #!ifdef WITH_NAT - if ((isflagset(5) || isbflagset("6")) && status=~"(183)|(2[0-9][0-9])") { + if ((isflagset(FLT_NATS) || isbflagset(FLB_NATB)) + && status=~"(183)|(2[0-9][0-9])") { force_rtp_proxy(); } if (isbflagset("6")) { @@ -720,7 +736,7 @@ onreply_route[REPLY_ONE] { failure_route[FAIL_ONE] { #!ifdef WITH_NAT if (is_method("INVITE") - && (isbflagset("6") || isflagset(5))) { + && (isbflagset(FLB_NATB) || isflagset(FLT_NATS))) { unforce_rtp_proxy(); } #!endif

13 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2010