@@ -124,6 +124,7 @@

 	int startline=1;

 	static int ign_lines=0;

 	static int ign_columns=0;

+	char* yy_number_str=0; /* str correspondent for the current NUMBER token */

 	static char* addchar(struct str_buf *, char);

 	static char* addstr(struct str_buf *, char*, int);

@@ -445,6 +446,7 @@ LETTER		[a-zA-Z]

 DIGIT		[0-9]

 ALPHANUM	{LETTER}|{DIGIT}|[_]

 ID			{LETTER}{ALPHANUM}*

+NUM_ID		{ALPHANUM}+

 HEX			[0-9a-fA-F]

 HEXNUMBER	0x{HEX}+

 OCTNUMBER	0[0-7]+

@@ -846,10 +848,14 @@ EAT_ABLE	[\ \t\b\r]

 <SELECT>{DOT}           { count(); return DOT; }

 <SELECT>{LBRACK}        { count(); return LBRACK; }

 <SELECT>{RBRACK}        { count(); return RBRACK; }

-<SELECT>{DECNUMBER}	{ count(); yylval.intval=atoi(yytext);return NUMBER; }

-<SELECT>{HEXNUMBER}	{ count(); yylval.intval=(int)strtol(yytext, 0, 16); return NUMBER; }

-<SELECT>{OCTNUMBER}	{ count(); yylval.intval=(int)strtol(yytext, 0, 8); return NUMBER; }

-<SELECT>{BINNUMBER}     { count(); yylval.intval=(int)strtol(yytext, 0, 2); return NUMBER; }

+<SELECT>{DECNUMBER}	{ count(); yylval.intval=atoi(yytext);

+						yy_number_str=yytext; return NUMBER; }

+<SELECT>{HEXNUMBER}	{ count(); yylval.intval=(int)strtol(yytext, 0, 16);

+						yy_number_str=yytext; return NUMBER; }

+<SELECT>{OCTNUMBER}	{ count(); yylval.intval=(int)strtol(yytext, 0, 8);

+						yy_number_str=yytext; return NUMBER; }

+<SELECT>{BINNUMBER}	{ count(); yylval.intval=(int)strtol(yytext, 0, 2);

+						yy_number_str=yytext; return NUMBER; }

 <INITIAL>{ATTR_MARK}    { count(); state = ATTR_S; BEGIN(ATTR);

@@ -867,7 +873,8 @@ EAT_ABLE	[\ \t\b\r]

 <ATTR>{LBRACK}          { count(); return LBRACK; }

 <ATTR>{RBRACK}          { count(); return RBRACK; }

 <ATTR>{STAR}			{ count(); return STAR; }

-<ATTR>{DECNUMBER}		{ count(); yylval.intval=atoi(yytext);return NUMBER; }

+<ATTR>{DECNUMBER}		{ count(); yylval.intval=atoi(yytext);

+							yy_number_str=yytext; return NUMBER; }

 <ATTR>{ID}				{ count(); addstr(&s_buf, yytext, yyleng);

 							yylval.strval=s_buf.s;

 							memset(&s_buf, 0, sizeof(s_buf));

@@ -950,26 +957,32 @@ EAT_ABLE	[\ \t\b\r]

 							}

 <INITIAL>{IPV6ADDR}		{ count(); yylval.strval=yytext; return IPV6ADDR; }

-<INITIAL>{DECNUMBER}		{ count(); yylval.intval=atoi(yytext);return NUMBER; }

+<INITIAL>{DECNUMBER}	{ count(); yylval.intval=atoi(yytext);

+								yy_number_str=yytext; return NUMBER; }

 <INITIAL>{HEXNUMBER}	{ count(); yylval.intval=(int)strtol(yytext, 0, 16);

-							return NUMBER; }

+							yy_number_str=yytext; return NUMBER; }

 <INITIAL>{OCTNUMBER}	{ count(); yylval.intval=(int)strtol(yytext, 0, 8);

-							return NUMBER; }

