@@ -305,6 +305,7 @@ XAVPVIAPARAMS	xavp_via_params

 XAVPVIAFIELDS	xavp_via_fields

 LISTEN		listen

 ADVERTISE	advertise|ADVERTISE

+VIRTUAL		virtual

 STRNAME		name|NAME

 ALIAS		alias

 SR_AUTO_ALIASES	auto_aliases

@@ -741,6 +742,7 @@ IMPORTFILE      "import_file"

 <INITIAL>{XAVPVIAFIELDS}	{ yylval.strval=yytext; return XAVPVIAFIELDS; }

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

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

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

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

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

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

@@ -328,6 +328,7 @@ extern char *default_routename;

 %token XAVPVIAFIELDS

 %token LISTEN

 %token ADVERTISE

+%token VIRTUAL

 %token STRNAME

 %token ALIAS

 %token SR_AUTO_ALIASES

@@ -1503,6 +1504,19 @@ assign_stm:

 		}

 		free_socket_id_lst($3);

 	}

+        | LISTEN EQUAL id_lst VIRTUAL {

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

+			lst_tmp->flags |= SI_IS_VIRTUAL;

+                        if (add_listen_iface(   lst_tmp->addr_lst->name,

+                                                                        lst_tmp->addr_lst->next,

+                                                                        lst_tmp->port, lst_tmp->proto,

+                                                                        lst_tmp->flags)!=0) {

+                                LM_CRIT("cfg. parser: failed to add listen address\n");

+                                break;

+                        }

+                }

+                free_socket_id_lst($3);

+        }

 	| LISTEN EQUAL id_lst STRNAME STRING {

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

 			if (add_listen_iface_name(lst_tmp->addr_lst->name,

@@ -1515,6 +1529,19 @@ assign_stm:

 		}

 		free_socket_id_lst($3);

 	}

+        | LISTEN EQUAL id_lst STRNAME STRING VIRTUAL {

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

+                        lst_tmp->flags |= SI_IS_VIRTUAL;

+                        if (add_listen_iface_name(lst_tmp->addr_lst->name,

+                                                                        lst_tmp->addr_lst->next,

+                                                                        lst_tmp->port, lst_tmp->proto, $5,

+                                                                        lst_tmp->flags)!=0) {

+                                LM_CRIT("cfg. parser: failed to add listen address\n");

+                                break;

+                        }

+                }

+                free_socket_id_lst($3);

+        }

 	| LISTEN EQUAL id_lst ADVERTISE listen_id COLON NUMBER {

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

 			if (add_listen_advertise_iface(	lst_tmp->addr_lst->name,

@@ -1528,6 +1555,20 @@ assign_stm:

 		}

 		free_socket_id_lst($3);

 	}

+        | LISTEN EQUAL id_lst ADVERTISE listen_id COLON NUMBER VIRTUAL {

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

+			lst_tmp->flags |= SI_IS_VIRTUAL;

+                        if (add_listen_advertise_iface( lst_tmp->addr_lst->name,

+                                                                        lst_tmp->addr_lst->next,

+                                                                        lst_tmp->port, lst_tmp->proto,

+                                                                        $5, $7,

+                                                                        lst_tmp->flags)!=0) {

+                                LM_CRIT("cfg. parser: failed to add listen address\n");

+                                break;

+                        }

+                }

+                free_socket_id_lst($3);

+        }

 	| LISTEN EQUAL id_lst ADVERTISE listen_id COLON NUMBER STRNAME STRING {

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

 			if (add_listen_advertise_iface_name(lst_tmp->addr_lst->name,

@@ -1541,6 +1582,20 @@ assign_stm:

 		}

 		free_socket_id_lst($3);

 	}

+        | LISTEN EQUAL id_lst ADVERTISE listen_id COLON NUMBER STRNAME STRING VIRTUAL {

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

+			lst_tmp->flags |= SI_IS_VIRTUAL;

+                        if (add_listen_advertise_iface_name(lst_tmp->addr_lst->name,

+                                                                        lst_tmp->addr_lst->next,

+                                                                        lst_tmp->port, lst_tmp->proto,

+                                                                        $5, $7, $9,

+                                                                        lst_tmp->flags)!=0) {

+                                LM_CRIT("cfg. parser: failed to add listen address\n");

+                                break;

+                        }

+                }

+                free_socket_id_lst($3);

+        }

 	| LISTEN EQUAL id_lst ADVERTISE listen_id {

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

 			if (add_listen_advertise_iface(	lst_tmp->addr_lst->name,

@@ -1554,6 +1609,20 @@ assign_stm:

 		}

 		free_socket_id_lst($3);

 	}

+        | LISTEN EQUAL id_lst ADVERTISE listen_id VIRTUAL {

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

+			lst_tmp->flags |= SI_IS_VIRTUAL;

+                        if (add_listen_advertise_iface( lst_tmp->addr_lst->name,

+                                                                        lst_tmp->addr_lst->next,

+                                                                        lst_tmp->port, lst_tmp->proto,

+                                                                        $5, 0,

+                                                                        lst_tmp->flags)!=0) {

+                                LM_CRIT("cfg. parser: failed to add listen address\n");

+                                break;

+                        }

+                }

+                free_socket_id_lst($3);

+        }

 	| LISTEN EQUAL id_lst ADVERTISE listen_id STRNAME STRING {

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

 			if (add_listen_advertise_iface_name(lst_tmp->addr_lst->name,

@@ -1567,6 +1636,20 @@ assign_stm:

 		}

 		free_socket_id_lst($3);

 	}

+        | LISTEN EQUAL id_lst ADVERTISE listen_id STRNAME STRING VIRTUAL {

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

+			lst_tmp->flags |= SI_IS_VIRTUAL;

+                        if (add_listen_advertise_iface_name(lst_tmp->addr_lst->name,

+                                                                        lst_tmp->addr_lst->next,

+                                                                        lst_tmp->port, lst_tmp->proto,

+                                                                        $5, 0, $7,

+                                                                        lst_tmp->flags)!=0) {

+                                LM_CRIT("cfg. parser: failed to add listen address\n");

+                                break;

+                        }

+                }

+                free_socket_id_lst($3);

+        }

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

 									" hostname expected"); }

 	| ALIAS EQUAL  id_lst {

@@ -955,10 +955,11 @@ static void core_sockets_list(rpc_t* rpc, void* c)

 				for (ai=si->addr_info_lst; ai; ai=ai->next)

 					rpc->struct_add(ha, "ss",

 						"address", ai->address_str.s);

-				rpc->struct_add(ha, "sss",

+				rpc->struct_add(ha, "ssss",

 						"port", si->port_no_str.s,

 						"mcast", si->flags & SI_IS_MCAST ? "yes" : "no",

-						"mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no");

+						"mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no",

+						"virtual", si->flags & SI_IS_VIRTUAL ? "yes" : "no");

 			} else {

 				printf("             %s: %s",

 						get_proto_name(proto),

@@ -969,10 +970,11 @@ static void core_sockets_list(rpc_t* rpc, void* c)

 				if (!(si->flags & SI_IS_IP))

 					rpc->struct_add(ha, "s",

 						"ipaddress", si->address_str.s);

-				rpc->struct_add(ha, "sss",

+				rpc->struct_add(ha, "ssss",

 						"port", si->port_no_str.s,

 						"mcast", si->flags & SI_IS_MCAST ? "yes" : "no",

-						"mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no");

+						"mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no",

+						"virtual", si->flags & SI_IS_VIRTUAL ? "yes" : "no");

 			}

 		}

 	} while((proto=next_proto(proto)));

