Change 'union sockaddr_union' to 'struct sockaddr_union_struct'

This is so that we can pass hostnames around attached to sockaddr's, so
that hostnames in TLS certificates can be validated.

The sockaddr_union definition changes from:

    union sockaddr_union {
        struct sockaddr     s;
        struct sockaddr_in  sin;
        struct sockaddr_in6 sin6;
    };

to:

    struct sockaddr_union_struct {
        union {
            struct sockaddr     s;
            struct sockaddr_in  sin;
            struct sockaddr_in6 sin6;
        } u;
        char hostname[MAX_DNS_NAME]; /* remote side hostname (used for TLS certificate hostname verification) */
    };

And all code that uses a sockaddr_union now has a sockaddr_union_struct,
and field accesses go through the "u" field.

Author: jes

blacklists.h

@@ -86,7 +86,7 @@ int check_against_blacklist(struct ip_addr *ip, str *text, unsigned short port,
 			unsigned short proto);
 
 static inline int check_blacklists( unsigned short proto,
-	union sockaddr_union *to, char *body_s, int body_len)
+	struct sockaddr_union_struct *to, char *body_s, int body_len)
 {
 	str body;
 	struct ip_addr ip;

core_cmds.c

@@ -682,13 +682,13 @@ static int w_forward(struct sip_msg *msg, struct proxy_l *dest)
 static int w_send(struct sip_msg *msg, struct proxy_l *dest, str *headers)
 {
 	int ret;
-	union sockaddr_union* to;
+	struct sockaddr_union_struct* to;
 	struct proxy_l* p;
 	int len;
 	char* tmp;
 
-	to=(union sockaddr_union*)
-			pkg_malloc(sizeof(union sockaddr_union));
+	to=(struct sockaddr_union_struct*)
+			pkg_malloc(sizeof(struct sockaddr_union_struct));
 	if (to==0){
 		LM_ERR("memory allocation failure\n");
 		return E_OUT_OF_MEM;

evi/evi_transport.h

@@ -45,7 +45,7 @@
 
 /* sockets */
 typedef union {
-	union sockaddr_union udp_addr;
+	struct sockaddr_union_struct udp_addr;
 	struct sockaddr_un unix_addr;
 } sockaddr_reply;
 

forward.c

@@ -90,11 +90,11 @@
  * be very likely noticeably slower, but it can deal better with
  * multihomed hosts
  */
-struct socket_info* get_out_socket(union sockaddr_union* to, int proto)
+struct socket_info* get_out_socket(struct sockaddr_union_struct* to, int proto)
 {
 	int temp_sock;
 	socklen_t len;
-	union sockaddr_union from;
+	struct sockaddr_union_struct from;
 	struct socket_info* si;
 	struct ip_addr ip, ip_dst;
 
@@ -103,17 +103,17 @@ struct socket_info* get_out_socket(union sockaddr_union* to, int proto)
 		return 0;
 	}
 
-	temp_sock=socket(to->s.sa_family, SOCK_DGRAM, 0 );
+	temp_sock=socket(to->u.s.sa_family, SOCK_DGRAM, 0 );
 	if (temp_sock==-1) {
 		LM_ERR("socket() failed: %s\n", strerror(errno));
 		return 0;
 	}
-	if (connect(temp_sock, &to->s, sockaddru_len(*to))==-1) {
+	if (connect(temp_sock, &to->u.s, sockaddru_len(*to))==-1) {
 		LM_ERR("connect failed: %s\n", strerror(errno));
 		goto error;
 	}
 	len=sizeof(from);
-	if (getsockname(temp_sock, &from.s, &len)==-1) {
+	if (getsockname(temp_sock, &from.u.s, &len)==-1) {
 		LM_ERR("getsockname failed: %s\n", strerror(errno));
 		goto error;
 	}
@@ -143,7 +143,7 @@ struct socket_info* get_out_socket(union sockaddr_union* to, int proto)
  * \note if msg!=null and msg->force_send_socket, the force_send_socket will be used
  */
 struct socket_info* get_send_socket(struct sip_msg *msg,
-										union sockaddr_union* to, int proto)
+										struct sockaddr_union_struct* to, int proto)
 {
 	struct socket_info* send_sock;
 
@@ -181,7 +181,7 @@ struct socket_info* get_send_socket(struct sip_msg *msg,
 	switch(proto){
 		case PROTO_UDP:
 			if (msg && msg->rcv.bind_address &&
-			msg->rcv.bind_address->address.af==to->s.sa_family &&
+			msg->rcv.bind_address->address.af==to->u.s.sa_family &&
 			msg->rcv.bind_address->proto==PROTO_UDP) {
 				send_sock = msg->rcv.bind_address;
 				break;
@@ -191,7 +191,7 @@ struct socket_info* get_send_socket(struct sip_msg *msg,
 			/* we don't really know the sending address (we can find it out,
 			 * but we'll need also to see if we listen on it, and if yes on
 			 * which port -> too complicated*/
-			send_sock = (to->s.sa_family==AF_INET) ?
+			send_sock = (to->u.s.sa_family==AF_INET) ?
 				protos[proto].sendipv4 : protos[proto].sendipv6;
 	}
 	return send_sock;
@@ -306,7 +306,7 @@ static inline int set_sl_branch(struct sip_msg* msg)
 
 int forward_request( struct sip_msg* msg, struct proxy_l * p)
 {
-	union sockaddr_union to;
+	struct sockaddr_union_struct to;
 	str buf;
 	struct socket_info* send_sock;
 	struct socket_info* last_sock;
@@ -337,7 +337,7 @@ int forward_request( struct sip_msg* msg, struct proxy_l * p)
 		send_sock=get_send_socket( msg, &to, p->proto);
 		if (send_sock==0){
 			LM_ERR("cannot forward to af %d, proto %d no corresponding"
-				"listening socket\n", to.s.sa_family, p->proto);
+				"listening socket\n", to.u.s.sa_family, p->proto);
 			ser_error=E_NO_SOCKET;
 			continue;
 		}
@@ -402,7 +402,7 @@ int forward_request( struct sip_msg* msg, struct proxy_l * p)
 
 
 
-int update_sock_struct_from_via( union sockaddr_union* to,
+int update_sock_struct_from_via( struct sockaddr_union_struct* to,
 								 struct sip_msg* msg,
 								 struct via_body* via )
 {
@@ -468,7 +468,7 @@ int update_sock_struct_from_via( union sockaddr_union* to,
 int forward_reply(struct sip_msg* msg)
 {
 	char* new_buf;
-	union sockaddr_union* to;
+	struct sockaddr_union_struct* to;
 	unsigned int new_len;
 	struct sr_module *mod;
 	int proto;
@@ -513,7 +513,7 @@ int forward_reply(struct sip_msg* msg)
 		goto error;
 	}
 
-	to=(union sockaddr_union*)pkg_malloc(sizeof(union sockaddr_union));
+	to=(struct sockaddr_union_struct*)pkg_malloc(sizeof(struct sockaddr_union_struct));
 	if (to==0){
 		LM_ERR("out of pkg memory\n");
 		goto error;

forward.h

@@ -48,11 +48,11 @@
 #include "socket_info.h"
 
 struct socket_info* get_send_socket(struct sip_msg* msg,
-									union sockaddr_union* su, int proto);
-struct socket_info* get_out_socket(union sockaddr_union* to, int proto);
+									struct sockaddr_union_struct* su, int proto);
+struct socket_info* get_out_socket(struct sockaddr_union_struct* to, int proto);
 int check_self(str* host, unsigned short port, unsigned short proto);
 int forward_request( struct sip_msg* msg,  struct proxy_l* p);
-int update_sock_struct_from_via( union sockaddr_union* to,
+int update_sock_struct_from_via( struct sockaddr_union_struct* to,
 								 struct sip_msg* msg,
 								 struct via_body* via );
 
@@ -82,7 +82,7 @@ int forward_reply( struct sip_msg* msg);
  * \return 0 if ok, -1 on error
  */
 static inline int msg_send( struct socket_info* send_sock, int proto,
-							union sockaddr_union* to, unsigned int id,
+							struct sockaddr_union_struct* to, unsigned int id,
 							char* buf, int len, struct sip_msg* msg)
 {
 	str out_buff;

ip_addr.h

@@ -80,14 +80,15 @@ struct net{
 	struct ip_addr mask;
 };
 
-union sockaddr_union{
+struct sockaddr_union_struct{
+    union {
 		struct sockaddr     s;
 		struct sockaddr_in  sin;
 		struct sockaddr_in6 sin6;
+    } u;
+    char hostname[256]; /* remote side hostname (used for TLS certificate hostname verification) */
 };
 
-
-
 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 };
 
@@ -99,7 +100,7 @@ struct receive_info {
 	int proto;
 	unsigned int proto_reserved1; /*!< tcp stores the connection id here */
 	unsigned int proto_reserved2;
-	union sockaddr_union src_su; /*!< useful for replies*/
+	struct sockaddr_union_struct src_su; /*!< useful for replies*/
 	struct socket_info* bind_address; /*!< sock_info structure on which the msg was received*/
 	/* no need for dst_su yet */
 };
@@ -108,7 +109,7 @@ struct receive_info {
 struct dest_info {
 	int proto;
 	unsigned int proto_reserved1; /*!< tcp stores the connection id here */
-	union sockaddr_union to;
+	struct sockaddr_union_struct to;
 	struct socket_info* send_sock;
 };
 
@@ -130,10 +131,10 @@ struct socket_id {
 
 /* len of the sockaddr */
 #ifdef HAVE_SOCKADDR_SA_LEN
-#define sockaddru_len(su)	((su).s.sa_len)
+#define sockaddru_len(su)	((su).u.s.sa_len)
 #else
 #define sockaddru_len(su)	\
-			(((su).s.sa_family==AF_INET6)?sizeof(struct sockaddr_in6):\
+			(((su).u.s.sa_family==AF_INET6)?sizeof(struct sockaddr_in6):\
 					sizeof(struct sockaddr_in))
 #endif /* HAVE_SOCKADDR_SA_LEN*/
 
@@ -154,7 +155,7 @@ struct socket_id {
 		struct ip_addr __ip; \
 		sockaddr2ip_addr( &__ip, (struct sockaddr*)_su ); \
 		_ip_char = ip_addr2a(&__ip); \
-		_port_no = su_getport( (union sockaddr_union*)(void *)_su); \
+		_port_no = su_getport( (struct sockaddr_union_struct*)(void *)_su); \
 	} while(0)
 
 
@@ -246,73 +247,73 @@ static inline void sockaddr2ip_addr(struct ip_addr* ip, struct sockaddr* sa)
 
 
 /*! \brief compare 2 sockaddr_unions */
-static inline int su_cmp(union sockaddr_union* s1, union sockaddr_union* s2)
+static inline int su_cmp(struct sockaddr_union_struct* s1, struct sockaddr_union_struct* s2)
 {
-	if (s1->s.sa_family!=s2->s.sa_family) return 0;
-	switch(s1->s.sa_family){
+	if (s1->u.s.sa_family!=s2->u.s.sa_family) return 0;
+	switch(s1->u.s.sa_family){
 		case AF_INET:
-			return (s1->sin.sin_port==s2->sin.sin_port)&&
-					(memcmp(&s1->sin.sin_addr, &s2->sin.sin_addr, 4)==0);
+			return (s1->u.sin.sin_port==s2->u.sin.sin_port)&&
+					(memcmp(&s1->u.sin.sin_addr, &s2->u.sin.sin_addr, 4)==0);
 		case AF_INET6:
-			return (s1->sin6.sin6_port==s2->sin6.sin6_port)&&
-					(memcmp(&s1->sin6.sin6_addr, &s2->sin6.sin6_addr, 16)==0);
+			return (s1->u.sin6.sin6_port==s2->u.sin6.sin6_port)&&
+					(memcmp(&s1->u.sin6.sin6_addr, &s2->u.sin6.sin6_addr, 16)==0);
 		default:
 			LM_CRIT("unknown address family %d\n",
-						s1->s.sa_family);
+						s1->u.s.sa_family);
 			return 0;
 	}
 }
 
 
 
 /*! \brief gets the port number (host byte order) */
-static inline unsigned short su_getport(union sockaddr_union* su)
+static inline unsigned short su_getport(struct sockaddr_union_struct* su)
 {
 	if(su==0)
 		return 0;
 
-	switch(su->s.sa_family){
+	switch(su->u.s.sa_family){
 		case AF_INET:
-			return ntohs(su->sin.sin_port);
+			return ntohs(su->u.sin.sin_port);
 		case AF_INET6:
-			return ntohs(su->sin6.sin6_port);
+			return ntohs(su->u.sin6.sin6_port);
 		default:
-			LM_CRIT("unknown address family %d\n", su->s.sa_family);
+			LM_CRIT("unknown address family %d\n", su->u.s.sa_family);
 			return 0;
 	}
 }
 
 /*! \brief sets the port number (host byte order) */
-static inline void su_setport(union sockaddr_union* su, unsigned short port)
+static inline void su_setport(struct sockaddr_union_struct* su, unsigned short port)
 {
-	switch(su->s.sa_family){
+	switch(su->u.s.sa_family){
 		case AF_INET:
-			su->sin.sin_port=htons(port);
+			su->u.sin.sin_port=htons(port);
 			break;
 		case AF_INET6:
-			 su->sin6.sin6_port=htons(port);
+			 su->u.sin6.sin6_port=htons(port);
 			 break;
 		default:
-			LM_CRIT("unknown address family %d\n", su->s.sa_family);
+			LM_CRIT("unknown address family %d\n", su->u.s.sa_family);
 	}
 }
 
 /*! \brief inits an ip_addr pointer from a sockaddr_union ip address */
-static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su)
+static inline void su2ip_addr(struct ip_addr* ip, struct sockaddr_union_struct* su)
 {
-	switch(su->s.sa_family){
+	switch(su->u.s.sa_family){
 	case AF_INET:
 		ip->af=AF_INET;
 		ip->len=4;
-		memcpy(ip->u.addr, &su->sin.sin_addr, 4);
+		memcpy(ip->u.addr, &su->u.sin.sin_addr, 4);
 		break;
 	case AF_INET6:
 		ip->af=AF_INET6;
 		ip->len=16;
-		memcpy(ip->u.addr, &su->sin6.sin6_addr, 16);
+		memcpy(ip->u.addr, &su->u.sin6.sin6_addr, 16);
 		break;
 	default:
-		LM_CRIT("Unknown address family %d\n", su->s.sa_family);
+		LM_CRIT("Unknown address family %d\n", su->u.s.sa_family);
 		ip->af=0;
 		ip->len=0;
 	}
@@ -325,26 +326,26 @@ static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su)
 /*! \brief inits a struct sockaddr_union from a struct ip_addr and a port no
  * \return 0 if ok, -1 on error (unknown address family)
  * \note the port number is in host byte order */
-static inline int init_su( union sockaddr_union* su,
+static inline int init_su( struct sockaddr_union_struct* su,
 							struct ip_addr* ip,
 							unsigned short   port )
 {
-	memset(su, 0, sizeof(union sockaddr_union));/*needed on freebsd*/
-	su->s.sa_family=ip->af;
+	memset(su, 0, sizeof(struct sockaddr_union_struct));/*needed on freebsd*/
+	su->u.s.sa_family=ip->af;
 	switch(ip->af){
 	case	AF_INET6:
-		memcpy(&su->sin6.sin6_addr, ip->u.addr, ip->len);
+		memcpy(&su->u.sin6.sin6_addr, ip->u.addr, ip->len);
 		#ifdef HAVE_SOCKADDR_SA_LEN
-			su->sin6.sin6_len=sizeof(struct sockaddr_in6);
+			su->u.sin6.sin6_len=sizeof(struct sockaddr_in6);
 		#endif
-		su->sin6.sin6_port=htons(port);
+		su->u.sin6.sin6_port=htons(port);
 		break;
 	case AF_INET:
-		memcpy(&su->sin.sin_addr, ip->u.addr, ip->len);
+		memcpy(&su->u.sin.sin_addr, ip->u.addr, ip->len);
 		#ifdef HAVE_SOCKADDR_SA_LEN
-			su->sin.sin_len=sizeof(struct sockaddr_in);
+			su->u.sin.sin_len=sizeof(struct sockaddr_in);
 		#endif
-		su->sin.sin_port=htons(port);
+		su->u.sin.sin_port=htons(port);
 		break;
 	default:
 		LM_CRIT("unknown address family %d\n", ip->af);
@@ -359,27 +360,27 @@ static inline int init_su( union sockaddr_union* su,
  * the hostent structure and a port no. (host byte order)
  * WARNING: no index overflow  checks!
  * \return 0 if ok, -1 on error (unknown address family) */
-static inline int hostent2su( union sockaddr_union* su,
+static inline int hostent2su( struct sockaddr_union_struct* su,
 								struct hostent* he,
 								unsigned int idx,
 								unsigned short   port )
 {
-	memset(su, 0, sizeof(union sockaddr_union)); /*needed on freebsd*/
-	su->s.sa_family=he->h_addrtype;
+	memset(su, 0, sizeof(struct sockaddr_union_struct)); /*needed on freebsd*/
+	su->u.s.sa_family=he->h_addrtype;
 	switch(he->h_addrtype){
 	case	AF_INET6:
-		memcpy(&su->sin6.sin6_addr, he->h_addr_list[idx], he->h_length);
+		memcpy(&su->u.sin6.sin6_addr, he->h_addr_list[idx], he->h_length);
 		#ifdef HAVE_SOCKADDR_SA_LEN
-			su->sin6.sin6_len=sizeof(struct sockaddr_in6);
+			su->u.sin6.sin6_len=sizeof(struct sockaddr_in6);
 		#endif
-		su->sin6.sin6_port=htons(port);
+		su->u.sin6.sin6_port=htons(port);
 		break;
 	case AF_INET:
-		memcpy(&su->sin.sin_addr, he->h_addr_list[idx], he->h_length);
+		memcpy(&su->u.sin.sin_addr, he->h_addr_list[idx], he->h_length);
 		#ifdef HAVE_SOCKADDR_SA_LEN
-			su->sin.sin_len=sizeof(struct sockaddr_in);
+			su->u.sin.sin_len=sizeof(struct sockaddr_in);
 		#endif
-		su->sin.sin_port=htons(port);
+		su->u.sin.sin_port=htons(port);
 		break;
 	default:
 		LM_CRIT("unknown address family %d\n", he->h_addrtype);