sr-dev

sr-dev@lists.kamailio.org

17 participants
45430 discussions

git:master: siputils: documented new functions
by Daniel-Constantin Mierla 27 Feb '11

27 Feb '11

Module: sip-router Branch: master Commit: d4eb2e661ad72d0a6b70aea853e428608e80ab2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4eb2e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 26 22:26:29 2011 +0100 siputils: documented new functions - readme updated with is_request() and is_reply() --- modules_k/siputils/README | 34 +++++++++++++++++++++++ modules_k/siputils/doc/siputils_admin.xml | 42 +++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/modules_k/siputils/README b/modules_k/siputils/README index 23ccd30..b217f7b 100644 --- a/modules_k/siputils/README +++ b/modules_k/siputils/README @@ -91,6 +91,8 @@ Gabriel Vasile 4.18. append_rpid_hf(prefix, suffix) 4.19. is_rpid_user_e164() 4.20. set_uri_user(uri, user) + 4.21. is_request() + 4.22. is_reply() List of Examples @@ -123,6 +125,8 @@ Gabriel Vasile 1.27. append_rpid_hf(prefix, suffix) usage 1.28. is_rpid_user_e164 usage 1.29. set_uri_user usage + 1.30. is_request usage + 1.31. is_reply usage Chapter 1. Admin Guide @@ -168,6 +172,8 @@ Chapter 1. Admin Guide 4.18. append_rpid_hf(prefix, suffix) 4.19. is_rpid_user_e164() 4.20. set_uri_user(uri, user) + 4.21. is_request() + 4.22. is_reply() 1. Overview @@ -362,6 +368,8 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") 4.18. append_rpid_hf(prefix, suffix) 4.19. is_rpid_user_e164() 4.20. set_uri_user(uri, user) + 4.21. is_request() + 4.22. is_reply() 4.1. ring_insert_callid() @@ -731,3 +739,29 @@ $var(uri) = "sip:user@host"; $var(user) = "new_user"; set_uri_user("$var(uri)", "$var(user)"); ... + +4.21. is_request() + + Return true if the SIP message is a request. + + This function can be used from ANY_ROUTE. + + Example 1.30. is_request usage +... +if (is_request()) { + ... +} +... + +4.22. is_reply() + + Return true if the SIP message is a reply. + + This function can be used from ANY_ROUTE. + + Example 1.31. is_reply usage +... +if (is_reply()) { + ... +} +... diff --git a/modules_k/siputils/doc/siputils_admin.xml b/modules_k/siputils/doc/siputils_admin.xml index fd8ec1d..7950392 100644 --- a/modules_k/siputils/doc/siputils_admin.xml +++ b/modules_k/siputils/doc/siputils_admin.xml @@ -860,6 +860,48 @@ set_uri_user("$var(uri)", "$var(user)"); </programlisting> </example> </section> + <section> + <title> + <function moreinfo="none">is_request()</function> + </title> + <para> + Return true if the SIP message is a request. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_request</function> usage</title> + <programlisting format="linespecific"> +... +if (is_request()) { + ... +} +... +</programlisting> + </example> + </section> + <section> + <title> + <function moreinfo="none">is_reply()</function> + </title> + <para> + Return true if the SIP message is a reply. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_reply</function> usage</title> + <programlisting format="linespecific"> +... +if (is_reply()) { + ... +} +... +</programlisting> + </example> + </section> </section> </chapter>

1 0

git:master: siputils: added functions to detect type of SIP message
by Daniel-Constantin Mierla 27 Feb '11

27 Feb '11

