Merge branch 'subdomain_alias' of github.com:purecloudlabs/opensips into purecloudlabs-subdomain_alias

Author: liviuchircu

cfg.lex

@@ -342,6 +342,7 @@ CR			\n
 
 ANY		"any"
 ANYCAST	("anycast"|"ANYCAST")
+ACCEPT_SUBDOMAIN ("accept_subdomain"|"ACCEPT_SUBDOMAIN")
 FRAG	("frag"|"FRAG")
 REUSE_PORT	("reuse_port"|"REUSE_PORT")
 
@@ -617,6 +618,7 @@ SPACE		[ ]
 <INITIAL>{CR}		{ count();/* return CR;*/ }
 <INITIAL>{ANY}		{ count(); return ANY; }
 <INITIAL>{ANYCAST}	{ count(); return ANYCAST; }
+<INITIAL>{ACCEPT_SUBDOMAIN}	{ count(); return ACCEPT_SUBDOMAIN; }
 <INITIAL>{REUSE_PORT}	{ count(); return REUSE_PORT; }
 <INITIAL>{FRAG}		{ count(); return FRAG; }
 <INITIAL>{SLASH}	{ count(); return SLASH; }

cfg.y

@@ -206,7 +206,7 @@ static struct multi_str *tmp_mod;
 #define get_cfg_file_name \
 	((finame) ? finame : cfg_file ? cfg_file : "default")
 
