From 7ad526d288a2e992ed83bf98d72ccf1347cef407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 25 Aug 2010 13:30:06 +0000 Subject: [PATCH] Simplify resolve_destination in sdp.c further, now that we don't enforce IPv4 any longer Originally committed as revision 24918 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/sdp.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 9c0e1a93bf..249d19ad28 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -82,7 +82,7 @@ static void sdp_write_header(char *buff, int size, struct sdp_session_level *s) static void resolve_destination(char *dest_addr, int size, char *type, int type_size) { - struct addrinfo hints, *ai, *cur; + struct addrinfo hints, *ai; av_strlcpy(type, "IP4", type_size); if (!dest_addr[0]) @@ -94,13 +94,10 @@ static void resolve_destination(char *dest_addr, int size, char *type, memset(&hints, 0, sizeof(hints)); if (getaddrinfo(dest_addr, NULL, &hints, &ai)) return; - for (cur = ai; cur; cur = cur->ai_next) { - getnameinfo(cur->ai_addr, cur->ai_addrlen, dest_addr, size, + getnameinfo(ai->ai_addr, ai->ai_addrlen, dest_addr, size, NULL, 0, NI_NUMERICHOST); - if (cur->ai_family == AF_INET6) + if (ai->ai_family == AF_INET6) av_strlcpy(type, "IP6", type_size); - break; - } freeaddrinfo(ai); } #else