generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve hosts and bind sockets even when the local_port is not set (0)

Browse Source 
Fixes ffserver on linux when "--disable-ipv6" is not used

Patch by Nicolas George (nicolas dot george at normalesup dot org)

Originally committed as revision 10881 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Nicolas George 2007-10-31 07:02:30 +00:00 committed by Luca Abeni
parent fac84d3c18
commit d607861cd5
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/udp.c
View File

@ -111,7 +111,7 @@ static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, in
struct addrinfo hints, *res = 0; struct addrinfo hints, *res = 0;
int error; int error;
char sport[16]; char sport[16];
const char *node = 0, *service = 0; const char *node = 0, *service = "0";
if (port > 0) { if (port > 0) {
snprintf(sport, sizeof(sport), "%d", port); snprintf(sport, sizeof(sport), "%d", port);
@ -120,7 +120,6 @@ static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, in
if ((hostname) && (hostname[0] != '\0') && (hostname[0] != '?')) { if ((hostname) && (hostname[0] != '\0') && (hostname[0] != '?')) {
node = hostname; node = hostname;
} }
if ((node) || (service)) {
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_socktype = type; hints.ai_socktype = type;
hints.ai_family = family; hints.ai_family = family;
@ -128,7 +127,6 @@ static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, in
if ((error = getaddrinfo(node, service, &hints, &res))) { if ((error = getaddrinfo(node, service, &hints, &res))) {
av_log(NULL, AV_LOG_ERROR, "udp_ipv6_resolve_host: %s\n", gai_strerror(error)); av_log(NULL, AV_LOG_ERROR, "udp_ipv6_resolve_host: %s\n", gai_strerror(error));
} }
}
return res; return res;
} }
@ -155,7 +153,6 @@ static int udp_ipv6_set_local(URLContext *h) {
char hbuf[NI_MAXHOST]; char hbuf[NI_MAXHOST];
struct addrinfo *res0 = NULL, *res = NULL; 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); res0 = udp_ipv6_resolve_host(0, s->local_port, SOCK_DGRAM, AF_UNSPEC, AI_PASSIVE);
if (res0 == 0) if (res0 == 0)
goto fail; goto fail;
@ -164,23 +161,16 @@ static int udp_ipv6_set_local(URLContext *h) {
if (udp_fd > 0) break; if (udp_fd > 0) break;
perror("socket"); perror("socket");
} }
} else {
udp_fd = socket(s->dest_addr.ss_family, SOCK_DGRAM, 0);
if (udp_fd < 0)
perror("socket");
}
if (udp_fd < 0) if (udp_fd < 0)
goto fail; goto fail;
if (s->local_port != 0) {
if (bind(udp_fd, res0->ai_addr, res0->ai_addrlen) < 0) { if (bind(udp_fd, res0->ai_addr, res0->ai_addrlen) < 0) {
perror("bind"); perror("bind");
goto fail; goto fail;
} }
freeaddrinfo(res0); freeaddrinfo(res0);
res0 = NULL; res0 = NULL;
}
addrlen = sizeof(clientaddr); addrlen = sizeof(clientaddr);
if (getsockname(udp_fd, (struct sockaddr *)&clientaddr, &addrlen) < 0) { if (getsockname(udp_fd, (struct sockaddr *)&clientaddr, &addrlen) < 0) {