-<INITIAL>{BINNUMBER}    { count(); yylval.intval=(int)strtol(yytext, 0, 2); return NUMBER; }

-<INITIAL>{YES}			{ count(); yylval.intval=1; return NUMBER; }

-<INITIAL>{NO}			{ count(); yylval.intval=0; return NUMBER; }

+							yy_number_str=yytext; return NUMBER; }

+<INITIAL>{BINNUMBER}    { count(); yylval.intval=(int)strtol(yytext, 0, 2);

+							yy_number_str=yytext; return NUMBER; }

+<INITIAL>{YES}			{ count(); yylval.intval=1;

+							yy_number_str=yytext; return NUMBER; }

+<INITIAL>{NO}			{ count(); yylval.intval=0;

+							yy_number_str=yytext; return NUMBER; }

 <INITIAL>{TCP}			{ count(); return TCP; }

 <INITIAL>{UDP}			{ count(); return UDP; }

 <INITIAL>{TLS}			{ count(); return TLS; }

 <INITIAL>{SCTP}			{ count(); return SCTP; }

-<INITIAL>{INET}			{ count(); yylval.intval=AF_INET; return NUMBER; }

+<INITIAL>{INET}			{ count(); yylval.intval=AF_INET;

+							yy_number_str=yytext; return NUMBER; }

 <INITIAL>{INET6}		{ count();

 						#ifdef USE_IPV6

 						  yylval.intval=AF_INET6;

 						#else

 						  yylval.intval=-1; /* no match*/

 						#endif

-						  return NUMBER; }

+						yy_number_str=yytext;

+						return NUMBER; }

 <INITIAL>{SSLv23}		{ count(); yylval.strval=yytext; return SSLv23; }

 <INITIAL>{SSLv2}		{ count(); yylval.strval=yytext; return SSLv2; }

 <INITIAL>{SSLv3}		{ count(); yylval.strval=yytext; return SSLv3; }

@@ -1068,6 +1081,10 @@ EAT_ABLE	[\ \t\b\r]

 									yylval.strval=s_buf.s;

 									memset(&s_buf, 0, sizeof(s_buf));

 									return ID; }

+<INITIAL>{NUM_ID}			{ count(); addstr(&s_buf, yytext, yyleng);

+									yylval.strval=s_buf.s;

+									memset(&s_buf, 0, sizeof(s_buf));

+									return NUM_ID; }

 <SELECT>.               { unput(yytext[0]); state = INITIAL_S; BEGIN(INITIAL); } /* Rescan the token in INITIAL state */

@@ -193,6 +193,9 @@

 extern int yylex();

+/* safer then using yytext which can be array or pointer */

+extern char* yy_number_str;

+

 static void yyerror(char* s, ...);

 static void yyerror_at(struct cfg_pos* pos, char* s, ...);

 static char* tmp;

@@ -526,6 +529,7 @@ static int case_check_default(struct case_stms* stms);

 /* values */

 %token <intval> NUMBER

 %token <strval> ID

+%token <strval> NUM_ID

 %token <strval> STRING

 %token <strval> IPV6ADDR

 %token <strval> PVAR

@@ -556,7 +560,7 @@ static int case_check_default(struct case_stms* stms);

 %type <case_stms> single_case case_stms

 %type <ipaddr> ipv4 ipv6 ipv6addr ip

 %type <ipnet> ipnet

-%type <strval> host

+%type <strval> host host_or_if host_if_id

 %type <strval> listen_id

 %type <name_l> listen_id_lst

 %type <name_l> listen_id2

