[SCM] libav/experimental: udp ipv6 localhost resolving patch by ("Hans Zandbelt": Hans Zandbelt, telin nl)
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:44:43 UTC 2013
The following commit has been merged in the experimental branch:
commit 276358c1c40311a068c17639fe4c0135710b7688
Author: Hans Zandbelt <Hans.Zandbelt at telin.nl>
Date: Thu Jul 21 21:10:23 2005 +0000
udp ipv6 localhost resolving patch by ("Hans Zandbelt": Hans Zandbelt, telin nl)
Originally committed as revision 4463 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/udp.c b/libavformat/udp.c
index 50aa14b..3f3a9f7 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");
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list