diff options
| author | Alistair Leslie-Hughes <leslie_alistair@hotmail.com> | 2023-01-25 17:04:51 +1100 |
|---|---|---|
| committer | Igor Kovalenko <igor.v.kovalenko@gmail.com> | 2023-02-08 20:50:48 +0000 |
| commit | f44cb36374a6b72e33b03b555771137042aaf6b2 (patch) | |
| tree | 207116dd871004704f31d33be166968eb1a8d6df | |
| parent | 1cfa7378236b3cf9daf3be09d3227b92df69cc53 (diff) | |
| download | pulseaudio-f44cb36374a6b72e33b03b555771137042aaf6b2.tar.gz | |
rtp-send: Use getaddrinfo to improve support for ipv6 on source address
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/774>
| -rw-r--r-- | src/modules/rtp/module-rtp-send.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c index e917105c7..ce05360d5 100644 --- a/src/modules/rtp/module-rtp-send.c +++ b/src/modules/rtp/module-rtp-send.c @@ -319,6 +319,42 @@ int pa__init(pa_module*m) { src_addr = pa_modargs_get_value(ma, "source_ip", DEFAULT_SOURCE_IP); +#if defined(HAVE_GETADDRINFO) + { + struct addrinfo *src_addrinfo = NULL; + struct addrinfo hints; + + pa_zero(hints); + + hints.ai_flags = AI_NUMERICHOST; + if (getaddrinfo(src_addr, NULL, &hints, &src_addrinfo) != 0) { + pa_log("Invalid source '%s'", src_addr); + goto fail; + } + + af = src_addrinfo->ai_family; + if (af == AF_INET) { + memcpy(&src_sa4, src_addrinfo->ai_addr, src_addrinfo->ai_addrlen); + src_sa4.sin_port = htons(0); + src_sap_sa4 = src_sa4; + } +#ifdef HAVE_IPV6 + else if (af == AF_INET6) { + memcpy(&src_sa6, src_addrinfo->ai_addr, src_addrinfo->ai_addrlen); + src_sa6.sin6_port = htons(0); + src_sap_sa6 = src_sa6; + } +#endif + else + { + freeaddrinfo(src_addrinfo); + pa_log("Invalid source '%s'", src_addr); + goto fail; + } + + freeaddrinfo(src_addrinfo); + } +#else if (inet_pton(AF_INET, src_addr, &src_sa4.sin_addr) > 0) { src_sa4.sin_family = af = AF_INET; src_sa4.sin_port = htons(0); @@ -336,6 +372,7 @@ int pa__init(pa_module*m) { pa_log("Invalid source address '%s'", src_addr); goto fail; } +#endif /* HAVE_GETADDRINFO */ dst_addr = pa_modargs_get_value(ma, "destination", NULL); if (dst_addr == NULL) |