@@ -618,18 +622,20 @@ statement:

 	;

 listen_id:

 	ip {

-		tmp=ip_addr2a($1);

-		if (tmp==0) {

-			LOG(L_CRIT, "ERROR: cfg. parser: bad ip "

-					"address.\n");

-			$$=0;

-		} else {

-			$$=pkg_malloc(strlen(tmp)+1);

-			if ($$==0) {

-				LOG(L_CRIT, "ERROR: cfg. parser: out of "

-						"memory.\n");

+		if ($1){

+			tmp=ip_addr2a($1);

+			if (tmp==0) {

+				LOG(L_CRIT, "ERROR: cfg. parser: bad ip "

+						"address.\n");

+				$$=0;

 			} else {

-				strncpy($$, tmp, strlen(tmp)+1);

+				$$=pkg_malloc(strlen(tmp)+1);

+				if ($$==0) {

+					LOG(L_CRIT, "ERROR: cfg. parser: out of "

+							"memory.\n");

+				} else {

+					strncpy($$, tmp, strlen(tmp)+1);

+				}

 			}

 		}

 	}

@@ -642,13 +648,15 @@ listen_id:

 				strncpy($$, $1, strlen($1)+1);

 		}

 	}

-	| host {

-		$$=pkg_malloc(strlen($1)+1);

-		if ($$==0) {

-				LOG(L_CRIT, "ERROR: cfg. parser: out of "

-						"memory.\n");

-		} else {

-				strncpy($$, $1, strlen($1)+1);

+	| host_or_if {

+		if ($1){

+			$$=pkg_malloc(strlen($1)+1);

+			if ($$==0) {

+					LOG(L_CRIT, "ERROR: cfg. parser: out of "

+							"memory.\n");

+			} else {

+					strncpy($$, $1, strlen($1)+1);

+			}

 		}

 	}

 	;

@@ -695,7 +703,7 @@ listen_phostport:

 id_lst:

 	listen_phostport		{  $$=$1 ; }

-	| listen_phostport id_lst	{ $$=$1; $$->next=$2; }

+	| listen_phostport id_lst	{ $$=$1;  if ($$) $$->next=$2; }

 	;

 intno: NUMBER

@@ -1366,7 +1374,8 @@ assign_stm:

 		}

 		free_socket_id_lst($3);

 	}

-	| LISTEN EQUAL  error { yyerror("ip address or hostname expected"); }

