#include <sys/time.h>
#include "os_support.h"
-#ifdef CONFIG_NETWORK
-#ifndef HAVE_POLL_H
-#ifdef HAVE_WINSOCK2_H
+#if CONFIG_NETWORK
+#if !HAVE_POLL_H
+#if HAVE_WINSOCK2_H
#include <winsock2.h>
-#elif defined (HAVE_SYS_SELECT_H)
+#elif HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
#endif
#include "network.h"
-#if !defined(HAVE_INET_ATON)
+#if !HAVE_INET_ATON
#include <stdlib.h>
#include <strings.h>
if (!add1 || (add1|add2|add3|add4) > 255) return 0;
- add->s_addr=(add4<<24)+(add3<<16)+(add2<<8)+add1;
+ add->s_addr = htonl((add1 << 24) + (add2 << 16) + (add3 << 8) + add4);
return 1;
}
-#endif /* !defined(HAVE_INET_ATON) */
+#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;
+
+ 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 (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));
+ }
+ } else {
+ if (hints && (hints->ai_flags & AI_PASSIVE)) {
+ sin->sin_addr.s_addr = INADDR_ANY;
+ } else
+ sin->sin_addr.s_addr = INADDR_LOOPBACK;
+ }
+
+ /* Note: getaddrinfo allows service to be a string, which
+ * should be looked up using getservbyname. */
+ if (service)
+ sin->sin_port = htons(atoi(service));
+
+ ai = av_mallocz(sizeof(struct addrinfo));
+ if (!ai) {
+ av_free(sin);
+ return EAI_FAIL;
+ }
+
+ *res = ai;
+ ai->ai_family = AF_INET;
+ ai->ai_socktype = hints ? hints->ai_socktype : 0;
+ switch (ai->ai_socktype) {
+ case SOCK_STREAM: ai->ai_protocol = IPPROTO_TCP; break;
+ case SOCK_DGRAM: ai->ai_protocol = IPPROTO_UDP; break;
+ default: ai->ai_protocol = 0; break;
+ }
+
+ ai->ai_addr = (struct sockaddr *)sin;
+ ai->ai_addrlen = sizeof(struct sockaddr_in);
+ if (hints && (hints->ai_flags & AI_CANONNAME))
+ ai->ai_canonname = h ? av_strdup(h->h_name) : NULL;
+
+ ai->ai_next = NULL;
+ return 0;
+}
+
+void ff_freeaddrinfo(struct addrinfo *res)
+{
+ av_free(res->ai_canonname);
+ av_free(res->ai_addr);
+ av_free(res);
+}
+
+int ff_getnameinfo(const struct sockaddr *sa, int salen,
+ char *host, int hostlen,
+ char *serv, int servlen, int flags)
+{
+ const struct sockaddr_in *sin = (const struct sockaddr_in *)sa;
+
+ if (sa->sa_family != AF_INET)
+ return EAI_FAMILY;
+ if (!host && !serv)
+ return EAI_NONAME;
+
+ if (host && hostlen > 0) {
+ struct hostent *ent = NULL;
+ uint32_t a;
+ if (!(flags & NI_NUMERICHOST))
+ ent = gethostbyaddr((const char *)&sin->sin_addr,
+ sizeof(sin->sin_addr), AF_INET);
+
+ if (ent) {
+ snprintf(host, hostlen, "%s", ent->h_name);
+ } else if (flags & NI_NAMERQD) {
+ return EAI_NONAME;
+ } else {
+ a = ntohl(sin->sin_addr.s_addr);
+ snprintf(host, hostlen, "%d.%d.%d.%d",
+ ((a >> 24) & 0xff), ((a >> 16) & 0xff),
+ ((a >> 8) & 0xff), ( a & 0xff));
+ }
+ }
+
+ if (serv && servlen > 0) {
+ struct servent *ent = NULL;
+ if (!(flags & NI_NUMERICSERV))
+ 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;
+}
+#endif
/* resolve host with also IP address parsing */
int resolve_host(struct in_addr *sin_addr, const char *hostname)
{
- struct hostent *hp;
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)
{
-#ifdef HAVE_WINSOCK2_H
+#if HAVE_WINSOCK2_H
return ioctlsocket(socket, FIONBIO, &enable);
#else
if (enable)
}
#endif /* CONFIG_NETWORK */
-#ifdef CONFIG_FFSERVER
-#ifndef HAVE_POLL_H
+#if CONFIG_FFSERVER
+#if !HAVE_POLL_H
int poll(struct pollfd *fds, nfds_t numfds, int timeout)
{
fd_set read_set;
int n;
int rc;
-#ifdef HAVE_WINSOCK2_H
+#if HAVE_WINSOCK2_H
if (numfds >= FD_SETSIZE) {
errno = EINVAL;
return -1;
for(i = 0; i < numfds; i++) {
if (fds[i].fd < 0)
continue;
-#ifndef HAVE_WINSOCK2_H
+#if !HAVE_WINSOCK2_H
if (fds[i].fd >= FD_SETSIZE) {
errno = EINVAL;
return -1;
projects / ffmpeg / blobdiff