Module: sip-router Branch: master Commit: f82c04eb21aa496b883c0e4ee486b247efeb04c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f82c04e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 26 22:20:49 2011 +0100 siputils: added functions to detect type of SIP message - is_request() returns true if the SIP message is a request - is_reply() returns true if the SIP message is a reply - useful to check in sub-routes that can be executed from both request and reply routes --- modules_k/siputils/checks.c | 27 +++++++++++++++++ modules_k/siputils/checks.h | 10 ++++++ modules_k/siputils/siputils.c | 64 +++++++++++++++++++++++++---------------- 3 files changed, 76 insertions(+), 25 deletions(-) diff --git a/modules_k/siputils/checks.c b/modules_k/siputils/checks.c index c0cee5f..f729739 100644 --- a/modules_k/siputils/checks.c +++ b/modules_k/siputils/checks.c @@ -54,6 +54,33 @@ #include "../../lvalue.h" #include "checks.h" +/** + * return 1 (true) if the SIP message type is request + */ +int w_is_request(struct sip_msg* msg, char *foo, char *bar) +{ + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REQUEST) + return 1; + + return -1; +} + +/** + * return 1 (true) if the SIP message type is reply + */ +int w_is_reply(struct sip_msg* msg, char *foo, char *bar) +{ + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REPLY) + return 1; + + return -1; +} /* * Checks if From includes a To-tag -- good to identify diff --git a/modules_k/siputils/checks.h b/modules_k/siputils/checks.h index cb49850..eeb2788 100644 --- a/modules_k/siputils/checks.h +++ b/modules_k/siputils/checks.h @@ -95,4 +95,14 @@ int is_e164(struct sip_msg* _m, char* _sp, char* _s2); */ int set_uri_user(struct sip_msg* _m, char* _uri, char* _value); +/* + * Return true (1) if SIP message is request, otherwise false (-1) + */ +int w_is_request(struct sip_msg* msg, char *foo, char *bar); + +/* + * Return true (1) if SIP message is reply, otherwise false (-1) + */ +int w_is_reply(struct sip_msg* msg, char *foo, char *bar); + #endif /* CHECKS_H */ diff --git a/modules_k/siputils/siputils.c b/modules_k/siputils/siputils.c index 3b31ad0..054dc9b 100644 --- a/modules_k/siputils/siputils.c +++ b/modules_k/siputils/siputils.c @@ -113,36 +113,50 @@ static int fixup_free_set_uri(void** param, int param_no); char *contact_flds_separator = DEFAULT_SEPARATOR; static cmd_export_t cmds[]={ - {"ring_insert_callid", (cmd_function)ring_insert_callid, 0, ring_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, - {"options_reply", (cmd_function)opt_reply, 0, 0, 0, REQUEST_ROUTE}, - {"is_user", (cmd_function)is_user, 1, fixup_str_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"has_totag", (cmd_function)has_totag, 0, 0, 0, ANY_ROUTE}, - {"uri_param", (cmd_function)uri_param_1, 1, fixup_str_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"uri_param", (cmd_function)uri_param_2, 2, fixup_str_str, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"add_uri_param", (cmd_function)add_uri_param, 1, fixup_str_null, 0, REQUEST_ROUTE}, - {"tel2sip", (cmd_function)tel2sip, 0, 0, 0, REQUEST_ROUTE}, - {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"is_uri_user_e164", (cmd_function)is_uri_user_e164, 1, fixup_pvar_null, fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, - {"encode_contact", (cmd_function)encode_contact,2,0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"decode_contact", (cmd_function)decode_contact,0,0, 0, REQUEST_ROUTE}, - {"decode_contact_header", (cmd_function)decode_contact_header,0,0,0,REQUEST_ROUTE|ONREPLY_ROUTE}, - {"cmp_uri", (cmd_function)w_cmp_uri, 2, - fixup_spve_spve, 0, - ANY_ROUTE}, - {"cmp_aor", (cmd_function)w_cmp_aor, 2, - fixup_spve_spve, 0, - ANY_ROUTE}, - {"is_rpid_user_e164", (cmd_function)is_rpid_user_e164, 0, 0, + {"ring_insert_callid", (cmd_function)ring_insert_callid, 0, ring_fixup, + 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"options_reply", (cmd_function)opt_reply, 0, 0, + 0, REQUEST_ROUTE}, + {"is_user", (cmd_function)is_user, 1, fixup_str_null, + 0, REQUEST_ROUTE|LOCAL_ROUTE}, + {"has_totag", (cmd_function)has_totag, 0, 0, + 0, ANY_ROUTE}, + {"uri_param", (cmd_function)uri_param_1, 1, fixup_str_null, + 0, REQUEST_ROUTE|LOCAL_ROUTE}, + {"uri_param", (cmd_function)uri_param_2, 2, fixup_str_str, + 0, REQUEST_ROUTE|LOCAL_ROUTE}, + {"add_uri_param", (cmd_function)add_uri_param, 1, fixup_str_null, + 0, REQUEST_ROUTE}, + {"tel2sip", (cmd_function)tel2sip, 0, 0, + 0, REQUEST_ROUTE}, + {"is_e164", (cmd_function)is_e164, 1, fixup_pvar_null, + fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"is_uri_user_e164", (cmd_function)is_uri_user_e164, 1, fixup_pvar_null, + fixup_free_pvar_null, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"encode_contact", (cmd_function)encode_contact, 2, 0, + 0, REQUEST_ROUTE|ONREPLY_ROUTE}, + {"decode_contact", (cmd_function)decode_contact, 0, 0, + 0, REQUEST_ROUTE}, + {"decode_contact_header", (cmd_function)decode_contact_header, 0, 0, + 0,REQUEST_ROUTE|ONREPLY_ROUTE}, + {"cmp_uri", (cmd_function)w_cmp_uri, 2, fixup_spve_spve, + 0, ANY_ROUTE}, + {"cmp_aor", (cmd_function)w_cmp_aor, 2, fixup_spve_spve, + 0, ANY_ROUTE}, + {"is_rpid_user_e164", (cmd_function)is_rpid_user_e164, 0, 0, 0, REQUEST_ROUTE}, - {"append_rpid_hf", (cmd_function)append_rpid_hf, 0, 0, + {"append_rpid_hf", (cmd_function)append_rpid_hf, 0, 0, 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, - {"append_rpid_hf", (cmd_function)append_rpid_hf_p, 2, fixup_str_str, + {"append_rpid_hf", (cmd_function)append_rpid_hf_p, 2, fixup_str_str, 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, - {"set_uri_user", (cmd_function)set_uri_user, 2, fixup_set_uri, - fixup_free_set_uri, - REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE}, + {"set_uri_user", (cmd_function)set_uri_user, 2, fixup_set_uri, + fixup_free_set_uri, ANY_ROUTE}, {"bind_siputils", (cmd_function)bind_siputils, 0, 0, 0, 0}, + {"is_request", (cmd_function)w_is_request, 0, 0, + 0, ANY_ROUTE}, + {"is_reply", (cmd_function)w_is_reply, 0, 0, + 0, ANY_ROUTE}, {0,0,0,0,0,0} };