@@ -84,6 +84,7 @@ typedef enum si_flags {

 	SI_IS_MCAST     = (1<<2),

 	SI_IS_ANY       = (1<<3),

 	SI_IS_MHOMED    = (1<<4),

+	SI_IS_VIRTUAL	= (1<<5),

 } si_flags_t;

 typedef struct addr_info {

@@ -562,6 +562,67 @@ struct socket_info** get_sock_info_list(unsigned short proto)

 	return 0;

 }

+/* Check list of active local IPs for grep_sock_info

+ * This function is only used for sockets with the SI_IS_VIRTUAL flag set. This

+ * is so floating (virtual) IPs that are not currently local, are not returned

+ * as matches by grep_sock_info.

+ *

+ * Params:

+ * - si - Socket info of socket that has been flagged with SI_IS_VIRTUAL, 

+ *   that we want to check if it's actually local right now.

+ *

+ * Returns 1 if socket is local, or 0 if not.

+ */

+static int check_local_addresses(struct socket_info* si)

+{

+	int match = 0;

+	struct ifaddrs *ifap, *ifa;

+

+	if (si == NULL) {

+		LM_ERR("Socket info is NULL. Returning no match.\n");

+		return 0;

+	}

+

+	if (!(si->flags & SI_IS_VIRTUAL)) {

+		LM_ERR("Have been passed a socket without the virtual flag set. This should "

+			"not happen. Returning a match to maintain standard behaviour.\n");

+		return 1;

+	}

+

+	if (getifaddrs(&ifap) != 0) {

+		LM_ERR("getifaddrs failed. Assuming no match.\n");

+		return 0;

+	}

+

+	for (ifa = ifap; ifa; ifa = ifa->ifa_next)

+	{

+		/* skip if no IP addr associated with the interface */

+		if (ifa->ifa_addr==0)

+			continue;

+#ifdef AF_PACKET

+		/* skip AF_PACKET addr family since it is of no use later on */

+		if (ifa->ifa_addr->sa_family == AF_PACKET)

+			continue;

+#endif

+		struct ip_addr local_addr;

+		sockaddr2ip_addr(&local_addr, (struct sockaddr*)ifa->ifa_addr);

+

+		LM_DBG("Checking local address: %s\n", ip_addr2a(&local_addr));

+		if (ip_addr_cmp(&si->address, &local_addr)) {

+			match = 1;

+			LM_DBG("Found matching local IP %s for virtual socket %s\n", ip_addr2a(&local_addr), si->name.s);

+			break;

+		}

+	}

+	freeifaddrs(ifap);

+	//Default to not local if no match is found

+	if (!match) {

+		LM_DBG("No matching local IP found for socket %s.\n", si->name.s);

+		return 0;

+	} else {

+		return 1;

+	}

+}

 /* helper function for grep_sock_info

  * params:

@@ -653,7 +714,16 @@ retry:

 			}

 			if (si_hname_cmp(&hname, &si->name, &si->address_str,

 								&si->address, si->flags)==0) {

-				goto found;

+				if (si->flags & SI_IS_VIRTUAL) {

+					LM_DBG("Checking virtual socket: [%.*s]\n", si->name.len, si->name.s);

+					if (check_local_addresses(si)) {

+						goto found;

+					} else {

+						LM_DBG("Skipping virtual socket that is not local.\n");

+					}

+				} else {

+					goto found;

+				}

 			}

 			if(si->useinfo.name.s!=NULL) {

 				LM_DBG("checking advertise if host==us:"

@@ -2071,10 +2141,11 @@ void print_all_socket_lists()

 				for (ai=si->addr_info_lst; ai; ai=ai->next) {

 					printf(", %s", ai->address_str.s);

 				}

-				printf("):%s%s%s\n",

+				printf("):%s%s%s%s\n",

 						si->port_no_str.s,

-						si->flags & SI_IS_MCAST ? " mcast" : "",

-						si->flags & SI_IS_MHOMED? " mhomed" : "");

+						si->flags & SI_IS_MCAST  ? " mcast" : "",

+						si->flags & SI_IS_MHOMED ? " mhomed" : "",

+						si->flags & SI_IS_VIRTUAL? " virtual" : "");

 			}else{

 				printf("             %s: %s",

 						get_valid_proto_name(proto),

@@ -2082,10 +2153,11 @@ void print_all_socket_lists()

 				if (!(si->flags & SI_IS_IP)) {

 					printf(" [%s]", si->address_str.s);

 				}

-				printf( ":%s%s%s",

+				printf( ":%s%s%s%s",

 						si->port_no_str.s,

-						si->flags & SI_IS_MCAST ? " mcast" : "",

-						si->flags & SI_IS_MHOMED? " mhomed" : "");

+						si->flags & SI_IS_MCAST  ? " mcast" : "",

+						si->flags & SI_IS_MHOMED ? " mhomed" : "",

+						si->flags & SI_IS_VIRTUAL? " virtual" : "");

 				if (si->sockname.s) {

 					printf(" name %s", si->sockname.s);

 				}

@@ -95,10 +95,11 @@ static void corex_rpc_list_sockets(rpc_t* rpc, void* ctx)

 				}

 			}

-			if(rpc->struct_add(th, "sssss",

+			if(rpc->struct_add(th, "ssssss",

 					"PORT", si->port_no_str.s,

 					"MCAST", si->flags & SI_IS_MCAST ? "yes" : "no",

-					"MHOMED", si->flags & SI_IS_MHOMED? "yes" : "no",

+					"MHOMED", si->flags & SI_IS_MHOMED ? "yes" : "no",

+					"VIRTUAL", si->flags & SI_IS_VIRTUAL ? "yes" : "no",

 					"SOCKNAME", si->sockname.s? si->sockname.s : "-",

 					"ADVERTISE", si->useinfo.name.s?si->useinfo.name.s:"-")<0)

 			{

@@ -140,9 +140,9 @@ static void ipsec_print_all_socket_lists()

 				}

 				if(si->port_no_str.s){

-					sprintf(buf + cnt, "):%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : "");

+					sprintf(buf + cnt, "):%s%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : "");

 				}else{

-					sprintf(buf + cnt, "):%u%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : "");

+					sprintf(buf + cnt, "):%u%s%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : "");

 				}

 				cnt = strlen(buf);

 			}else{

@@ -157,9 +157,9 @@ static void ipsec_print_all_socket_lists()

 				}

 				if(si->port_no_str.s){

-					sprintf(buf + cnt, ":%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : "");

+					sprintf(buf + cnt, ":%s%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : "");

 				}else{

-					sprintf(buf + cnt, ":%u%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : "");

+					sprintf(buf + cnt, ":%u%s%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : "");

 				}

 				cnt = strlen(buf);