db80f635c1
as much as possible: * dtable.cc: Drop including sys/socket.h. * fhandler_procnet.cc: Change includes accordingly. * fhandler_socket.cc: Ditto. (fhandler_socket::listen): Avoid gcc error message initializing sin6. (LPFN_WSARECVMSG): Only define when building against w32api headers. * net.cc: Change includes accordingly. Define USE_SYS_TYPES_FD_SET and __WSA_ERR_MACROS_DEFINED. Define _INC_NETIOAPI temporarily and explain why. (struct _IP_ADAPTER_UNICAST_ADDRESS_LH): Only define when building against w32api headers. (struct _IP_ADAPTER_ADDRESSES_LH): Ditto. (SIO_GET_INTERFACE_LIST): Ditto. (ws_freeaddrinfo): Rename from freeaddrinfo so as not to collide with Winsock declaration. Change througout. (ws_getaddrinfo): Ditto. (ws_getnameinfo): Ditto. * select.cc: Include netdb.h after defining USE_SYS_TYPES_FD_SET. * syslog.cc: Drop including netinet/in.h. Define USE_SYS_TYPES_FD_SET and include ws2tcpip.h. * include/netdb.h (struct addrinfo): Don't define when building Cygwin. * include/cygwin/if.h: Don't declare if_xxx functions when building Cygwin. * include/cygwin/in.h: Disable most definitions when building Cygwin. * include/cygwin/socket.h: Disable sockaddr and sockaddr_storage definitions when building Cygwin. Same for MCAST_INCLUDE/MCAST_EXCLUDE. * libc/inet_addr.c: Don't define __INSIDE_CYGWIN__ nor __INSIDE_CYGWIN_NET__. * libc/inet_network.c: Ditto. * libc/minires.h: Drop redundant inclusion of netdb.h. Define __INSIDE_CYGWIN_NET__ only before including netdb.h and resolver headers.
120 lines
3.3 KiB
C
120 lines
3.3 KiB
C
/*
|
|
* Copyright (c) 1983, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static const char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
#include <sys/cdefs.h>
|
|
#ifndef __CYGWIN__
|
|
__FBSDID("$FreeBSD$");
|
|
#else
|
|
#include "winsup.h"
|
|
#endif
|
|
|
|
#ifndef __CYGWIN__
|
|
#include "port_before.h"
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <ctype.h>
|
|
|
|
#ifndef __CYGWIN__
|
|
#include "port_after.h"
|
|
#endif
|
|
|
|
/*
|
|
* Internet network address interpretation routine.
|
|
* The library routines call this routine to interpret
|
|
* network numbers.
|
|
*/
|
|
in_addr_t
|
|
cygwin_inet_network(cp)
|
|
const char *cp;
|
|
{
|
|
in_addr_t val, base, n;
|
|
char c;
|
|
in_addr_t parts[4], *pp = parts;
|
|
int i, digit;
|
|
|
|
again:
|
|
val = 0; base = 10; digit = 0;
|
|
if (*cp == '0')
|
|
digit = 1, base = 8, cp++;
|
|
if (*cp == 'x' || *cp == 'X')
|
|
base = 16, cp++;
|
|
while ((c = *cp) != 0) {
|
|
if (isdigit((unsigned char)c)) {
|
|
if (base == 8U && (c == '8' || c == '9'))
|
|
return (INADDR_NONE);
|
|
val = (val * base) + (c - '0');
|
|
cp++;
|
|
digit = 1;
|
|
continue;
|
|
}
|
|
if (base == 16U && isxdigit((unsigned char)c)) {
|
|
val = (val << 4) +
|
|
(c + 10 - (islower((unsigned char)c) ? 'a' : 'A'));
|
|
cp++;
|
|
digit = 1;
|
|
continue;
|
|
}
|
|
break;
|
|
}
|
|
if (!digit)
|
|
return (INADDR_NONE);
|
|
if (*cp == '.') {
|
|
if (pp >= parts + 4 || val > 0xffU)
|
|
return (INADDR_NONE);
|
|
*pp++ = val, cp++;
|
|
goto again;
|
|
}
|
|
if (*cp && !isspace(*cp&0xff))
|
|
return (INADDR_NONE);
|
|
*pp++ = val;
|
|
n = pp - parts;
|
|
if (n > 4U)
|
|
return (INADDR_NONE);
|
|
for (val = 0, i = 0; i < n; i++) {
|
|
val <<= 8;
|
|
val |= parts[i] & 0xff;
|
|
}
|
|
return (val);
|
|
}
|
|
|
|
#ifndef __CYGWIN__
|
|
/*
|
|
* Weak aliases for applications that use certain private entry points,
|
|
* and fail to include <arpa/inet.h>.
|
|
*/
|
|
#undef inet_network
|
|
__weak_reference(__inet_network, inet_network);
|
|
#endif
|