1 0

Kamailio Installation
by Suresh Bhandari 27 Feb '11

27 Feb '11

Hello Community, I am new to Kamailio, and this list as well. I am trying to install Kamailio 3.1.2, but I am getting too many errors. I have fixed some but still not getting the way. I am using Red Hat Enterprise Linux (RHEL) 5, and /usr/local directory. When I ran the following command: make group_include="standard standard-dep mysql" include_modules="carrierroute peering" install it prompted not found error for the file docbookx.dtd, I found it (modules/auth/auth.xml, and modules_s/acc_syslog/acc_syslog.xml) and fixed it as it was errorenous URL location. For reference earlier it was http://www.oasis-open.org/docbookid/id/g/4.5/docbookx.dtd, which I changed to http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd. Now when I run the previous command again, I am getting the follwing errors: *nsgmls:<URL>http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd:116:17:E: "X20AC" is not a function name* If I ignore this, and continue, I am not able to find the "sip-router" service in /etc/init.d. The entire errors is attached here. Please help me solve the issue. TIA

2 1

git:master: modules/dialplan: change in dp_translate return code
by Juha Heinanen 27 Feb '11

27 Feb '11

Module: sip-router Branch: master Commit: f7b5a333d29579a700d636787550ff1430a58189 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f7b5a33… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Feb 27 06:54:44 2011 +0200 modules/dialplan: change in dp_translate return code - dp_translate now returns -2 (instead of -1) if dp with given id does not exist. --- modules/dialplan/README | 3 +++ modules/dialplan/dialplan.c | 2 +- modules/dialplan/doc/dialplan_admin.xml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules/dialplan/README b/modules/dialplan/README index cf9d9d5..e03067d 100644 --- a/modules/dialplan/README +++ b/modules/dialplan/README @@ -334,6 +334,9 @@ modparam("dialplan", "fetch_rows", 4000) with dialplan ID equal to id. If dest is missing, only matching and storing of matching rule's attributes is done. + Returns 1, if translation succeeded, -1 in case of some error occurred, + and -2 if dialplan with ID equal to id does not exist. + Meaning of the parameters is as follows: * id -the dialplan id of the possible matching rules. This parameter can have the following types: diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index 4c86778..16050cc 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -326,7 +326,7 @@ static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2) if ((idp = select_dpid(dpid)) ==0 ){ LM_DBG("no information available for dpid %i\n", dpid); - return -1; + return -2; } repl_par = (str2!=NULL)? ((dp_param_p)str2):default_par2; diff --git a/modules/dialplan/doc/dialplan_admin.xml b/modules/dialplan/doc/dialplan_admin.xml index ac9a84d..43c418b 100644 --- a/modules/dialplan/doc/dialplan_admin.xml +++ b/modules/dialplan/doc/dialplan_admin.xml @@ -365,6 +365,10 @@ modparam("dialplan", "fetch_rows", 4000) missing, only matching and storing of matching rule's attributes is done. </para> + <para> + Returns 1, if translation succeeded, -1 in case of some error + occurred, and -2 if dialplan with ID equal to id does not exist. + </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem>

