ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavformat/os_support.c

 /*
  * Various utilities for ffmpeg system
  * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
  * copyright (c) 2002 Francois Revol
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /* needed by inet_aton() */
 #define _SVID_SOURCE
+#define _DARWIN_C_SOURCE
 
 #include "config.h"
 #include "avformat.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include "os_support.h"
 
 #if CONFIG_NETWORK
 #if !HAVE_POLL_H
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
 #elif HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 #endif
 
 #include "network.h"
 
 #if !HAVE_INET_ATON
 #include <stdlib.h>
 #include <strings.h>
 
-int inet_aton (const char * str, struct in_addr * add)
+int ff_inet_aton (const char * str, struct in_addr * add)
 {
     unsigned int add1 = 0, add2 = 0, add3 = 0, add4 = 0;
 
     if (sscanf(str, "%d.%d.%d.%d", &add1, &add2, &add3, &add4) != 4)
         return 0;
 
     if (!add1 || (add1|add2|add3|add4) > 255) return 0;
 
     add->s_addr = htonl((add1 << 24) + (add2 << 16) + (add3 << 8) + add4);
 
     return 1;
 }
+#else
+int ff_inet_aton (const char * str, struct in_addr * add)
+{
+    return inet_aton(str, add);
+}
 #endif /* !HAVE_INET_ATON */
 
 #if !HAVE_GETADDRINFO
 int ff_getaddrinfo(const char *node, const char *service,
                 const struct addrinfo *hints, struct addrinfo **res)
 {
     struct hostent *h = NULL;
     struct addrinfo *ai;
     struct sockaddr_in *sin;
 
 #if HAVE_WINSOCK2_H
     int (WSAAPI *win_getaddrinfo)(const char *node, const char *service,
                                   const struct addrinfo *hints,
                                   struct addrinfo **res);
     HMODULE ws2mod = GetModuleHandle("ws2_32.dll");
     win_getaddrinfo = GetProcAddress(ws2mod, "getaddrinfo");
     if (win_getaddrinfo)
         return win_getaddrinfo(node, service, hints, res);
 #endif
 
+    *res = NULL;
     sin = av_mallocz(sizeof(struct sockaddr_in));
     if (!sin)
         return EAI_FAIL;
     sin->sin_family = AF_INET;
 
     if (node) {
-        if (!inet_aton(node, &sin->sin_addr)) {
+        if (!ff_inet_aton(node, &sin->sin_addr)) {
             if (hints && (hints->ai_flags & AI_NUMERICHOST)) {
                 av_free(sin);
                 return EAI_FAIL;
             }
             h = gethostbyname(node);
             if (!h) {
                 av_free(sin);
                 return EAI_FAIL;
             }
             memcpy(&sin->sin_addr, h->h_addr_list[0], sizeof(struct in_addr));
@@ skipping 98 matching lines @@
             ent = getservbyport(sin->sin_port, flags & NI_DGRAM ? "udp" : "tcp");
 
         if (ent) {
             snprintf(serv, servlen, "%s", ent->s_name);
         } else
             snprintf(serv, servlen, "%d", ntohs(sin->sin_port));
     }
 
     return 0;
 }
+
+const char *ff_gai_strerror(int ecode)
+{
+    switch(ecode) {
+    case EAI_FAIL   : return "A non-recoverable error occurred";
+    case EAI_FAMILY : return "The address family was not recognized or the address length was invalid for the specified family";
+    case EAI_NONAME : return "The name does not resolve for the supplied parameters";
+    }
+
+    return "Unknown error";
+}
 #endif
 
-/* resolve host with also IP address parsing */
-int resolve_host(struct in_addr *sin_addr, const char *hostname)
-{
-
-    if (!inet_aton(hostname, sin_addr)) {
-#if HAVE_GETADDRINFO
-        struct addrinfo *ai, *cur;
-        struct addrinfo hints;
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = AF_INET;
-        if (getaddrinfo(hostname, NULL, &hints, &ai))
-            return -1;
-        /* getaddrinfo returns a linked list of addrinfo structs.
-         * Even if we set ai_family = AF_INET above, make sure
-         * that the returned one actually is of the correct type. */
-        for (cur = ai; cur; cur = cur->ai_next) {
-            if (cur->ai_family == AF_INET) {
-                *sin_addr = ((struct sockaddr_in *)cur->ai_addr)->sin_addr;
-                freeaddrinfo(ai);
-                return 0;
-            }
-        }
-        freeaddrinfo(ai);
-        return -1;
-#else
-        struct hostent *hp;
-        hp = gethostbyname(hostname);
-        if (!hp)
-            return -1;
-        memcpy(sin_addr, hp->h_addr_list[0], sizeof(struct in_addr));
-#endif
-    }
-    return 0;
-}
-
 int ff_socket_nonblock(int socket, int enable)
 {
 #if HAVE_WINSOCK2_H
    return ioctlsocket(socket, FIONBIO, &enable);
 #else
    if (enable)
       return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) | O_NONBLOCK);
    else
       return fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) & ~O_NONBLOCK);
 #endif
@@ skipping 64 matching lines @@
         if (FD_ISSET(fds[i].fd, &read_set))      fds[i].revents |= POLLIN;
         if (FD_ISSET(fds[i].fd, &write_set))     fds[i].revents |= POLLOUT;
         if (FD_ISSET(fds[i].fd, &exception_set)) fds[i].revents |= POLLERR;
     };
 
     return rc;
 }
 #endif /* HAVE_POLL_H */
 #endif /* CONFIG_FFSERVER */