From 276358c1c40311a068c17639fe4c0135710b7688 Mon Sep 17 00:00:00 2001
From: Hans Zandbelt <Hans.Zandbelt@telin.nl>
Date: Thu, 21 Jul 2005 21:10:23 +0000
Subject: [PATCH] udp ipv6 localhost resolving patch by ("Hans Zandbelt": Hans
Zandbelt, telin nl)
Originally committed as revision 4463 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/udp.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/libavformat/udp.c b/libavformat/udp.c
index 50aa14bfaf0..3f3a9f760bb 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -160,24 +160,26 @@ int udp_ipv6_set_local(URLContext *h) {
socklen_t addrlen;
char sbuf[NI_MAXSERV];
char hbuf[NI_MAXHOST];
- struct addrinfo *res0 = NULL;
- int family;
+ struct addrinfo *res0 = NULL, *res = NULL;
if (s->local_port != 0) {
res0 = udp_ipv6_resolve_host(0, s->local_port, SOCK_DGRAM, AF_UNSPEC, AI_PASSIVE);
if (res0 == 0)
goto fail;
- family = res0->ai_family;
+ for (res = res0; res; res=res->ai_next) {
+ udp_fd = socket(res->ai_family, SOCK_DGRAM, 0);
+ if (udp_fd > 0) break;
+ perror("socket");
+ }
} else {
- family = s->dest_addr.ss_family;
+ udp_fd = socket(s->dest_addr.ss_family, SOCK_DGRAM, 0);
+ if (udp_fd < 0)
+ perror("socket");
}
-
- udp_fd = socket(family, SOCK_DGRAM, 0);
- if (udp_fd < 0) {
- perror("socket");
+
+ if (udp_fd < 0)
goto fail;
- }
-
+
if (s->local_port != 0) {
if (bind(udp_fd, res0->ai_addr, res0->ai_addrlen) < 0) {
perror("bind");
--
GitLab