[asterisk-commits] res rtp: Fix regression when IPv6 is not available. (asterisk[master])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/4487 )

Change subject: res_rtp: Fix regression when IPv6 is not available.
......................................................................


res_rtp: Fix regression when IPv6 is not available.

The latest Release candidate fails to create RTP streams when IPv6
is not available. Due to the changes made in September the ast_sockaddr
structure passed around to create these streams is always of AF_INET6
type, causing failure when used for IPv4. This patch adds a utility
function to check for availability of IPv6 and applies such check
at startup to determine how to create the ast_sockaddr structures.

ASTERISK-26617 #close

Change-Id: I627a4e91795e821111e1cda523f083a40d0e0c3e
---
M include/asterisk/utils.h
M main/utils.c
M res/res_pjsip_sdp_rtp.c
M res/res_pjsip_t38.c
4 files changed, 33 insertions(+), 2 deletions(-)

Approvals:
  Alexei Gradinari: Looks good to me, but someone else must approve
  Guido Falsi: Looks good to me, but someone else must approve
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved



diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 2378c69..423d73b 100644
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -1126,4 +1126,13 @@
  */
 int ast_compare_versions(const char *version1, const char *version2);
 
+/*
+ * \brief Test that an OS supports IPv6 Networking.
+ * \since 13.14.0
+ *
+ * \return True (non-zero) if the IPv6 supported.
+ * \return False (zero) if the OS doesn't support IPv6.
+ */
+int ast_check_ipv6(void);
+
 #endif /* _ASTERISK_UTILS_H */
diff --git a/main/utils.c b/main/utils.c
index 2c56af3..2033664 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -2391,6 +2391,18 @@
 	return NULL;
 }
 
+int ast_check_ipv6(void)
+{
+	int udp6_socket = socket(AF_INET6, SOCK_DGRAM, 0);
+
+	if (udp6_socket < 0) {
+		return 0;
+	}
+
+	close(udp6_socket);
+	return 1;
+}
+
 void DO_CRASH_NORETURN ast_do_crash(void)
 {
 #if defined(DO_CRASH)
diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index 7fd4f9a..4d6a1a1 100644
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -38,6 +38,7 @@
 #include <pjmedia.h>
 #include <pjlib.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/format.h"
 #include "asterisk/format_cap.h"
@@ -1514,7 +1515,11 @@
 {
 	CHECK_PJSIP_SESSION_MODULE_LOADED();
 
-	ast_sockaddr_parse(&address_rtp, "::", 0);
+	if (ast_check_ipv6()) {
+		ast_sockaddr_parse(&address_rtp, "::", 0);
+	} else {
+		ast_sockaddr_parse(&address_rtp, "0.0.0.0", 0);
+	}
 
 	if (!(sched = ast_sched_context_create())) {
 		ast_log(LOG_ERROR, "Unable to create scheduler context.\n");
diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c
index adc99c3..79dc9c3 100644
--- a/res/res_pjsip_t38.c
+++ b/res/res_pjsip_t38.c
@@ -37,6 +37,7 @@
 #include <pjmedia.h>
 #include <pjlib.h>
 
+#include "asterisk/utils.h"
 #include "asterisk/module.h"
 #include "asterisk/udptl.h"
 #include "asterisk/netsock2.h"
@@ -916,7 +917,11 @@
 {
 	CHECK_PJSIP_SESSION_MODULE_LOADED();
 
-	ast_sockaddr_parse(&address, "::", 0);
+	if (ast_check_ipv6()) {
+		ast_sockaddr_parse(&address, "::", 0);
+	} else {
+		ast_sockaddr_parse(&address, "0.0.0.0", 0);
+	}
 
 	if (ast_sip_session_register_supplement(&t38_supplement)) {
 		ast_log(LOG_ERROR, "Unable to register T.38 session supplement\n");

-- 
To view, visit https://gerrit.asterisk.org/4487
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I627a4e91795e821111e1cda523f083a40d0e0c3e
Gerrit-PatchSet: 12
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Guido Falsi <madpilot at freebsd.org>
Gerrit-Reviewer: Alexei Gradinari <alex2grad at gmail.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Guido Falsi <madpilot at freebsd.org>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>