kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 07:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_rtp: Fix regression when IPv6 is not available.

Browse Source 
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
This commit is contained in:
Guido Falsi
2016-11-22 18:20:06 +01:00
committed by Joshua Colp
parent a0c0b1c9cb
commit 75230f4c01
4 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/asterisk/utils.h
View File

@@ -1126,4 +1126,13 @@ int ast_file_is_readable(const char *filename);
*/ */
int ast_compare_versions(const char *version1, const char *version2); 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 */ #endif /* _ASTERISK_UTILS_H */

12
main/utils.c
View File

@@ -2391,6 +2391,18 @@ char *ast_utils_which(const char *binary, char *fullpath, size_t fullpath_size)
return NULL; 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) void DO_CRASH_NORETURN ast_do_crash(void)
{ {
#if defined(DO_CRASH) #if defined(DO_CRASH)

5
res/res_pjsip_sdp_rtp.c
View File

@@ -38,6 +38,7 @@
#include <pjmedia.h> #include <pjmedia.h>
#include <pjlib.h> #include <pjlib.h>
#include "asterisk/utils.h"
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/format.h" #include "asterisk/format.h"
#include "asterisk/format_cap.h" #include "asterisk/format_cap.h"
@@ -1514,7 +1515,11 @@ static int load_module(void)
{ {
CHECK_PJSIP_SESSION_MODULE_LOADED(); CHECK_PJSIP_SESSION_MODULE_LOADED();
if (ast_check_ipv6()) {
ast_sockaddr_parse(&address_rtp, "::", 0); ast_sockaddr_parse(&address_rtp, "::", 0);
} else {
ast_sockaddr_parse(&address_rtp, "0.0.0.0", 0);
}
if (!(sched = ast_sched_context_create())) { if (!(sched = ast_sched_context_create())) {
ast_log(LOG_ERROR, "Unable to create scheduler context.\n"); ast_log(LOG_ERROR, "Unable to create scheduler context.\n");

5
res/res_pjsip_t38.c
View File

@@ -37,6 +37,7 @@
#include <pjmedia.h> #include <pjmedia.h>
#include <pjlib.h> #include <pjlib.h>
#include "asterisk/utils.h"
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/udptl.h" #include "asterisk/udptl.h"
#include "asterisk/netsock2.h" #include "asterisk/netsock2.h"
@@ -916,7 +917,11 @@ static int load_module(void)
{ {
CHECK_PJSIP_SESSION_MODULE_LOADED(); CHECK_PJSIP_SESSION_MODULE_LOADED();
if (ast_check_ipv6()) {
ast_sockaddr_parse(&address, "::", 0); ast_sockaddr_parse(&address, "::", 0);
} else {
ast_sockaddr_parse(&address, "0.0.0.0", 0);
}
if (ast_sip_session_register_supplement(&t38_supplement)) { if (ast_sip_session_register_supplement(&t38_supplement)) {
ast_log(LOG_ERROR, "Unable to register T.38 session supplement\n"); ast_log(LOG_ERROR, "Unable to register T.38 session supplement\n");