-
+#define si_subdomain_to_alias_flag(_flags) (int) _flags & SI_ACCEPT_SUBDOMAIN_ALIAS
 
 #define mk_action_(_res, _type, _no, _elems) \
 	do { \
@@ -468,6 +468,7 @@ extern int cfg_parse_only_routes;
 %token COLON
 %token ANY
 %token ANYCAST
+%token ACCEPT_SUBDOMAIN
 %token FRAG
 %token REUSE_PORT
 %token SCRIPTVARERR
@@ -493,6 +494,7 @@ extern int cfg_parse_only_routes;
 %type <sockid> socket_def
 %type <sockid> id_lst
 %type <sockid> alias_def
+%type <sockid> any_alias
 %type <sockid> listen_id_def
 %type <sockid> phostport phostportrange
 %type <intval> proto port any_proto
@@ -696,7 +698,7 @@ phostportrange: proto COLON MULT				{ IFOR();
 			}
 			;
 
-alias_def:	listen_id						{ IFOR();
+any_alias:	listen_id						{ IFOR();
 				$$=mk_listen_id($1, PROTO_NONE, 0); }
 		 |	ANY COLON listen_id				{ IFOR();
 		 		$$=mk_listen_id($3, PROTO_NONE, 0); }
@@ -709,6 +711,13 @@ alias_def:	listen_id						{ IFOR();
 		 | phostport
 		 ;
 
+alias_def: any_alias			      { $$=$1; }
+		 | any_alias ACCEPT_SUBDOMAIN {
+				$$=$1;
+				$$->flags |= SI_ACCEPT_SUBDOMAIN_ALIAS;
+				}
+		 ;
+
 id_lst:		alias_def		{ IFOR();  $$=$1 ; }
 		| alias_def id_lst	{ IFOR(); $$=$1; $$->next=$2; }
 		;
@@ -732,6 +741,9 @@ socket_def_param: ANYCAST { IFOR();
 				| REUSE_PORT { IFOR();
 					p_tmp.flags |= SI_REUSEPORT;
 					}
+				| ACCEPT_SUBDOMAIN { IFOR();
+					p_tmp.flags |= SI_ACCEPT_SUBDOMAIN_ALIAS;
+					}
 				| USE_WORKERS NUMBER { IFOR();
 					p_tmp.workers=$2;
 					}
@@ -1489,7 +1501,7 @@ assign_stm: LOGLEVEL EQUAL snumber { IFOR();
 		| ALIAS EQUAL  id_lst { IFOR();
 							for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next)
 								add_alias(lst_tmp->name, strlen(lst_tmp->name),
-											lst_tmp->port, lst_tmp->proto);
+											lst_tmp->port, lst_tmp->proto, si_subdomain_to_alias_flag(lst_tmp->flags));
 							  }
 		| ALIAS  EQUAL error  { yyerror("hostname expected (use quotes"
 							" if the hostname includes config keywords)"); }

db/schema/domain.xml

@@ -44,6 +44,13 @@
         <null/>
     </column>
 
+    <column id="accept_subdomain">
+        <name>accept_subdomain</name>
+        <type>unsigned int</type>
+        <size>11</size>
+        <default>0</default>
+        <description>Accept subdomain</description>
+    </column>
 
     <column>
         <name>last_modified</name>

ip_addr.h

@@ -89,7 +89,7 @@ union sockaddr_union{
 
 
 enum si_flags { SI_NONE=0, SI_IS_IP=1, SI_IS_LO=2, SI_IS_MCAST=4,
-	SI_IS_ANYCAST=8, SI_FRAG=16, SI_REUSEPORT=32, SI_INTERNAL=64 };
+	SI_IS_ANYCAST=8, SI_FRAG=16, SI_REUSEPORT=32, SI_INTERNAL=64, SI_ACCEPT_SUBDOMAIN_ALIAS=128 };
 
 struct receive_info {
 	struct ip_addr src_ip;
@@ -127,8 +127,6 @@ struct socket_id {
 	struct socket_id* next;
 };
 
-
-
 /* len of the sockaddr */
 #ifdef HAVE_SOCKADDR_SA_LEN
 #define sockaddru_len(su)	((su).s.sa_len)

modules/domain/README

@@ -14,6 +14,7 @@ domain Module
               1.3.3. domain_table (string)
               1.3.4. domain_col (string)
               1.3.5. attrs_col (string)
+              1.3.6. accept_subdomain_col (string)
 
         1.4. Exported Functions
 
@@ -57,9 +58,10 @@ domain Module
    1.3. Setting domain_table parameter
    1.4. Setting domain_col parameter
    1.5. Setting attrs_col parameter
-   1.6. is_from_local usage
-   1.7. is_uri_host_local usage
-   1.8. is_domain_local usage
+   1.6. Setting accept_subdomain_col parameter
+   1.7. is_from_local usage
+   1.8. is_uri_host_local usage
+   1.9. is_domain_local usage
 
 Chapter 1. Admin Guide
 
@@ -139,6 +141,15 @@ modparam("domain", "domain_col", "domain_name")
    Example 1.5. Setting attrs_col parameter
 modparam("domain", "attrs_col", "attributes")
 
+1.3.6. accept_subdomain_col (string)
+
+   Name of column containing accept_subdomain value in domain table.
+
+   Default value is “accept_subdomain”.
+
+   Example 1.6. Setting accept_subdomain_col parameter
+modparam("domain", "accept_subdomain_col", "accept_subdomain")
+
 1.4. Exported Functions
 
 1.4.1. is_from_local([attrs_var])
@@ -151,7 +162,7 @@ modparam("domain", "attrs_col", "attributes")
 
    This function can be used from REQUEST_ROUTE.
 
-   Example 1.6. is_from_local usage
+   Example 1.7. is_from_local usage
 ...
 if (is_from_local()) {
         ...
@@ -177,7 +188,7 @@ if (is_from_local($var(attrs))) {
    This function can be used from REQUEST_ROUTE, FAILURE_ROUTE,
    BRANCH_ROUTE.
 
-   Example 1.7. is_uri_host_local usage
+   Example 1.8. is_uri_host_local usage
 ...
 if (is_uri_host_local()) {
         ...
@@ -209,7 +220,7 @@ if (is_uri_host_local($var(attrs))) {
    This function can be used from REQUEST_ROUTE, FAILURE_ROUTE,
    BRANCH_ROUTE.
 
-   Example 1.8. is_domain_local usage
+   Example 1.9. is_domain_local usage
 ...
 if (is_domain_local($rd)) {
         ...