+	| LISTEN EQUAL  error { yyerror("ip address, interface name or"

+									" hostname expected"); }

 	| ALIAS EQUAL  id_lst {

 		for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next){

 			add_alias(	lst_tmp->addr_lst->name,

@@ -1382,8 +1391,10 @@ assign_stm:

 	| SR_AUTO_ALIASES EQUAL NUMBER { sr_auto_aliases=$3; }

 	| SR_AUTO_ALIASES EQUAL error  { yyerror("boolean value expected"); }

 	| ADVERTISED_ADDRESS EQUAL listen_id {

-		default_global_address.s=$3;

-		default_global_address.len=strlen($3);

+		if ($3){

+			default_global_address.s=$3;

+			default_global_address.len=strlen($3);

+		}

 	}

 	| ADVERTISED_ADDRESS EQUAL error {yyerror("ip address or hostname expected"); }

 	| ADVERTISED_PORT EQUAL NUMBER {

@@ -1908,33 +1919,83 @@ ipnet:

 host:

 	ID { $$=$1; }

 	| host DOT ID {

-		$$=(char*)pkg_malloc(strlen($1)+1+strlen($3)+1);

-		if ($$==0) {

-			LOG(L_CRIT, "ERROR: cfg. parser: memory allocation failure while parsing host\n");

-		} else {

-			memcpy($$, $1, strlen($1));

-			$$[strlen($1)]='.';

-			memcpy($$+strlen($1)+1, $3, strlen($3));

-			$$[strlen($1)+1+strlen($3)]=0;

+		if ($1){

+			$$=(char*)pkg_malloc(strlen($1)+1+strlen($3)+1);

+			if ($$==0) {

+				LOG(L_CRIT, "ERROR: cfg. parser: memory allocation"

+							" failure while parsing host\n");

+			} else {

+				memcpy($$, $1, strlen($1));

+				$$[strlen($1)]='.';

+				memcpy($$+strlen($1)+1, $3, strlen($3));

+				$$[strlen($1)+1+strlen($3)]=0;

+			}

+			pkg_free($1);

 		}

-		pkg_free($1);

-		pkg_free($3);

 	}

 	| host MINUS ID {

-		$$=(char*)pkg_malloc(strlen($1)+1+strlen($3)+1);

-		if ($$==0) {

-			LOG(L_CRIT, "ERROR: cfg. parser: memory allocation failure while parsing host\n");

-		} else {

-			memcpy($$, $1, strlen($1));

-			$$[strlen($1)]='-';

-			memcpy($$+strlen($1)+1, $3, strlen($3));

-			$$[strlen($1)+1+strlen($3)]=0;

+		if ($1){

+			$$=(char*)pkg_malloc(strlen($1)+1+strlen($3)+1);

+			if ($$==0) {

+				LOG(L_CRIT, "ERROR: cfg. parser: memory allocation"

+							" failure while parsing host\n");

+			} else {

+				memcpy($$, $1, strlen($1));

+				$$[strlen($1)]='-';

+				memcpy($$+strlen($1)+1, $3, strlen($3));

+				$$[strlen($1)+1+strlen($3)]=0;

+			}

+			pkg_free($1);

 		}

-		pkg_free($1);

-		pkg_free($3);

 	}

 	| host DOT error { $$=0; pkg_free($1); yyerror("invalid hostname"); }

+	| host MINUS error { $$=0; pkg_free($1); yyerror("invalid hostname"); }

+	;

+

+host_if_id: ID

+		| NUM_ID

+		| NUMBER { $$=yy_number_str /* text version */; }

+		;

+

+host_or_if:

+	host_if_id { $$=$1; }

+	| host_or_if DOT host_if_id {

+		if ($1){

+			$$=(char*)pkg_malloc(strlen($1)+1+strlen($3)+1);

+			if ($$==0) {

+				LOG(L_CRIT, "ERROR: cfg. parser: memory allocation"

+							" failure while parsing host/interface name\n");

+			} else {

+				memcpy($$, $1, strlen($1));

+				$$[strlen($1)]='.';

+				memcpy($$+strlen($1)+1, $3, strlen($3));

+				$$[strlen($1)+1+strlen($3)]=0;

+			}

+			pkg_free($1);

+		}

+	}

+	| host_or_if MINUS host_if_id {

+		if ($1){

+			$$=(char*)pkg_malloc(strlen($1)+1+strlen($3)+1);

+			if ($$==0) {

+				LOG(L_CRIT, "ERROR: cfg. parser: memory allocation"

+							" failure while parsing host/interface name\n");

+			} else {

+				memcpy($$, $1, strlen($1));

+				$$[strlen($1)]='-';

+				memcpy($$+strlen($1)+1, $3, strlen($3));

+				$$[strlen($1)+1+strlen($3)]=0;

+			}

+			pkg_free($1);

+		}

+	}

+	| host_or_if DOT error { $$=0; pkg_free($1);

+								yyerror("invalid host or interface name"); }

+	| host_or_if MINUS error { $$=0; pkg_free($1);

+								yyerror("invalid host or interface name"); }

 	;

+

+

 /* filtered cmd */

 fcmd:

 	cmd {

@@ -2834,7 +2895,7 @@ cmd:

 			LOG(L_CRIT, "ERROR: cfg. parser: out of memory.\n");

 		} else {

 			str_tmp->s=$3;

-			str_tmp->len=strlen($3);

+			str_tmp->len=$3?strlen($3):0;

 			$$=mk_action(SET_ADV_ADDR_T, 1, STR_ST, str_tmp);

 		}

 	}

@@ -3194,6 +3255,7 @@ static int warn_ct_rve(struct rval_expr *rve, char* name)

 static struct name_lst* mk_name_lst(char* host, int flags)

 {

 	struct name_lst* l;

+	if (host==0) return 0;

 	l=pkg_malloc(sizeof(struct name_lst));

 	if (l==0) {

 		LOG(L_CRIT,"ERROR: cfg. parser: out of memory.\n");

@@ -3209,6 +3271,7 @@ static struct name_lst* mk_name_lst(char* host, int flags)

 static struct socket_id* mk_listen_id(char* host, int proto, int port)

 {

 	struct socket_id* l;

+	if (host==0) return 0;

 	l=pkg_malloc(sizeof(struct socket_id));

 	if (l==0) {

 		LOG(L_CRIT,"ERROR: cfg. parser: out of memory.\n");

@@ -3243,6 +3306,7 @@ static struct socket_id* mk_listen_id2(struct name_lst* addr_l, int proto,

 										int port)

 {

 	struct socket_id* l;

+	if (addr_l==0) return 0;

 	l=pkg_malloc(sizeof(struct socket_id));

 	if (l==0) {

 		LOG(L_CRIT,"ERROR: cfg. parser: out of memory.\n");

@@ -690,7 +690,7 @@ static int assemble_msg(struct sip_msg* msg, struct tw_info *twi)

 	}

 	 /* parse from header */

-	if (msg->from->parsed==0 && parse_from_header(msg)==-1 ) {

+	if (msg->from==0 || (msg->from->parsed==0 && parse_from_header(msg)==-1)) {

 		LOG(L_ERR,"assemble_msg: while parsing <From:> header\n");

 		goto error;

 	}

@@ -309,13 +309,15 @@ int parse_headers(struct sip_msg* msg, hdr_flags_t flags, int next)

 	end=msg->buf+msg->len;

 	tmp=msg->unparsed;

-	if (next) {

+	if (unlikely(next)) {

 		orig_flag = msg->parsed_flag;

 		msg->parsed_flag &= ~flags;

 	}else

 		orig_flag=0;

+#ifdef EXTRA_DEBUG

 	DBG("parse_headers: flags=%llx\n", (unsigned long long)flags);

+#endif

 	while( tmp<end && (flags & msg->parsed_flag) != flags){

 		prefetch_loc_r(tmp+64, 1);

 		hf=pkg_malloc(sizeof(struct hdr_field));

@@ -549,12 +551,15 @@ int parse_headers(struct sip_msg* msg, hdr_flags_t flags, int next)

 	}

 skip:

 	msg->unparsed=tmp;

+	/* restore original flags */

+	msg->parsed_flag |= orig_flag;

 	return 0;

 error:

 	ser_error=E_BAD_REQ;

 	if (hf) pkg_free(hf);

-	if (next) msg->parsed_flag |= orig_flag;

+	/* restore original flags */

+	msg->parsed_flag |= orig_flag;

 	return -1;

 }

@@ -939,7 +939,7 @@ static int addr_info_to_si_lst(struct addr_info* ai_lst, unsigned short port,

 	struct addr_info* ail;

 	for (ail=ai_lst; ail; ail=ail->next){

-		if(new_sock2list(ail->name.s, 0, port_no, proto, ail->flags | flags,

+		if(new_sock2list(ail->name.s, 0, port, proto, ail->flags | flags,

 							list)==0)

 			return -1;

 	}

@@ -961,7 +961,7 @@ static int addr_info_to_si_lst_after(struct addr_info* ai_lst,

 	struct socket_info* new_si;

 	for (ail=ai_lst; ail; ail=ail->next){

-		if((new_si=new_sock2list_after(ail->name.s, 0, port_no, proto,

+		if((new_si=new_sock2list_after(ail->name.s, 0, port, proto,

 								ail->flags | flags, el))==0)

 			return -1;

 		el=new_si;

@@ -1148,7 +1148,9 @@ static int fix_socket_list(struct socket_info **list, int* type_flags)

 					)

 					add_alias(del_si->name.s, del_si->name.len,

 								l->port_no, l->proto);

-						

+				/* make sure next_si doesn't point to del_si */

+				if (del_si==next_si)

+					next_si=next_si->next;

 				/* remove del_si*/

 				sock_listrm(list, del_si);

 				free_sock_info(del_si);