1 0

git:master: modules/dialplan: more repl_exp fixes
by Juha Heinanen 27 Feb '11

27 Feb '11

Module: sip-router Branch: master Commit: d8ae33c90851cfca9c956574f3ed1f82fc4da651 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8ae33c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Feb 27 05:59:16 2011 +0200 modules/dialplan: more repl_exp fixes - Now also REPLACE_CHAR, REPLACE_URI, and REPLACE_SPEC repl_exp tokens should work. --- modules/dialplan/dp_repl.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c index 1fe11ad..1e4e7d4 100644 --- a/modules/dialplan/dp_repl.c +++ b/modules/dialplan/dp_repl.c @@ -72,7 +72,7 @@ struct subst_expr* repl_exp_parse(str subst) repl = p; if((rw_no = parse_repl(rw, &p, end, &max_pmatch, WITHOUT_SEP))< 0) goto error; - + repl_end=p; /* construct the subst_expr structure */ @@ -179,6 +179,7 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, result->s[result->len] = '\0'; return 0; } + /* offset- offset in the replacement string */ result->len = repl_nb = offset = 0; p=repl_comp->replacement.s; @@ -199,7 +200,7 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, LM_DBG("copying <%.*s> from replacing string\n", size, p + offset); result->len += size; - offset = token.offset; /*update the offset*/ + offset = token.offset; } switch(token.type) { @@ -217,15 +218,18 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, LM_DBG("copying match <%.*s> token size %d\n", match.len, match.s, token.size); result->len += match.len; - offset += token.size; /*update the offset*/ + offset += token.size; break; case REPLACE_CHAR: if(result->len + 1>= MAX_PHONE_NB_DIGITS){ LM_ERR("overflow\n"); goto error; } - *result->s=repl_comp->replace[repl_nb].u.c; + *(result->s + result->len) = token.u.c; + LM_DBG("copying char <%c> token size %d\n", + token.u.c, token.size); result->len++; + offset += token.size; break; case REPLACE_URI: if ( msg== NULL || msg->first_line.type!=SIP_REQUEST){ @@ -240,15 +244,17 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, goto error; } memcpy(result->s + result->len, uri->s, uri->len); + LM_DBG("copying uri <%.*s> token size %d\n", + uri->len, uri->s, token.size); result->len+=uri->len; + offset += token.size; break; case REPLACE_SPEC: if (msg== NULL) { LM_DBG("replace spec attempted on no message\n"); break; } - if(pv_get_spec_value(msg, - &repl_comp->replace[repl_nb].u.spec, &sv)!=0){ + if (pv_get_spec_value(msg, &token.u.spec, &sv) != 0) { LM_CRIT("item substitution returned error\n"); break; /* ignore, we can continue */ } @@ -256,8 +262,12 @@ int rule_translate(struct sip_msg *msg, str string, dpl_node_t * rule, LM_ERR("rule_translate: overflow\n"); goto error; } - memcpy(result->s + result->len, sv.rs.s, sv.rs.len); + memcpy(result->s + result->len, sv.rs.s, + sv.rs.len); + LM_DBG("copying pvar value <%.*s> token size %d\n", + sv.rs.len, sv.rs.s, token.size); result->len+=sv.rs.len; + offset += token.size; break; default: LM_CRIT("unknown type %d\n", repl_comp->replace[repl_nb].type);

1 0

[tracker] Task closed: bug in dialplan or core re.c
by sip-router 26 Feb '11

26 Feb '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#115 - bug in dialplan or core re.c User who did this - Juha Heinanen (jh) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=115 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] Comment added: bug in dialplan or core re.c
by sip-router 26 Feb '11

26 Feb '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#115 - bug in dialplan or core re.c User who did this - Juha Heinanen (jh) ---------- i have made the tests with latest 3.1 from git. here is what happens with subst_exp ^(.+:)\+358(.+) and input uri sip:+35892345674@test.fi using various repl_exps: - if repl_exp is \1\2, i get what is expected, i.e., both \1 and \2 are replaced and consumed: Feb 22 09:40:39 sip /usr/sbin/sip-proxy[7323]: INFO: uri <sip:92345674@test.fi> - if repl_exp is \1X\2, \1 is replaced but not consumed and i get: Feb 22 09:42:48 sip /usr/sbin/sip-proxy[7484]: INFO: uri <sip:\1X92345674@test.fi> - if repl_exp is \1X\2Y, i get Feb 22 09:44:50 sip /usr/sbin/sip-proxy[7642]: INFO: uri <sip:\1X92345674@test.fiY> i.e., \2 is correctly replaced and consumed, but again \1 is replaced, but not consumed. -- juha Feb 22 09:44:16 sip /usr/sbin/sip-proxy[7481]: INFO: pai_uri <sip:\1X92345674@test.fi> Feb 22 09:44:51 sip /usr/sbin/sip-proxy[7640]: NOTICE: Discarding unmatched CANCEL to <sip:032345670@test.fi> ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=115#comment166 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.

3 3

git:master: siputils: readme updated
by Daniel-Constantin Mierla 26 Feb '11

26 Feb '11

Module: sip-router Branch: master Commit: 1147c09665a05d4af5f1b48764a78fb47649a930 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1147c09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 26 20:26:54 2011 +0100 siputils: readme updated - updated the description of the functions that can be used in ANY_ROUTE --- modules_k/siputils/README | 12 +++++++----- modules_k/siputils/doc/siputils_admin.xml | 8 +++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules_k/siputils/README b/modules_k/siputils/README index e37d933..23ccd30 100644 --- a/modules_k/siputils/README +++ b/modules_k/siputils/README @@ -24,6 +24,10 @@ Gabriel Vasile FhG FOKUS +Juha Heinanen + + TutPro Inc. + Edited by Jan Janak @@ -424,7 +428,7 @@ if (is_user("john")) { Check if To header field uri contains tag parameter. - This function can be used from REQUEST_ROUTE. + This function can be used from ANY_ROUTE. Example 1.13. has_totag usage ... @@ -613,8 +617,7 @@ reply_route[2] { The function returns true if the two parameters matches as SIP URI. - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. Example 1.23. cmp_uri usage ... @@ -629,8 +632,7 @@ if(cmp_uri("$ru", "sip:kamailio@kamailio.org")) The function returns true if the two parameters matches as AoR. The parameters have to be SIP URIs. - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. Example 1.24. cmp_aor usage ... diff --git a/modules_k/siputils/doc/siputils_admin.xml b/modules_k/siputils/doc/siputils_admin.xml index 8511da9..fd8ec1d 100644 --- a/modules_k/siputils/doc/siputils_admin.xml +++ b/modules_k/siputils/doc/siputils_admin.xml @@ -375,7 +375,7 @@ if (is_user("john")) { Check if To header field uri contains tag parameter. </para> <para> - This function can be used from REQUEST_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>has_totag</function> usage</title> @@ -684,8 +684,7 @@ reply_route[2] { the two parameters matches as SIP URI. </para> <para> - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>cmp_uri</function> usage</title> @@ -710,8 +709,7 @@ if(cmp_uri("$ru", "sip:kamailio@kamailio.org")) URIs. </para> <para> - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>cmp_aor</function> usage</title>

1 0

git:master: siputils: several functions updated to ANY_ROUTE
by Daniel-Constantin Mierla 26 Feb '11

26 Feb '11

Module: sip-router Branch: master Commit: 3a1be374d4575e91ba7196db77813df836d98f99 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a1be37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 26 20:25:29 2011 +0100 siputils: several functions updated to ANY_ROUTE - has_totag() and comparison of uri or aor can work for requests and reply routes --- modules_k/siputils/siputils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/siputils/siputils.c b/modules_k/siputils/siputils.c index 1eace83..3b31ad0 100644 --- a/modules_k/siputils/siputils.c +++ b/modules_k/siputils/siputils.c @@ -116,7 +116,7 @@ static cmd_export_t cmds[]={ {"ring_insert_callid", (cmd_function)ring_insert_callid, 0, ring_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"options_reply", (cmd_function)opt_reply, 0, 0, 0, REQUEST_ROUTE}, {"is_user", (cmd_function)is_user, 1, fixup_str_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, - {"has_totag", (cmd_function)has_totag, 0, 0, 0, REQUEST_ROUTE|LOCAL_ROUTE}, + {"has_totag", (cmd_function)has_totag, 0, 0, 0, ANY_ROUTE}, {"uri_param", (cmd_function)uri_param_1, 1, fixup_str_null, 0, REQUEST_ROUTE|LOCAL_ROUTE}, {"uri_param", (cmd_function)uri_param_2, 2, fixup_str_str, 0, REQUEST_ROUTE|LOCAL_ROUTE}, {"add_uri_param", (cmd_function)add_uri_param, 1, fixup_str_null, 0, REQUEST_ROUTE}, @@ -128,10 +128,10 @@ static cmd_export_t cmds[]={ {"decode_contact_header", (cmd_function)decode_contact_header,0,0,0,REQUEST_ROUTE|ONREPLY_ROUTE}, {"cmp_uri", (cmd_function)w_cmp_uri, 2, fixup_spve_spve, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"cmp_aor", (cmd_function)w_cmp_aor, 2, fixup_spve_spve, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"is_rpid_user_e164", (cmd_function)is_rpid_user_e164, 0, 0, 0, REQUEST_ROUTE}, {"append_rpid_hf", (cmd_function)append_rpid_hf, 0, 0,

1 0

git:master: version set to 3.2.0-dev3
by Daniel-Constantin Mierla 26 Feb '11

26 Feb '11

Module: sip-router Branch: master Commit: fe40de5b32ae44df06b97b25016caec1f8666894 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe40de5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 26 15:24:30 2011 +0100 version set to 3.2.0-dev3 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 9d7fd99..008316c 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -160,7 +160,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory debugger switcher # 0 - off (release mode)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev