# HG changeset patch # User Michael Schloh von Bennewitz # Date 1265834410 -3600 # Node ID 3374f578f080984334a67844adb7c50eedd437c7 # Parent 8ec65b8f6e2ce48ae29c773915a423bd41968cd8 Changes accepted by upstream vendor and merged into trunk revision 6590. http://opensips.svn.sourceforge.net/viewvc/opensips?view=rev&revision=6590 svn co -r 6590 https://opensips.svn.sourceforge.net/svnroot/opensips/trunk diff -r 8ec65b8f6e2c -r 3374f578f080 opensips/enum-isn.diff --- a/opensips/enum-isn.diff Wed Feb 10 21:25:01 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,502 +0,0 @@ -Index: modules/enum/enum_mod.h -diff -Nau modules/enum/enum_mod.h.orig modules/enum/enum_mod.h ---- modules/enum/enum_mod.h.orig 2010-01-18 15:54:52.842465412 +0100 -+++ modules/enum/enum_mod.h 2010-01-18 15:55:20.812190874 +0100 -@@ -41,5 +41,7 @@ - extern str i_branchlabel; /* the label branching off the infrastructure tree */ - extern str i_bl_alg; /* how to know where to branch off */ - -+extern str isnsuffix; /* str version of isn_suffix */ -+ - - #endif /* ENUM_MOD_H */ -Index: modules/enum/enum_mod.c -diff -Nau modules/enum/enum_mod.c.orig modules/enum/enum_mod.c ---- modules/enum/enum_mod.c.orig 2010-01-18 15:52:57.316263519 +0100 -+++ modules/enum/enum_mod.c 2010-01-18 15:52:42.844229824 +0100 -@@ -55,6 +55,8 @@ - char* i_enum_suffix = "e164.arpa."; - char* bl_algorithm = "cc"; - -+char* isn_suffix = "freenum.org."; -+ - - /* - * Internal module variables -@@ -67,6 +69,8 @@ - str i_branchlabel; - str i_bl_alg; - -+str isnsuffix; -+ - - /* - * Exported functions -@@ -94,6 +98,11 @@ - REQUEST_ROUTE}, - {"i_enum_query", (cmd_function)i_enum_query_2, 2, fixup_str_str, 0, - REQUEST_ROUTE}, -+ {"isn_query", (cmd_function)isn_query_0, 0, 0, 0, REQUEST_ROUTE}, -+ {"isn_query", (cmd_function)isn_query_1, 1, fixup_str_null, -+ fixup_free_str_null, REQUEST_ROUTE}, -+ {"isn_query", (cmd_function)isn_query_2, 2, fixup_str_str, -+ fixup_free_str_str, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0} - }; - -@@ -107,6 +116,7 @@ - {"branchlabel", STR_PARAM, &branchlabel}, - {"i_enum_suffix", STR_PARAM, &i_enum_suffix}, - {"bl_algorithm", STR_PARAM, &bl_algorithm}, -+ {"isn_suffix", STR_PARAM, &isn_suffix}, - {0, 0, 0} - }; - -@@ -152,6 +162,9 @@ - i_bl_alg.s = bl_algorithm; - i_bl_alg.len = strlen(bl_algorithm); - -+ isnsuffix.s = isn_suffix; -+ isnsuffix.len = strlen(isn_suffix.s); -+ - return 0; - } - -Index: modules/enum/enum.h -diff -Nau modules/enum/enum.h.orig modules/enum/enum.h ---- modules/enum/enum.h.orig 2010-01-18 15:54:40.361624448 +0100 -+++ modules/enum/enum.h 2010-01-18 15:54:43.090330399 +0100 -@@ -66,5 +66,13 @@ - int i_enum_query_1(struct sip_msg* _msg, char* _suffix, char* _str2); - int i_enum_query_2(struct sip_msg* _msg, char* _suffix, char* _service); - -+/* -+ * Make ISN query and if query succeeds, replace current uri with the -+ * result of the query -+ */ -+int isn_query_0(struct sip_msg* _msg, char* _str1, char* _str2); -+int isn_query_1(struct sip_msg* _msg, char* _suffix, char* _str2); -+int isn_query_2(struct sip_msg* _msg, char* _suffix, char* _service); -+ - - #endif /* ENUM_H */ -Index: modules/enum/enum.c -diff -Nau modules/enum/enum.c.orig modules/enum/enum.c ---- modules/enum/enum.c.orig 2010-01-18 15:57:10.995902181 +0100 -+++ modules/enum/enum.c 2010-01-18 15:46:19.642209178 +0100 -@@ -736,6 +736,84 @@ - } - - -+/* -+ * Call isn_query_2 with module parameter suffix and default service. -+ */ -+int isn_query_0(struct sip_msg* _msg, char* _str1, char* _str2) -+{ -+ return isn_query_2(_msg, (char *)(&isnsuffix), (char *)(&service)); -+} -+ -+ -+/* -+ * Call isn_query_2 with given suffix and default service. -+ */ -+int isn_query_1(struct sip_msg* _msg, char* _suffix, char* _str2) -+{ -+ return isn_query_2(_msg, _suffix, (char *)(&service)); -+} -+ -+ -+/* -+ * See documentation in README file. -+ */ -+int isn_query_2(struct sip_msg* _msg, char* _suffix, char* _service) -+{ -+ char *user_s = NULL; -+ int user_len, i, j; -+ char name[MAX_DOMAIN_SIZE] = {0}; -+ char string[17] = {0}; -+ char szItad[17] = {0}; -+ size_t nItlen = 0; -+ -+ str *suffix, *service; -+ -+ suffix = (str*)_suffix; -+ service = (str*)_service; -+ -+ if (parse_sip_msg_uri(_msg) < 0) { -+ LM_ERR("Parsing of R-URI failed\n"); -+ return -1; -+ } -+ -+ user_s = _msg->parsed_uri.user.s; -+ user_len = _msg->parsed_uri.user.len; -+ -+ memcpy(&(string[0]), user_s, user_len); -+ string[user_len] = (char)0; -+ -+ /* Do primitive test for correct ISN format, */ -+ /* and set szItad to the ISN ITAD (RFC 3872/2871). */ -+ /* Correct ISN format guessed from freenum.org and IANA */ -+ /* doc http://www.iana.org/assignments/trip-parameters/ */ -+ { -+ char *pAster = strchr(string, '*'); -+ if (pAster && (nItlen = strspn(pAster + sizeof(char), "0123456789"))) -+ strncpy(szItad, pAster + sizeof(char), nItlen); -+ else { -+ LM_ERR("R-URI user does not contain a valid ISN\n"); -+ return -1; -+ } -+ } -+ -+ /* Ammend the original ENUM E.164 string logic to process */ -+ /* ISN numbers instead, which include a nonreversed ITAD. */ -+ i = user_len - nItlen - sizeof(char); /* Ex: *1212 */ -+ j = 0; -+ while (i--) { -+ name[j] = user_s[i]; -+ name[j + 1] = '.'; -+ j = j + 2; -+ } -+ -+ strcat(name + j, szItad); /* Copy the unreversed ITAD, */ -+ name[j + nItlen] = '.'; /* and append a trailing dot. */ -+ memcpy(name + j + nItlen + sizeof(char), suffix->s, suffix->len + 1); -+ -+ return do_query(_msg, string, name, service); -+} -+ -+ - /*********** INFRASTRUCTURE ENUM ***************/ - - /* -Index: modules/enum/README -diff -Nau modules/enum/README.orig modules/enum/README ---- modules/enum/README.orig 2010-01-18 17:59:52.034172367 +0100 -+++ modules/enum/README 2010-01-18 18:01:30.730633377 +0100 -@@ -10,8 +10,8 @@ - - Copyright © 2002, 2003 Juha Heinanen - Revision History -- Revision $Revision: 5906 $ $Date: 2009-07-21 10:45:05 +0300 -- (Tue, 21 Jul 2009) $ -+ Revision $Revision: 5907 $ $Date: 2010-01-18 10:45:05 +0100 -+ (Mon, 18 Jan 2010) $ - __________________________________________________________ - - Table of Contents -@@ -25,28 +25,32 @@ - 1.3.1. domain_suffix (string) - 1.3.2. tel_uri_params (string) - 1.3.3. i_enum_suffix (string) -- 1.3.4. branchlabel (string) -- 1.3.5. bl_algorithm (string) -+ 1.3.4. isn_suffix (string) -+ 1.3.5. branchlabel (string) -+ 1.3.6. bl_algorithm (string) - - 1.4. Exported Functions - - 1.4.1. enum_query(["suffix"[,"service"]]) - 1.4.2. enum_pv_query("pvar"[,"suffix"[,"service"]]) - 1.4.3. i_enum_query(["suffix"[,"service"]]) -- 1.4.4. is_from_user_enum() -+ 1.4.4. isn_query(["suffix"[,"service"]]) -+ 1.4.5. is_from_user_enum() - - List of Examples - - 1.1. Setting domain_suffix module parameter - 1.2. Setting tel_uri_params module parameter - 1.3. Setting i_enum_suffix module parameter -- 1.4. Setting brachlabel module parameter -- 1.5. Zone file example -+ 1.4. Setting isn_query usage module parameter -+ 1.5. Setting branchlabel module parameter - 1.6. Zone file example -- 1.7. Setting the bl_algorithm module parameter -- 1.8. enum_query usage -- 1.9. enum_pv_query usage -- 1.10. is_from_user_enum usage -+ 1.7. Zone file example -+ 1.8. Setting the bl_algorithm module parameter -+ 1.9. enum_query usage -+ 1.10. enum_pv_query usage -+ 1.11. isn_query usage -+ 1.12. is_from_user_enum usage - - Chapter 1. Admin Guide - -@@ -113,6 +117,22 @@ - function does an enum lookup on the from user and returns true - if found, false otherwise. - -+ In addition to standard ENUM, support for ISN (ITAD Subscriber -+ Numbers) is provided as well. To allow ISN lookups to resolve, -+ a different formatting algorithm is expected by the DNS server. -+ Whereas a ENUM NAPTR record expects a DNS query of the form -+ 9.8.7.6.5.4.3.2.1., ISN method expects a DNS query of -+ the form 6.5.1212.. That is, a valid ISN number includes -+ a prefix of '56' in the example. The rest of the number is a -+ ITAD (Internet Telephony Administrative Domain) as defined -+ in RFCs 3872 and 2871, and as allocated by the IANA in -+ http://www.iana.org/assignments/trip-parameters. The ITAD is -+ left intact and not refersed as ENUM requires. To learn more -+ about ISN please refer to documents at www.freenum.org. -+ -+ To complete a ISN lookup on the user part of the Request-URI, -+ isn_query() is used instead of enum_query(). -+ - 1.2. Dependencies - - The module depends on the following modules (in the other words -@@ -158,17 +178,27 @@ - Example 1.3. Setting i_enum_suffix module parameter - modparam("enum", "i_enum_suffix", "e1234.arpa.") - --1.3.4. branchlabel (string) -+1.3.4. isn_suffix (string) -+ -+ The domain suffix to be used for isn_query() lookups. Can be -+ overridden by a parameter to isn_query. -+ -+ Default value is "freenum.org." -+ -+ Example 1.4. Setting isn_suffix module parameter -+modparam("enum", "isn_suffix", "freenum.org.") -+ -+1.3.5. branchlabel (string) - - This parameter determines which label i_enum_query() will use - to branch off to the infrastructure ENUM tree. - - Default value is ""i"" - -- Example 1.4. Setting brachlabel module parameter -+ Example 1.5. Setting branchlabel module parameter - modparam("enum", "branchlabel", "i") - --1.3.5. bl_algorithm (string) -+1.3.6. bl_algorithm (string) - - This parameter determines which algorithm i_enum_query() will - use to select the position in the DNS tree where the -@@ -182,7 +212,7 @@ - [branchlabel].[reverse-country-code].[i_enum_suffix] to - indicate after how many digits the label should in inserted. - -- Example 1.5. Zone file example -+ Example 1.6. Zone file example - i.1.e164.arpa. IN TXT "4" - 9.9.9.8.7.6.5.i.4.3.2.1.e164.arpa. IN NAPTR "NAPTR content for +1 234 5 - 678 999" -@@ -196,7 +226,7 @@ - allocated yet. This version of the code uses 65300. See - resolve.h. - -- Example 1.6. Zone file example -+ Example 1.7. Zone file example - i.1.e164.arpa. TYPE65300 \# 14 ( - 04 ; position - 01 69 ; separator -@@ -208,7 +238,7 @@ - - Default value is "cc" - -- Example 1.7. Setting the bl_algorithm module parameter -+ Example 1.8. Setting the bl_algorithm module parameter - modparam("enum", "bl_algorithm", "txt") - - 1.4. Exported Functions -@@ -225,7 +255,7 @@ - - This function can be used from REQUEST_ROUTE. - -- Example 1.8. enum_query usage -+ Example 1.9. enum_query usage - ... - # search for "e2u+sip" in freenum.org - enum_query("freenum.org."); -@@ -262,7 +292,7 @@ - - This function can be used from REQUEST_ROUTE. - -- Example 1.9. enum_pv_query usage -+ Example 1.10. enum_pv_query usage - ... - # search for "e2u+sip" in freenum.org - enum_pv_query("$avp(i:100)", "freenum.org."); -@@ -296,14 +326,42 @@ - ftp://ftp.rfc-editor.org/in-notes/internet-drafts/draft-haberle - r-carrier-enum-01.txt for the rationale behind this function. - --1.4.4. is_from_user_enum() -+1.4.4. isn_query(["suffix"[,"service"]]) -+ -+ The function performs a ISN query and rewrites the -+ Request-URI with the result of the query. See Section 1.1, -+ "Overview" for more information. -+ -+ Meaning of the parameters is as follows: -+ * suffix - Suffix to be appended to the domain name. -+ * service - Service string to be used in the service field. -+ -+ This function can be used from REQUEST_ROUTE. -+ -+ See ftp://www.ietf.org/rfc/rfc3872.txt and -+ ftp://www.ietf.org/rfc/rfc2871.txt for information -+ regarding the ITAD part of the ISN string. -+ -+ Example 1.11. isn_query usage -+... -+# search for "e2u+sip" in freenum.org -+isn_query("freenum.org."); -+... -+# search for "e2u+sip" in default tree (configured as parameter) -+enum_query(); -+... -+# search for "e2u+voice:sip" in freenum.org -+enum_query("freenum.org.","voice"); -+... -+ -+1.4.5. is_from_user_enum() - - Checks if the user part of from URI is found in an enum lookup. - Returns 1 if yes and -1 if not. - - This function can be used from REQUEST_ROUTE. - -- Example 1.10. is_from_user_enum usage -+ Example 1.12. is_from_user_enum usage - ... - if (is_from_user_enum()) { - .... -Index: modules/enum/doc/enum.xml -diff -Nau modules/enum/doc/enum.xml.orig modules/enum/doc/enum.xml ---- modules/enum/doc/enum.xml.orig 2009-10-16 02:31:52.000000000 +0200 -+++ modules/enum/doc/enum.xml 2010-01-18 18:01:15.954172402 +0100 -@@ -33,8 +33,8 @@ - - - -- $Revision: 5901 $ -- $Date: 2009-07-21 10:45:05 +0300 (Tue, 21 Jul 2009) $ -+ $Revision: 5907 $ -+ $Date: 2010-01-18 10:45:05 +0100 (Mon, 18 Jan 2010) $ - - - -Index: modules/enum/doc/enum_admin.xml -diff -Nau modules/enum/doc/enum_admin.xml.orig modules/enum/doc/enum_admin.xml ---- modules/enum/doc/enum_admin.xml.orig 2010-01-18 12:33:30.053644000 +0100 -+++ modules/enum/doc/enum_admin.xml 2010-01-18 18:14:59.583157910 +0100 -@@ -75,6 +75,24 @@ - and -1 if not. - - -+ In addition to standard ENUM, support for ISN (ITAD Subscriber -+ Numbers) is provided as well. To allow ISN lookups to resolve, -+ a different formatting algorithm is expected by the DNS server. -+ Whereas a ENUM NAPTR record expects a DNS query of the form -+ 9.8.7.6.5.4.3.2.1., ISN method expects a DNS query of -+ the form 6.5.1212.. That is, a valid ISN number includes -+ a prefix of '56' in the example. The rest of the number is a -+ ITAD (Internet Telephony Administrative Domain) as defined -+ in RFCs 3872 and 2871, and as allocated by the IANA in -+ http://www.iana.org/assignments/trip-parameters. The ITAD is -+ left intact and not refersed as ENUM requires. To learn more -+ about ISN please refer to documents at www.freenum.org. -+ -+ -+ To complete a ISN lookup on the user part of the Request-URI, -+ isn_query() is used instead of enum_query(). -+ -+ - Enum module also implements is_from_user_enum function. - This function does an enum lookup on the from user and - returns true if found, false otherwise. -@@ -153,6 +171,22 @@ - - -
-+ <varname>isn_suffix</varname> (string) -+ -+ The domain suffix to be used for isn_query() lookups. Can -+ be overridden by a parameter to isn_query. -+ -+ -+ Default value is freenum.org. -+ -+ -+ Setting isn_suffix module parameter -+ -+modparam("enum", "isn_suffix", "freenum.org.") -+ -+ -+
-+
- <varname>branchlabel</varname> (string) - - This parameter determines which label i_enum_query() will use -@@ -162,7 +196,7 @@ - Default value is "i" - - -- Setting brachlabel module parameter -+ Setting branchlabel module parameter - - modparam("enum", "branchlabel", "i") - -@@ -353,6 +387,53 @@ -
- -
-+ -+ <function moreinfo="none">isn_query(["suffix"[,"service"]])</function> -+ -+ -+ The function performs a ISN query and rewrites the Request-URI with -+ the result of the query. See for more -+ information. -+ -+ Meaning of the parameters is as follows: -+ -+ -+ suffix - Suffix to be appended to the -+ domain name. -+ -+ -+ -+ service - Service string to be used in -+ the service field. -+ -+ -+ -+ -+ This function can be used from REQUEST_ROUTE. -+ -+ -+ See ftp://www.ietf.org/rfc/rfc3872.txt and -+ ftp://www.ietf.org/rfc/rfc2871.txt for information -+ regarding the ITAD part of the ISN string. -+ -+ -+ <function moreinfo="none">isn_query</function> usage -+ -+... -+# search for "e2u+sip" in freenum.org -+isn_query("freenum.org."); -+... -+# search for "e2u+sip" in default tree (configured as parameter) -+isn_query(); -+... -+# search for "e2u+voice:sip" in freenum.org -+isn_query("freenum.org.","voice"); -+... -+ -+ -+
-+ -+
- <function moreinfo="none">is_from_user_enum()</function> - - Checks if the user part of from URI diff -r 8ec65b8f6e2c -r 3374f578f080 opensips/enum-isn.txt --- a/opensips/enum-isn.txt Wed Feb 10 21:25:01 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -ISN (ITAD Subscriber Number) lookup integration contribution code - -Contribution - -This contribution introduces ISN formatting logic into the OpenSIPS -ENUM module, allowing it to perform NAPTR based ISN lookups on the -user part of the Request-URI in addition to the existing ENUM lookups. - -Rationale - -This extends the utility of the existing E.164 formatting logic which -previously caused valid ISN lookups to fail (although the OpenSIPS -documentation did suggest that lookups to freenum.org would succeed.) - -Compliance - -The author believes that the introduced logic complies with the -relevant ITAD standards as defined by RFC 3872 and RFC 2871, however -it seems that at this time ISN is rather loosely defined according to -nonstandard documentation provided by freenum.org. - -Location - -http://scm.europalab.com/contrib/opensips/ -http://scm.europalab.com/contrib/file/tip/opensips/ - -Instructions - -To integrate this contributed logic into the source code tree of -a OpenSIPS distribution, download the unified diff and use the -patch(1) command: - - $ cd /tmp && mkdir enum-patch && cd enum-patch - $ wget http://scm.europalab.com/contrib/raw-file/tip/opensips/enum-isn.diff - $ tar zxf /tmp/opensips--tls.tar.gz - $ cd opensips--tls - $ patch -p0 <../enum-isn.diff - -Testing - -A basic test of this contribution -Once compiled and installed, a basic test of this contributed software -involves calling the new exported function in the routing script of the -OpenSIPS configuration file: - - # dial '1234*256' from a UAC first - isn_query(); - t_relay(); - -According to the freenum.org cookbook, the ISN '1234*256' is being -provided for testing. After dialing the caller hears monkeys screaming. - -Disclaimer - -This software contribution is based on source code from OpenSIPS SVN -revision 6511. The author makes no guarantees as to this contribution. -A user who downloads and executes it does so at his own risk. - -Michael Schloh von Bennewitz -http://michael.schloh.com/ -Monday, 18. January 2010 diff -r 8ec65b8f6e2c -r 3374f578f080 opensips/modules/enum/README --- a/opensips/modules/enum/README Wed Feb 10 21:25:01 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,369 +0,0 @@ -Enum Module - -Juha Heinanen - - - -Otmar Lendl - - - - Copyright © 2002, 2003 Juha Heinanen - Revision History - Revision $Revision: 5907 $ $Date: 2010-01-18 10:45:05 +0100 - (Mon, 18 Jan 2010) $ - __________________________________________________________ - - Table of Contents - - 1. Admin Guide - - 1.1. Overview - 1.2. Dependencies - 1.3. Exported Parameters - - 1.3.1. domain_suffix (string) - 1.3.2. tel_uri_params (string) - 1.3.3. i_enum_suffix (string) - 1.3.4. isn_suffix (string) - 1.3.5. branchlabel (string) - 1.3.6. bl_algorithm (string) - - 1.4. Exported Functions - - 1.4.1. enum_query(["suffix"[,"service"]]) - 1.4.2. enum_pv_query("pvar"[,"suffix"[,"service"]]) - 1.4.3. i_enum_query(["suffix"[,"service"]]) - 1.4.4. isn_query(["suffix"[,"service"]]) - 1.4.5. is_from_user_enum() - - List of Examples - - 1.1. Setting domain_suffix module parameter - 1.2. Setting tel_uri_params module parameter - 1.3. Setting i_enum_suffix module parameter - 1.4. Setting isn_query usage module parameter - 1.5. Setting branchlabel module parameter - 1.6. Zone file example - 1.7. Zone file example - 1.8. Setting the bl_algorithm module parameter - 1.9. enum_query usage - 1.10. enum_pv_query usage - 1.11. isn_query usage - 1.12. is_from_user_enum usage - -Chapter 1. Admin Guide - -1.1. Overview - - Enum module implements [i_]enum_query functions that make an - enum query based on the user part of the current Request-URI. - These functions assume that the user part consists of an - international phone number of the form +decimal-digits, where - the number of digits is at least 2 and at most 15. Out of this - number enum_query forms a domain name, where the digits are in - reverse order and separated by dots followed by domain suffix - that by default is "e164.arpa.". For example, if the user part - is +35831234567, the domain name will be - "7.6.5.4.3.2.1.3.8.5.3.e164.arpa.". i_enum_query operates in a - similar fashion. The only difference is that it adds a label - (default "i") to branch off from the default, user-ENUM tree to - an infrastructure ENUM tree. - - After forming the domain name, enum_query queries DNS for its - NAPTR records. From the possible response enum_query chooses - those records, whose flags field has string value "u", and - whose services field has string value "e2u+[service:]sip" or - "e2u+type[:subtype][+type[:subtype]...]" (case is ignored in - both cases), and whose regexp field is of the form - !pattern!replacement!. - - Then enum_query sorts the chosen NAPTR records based on their - . After sorting, enum_query replaces the - current Request URI by applying regexp of the most preferred - NAPTR record its user part and appends to the request new - branches by applying regexp of each remaining NAPTR record to - the user part of the current Request URI. If a new URI is a tel - URI, enum_query appends to it as tel URI parameters the value - of tel_uri_params module parameter. Finally, enum_query - associates a q value with each new URI based on the of the corresponding NAPTR record. - - When using enum_query without any parameters, it searches for - NAPTRs with service type "e2u+sip" in the default enum tree. - When using enum_query with a single parameter, this parameter - will be used as enum tree. When using enum_query with two - parameters, the functionality depends on the first letter in - the second parameter. When the first letter is not a '+' sign, - the second parameter will be used to search for NAPTRs with - service type "e2u+parameter:sip". When the second parameter - starts with a '+' sign, the ENUM lookup also supports compound - NAPTRs (e.g. "e2u+voice:sip+video:sip") and searching for - multiple service types within one lookup. Multiple service - types must be separeted by a '+' sign. - - Most of the time you want to route based on the RURI. On rare - occasions you may wish to route based on something else. The - function enum_pv_query mimics the behavior of the enum_query - function except the E.164 number in its pseudo variable - argument is used for the enum lookup instead of the user part - of the RURI. Obviously the user part of the RURI is still used - in the NAPTR regexp. - - Enum query returns 1 if the current Request URI was replaced - and -1 if not. - - Enum module also implements is_from_user_enum function. This - function does an enum lookup on the from user and returns true - if found, false otherwise. - - In addition to standard ENUM, support for ISN (ITAD Subscriber - Numbers) is provided as well. To allow ISN lookups to resolve, - a different formatting algorithm is expected by the DNS server. - Whereas a ENUM NAPTR record expects a DNS query of the form - 9.8.7.6.5.4.3.2.1., ISN method expects a DNS query of - the form 6.5.1212.. That is, a valid ISN number includes - a prefix of '56' in the example. The rest of the number is a - ITAD (Internet Telephony Administrative Domain) as defined - in RFCs 3872 and 2871, and as allocated by the IANA in - http://www.iana.org/assignments/trip-parameters. The ITAD is - left intact and not refersed as ENUM requires. To learn more - about ISN please refer to documents at www.freenum.org. - - To complete a ISN lookup on the user part of the Request-URI, - isn_query() is used instead of enum_query(). - -1.2. Dependencies - - The module depends on the following modules (in the other words - the listed modules must be loaded before this module): - * No dependencies. - -1.3. Exported Parameters - -1.3.1. domain_suffix (string) - - The domain suffix to be added to the domain name obtained from - the digits of an E164 number. Can be overridden by a parameter - to enum_query. - - Default value is "e164.arpa." - - Example 1.1. Setting domain_suffix module parameter -modparam("enum", "domain_suffix", "e1234.arpa.") - -1.3.2. tel_uri_params (string) - - A string whose contents is appended to each new tel URI in the - request as tel URI parameters. - -Note - - Currently OpenSIPS does not support tel URIs. This means that - at present tel_uri_params is appended as URI parameters to - every URI. - - Default value is "" - - Example 1.2. Setting tel_uri_params module parameter -modparam("enum", "tel_uri_params", ";npdi") - -1.3.3. i_enum_suffix (string) - - The domain suffix to be used for i_enum_query() lookups. Can be - overridden by a parameter to i_enum_query. - - Default value is "e164.arpa." - - Example 1.3. Setting i_enum_suffix module parameter -modparam("enum", "i_enum_suffix", "e1234.arpa.") - -1.3.4. isn_suffix (string) - - The domain suffix to be used for isn_query() lookups. Can be - overridden by a parameter to isn_query. - - Default value is "freenum.org." - - Example 1.4. Setting isn_suffix module parameter -modparam("enum", "isn_suffix", "freenum.org.") - -1.3.5. branchlabel (string) - - This parameter determines which label i_enum_query() will use - to branch off to the infrastructure ENUM tree. - - Default value is ""i"" - - Example 1.5. Setting branchlabel module parameter -modparam("enum", "branchlabel", "i") - -1.3.6. bl_algorithm (string) - - This parameter determines which algorithm i_enum_query() will - use to select the position in the DNS tree where the - infrastructure tree branches off the user ENUM tree. - - If set to "cc", i_enum_query() will always inserts the label at - the country-code level. Examples: i.1.e164.arpa, - i.3.4.e164.arpa, i.2.5.3.e164.arpa - - If set to "txt", i_enum_query() will look for a TXT record at - [branchlabel].[reverse-country-code].[i_enum_suffix] to - indicate after how many digits the label should in inserted. - - Example 1.6. Zone file example -i.1.e164.arpa. IN TXT "4" -9.9.9.8.7.6.5.i.4.3.2.1.e164.arpa. IN NAPTR "NAPTR content for +1 234 5 -678 999" - - If set to "ebl", i_enum_query() will look for an EBL (ENUM - Branch Label) record at - [branchlabel].[reverse-country-code].[i_enum_suffix]. See - http://www.ietf.org/internet-drafts/draft-lendl-enum-branch-loc - ation-record-00.txt for a description of that record and the - meaning of the fields. The RR type for the EBL has not been - allocated yet. This version of the code uses 65300. See - resolve.h. - - Example 1.7. Zone file example -i.1.e164.arpa. TYPE65300 \# 14 ( - 04 ; position - 01 69 ; separator - 04 65 31 36 34 04 61 72 70 61 00 ; e164.ar -pa -; ) -9.9.9.8.7.6.5.i.4.3.2.1.e164.arpa. IN NAPTR "NAPTR content for +1 234 5 -678 999" - - Default value is "cc" - - Example 1.8. Setting the bl_algorithm module parameter -modparam("enum", "bl_algorithm", "txt") - -1.4. Exported Functions - -1.4.1. enum_query(["suffix"[,"service"]]) - - The function performs an enum query and rewrites the - Request-URI with the result of the query. See Section 1.1, - "Overview" for more information. - - Meaning of the parameters is as follows: - * suffix - Suffix to be appended to the domain name. - * service - Service string to be used in the service field. - - This function can be used from REQUEST_ROUTE. - - Example 1.9. enum_query usage -... -# search for "e2u+sip" in freenum.org -enum_query("freenum.org."); -... -# search for "e2u+sip" in default tree (configured as parameter) -enum_query(); -... -# search for "e2u+voice:sip" in e164.arpa -enum_query("e164.arpa.","voice"); -... -# search for service type "sip" or "voice:sip" or "video:sip" -# note the '+' sign in front of the second parameter -enum_query("e164.arpa.","+sip+voice:sip+video:sip"); -... -# quering for service sip and voice:sip -enum_query("e164.arpa."); -enum_query("e164.arpa.","voice"); -# or use instead -enum_query("e164.arpa.","+sip+voice:sip"); -... - -1.4.2. enum_pv_query("pvar"[,"suffix"[,"service"]]) - - The function performs an enum query on E.164 number stored in - its pseudo variable argument and rewrites the Request-URI with - the result of the query. See Section 1.1, "Overview" for more - information. - - Meaning of the parameters is as follows: - * pvar - Pseudo variable that holds an E.164 number on which - enum query is performed. - * suffix - Suffix to be appended to the domain name. - * service - Service string to be used in the service field. - - This function can be used from REQUEST_ROUTE. - - Example 1.10. enum_pv_query usage -... -# search for "e2u+sip" in freenum.org -enum_pv_query("$avp(i:100)", "freenum.org."); -... -# search for "e2u+sip" in default tree (configured as parameter) -enum_pv_query("$fU"); -... -# search for "e2u+voice:sip" in e164.arpa -enum_pv_query("$avp(i:100)","e164.arpa.","voice"); -... -# search for service type "sip" or "voice:sip" or "video:sip" -# note the '+' sign in front of the second parameter -enum_pv_query("$fU","e164.arpa.","+sip+voice:sip+video:sip"); -... -# quering for service sip and voice:sip -enum_pv_query("$avp(i:100)","e164.arpa."); -enum_pv_query("$avp(i:100)","e164.arpa.","voice"); -# or use instead -enum_pv_query("$avp(i:100)","e164.arpa.","+sip+voice:sip"); -... - -1.4.3. i_enum_query(["suffix"[,"service"]]) - - The function performs an enum query and rewrites the - Request-URI with the result of the query. This the - Infrastructure-ENUM version of enum_query(). The only - difference to enum_query() is in the calculation of the FQDN - where NAPTR records are looked for. - - See - ftp://ftp.rfc-editor.org/in-notes/internet-drafts/draft-haberle - r-carrier-enum-01.txt for the rationale behind this function. - -1.4.4. isn_query(["suffix"[,"service"]]) - - The function performs a ISN query and rewrites the - Request-URI with the result of the query. See Section 1.1, - "Overview" for more information. - - Meaning of the parameters is as follows: - * suffix - Suffix to be appended to the domain name. - * service - Service string to be used in the service field. - - This function can be used from REQUEST_ROUTE. - - See ftp://ftp.ietf.org/rfc/rfc3872.txt and - ftp://ftp.ietf.org/rfc/rfc2871.txt for information - regarding the ITAD part of the ISN string. - - Example 1.11. isn_query usage -... -# search for "e2u+sip" in freenum.org -isn_query("freenum.org."); -... -# search for "e2u+sip" in default tree (configured as parameter) -enum_query(); -... -# search for "e2u+voice:sip" in freenum.org -enum_query("freenum.org.","voice"); -... - -1.4.5. is_from_user_enum() - - Checks if the user part of from URI is found in an enum lookup. - Returns 1 if yes and -1 if not. - - This function can be used from REQUEST_ROUTE. - - Example 1.12. is_from_user_enum usage -... -if (is_from_user_enum()) { - .... -}; -... diff -r 8ec65b8f6e2c -r 3374f578f080 opensips/modules/enum/doc/enum.xml --- a/opensips/modules/enum/doc/enum.xml Wed Feb 10 21:25:01 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ - - - - - - -%docentities; - -]> - - - - Enum Module - - - Juha - Heinanen - jh@song.fi - - - Otmar - Lendl - lendl@nic.at - - - - 2002 - 2003 - Juha Heinanen - - - - $Revision: 5907 $ - $Date: 2010-01-18 10:45:05 +0100 (Mon, 18 Jan 2010) $ - - - - - - &admin; - &faq; - - diff -r 8ec65b8f6e2c -r 3374f578f080 opensips/modules/enum/doc/enum_admin.xml --- a/opensips/modules/enum/doc/enum_admin.xml Wed Feb 10 21:25:01 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,459 +0,0 @@ - - - - - &adminguide; - -
- Overview - - Enum module implements [i_]enum_query functions that make an enum query - based on the user part of the current Request-URI. These functions - assume that the user part consists of an international phone number - of the form +decimal-digits, where the number of digits is at - least 2 and at most 15. Out of this number - enum_query forms a domain name, - where the digits are in reverse order and separated by dots followed by - domain suffix that by default is e164.arpa.. For example, - if the user part is +35831234567, the domain - name will be 7.6.5.4.3.2.1.3.8.5.3.e164.arpa.. - i_enum_query operates in a similar - fashion. The only difference is that it adds a label (default "i") - to branch off from the default, user-ENUM tree to an infrastructure ENUM tree. - - - After forming the domain name, - enum_query queries - DNS for its NAPTR records. From the possible response - enum_query chooses those records, - whose flags field has string value "u", and whose services field has - string value "e2u+[service:]sip" or - "e2u+type[:subtype][+type[:subtype]...]" (case is ignored in both - cases), and whose regexp field is of the form !pattern!replacement!. - - - Then enum_query sorts the chosen - NAPTR records based on their <order, preference>. After sorting, - enum_query replaces the current - Request URI by applying regexp of the most preferred NAPTR record its - user part and appends to the request new branches by applying regexp of - each remaining NAPTR record to the user part of the - current Request URI. If a new URI is a tel URI, - enum_query appends to it as tel - URI parameters the value of tel_uri_params module parameter. Finally, - enum_query associates a q value - with each new URI based on the <order, preference> of the - corresponding NAPTR record. - - - When using enum_query without any - parameters, it searches for NAPTRs with service type "e2u+sip" in the - default enum tree. When using - enum_query with a single parameter, - this parameter will be used as enum tree. When using - enum_query - with two parameters, the functionality depends on the first letter in - the second parameter. When the first letter is not a '+' sign, the - second parameter will be used to search for NAPTRs with service type - "e2u+parameter:sip". When the second parameter starts with a '+' sign, - the ENUM lookup also supports compound NAPTRs - (e.g. "e2u+voice:sip+video:sip") and searching for multiple service - types within one lookup. Multiple service types must be separeted - by a '+' sign. - - - Most of the time you want to route based on the RURI. On rare occasions - you may wish to route based on something else. The function - enum_pv_query mimics the behavior - of the enum_query function except the - E.164 number in its pseudo variable argument is used for the enum lookup instead of the user - part of the RURI. Obviously the user part of the RURI is still used in the - NAPTR regexp. - - - Enum query returns 1 if the current Request URI was replaced - and -1 if not. - - - In addition to standard ENUM, support for ISN (ITAD Subscriber - Numbers) is provided as well. To allow ISN lookups to resolve, - a different formatting algorithm is expected by the DNS server. - Whereas a ENUM NAPTR record expects a DNS query of the form - 9.8.7.6.5.4.3.2.1., ISN method expects a DNS query of - the form 6.5.1212.. That is, a valid ISN number includes - a prefix of '56' in the example. The rest of the number is a - ITAD (Internet Telephony Administrative Domain) as defined - in RFCs 3872 and 2871, and as allocated by the IANA in - http://www.iana.org/assignments/trip-parameters. The ITAD is - left intact and not refersed as ENUM requires. To learn more - about ISN please refer to documents at www.freenum.org. - - - To complete a ISN lookup on the user part of the Request-URI, - isn_query() is used instead of enum_query(). - - - Enum module also implements is_from_user_enum function. - This function does an enum lookup on the from user and - returns true if found, false otherwise. - -
- -
- Dependencies - - The module depends on the following modules (in the other words the - listed modules must be loaded before this module): - - - No dependencies. - - - -
- -
- Exported Parameters -
- <varname>domain_suffix</varname> (string) - - The domain suffix to be added to the domain name obtained from - the digits of an E164 number. Can be overridden - by a parameter to enum_query. - - - Default value is e164.arpa. - - - Setting domain_suffix module parameter - -modparam("enum", "domain_suffix", "e1234.arpa.") - - -
- -
- <varname>tel_uri_params</varname> (string) - - A string whose contents is appended to each new tel URI in the - request as tel URI parameters. - - - - Currently &osips; does not support tel URIs. This means that at present - tel_uri_params is appended as URI parameters to every URI. - - - - Default value is - - - Setting tel_uri_params module parameter - -modparam("enum", "tel_uri_params", ";npdi") - - -
-
- <varname>i_enum_suffix</varname> (string) - - The domain suffix to be used for i_enum_query() lookups. - Can be overridden by a parameter to i_enum_query. - - - Default value is e164.arpa. - - - Setting i_enum_suffix module parameter - -modparam("enum", "i_enum_suffix", "e1234.arpa.") - - -
-
- <varname>isn_suffix</varname> (string) - - The domain suffix to be used for isn_query() lookups. Can - be overridden by a parameter to isn_query. - - - Default value is freenum.org. - - - Setting isn_suffix module parameter - -modparam("enum", "isn_suffix", "freenum.org.") - - -
-
- <varname>branchlabel</varname> (string) - - This parameter determines which label i_enum_query() will use - to branch off to the infrastructure ENUM tree. - - - Default value is "i" - - - Setting branchlabel module parameter - -modparam("enum", "branchlabel", "i") - - -
-
- <varname>bl_algorithm</varname> (string) - - This parameter determines which algorithm i_enum_query() will use - to select the position in the DNS tree where the infrastructure tree - branches off the user ENUM tree. - - - If set to "cc", i_enum_query() will always inserts the - label at the country-code level. - Examples: i.1.e164.arpa, i.3.4.e164.arpa, i.2.5.3.e164.arpa - - - If set to "txt", i_enum_query() will look for a TXT record at - [branchlabel].[reverse-country-code].[i_enum_suffix] to indicate after how many digits the - label should in inserted. - - Zone file example - -i.1.e164.arpa. IN TXT "4" -9.9.9.8.7.6.5.i.4.3.2.1.e164.arpa. IN NAPTR "NAPTR content for +1 234 5678 999" - - - - - If set to "ebl", i_enum_query() will look for an EBL (ENUM Branch Label) record at - [branchlabel].[reverse-country-code].[i_enum_suffix]. See http://www.ietf.org/internet-drafts/draft-lendl-enum-branch-location-record-00.txt for a description of that record and the - meaning of the fields. The RR type for the EBL has not been allocated yet. - This version of the code uses 65300. See resolve.h. - - Zone file example - -i.1.e164.arpa. TYPE65300 \# 14 ( - 04 ; position - 01 69 ; separator - 04 65 31 36 34 04 61 72 70 61 00 ; e164.arpa -; ) -9.9.9.8.7.6.5.i.4.3.2.1.e164.arpa. IN NAPTR "NAPTR content for +1 234 5678 999" - - - - - - Default value is cc - - - Setting the bl_algorithm module parameter - -modparam("enum", "bl_algorithm", "txt") - - -
- -
- -
- Exported Functions -
- - <function moreinfo="none">enum_query(["suffix"[,"service"]])</function> - - - The function performs an enum query and rewrites the Request-URI with - the result of the query. See for more - information. - - Meaning of the parameters is as follows: - - - suffix - Suffix to be appended to the - domain name. - - - - service - Service string to be used in - the service field. - - - - - This function can be used from REQUEST_ROUTE. - - - <function moreinfo="none">enum_query</function> usage - -... -# search for "e2u+sip" in freenum.org -enum_query("freenum.org."); -... -# search for "e2u+sip" in default tree (configured as parameter) -enum_query(); -... -# search for "e2u+voice:sip" in e164.arpa -enum_query("e164.arpa.","voice"); -... -# search for service type "sip" or "voice:sip" or "video:sip" -# note the '+' sign in front of the second parameter -enum_query("e164.arpa.","+sip+voice:sip+video:sip"); -... -# quering for service sip and voice:sip -enum_query("e164.arpa."); -enum_query("e164.arpa.","voice"); -# or use instead -enum_query("e164.arpa.","+sip+voice:sip"); -... - - -
- -
- - <function moreinfo="none">enum_pv_query("pvar"[,"suffix"[,"service"]])</function> - - - The function performs an enum query on E.164 number stored - in its pseudo variable argument and rewrites the Request-URI with - the result of the query. See for more - information. - - Meaning of the parameters is as follows: - - - pvar - Pseudo - variable that holds an E.164 number on which enum - query is performed. - - - - suffix - Suffix to be appended to the - domain name. - - - - service - Service string to be used in - the service field. - - - - - This function can be used from REQUEST_ROUTE. - - - <function moreinfo="none">enum_pv_query</function> usage - -... -# search for "e2u+sip" in freenum.org -enum_pv_query("$avp(i:100)", "freenum.org."); -... -# search for "e2u+sip" in default tree (configured as parameter) -enum_pv_query("$fU"); -... -# search for "e2u+voice:sip" in e164.arpa -enum_pv_query("$avp(i:100)","e164.arpa.","voice"); -... -# search for service type "sip" or "voice:sip" or "video:sip" -# note the '+' sign in front of the second parameter -enum_pv_query("$fU","e164.arpa.","+sip+voice:sip+video:sip"); -... -# quering for service sip and voice:sip -enum_pv_query("$avp(i:100)","e164.arpa."); -enum_pv_query("$avp(i:100)","e164.arpa.","voice"); -# or use instead -enum_pv_query("$avp(i:100)","e164.arpa.","+sip+voice:sip"); -... - - -
- -
- - <function moreinfo="none">i_enum_query(["suffix"[,"service"]])</function> - - - The function performs an enum query and rewrites the Request-URI with - the result of the query. This the Infrastructure-ENUM version of enum_query(). - The only difference to enum_query() is in the calculation of the - FQDN where NAPTR records are looked for. - - - See ftp://ftp.rfc-editor.org/in-notes/internet-drafts/draft-haberler-carrier-enum-01.txt - for the rationale behind this function. - -
- -
- - <function moreinfo="none">isn_query(["suffix"[,"service"]])</function> - - - The function performs a ISN query and rewrites the Request-URI with - the result of the query. See for more - information. - - Meaning of the parameters is as follows: - - - suffix - Suffix to be appended to the - domain name. - - - - service - Service string to be used in - the service field. - - - - - This function can be used from REQUEST_ROUTE. - - - See ftp://ftp.ietf.org/rfc/rfc3872.txt and - ftp://ftp.ietf.org/rfc/rfc2871.txt for information - regarding the ITAD part of the ISN string. - - - <function moreinfo="none">isn_query</function> usage - -... -# search for "e2u+sip" in freenum.org -isn_query("freenum.org."); -... -# search for "e2u+sip" in default tree (configured as parameter) -isn_query(); -... -# search for "e2u+voice:sip" in freenum.org -isn_query("freenum.org.","voice"); -... - - -
- -
- <function moreinfo="none">is_from_user_enum()</function> - - Checks if the user part of from URI - is found in an enum lookup. - Returns 1 if yes and -1 if not. - - - This function can be used from REQUEST_ROUTE. - - - <function moreinfo="none">is_from_user_enum</function> usage - -... -if (is_from_user_enum()) { - .... -}; -... - - -
-
- - diff -r 8ec65b8f6e2c -r 3374f578f080 opensips/modules/enum/enum.c --- a/opensips/modules/enum/enum.c Wed Feb 10 21:25:01 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1196 +0,0 @@ -/* - * $Id: enum.c 5901 2009-07-21 07:45:05Z bogdan_iancu $ - * - * Enum and E164 related functions - * - * Copyright (C) 2002-2008 Juha Heinanen - * - * This file is part of opensips, a free SIP server. - * - * opensips is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * opensips is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#include - -#include "enum.h" -#include "../../parser/parse_uri.h" -#include "../../parser/parse_from.h" -#include "../../ut.h" -#include "../../resolve.h" -#include "../../mem/mem.h" -#include "../../dset.h" -#include "../../qvalue.h" -#include "enum_mod.h" -#include "../../regexp.h" -#include "../../pvar.h" - -/* - * Input: E.164 number w/o leading + - * - * Output: number of digits in the country code - * 0 on invalid number - * - * convention: - * 3 digits is the default length of a country code. - * country codes 1 and 7 are a single digit. - * the following country codes are two digits: 20, 27, 30-34, 36, 39, - * 40, 41, 43-49, 51-58, 60-66, 81, 82, 84, 86, 90-95, 98. - */ -static int cclen(const char *number) -{ - char d1,d2; - - if (!number || (strlen(number) < 3)) - return(0); - - d1 = number[0]; - d2 = number[1]; - - if (!isdigit((int)d2)) - return(0); - - switch(d1) { - case '1': - case '7': - return(1); - case '2': - if ((d2 == '0') || (d1 == '7')) - return(2); - break; - case '3': - if ((d2 >= '0') && (d1 <= '4')) - return(2); - if ((d2 == '6') || (d1 == '9')) - return(2); - break; - case '4': - if (d2 != '2') - return(2); - break; - case '5': - if ((d2 >= '1') && (d1 <= '8')) - return(2); - break; - case '6': - if (d1 <= '6') - return(2); - break; - case '8': - if ((d2 == '1') || (d1 == '2') || (d1 == '4') || (d1 == '6')) - return(2); - break; - case '9': - if (d1 <= '5') - return(2); - if (d2 == '8') - return(2); - break; - default: - return(0); - } - - return(3); -} - - - -/* return the length of the string until c, if not found returns n */ -static inline int findchr(char* p, int c, unsigned int size) -{ - int len=0; - - for(;len 0) { - if (*first == '!') { - second = (char *)memchr((void *)(first + 1), '!', len - 1); - if (second) { - len = len - (second - first + 1); - if (len > 0) { - third = memchr(second + 1, '!', len); - if (third) { - pattern->len = second - first - 1; - pattern->s = first + 1; - replacement->len = third - second - 1; - replacement->s = second + 1; - return 1; - } else { - LM_ERR("Third ! missing from regexp\n"); - return -1; - } - } else { - LM_ERR("Third ! missing from regexp\n"); - return -2; - } - } else { - LM_ERR("Second ! missing from regexp\n"); - return -3; - } - } else { - LM_ERR("First ! missing from regexp\n"); - return -4; - } - } else { - LM_ERR("Regexp missing\n"); - return -5; - } -} -/* Checks if NAPTR record has flag u and its services field - * e2u+[service:]sip or - * e2u+service[+service[+service[+...]]] - */ -static inline int sip_match( struct naptr_rdata* naptr, str* service) -{ - if (service->len == 0) { - return (naptr->flags_len == 1) && - ((naptr->flags[0] == 'u') || (naptr->flags[0] == 'U')) && - (naptr->services_len == 7) && - ((strncasecmp(naptr->services, "e2u+sip", 7) == 0) || - (strncasecmp(naptr->services, "sip+e2u", 7) == 0)); - } else if (service->s[0] != '+') { - return (naptr->flags_len == 1) && - ((naptr->flags[0] == 'u') || (naptr->flags[0] == 'U')) && - (naptr->services_len == service->len + 8) && - (strncasecmp(naptr->services, "e2u+", 4) == 0) && - (strncasecmp(naptr->services + 4, service->s, service->len) == 0) && - (strncasecmp(naptr->services + 4 + service->len, ":sip", 4) == 0); - } else { /* handle compound NAPTRs and multiple services */ - str bakservice, baknaptr; /* we bakup the str */ - int naptrlen, len; /* length of the extracted service */ - - /* RFC 3761, NAPTR service field must start with E2U+ */ - if (strncasecmp(naptr->services, "e2u+", 4) != 0) { - return 0; - } - baknaptr.s = naptr->services + 4; /* leading 'e2u+' */ - baknaptr.len = naptr->services_len - 4; - for (;;) { /* iterate over services in NAPTR */ - bakservice.s = service->s + 1; /* leading '+' */ - bakservice.len = service->len - 1; - naptrlen = findchr(baknaptr.s,'+',baknaptr.len); - - for (;;) { /* iterate over services in enum_query */ - len = findchr(bakservice.s,'+',bakservice.len); - if ((naptrlen == len ) && !strncasecmp(baknaptr.s, bakservice.s, len)){ - return 1; - } - if ( (bakservice.len -= len+1) > 0) { - bakservice.s += len+1; - continue; - } - break; - } - if ( (baknaptr.len -= naptrlen+1) > 0) { - baknaptr.s += naptrlen+1; - continue; - } - break; - } - /* no matching service found */ - return 0; - } -} - - -/* - * Checks if argument is an e164 number starting with + - */ -static inline int is_e164(str* _user) -{ - int i; - char c; - - if ((_user->len > 2) && (_user->len < 17) && ((_user->s)[0] == '+')) { - for (i = 1; i < _user->len; i++) { - c = (_user->s)[i]; - if ((c < '0') || (c > '9')) return -1; - } - return 1; - } else { - return -1; - } -} - - -/* - * Call is_from_user_enum_2 with module parameter suffix and default service. - */ -int is_from_user_enum_0(struct sip_msg* _msg, char* _str1, char* _str2) -{ - return is_from_user_enum_2(_msg, (char *)(&suffix), (char *)(&service)); -} - -/* - * Call is_from_user_enum_2 with given suffix and default service. - */ -int is_from_user_enum_1(struct sip_msg* _msg, char* _suffix, char* _str2) -{ - return is_from_user_enum_2(_msg, _suffix, (char *)(&service)); -} - -/* - * Check if from user is a valid enum based user, and check to make sure - * that the src_ip == an srv record that maps to the enum from user. - */ -int is_from_user_enum_2(struct sip_msg* _msg, char* _suffix, char* _service) -{ - struct ip_addr addr; - struct hostent* he; - unsigned short zp; - unsigned short proto; - char *user_s; - int user_len, i, j; - char name[MAX_DOMAIN_SIZE]; - char uri[MAX_URI_SIZE]; - struct sip_uri *furi; - struct sip_uri luri; - struct rdata* head; - - str* suffix; - str* service; - - struct rdata* l; - struct naptr_rdata* naptr; - - str pattern, replacement, result; - char string[17]; - - if (parse_from_header(_msg) < 0) { - LM_ERR("Failed to parse From header\n"); - return -1; - } - - if(_msg->from==NULL || get_from(_msg)==NULL) { - LM_DBG("No From header\n"); - return -1; - } - - if ((furi = parse_from_uri(_msg)) == NULL) { - LM_ERR("Failed to parse From URI\n"); - return -1; - } - - suffix = (str*)_suffix; - service = (str*)_service; - - if (is_e164(&(furi->user)) == -1) { - LM_ERR("From URI user is not an E164 number\n"); - return -1; - } - - /* assert: the from user is a valid formatted e164 string */ - - user_s = furi->user.s; - user_len = furi->user.len; - - j = 0; - for (i = user_len - 1; i > 0; i--) { - name[j] = user_s[i]; - name[j + 1] = '.'; - j = j + 2; - } - - memcpy(name + j, suffix->s, suffix->len + 1); - - head = get_record(name, T_NAPTR); - - if (head == 0) { - LM_DBG("No NAPTR record found for %s.\n", name); - return -3; - } - - /* we have the naptr records, loop and find an srv record with */ - /* same ip address as source ip address, if we do then true is returned */ - - for (l = head; l; l = l->next) { - - if (l->type != T_NAPTR) continue; /*should never happen*/ - naptr = (struct naptr_rdata*)l->rdata; - if (naptr == 0) { - LM_ERR("Null rdata in DNS response\n"); - free_rdata_list(head); - return -4; - } - - LM_DBG("ENUM query on %s: order %u, pref %u, flen %u, flags " - "'%.*s', slen %u, services '%.*s', rlen %u, " - "regexp '%.*s'\n", - name, naptr->order, naptr->pref, - naptr->flags_len, (int)(naptr->flags_len), ZSW(naptr->flags), naptr->services_len, - (int)(naptr->services_len), ZSW(naptr->services), naptr->regexp_len, - (int)(naptr->regexp_len), ZSW(naptr->regexp)); - - if (sip_match(naptr, service) != 0) { - if (parse_naptr_regexp(&(naptr->regexp[0]), naptr->regexp_len, - &pattern, &replacement) < 0) { - free_rdata_list(head); /*clean up*/ - LM_ERR("Parsing of NAPTR regexp failed\n"); - return -5; - } -#ifdef LATER - if ((pattern.len == 4) && (strncmp(pattern.s, "^.*$", 4) == 0)) { - LM_DBG("Resulted in replacement: '%.*s'\n", - replacement.len, ZSW(replacement.s)); - retval = set_uri(_msg, replacement.s, replacement.len); - free_rdata_list(head); /*clean up*/ - return retval; - } -#endif - result.s = &(uri[0]); - result.len = MAX_URI_SIZE; - /* Avoid making copies of pattern and replacement */ - pattern.s[pattern.len] = (char)0; - replacement.s[replacement.len] = (char)0; - /* We have already checked the size of - _msg->parsed_uri.user.s */ - memcpy(&(string[0]), user_s, user_len); - string[user_len] = (char)0; - if (reg_replace(pattern.s, replacement.s, &(string[0]), - &result) < 0) { - pattern.s[pattern.len] = '!'; - replacement.s[replacement.len] = '!'; - LM_ERR("Regexp replace failed\n"); - free_rdata_list(head); /*clean up*/ - return -6; - } - LM_DBG("Resulted in replacement: '%.*s'\n", - result.len, ZSW(result.s)); - - if(parse_uri(result.s, result.len, &luri) < 0) - { - LM_ERR("Parsing of URI <%.*s> failed\n", - result.len, result.s); - free_rdata_list(head); /*clean up*/ - return -7; - } - - pattern.s[pattern.len] = '!'; - replacement.s[replacement.len] = '!'; - - zp = 0; - proto = PROTO_NONE; - he = sip_resolvehost(&luri.host, &zp, &proto, - (luri.type==SIPS_URI_T)?1:0 , 0); - - hostent2ip_addr(&addr, he, 0); - - if(ip_addr_cmp(&addr, &_msg->rcv.src_ip)) - { - free_rdata_list(head); - return(1); - } - } - } - free_rdata_list(head); /*clean up*/ - LM_DBG("FAIL\n"); - - /* must not have found the record */ - return(-8); -} - - - -/* - * Add parameter to URI. - */ -int add_uri_param(str *uri, str *param, str *new_uri) -{ - struct sip_uri puri; - char *at; - - if (parse_uri(uri->s, uri->len, &puri) < 0) { - return 0; - } - - /* if current uri has no headers, pad param to the end of uri */ - if (puri.headers.len == 0) { - memcpy(uri->s + uri->len, param->s, param->len); - uri->len = uri->len + param->len; - new_uri->len = 0; - return 1; - } - - /* otherwise take the long path and create new_uri */ - at = new_uri->s; - switch (puri.type) { - case SIP_URI_T: - memcpy(at, "sip:", 4); - at = at + 4; - break; - case SIPS_URI_T: - memcpy(at, "sips:", 5); - at = at + 5; - break; - case TEL_URI_T: - memcpy(at, "tel:", 4); - at = at + 4; - break; - case TELS_URI_T: - memcpy(at, "tels:", 5); - at = at + 5; - break; - default: - LM_ERR("Unknown URI scheme <%d>\n", puri.type); - return 0; - } - if (puri.user.len) { - memcpy(at, puri.user.s, puri.user.len); - at = at + puri.user.len; - if (puri.passwd.len) { - *at = ':'; - at = at + 1; - memcpy(at, puri.passwd.s, puri.passwd.len); - at = at + puri.passwd.len; - }; - *at = '@'; - at = at + 1; - } - memcpy(at, puri.host.s, puri.host.len); - at = at + puri.host.len; - if (puri.port.len) { - *at = ':'; - at = at + 1; - memcpy(at, puri.port.s, puri.port.len); - at = at + puri.port.len; - } - if (puri.params.len) { - *at = ';'; - at = at + 1; - memcpy(at, puri.params.s, puri.params.len); - at = at + puri.params.len; - } - memcpy(at, param->s, param->len); - at = at + param->len; - *at = '?'; - at = at + 1; - memcpy(at, puri.headers.s, puri.headers.len); - at = at + puri.headers.len; - new_uri->len = at - new_uri->s; - return 1; -} - -/* - * Tests if one result record is "greater" that the other. Non-NAPTR records - * greater that NAPTR record. An invalid NAPTR record is greater than a - * valid one. Valid NAPTR records are compared based on their - * (order,preference). - */ -static inline int naptr_greater(struct rdata* a, struct rdata* b) -{ - struct naptr_rdata *na, *nb; - - if (a->type != T_NAPTR) return 1; - if (b->type != T_NAPTR) return 0; - - na = (struct naptr_rdata*)a->rdata; - if (na == 0) return 1; - - nb = (struct naptr_rdata*)b->rdata; - if (nb == 0) return 0; - - return (((na->order) << 16) + na->pref) > - (((nb->order) << 16) + nb->pref); -} - - -/* - * Bubble sorts result record list according to naptr (order,preference). - */ -static inline void naptr_sort(struct rdata** head) -{ - struct rdata *p, *q, *r, *s, *temp, *start; - - /* r precedes p and s points to the node up to which comparisons - are to be made */ - - s = NULL; - start = *head; - while ( s != start -> next ) { - r = p = start ; - q = p -> next ; - while ( p != s ) { - if ( naptr_greater(p, q) ) { - if ( p == start ) { - temp = q -> next ; - q -> next = p ; - p -> next = temp ; - start = q ; - r = q ; - } else { - temp = q -> next ; - q -> next = p ; - p -> next = temp ; - r -> next = q ; - r = q ; - } - } else { - r = p ; - p = p -> next ; - } - q = p -> next ; - if ( q == s ) s = p ; - } - } - *head = start; -} - - -/* - * Makes enum query on name. On success, rewrites user part and - * replaces Request-URI. - */ -int do_query(struct sip_msg* _msg, char *user, char *name, str *service) { - - char uri[MAX_URI_SIZE]; - char new_uri[MAX_URI_SIZE]; - unsigned int priority, curr_prio, first; - qvalue_t q; - struct rdata* head; - struct rdata* l; - struct naptr_rdata* naptr; - str pattern, replacement, result, new_result; - - head = get_record(name, T_NAPTR); - - if (head == 0) { - LM_DBG("No NAPTR record found for %s.\n", name); - return -1; - } - - naptr_sort(&head); - - q = MAX_Q - 10; - curr_prio = 0; - first = 1; - - for (l = head; l; l = l->next) { - - if (l->type != T_NAPTR) continue; /*should never happen*/ - naptr = (struct naptr_rdata*)l->rdata; - if (naptr == 0) { - LM_ERR("Null rdata in DNS response\n"); - continue; - } - - LM_DBG("ENUM query on %s: order %u, pref %u, flen %u, flags '%.*s', " - "slen %u, services '%.*s', rlen %u, regexp '%.*s'\n", - name, naptr->order, naptr->pref, - naptr->flags_len, (int)(naptr->flags_len), ZSW(naptr->flags), - naptr->services_len, - (int)(naptr->services_len), ZSW(naptr->services), naptr->regexp_len, - (int)(naptr->regexp_len), ZSW(naptr->regexp)); - - if (sip_match(naptr, service) == 0) continue; - - if (parse_naptr_regexp(&(naptr->regexp[0]), naptr->regexp_len, - &pattern, &replacement) < 0) { - LM_ERR("Parsing of NAPTR regexp failed\n"); - continue; - } - result.s = &(uri[0]); - result.len = MAX_URI_SIZE; - /* Avoid making copies of pattern and replacement */ - pattern.s[pattern.len] = (char)0; - replacement.s[replacement.len] = (char)0; - if (reg_replace(pattern.s, replacement.s, user, &result) < 0) { - pattern.s[pattern.len] = '!'; - replacement.s[replacement.len] = '!'; - LM_ERR("Regexp replace failed\n"); - continue; - } - LM_DBG("Resulted in replacement: '%.*s'\n", result.len, ZSW(result.s)); - pattern.s[pattern.len] = '!'; - replacement.s[replacement.len] = '!'; - - if (param.len > 0) { - if (result.len + param.len > MAX_URI_SIZE - 1) { - LM_ERR("URI is too long\n"); - continue; - } - new_result.s = &(new_uri[0]); - new_result.len = MAX_URI_SIZE; - if (add_uri_param(&result, ¶m, &new_result) == 0) { - LM_ERR("Parsing of URI <%.*s> failed\n", - result.len, result.s); - continue; - } - if (new_result.len > 0) { - result = new_result; - } - } - - if (first) { - if (set_ruri(_msg, &result) == -1) { - goto done; - } - set_ruri_q(q); - first = 0; - curr_prio = ((naptr->order) << 16) + naptr->pref; - } else { - priority = ((naptr->order) << 16) + naptr->pref; - if (priority > curr_prio) { - q = q - 10; - curr_prio = priority; - } - if (append_branch(_msg, &result, 0, 0, q, 0, 0) == -1) { - goto done; - } - } - } - -done: - free_rdata_list(head); - return first ? -1 : 1; -} - - -/* - * Call enum_query_2 with module parameter suffix and default service. - */ -int enum_query_0(struct sip_msg* _msg, char* _str1, char* _str2) -{ - return enum_query_2(_msg, (char *)(&suffix), (char *)(&service)); -} - - -/* - * Call enum_query_2 with given suffix and default service. - */ -int enum_query_1(struct sip_msg* _msg, char* _suffix, char* _str2) -{ - return enum_query_2(_msg, _suffix, (char *)(&service)); -} - - -/* - * See documentation in README file. - */ -int enum_query_2(struct sip_msg* _msg, char* _suffix, char* _service) -{ - char *user_s; - int user_len, i, j; - char name[MAX_DOMAIN_SIZE]; - char string[17]; - - str *suffix, *service; - - suffix = (str*)_suffix; - service = (str*)_service; - - if (parse_sip_msg_uri(_msg) < 0) { - LM_ERR("Parsing of R-URI failed\n"); - return -1; - } - - if (is_e164(&(_msg->parsed_uri.user)) == -1) { - LM_ERR("R-URI user is not an E164 number\n"); - return -1; - } - - user_s = _msg->parsed_uri.user.s; - user_len = _msg->parsed_uri.user.len; - - memcpy(&(string[0]), user_s, user_len); - string[user_len] = (char)0; - - j = 0; - for (i = user_len - 1; i > 0; i--) { - name[j] = user_s[i]; - name[j + 1] = '.'; - j = j + 2; - } - - memcpy(name + j, suffix->s, suffix->len + 1); - - return do_query(_msg, string, name, service); -} - - -/* - * Call isn_query_2 with module parameter suffix and default service. - */ -int isn_query_0(struct sip_msg* _msg, char* _str1, char* _str2) -{ - return isn_query_2(_msg, (char *)(&isnsuffix), (char *)(&service)); -} - - -/* - * Call isn_query_2 with given suffix and default service. - */ -int isn_query_1(struct sip_msg* _msg, char* _suffix, char* _str2) -{ - return isn_query_2(_msg, _suffix, (char *)(&service)); -} - - -/* - * See documentation in README file. - */ -int isn_query_2(struct sip_msg* _msg, char* _suffix, char* _service) -{ - char *user_s = NULL; - int user_len, i, j; - char name[MAX_DOMAIN_SIZE] = {0}; - char string[17] = {0}; - char szItad[17] = {0}; - size_t nItlen = 0; - - str *suffix, *service; - - suffix = (str*)_suffix; - service = (str*)_service; - - if (parse_sip_msg_uri(_msg) < 0) { - LM_ERR("Parsing of R-URI failed\n"); - return -1; - } - - user_s = _msg->parsed_uri.user.s; - user_len = _msg->parsed_uri.user.len; - - memcpy(&(string[0]), user_s, user_len); - string[user_len] = (char)0; - - /* Do primitive test for correct ISN format, */ - /* and set szItad to the ISN ITAD (RFC 3872/2871). */ - /* Correct ISN format guessed from freenum.org and IANA */ - /* doc http://www.iana.org/assignments/trip-parameters/ */ - { - char *pAster = strchr(string, '*'); - if (pAster && (nItlen = strspn(pAster + sizeof(char), "0123456789"))) - strncpy(szItad, pAster + sizeof(char), nItlen); - else { - LM_ERR("R-URI user does not contain a valid ISN\n"); - return -1; - } - } - - /* Ammend the original ENUM E.164 string logic to process */ - /* ISN numbers instead, which include a nonreversed ITAD. */ - i = user_len - nItlen - sizeof(char); /* Ex: *1212 */ - j = 0; - while (i--) { - name[j] = user_s[i]; - name[j + 1] = '.'; - j = j + 2; - } - - strcat(name + j, szItad); /* Copy the unreversed ITAD, */ - name[j + nItlen] = '.'; /* and append a trailing dot. */ - memcpy(name + j + nItlen + sizeof(char), suffix->s, suffix->len + 1); - - return do_query(_msg, string, name, service); -} - - -/*********** INFRASTRUCTURE ENUM ***************/ - -/* - * Call enum_query_2 with default suffix and service. - */ -int i_enum_query_0(struct sip_msg* _msg, char* _suffix, char* _service) -{ - return i_enum_query_2(_msg, (char *)(&i_suffix), (char *)(&service)); -} - -/* - * Call enum_query_2 with given suffix and default service. - */ -int i_enum_query_1(struct sip_msg* _msg, char* _suffix, char* _service) -{ - return i_enum_query_2(_msg, _suffix, (char *)(&service)); -} - - -int i_enum_query_2(struct sip_msg* _msg, char* _suffix, char* _service) -{ - char *user_s; - int user_len, i, j; - char name[MAX_DOMAIN_SIZE]; - char apex[MAX_COMPONENT_SIZE + 1]; - char separator[MAX_COMPONENT_SIZE + 1]; - int sdl = 0; /* subdomain location: infrastructure enum offset */ - int cc_len; - struct rdata* head; - - char string[17]; - - str *suffix, *service; - - suffix = (str*)_suffix; - service = (str*)_service; - - if (parse_sip_msg_uri(_msg) < 0) { - LM_ERR("Parsing of R-URI failed\n"); - return -1; - } - - if (is_e164(&(_msg->parsed_uri.user)) == -1) { - LM_ERR("R-URI user is not an E164 number\n"); - return -1; - } - - user_s = _msg->parsed_uri.user.s; - user_len = _msg->parsed_uri.user.len; - - /* make sure we don't run out of space in strings */ - if (( 2*user_len + MAX_COMPONENT_SIZE + MAX_COMPONENT_SIZE + 4) > MAX_DOMAIN_SIZE) { - LM_ERR("Strings too long\n"); - return -1; - } - if ( i_branchlabel.len > MAX_COMPONENT_SIZE ) { - LM_ERR("i_branchlabel too long\n"); - return -1; - } - if ( suffix->len > MAX_COMPONENT_SIZE ) { - LM_ERR("Suffix too long\n"); - return -1; - } - - - memcpy(&(string[0]), user_s, user_len); - string[user_len] = (char)0; - - /* Set up parameters as for user-enum */ - memcpy(apex, suffix->s , suffix->len); - apex[suffix->len] = (char)0; - sdl = 0; /* where to insert i-enum separator */ - separator[0] = 0; /* don't insert anything */ - - cc_len = cclen(string + 1); - - if (!strncasecmp(i_bl_alg.s,"ebl",i_bl_alg.len)) { - sdl = cc_len; /* default */ - - j = 0; - memcpy(name, i_branchlabel.s, i_branchlabel.len); - j += i_branchlabel.len; - name[j++] = '.'; - - for (i = cc_len ; i > 0; i--) { - name[j++] = user_s[i]; - name[j++] = '.'; - } - memcpy(name + j, suffix->s, suffix->len + 1); - - LM_DBG("Looking for EBL record for %s.\n", name); - head = get_record(name, T_EBL); - if (head == 0) { - LM_DBG("No EBL found for %s. Defaulting to user ENUM.\n",name); - } else { - struct ebl_rdata* ebl; - ebl = (struct ebl_rdata *) head->rdata; - - LM_DBG("EBL record for %s is %d / %.*s / %.*s.\n", - name, ebl->position, (int)ebl->separator_len, - ebl->separator,(int)ebl->apex_len, ebl->apex); - - if ((ebl->apex_len > MAX_COMPONENT_SIZE) || (ebl->separator_len > MAX_COMPONENT_SIZE)) { - LM_ERR("EBL strings too long\n"); - return -1; - } - - if (ebl->position > 15) { - LM_ERR("EBL position too large (%d)\n", - ebl->position); - return -1; - } - - sdl = ebl->position; - - memcpy(separator, ebl->separator, ebl->separator_len); - separator[ebl->separator_len] = 0; - - memcpy(apex, ebl->apex, ebl->apex_len); - apex[ebl->apex_len] = 0; - free_rdata_list(head); - } - } else if (!strncasecmp(i_bl_alg.s,"txt",i_bl_alg.len)) { - sdl = cc_len; /* default */ - memcpy(separator, i_branchlabel.s, i_branchlabel.len); - separator[i_branchlabel.len] = 0; - /* no change to apex */ - - j = 0; - memcpy(name, i_branchlabel.s, i_branchlabel.len); - j += i_branchlabel.len; - name[j++] = '.'; - - for (i = cc_len ; i > 0; i--) { - name[j++] = user_s[i]; - name[j++] = '.'; - } - memcpy(name + j, suffix->s, suffix->len + 1); - - head = get_record(name, T_TXT); - if (head == 0) { - LM_DBG("TXT found for %s. Defaulting to %d\n", - name, cc_len); - } else { - sdl = atoi(((struct txt_rdata*)head->rdata)->txt); - LM_DBG("TXT record for %s is %d.\n", name, sdl); - - if ((sdl < 0) || (sdl > 10)) { - LM_ERR("Sdl %d out of bounds. Set back to cc_len.\n", sdl); - sdl = cc_len; - } - free_rdata_list(head); - } - } else { /* defaults to CC */ - sdl = cc_len; - memcpy(separator, i_branchlabel.s, i_branchlabel.len); - separator[i_branchlabel.len] = 0; - /* no change to apex */ - } - - j = 0; - sdl++; /* to avoid comparing i to (sdl+1) */ - for (i = user_len - 1; i > 0; i--) { - name[j] = user_s[i]; - name[j + 1] = '.'; - j = j + 2; - if (separator[0] && (i == sdl)) { /* insert the I-ENUM separator here? */ - strcpy(name + j, separator); /* we've checked string sizes. */ - j += strlen(separator); - name[j++] = '.'; - } - } - - memcpy(name + j, apex, strlen(apex)+1); - - return do_query(_msg, string, name, service); -} - - - -/******************* FQUERY *******************/ - - -/* - * Call enum_pv_query_3 with pv arg, module parameter suffix, - * and default service. - */ -int enum_pv_query_1(struct sip_msg* _msg, char* _sp) -{ - return enum_pv_query_3(_msg, _sp, (char *)(&suffix), (char *)(&service)); -} - -/* - * Call enum_pv_query_3 with pv and suffix args and default service. - */ -int enum_pv_query_2(struct sip_msg* _msg, char* _sp, char* _suffix) -{ - return enum_pv_query_3(_msg, _sp, _suffix, (char *)(&service)); -} - -/* - * See documentation in README file. - */ - -int enum_pv_query_3(struct sip_msg* _msg, char* _sp, char* _suffix, - char* _service) -{ - char *user_s; - int user_len, i, j, first; - char name[MAX_DOMAIN_SIZE]; - char uri[MAX_URI_SIZE]; - char new_uri[MAX_URI_SIZE]; - unsigned int priority, curr_prio; - qvalue_t q; - char tostring[17]; - struct rdata* head; - struct rdata* l; - struct naptr_rdata* naptr; - str pattern, replacement, result, new_result; - str *suffix, *service; - char string[17]; - pv_spec_t *sp; - pv_value_t pv_val; - - sp = (pv_spec_t *)_sp; - suffix = (str*)_suffix; - service = (str*)_service; - - /* - * Get R-URI user to tostring - */ - if (parse_sip_msg_uri(_msg) < 0) { - LM_ERR("R-URI parsing failed\n"); - return -1; - } - - if (is_e164(&(_msg->parsed_uri.user)) == -1) { - LM_ERR("R-URI user is not an E164 number\n"); - return -1; - } - - user_s = _msg->parsed_uri.user.s; - user_len = _msg->parsed_uri.user.len; - - memcpy(&(tostring[0]), user_s, user_len); - tostring[user_len] = (char)0; - - /* - * Get E.164 number from pseudo variable - */ - if (sp && (pv_get_spec_value(_msg, sp, &pv_val) == 0)) { - if (pv_val.flags & PV_VAL_STR) { - if (pv_val.rs.len == 0 || pv_val.rs.s == NULL) { - LM_DBG("Missing E.164 number\n"); - return -1; - } - } else { - LM_DBG("Pseudo variable value is not string\n"); - return -1; - } - } else { - LM_DBG("Cannot get pseudo variable value\n"); - return -1; - } - if (is_e164(&(pv_val.rs)) == -1) { - LM_ERR("pseudo variable does not contain an E164 number\n"); - return -1; - } - - user_s = pv_val.rs.s; - user_len = pv_val.rs.len; - - memcpy(&(string[0]), user_s, user_len); - string[user_len] = (char)0; - - j = 0; - for (i = user_len - 1; i > 0; i--) { - name[j] = user_s[i]; - name[j + 1] = '.'; - j = j + 2; - } - - memcpy(name + j, suffix->s, suffix->len + 1); - - head = get_record(name, T_NAPTR); - - if (head == 0) { - LM_DBG("No NAPTR record found for %s.\n", name); - return -1; - } - - naptr_sort(&head); - - q = MAX_Q - 10; - curr_prio = 0; - first = 1; - - for (l = head; l; l = l->next) { - - if (l->type != T_NAPTR) continue; /*should never happen*/ - naptr = (struct naptr_rdata*)l->rdata; - if (naptr == 0) { - LM_ERR("Null rdata in DNS response\n"); - continue; - } - - LM_DBG("ENUM query on %s: order %u, pref %u, flen %u, flags " - "'%.*s', slen %u, services '%.*s', rlen %u, " - "regexp '%.*s'\n", - name, naptr->order, naptr->pref, - naptr->flags_len, (int)(naptr->flags_len), ZSW(naptr->flags), - naptr->services_len, - (int)(naptr->services_len), ZSW(naptr->services), naptr->regexp_len, - (int)(naptr->regexp_len), ZSW(naptr->regexp)); - - if (sip_match(naptr, service) == 0) continue; - - if (parse_naptr_regexp(&(naptr->regexp[0]), naptr->regexp_len, - &pattern, &replacement) < 0) { - LM_ERR("Parsing of NAPTR regexp failed\n"); - continue; - } - result.s = &(uri[0]); - result.len = MAX_URI_SIZE; - /* Avoid making copies of pattern and replacement */ - pattern.s[pattern.len] = (char)0; - replacement.s[replacement.len] = (char)0; - if (reg_replace(pattern.s, replacement.s, &(tostring[0]), - &result) < 0) { - pattern.s[pattern.len] = '!'; - replacement.s[replacement.len] = '!'; - LM_ERR("Regexp replace failed\n"); - continue; - } - LM_DBG("Resulted in replacement: '%.*s'\n", - result.len, ZSW(result.s)); - pattern.s[pattern.len] = '!'; - replacement.s[replacement.len] = '!'; - - if (param.len > 0) { - if (result.len + param.len > MAX_URI_SIZE - 1) { - LM_ERR("URI is too long\n"); - continue; - } - new_result.s = &(new_uri[0]); - new_result.len = MAX_URI_SIZE; - if (add_uri_param(&result, ¶m, &new_result) == 0) { - LM_ERR("Parsing of URI <%.*s> failed\n", - result.len, result.s); - continue; - } - if (new_result.len > 0) { - result = new_result; - } - } - - if (first) { - if (set_ruri(_msg, &result) == -1) { - goto done; - } - set_ruri_q(q); - first = 0; - curr_prio = ((naptr->order) << 16) + naptr->pref; - } else { - priority = ((naptr->order) << 16) + naptr->pref; - if (priority > curr_prio) { - q = q - 10; - curr_prio = priority; - } - if (append_branch(_msg, &result, 0, 0, q, 0, 0) == -1) { - goto done; - } - } - } - -done: - free_rdata_list(head); - return first ? -1 : 1; -} - diff -r 8ec65b8f6e2c -r 3374f578f080 opensips/modules/enum/enum.h --- a/opensips/modules/enum/enum.h Wed Feb 10 21:25:01 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,78 +0,0 @@ -/* - * $Id: enum.h 5901 2009-07-21 07:45:05Z bogdan_iancu $ - * - * Header file for Enum and E164 related functions - * - * Copyright (C) 2002-2008 Juha Heinanen - * - * This file is part of opensips, a free SIP server. - * - * opensips is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * opensips is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef ENUM_H -#define ENUM_H - - -#include "../../parser/msg_parser.h" - - -#define MAX_DOMAIN_SIZE 256 -#define MAX_COMPONENT_SIZE 32 /* separator, apex, ... This simplifies checks */ - - -/* - * Check if from user is an e164 number and has a naptr record - */ -int is_from_user_enum_0(struct sip_msg* _msg, char* _str1, char* _str2); -int is_from_user_enum_1(struct sip_msg* _msg, char* _suffix, char* _str2); -int is_from_user_enum_2(struct sip_msg* _msg, char* _suffix, char* _service); - -/* - * do source number destination routing. - * that is, make the ruri based on the from number - * this is like source ip policy routing - */ -int enum_pv_query_1(struct sip_msg* _msg, char* _sp); -int enum_pv_query_2(struct sip_msg* _msg, char* _sp, char* _suffix); -int enum_pv_query_3(struct sip_msg* _msg, char* _sp, char* _suffix, - char* _service); - -/* - * Make enum query and if query succeeds, replace current uri with the - * result of the query - */ -int enum_query_0(struct sip_msg* _msg, char* _str1, char* _str2); -int enum_query_1(struct sip_msg* _msg, char* _suffix, char* _str2); -int enum_query_2(struct sip_msg* _msg, char* _suffix, char* _service); - -/* - * Infrastructure ENUM versions. - */ -int i_enum_query_0(struct sip_msg* _msg, char* _str1, char* _str2); -int i_enum_query_1(struct sip_msg* _msg, char* _suffix, char* _str2); -int i_enum_query_2(struct sip_msg* _msg, char* _suffix, char* _service); - -/* - * Make ISN query and if query succeeds, replace current uri with the - * result of the query - */ -int isn_query_0(struct sip_msg* _msg, char* _str1, char* _str2); -int isn_query_1(struct sip_msg* _msg, char* _suffix, char* _str2); -int isn_query_2(struct sip_msg* _msg, char* _suffix, char* _service); - - -#endif /* ENUM_H */ diff -r 8ec65b8f6e2c -r 3374f578f080 opensips/modules/enum/enum_mod.c --- a/opensips/modules/enum/enum_mod.c Wed Feb 10 21:25:01 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,170 +0,0 @@ -/* - * $Id: enum_mod.c 5976 2009-08-18 13:35:23Z bogdan_iancu $ - * - * Enum module - * - * Copyright (C) 2002-2008 Juha Heinanen - * - * This file is part of opensips, a free SIP server. - * - * opensips is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * opensips is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * History: - * ------- - * 2003-03-11: New module interface (janakj) - * 2003-03-16: flags export parameter added (janakj) - * 2003-12-15: added suffix parameter to enum_query (jh) - */ - - -#include "enum_mod.h" -#include -#include -#include "../../sr_module.h" -#include "../../error.h" -#include "../../mod_fix.h" -#include "enum.h" - - - -/* - * Module initialization function prototype - */ -static int mod_init(void); - - -/* - * Module parameter variables - */ -char* domain_suffix = "e164.arpa."; -char* tel_uri_params = ""; - -char* branchlabel = "i"; -char* i_enum_suffix = "e164.arpa."; -char* bl_algorithm = "cc"; - -char* isn_suffix = "freenum.org."; - - -/* - * Internal module variables - */ -str suffix; -str param; -str service; - -str i_suffix; -str i_branchlabel; -str i_bl_alg; - -str isnsuffix; - - -/* - * Exported functions - */ -static cmd_export_t cmds[] = { - {"enum_query", (cmd_function)enum_query_0, 0, 0, 0, REQUEST_ROUTE}, - {"enum_query", (cmd_function)enum_query_1, 1, fixup_str_null, - fixup_free_str_null, REQUEST_ROUTE}, - {"enum_query", (cmd_function)enum_query_2, 2, fixup_str_str, - fixup_free_str_str, REQUEST_ROUTE}, - {"enum_pv_query", (cmd_function)enum_pv_query_1, 1, fixup_pvar_null, - fixup_free_pvar_null, REQUEST_ROUTE}, - {"enum_pv_query", (cmd_function)enum_pv_query_2, 2, fixup_pvar_str, - fixup_free_pvar_str, REQUEST_ROUTE}, - {"enum_pv_query", (cmd_function)enum_pv_query_3, 3, - fixup_pvar_str_str, fixup_free_pvar_str_str, REQUEST_ROUTE}, - {"is_from_user_enum", (cmd_function)is_from_user_enum_0, 0, 0, 0, - REQUEST_ROUTE}, - {"is_from_user_enum", (cmd_function)is_from_user_enum_1, 1, - fixup_str_null, fixup_free_str_null, REQUEST_ROUTE}, - {"is_from_user_enum", (cmd_function)is_from_user_enum_2, 2, - fixup_str_str, fixup_free_str_str, REQUEST_ROUTE}, - {"i_enum_query", (cmd_function)i_enum_query_0, 0, 0, 0, REQUEST_ROUTE}, - {"i_enum_query", (cmd_function)i_enum_query_1, 1, fixup_str_null, 0, - REQUEST_ROUTE}, - {"i_enum_query", (cmd_function)i_enum_query_2, 2, fixup_str_str, 0, - REQUEST_ROUTE}, - {"isn_query", (cmd_function)isn_query_0, 0, 0, 0, REQUEST_ROUTE}, - {"isn_query", (cmd_function)isn_query_1, 1, fixup_str_null, - fixup_free_str_null, REQUEST_ROUTE}, - {"isn_query", (cmd_function)isn_query_2, 2, fixup_str_str, - fixup_free_str_str, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0} -}; - - -/* - * Exported parameters - */ -static param_export_t params[] = { - {"domain_suffix", STR_PARAM, &domain_suffix}, - {"tel_uri_params", STR_PARAM, &tel_uri_params}, - {"branchlabel", STR_PARAM, &branchlabel}, - {"i_enum_suffix", STR_PARAM, &i_enum_suffix}, - {"bl_algorithm", STR_PARAM, &bl_algorithm}, - {"isn_suffix", STR_PARAM, &isn_suffix}, - {0, 0, 0} -}; - - -/* - * Module parameter variables - */ -struct module_exports exports = { - "enum", - MODULE_VERSION, - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* Exported functions */ - params, /* Exported parameters */ - 0, /* exported statistics */ - 0, /* exported MI functions */ - 0, /* exported pseudo-variables */ - 0, /* extra processes */ - mod_init, /* module initialization function */ - 0, /* response function*/ - 0, /* destroy function */ - 0 /* per-child init function */ -}; - - -static int mod_init(void) -{ - LM_DBG("Initializing\n"); - - suffix.s = domain_suffix; - suffix.len = strlen(suffix.s); - - param.s = tel_uri_params; - param.len = strlen(param.s); - - service.len = 0; - - i_suffix.s = i_enum_suffix; - i_suffix.len = strlen(i_enum_suffix); - - i_branchlabel.s = branchlabel; - i_branchlabel.len = strlen(branchlabel); - - i_bl_alg.s = bl_algorithm; - i_bl_alg.len = strlen(bl_algorithm); - - isnsuffix.s = isn_suffix; - isnsuffix.len = strlen(isnsuffix.s); - - return 0; -} - diff -r 8ec65b8f6e2c -r 3374f578f080 opensips/modules/enum/enum_mod.h --- a/opensips/modules/enum/enum_mod.h Wed Feb 10 21:25:01 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -/* - * $Id: enum_mod.h 5901 2009-07-21 07:45:05Z bogdan_iancu $ - * - * Enum module headers - * - * Copyright (C) 2002-2003 Juha Heinanen - * - * This file is part of opensips, a free SIP server. - * - * opensips is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * opensips is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef ENUM_MOD_H -#define ENUM_MOD_H - - -#include "../../str.h" - - -/* - * Internal module variables - */ -extern str suffix; /* str version of domain_suffix */ -extern str param; /* str version of tel_uri_params */ -extern str service; /* default (empty) service */ - -extern str i_suffix; /* suffix for infrastructure ENUM */ -extern str i_branchlabel; /* the label branching off the infrastructure tree */ -extern str i_bl_alg; /* how to know where to branch off */ - -extern str isnsuffix; /* str version of isn_suffix */ - - -#endif /* ENUM_MOD_H */