rtpengine: allow IPv6 destinations in sockets

(cherry picked from commit afec9c8)

Author: razvancrainea

modules/rtpengine/rtpengine.c

@@ -1832,6 +1832,12 @@ static inline int rtpengine_connect_node(struct rtpe_node *pnode)
 	}
 	pkg_free(hostname);
 
+	if (res->ai_addrlen > sizeof(pnode->ai_addr)) {
+		LM_ERR("RTP proxy address is too large\n");
+		freeaddrinfo(res);
+		return 0;
+	}
+
 	rtpe_socks[pnode->idx] = socket((pnode->rn_umode == 6)
 			? AF_INET6 : AF_INET, SOCK_DGRAM, 0);
 	if ( rtpe_socks[pnode->idx] == -1) {
@@ -1849,7 +1855,7 @@ static inline int rtpengine_connect_node(struct rtpe_node *pnode)
 	}
 
 	pnode->ai_addrlen = res->ai_addrlen;
-	memcpy(&(pnode->ai_addr), res->ai_addr, res->ai_addrlen);
+	memcpy(&pnode->ai_addr.s, res->ai_addr, res->ai_addrlen);
 
 	freeaddrinfo(res);
 	return 1;
@@ -3669,7 +3675,7 @@ static int start_async_send_rtpe_command(struct rtpe_node *node, bencode_item_t
 			LM_ERR("can't create socket %d \n",errno);
 			goto badproxy;
 		}
-		if (connect(fd, &(node->ai_addr), node->ai_addrlen) < 0) {
+		if (connect(fd, &node->ai_addr.s, node->ai_addrlen) < 0) {
 			LM_ERR("can't connect to RTP proxy %s (%d:%s)\n",node->rn_url.s,errno,strerror(errno));
 			close(fd);
 			goto badproxy;

modules/rtpengine/rtpengine.h

@@ -27,6 +27,7 @@
 #define _RTPENGINE_H
 
 #include "bencode.h"
+#include "../../ip_addr.h"
 #include "../../str.h"
 
 /* flags for set, node, and socket management */
@@ -46,7 +47,7 @@ struct rtpe_node {
 	unsigned int		rn_last_ticks;
 	int					rn_flags;
 	socklen_t       ai_addrlen;
-	struct sockaddr ai_addr;
+	union sockaddr_union ai_addr;
 
 	struct rtpe_node	*rn_next;
 };