2006-07-25 Corinna Vinschen <corinna@vinschen.de>
* include/cygwin/version.h: Bump DLL version to 1.7.0. 2006-07-25 Corinna Vinschen <corinna@vinschen.de> * select.h: Remove. * fhandler_socket.cc: Don't include select.h. * select.cc: Ditto. 2006-07-25 Corinna Vinschen <corinna@vinschen.de> * cygtls.h: Drop socket related includes. (struct _local_storage): Remove exitsock and exitsock_sin. Add select_sockevt. * cygtls.cc: Accomodate above change throughout. * fhandler.h (class fhandler_socket): Make wsock_evt public. * fhandler_socket.cc (fhandler_socket::fhandler_socket): Accomodate reordering members. (fhandler_socket::evaluate_events): Drop FD_CONNECT event as soon as it gets read once. Never remove FD_WRITE event here. (fhandler_socket::wait_for_events): Wait 50 ms instead of INFINITE for socket events. (fhandler_socket::accept): Fix conditional. Set wsock_events members of accepted socket to useful start values. (fhandler_socket::recv_internal): Always drop FD_READ/FD_OOB events from wsock_events after the call to WSARecvFrom. (fhandler_socket::send_internal): Drop FD_WRITE event from wsock_events if the call to WSASendTo fails with WSAEWOULDBLOCK. Fix return value condition. * select.cc (struct socketinf): Change to accomodate using socket event handling. (peek_socket): Use event handling for peeking socket. (thread_socket): Ditto. (start_thread_socket): Ditto. (socket_cleanup): Same here. * tlsoffsets.h: Regenerate. 2006-07-20 Corinna Vinschen <corinna@vinschen.de> * fhandler.h (class fhandler_socket): Rearrange slightly to keep event handling methods and members together. Drop owner status flag. Split wait method. Rename event handling methods for readability. * fhandler_socket.cc (struct wsa_event): Add owner field. (LOCK_EVENTS): New macro. (UNLOCK_EVENTS): Ditto. (fhandler_socket::init_events): rename from prepare. (fhandler_socket::evaluate_events): First half of former wait method. Do everything but wait. Allow specifiying whether or not events from event_mask should be erased from wsock_events->events. Simplify OOB handling. Allow sending SIGURG to any process (group). (fhandler_socket::wait_for_events): Second half of former wait method. Call evaluate_events and wait in a loop if socket is blocking. (fhandler_socket::release_events): Rename from release. (fhandler_socket::connect): Accomodate above name changes. (fhandler_socket::accept): Ditto. (fhandler_socket::recv_internal): Ditto. (fhandler_socket::send_internal): Ditto. (fhandler_socket::close): Ditto. (fhandler_socket::fcntl): Always set owner to given input value on F_SETOWN. Handle F_GETOWN. * net.cc (fdsock): Accomodate above name changes. 2006-07-20 Corinna Vinschen <corinna@vinschen.de> * fhandler_socket.cc (fhandler_socket::wait): Set Winsock errno to WSAEWOULDBLOCK instead of WSAEINPROGRESS. 2006-07-18 Brian Ford <Brian.Ford@FlightSafety.com> Corinna Vinschen <corinna@vinschen.de> * winsup.h (mmap_region_status): New enum. (mmap_is_attached_or_noreserve_page): Adjust prototype and rename as below. * mmap.cc (mmap_is_attached_or_noreserve_page): Rename mmap_is_attached_or_noreserve. Add region length parameter. Return enum above. * exceptions.cc (_cygtls::handle_exceptions): Accomodate above. * fhandler.cc (fhandler_base::raw_read): Call above for NOACCESS errors and retry on success to allow reads into untouched MAP_NORESERVE buffers. 2006-07-18 Corinna Vinschen <corinna@vinschen.de> * cygwin.din (posix_openpt): Export. * tty.cc (posix_openpt): New function. * include/cygwin/stdlib.h (posix_openpt): Declare. * include/cygwin/version.h: Bump API minor number. 2006-07-14 Corinna Vinschen <corinna@vinschen.de> * security.cc (get_token_group_sidlist): Always add the interactive group to the token. Add comment. Create logon_id group SID by copying it from incoming group list. (create_token): Add subauth_token parameter. Use information in subauth_token if present. Tweak SourceIdentifier if subauth_token is present for debugging purposes. * security.h (create_token): Add subauth_token parameter in declaration. * syscalls.cc (seteuid32): Call subauth first. Call create_token regardless. Use subauth token in call to create_token if subauth succeeded. 2006-07-13 Corinna Vinschen <corinna@vinschen.de> * include/netinet/in.h: Update copyright. 2006-07-13 Corinna Vinschen <corinna@vinschen.de> * fhandler_socket.cc (fhandler_socket::wait): Rework function so that WaitForMultipleObjects is really only called when necessary. 2006-07-12 Corinna Vinschen <corinna@vinschen.de> * include/netdb.h: Declare rcmd, rcmd_af, rexec, rresvport, rresvport_af, iruserok, iruserok_sa, ruserok. 2006-07-12 Corinna Vinschen <corinna@vinschen.de> * Makefile.in (DLL_OFILES): Drop iruserok.o. Add rcmd.o. * autoload.cc (rcmd): Drop definition. * cygwin.din: Export bindresvport, bindresvport_sa, iruserok_sa, rcmd_af, rresvport_af. * net.cc (cygwin_rcmd): Remove. (last_used_bindresvport): Rename from last_used_rrecvport. (cygwin_bindresvport_sa): New function implementing bindresvport_sa. (cygwin_bindresvport): New function implementing bindresvport. (cygwin_rresvport): Remove. * include/cygwin/version.h: Bump API minor number. * include/netinet/in.h: Declare bindresvport and bindresvport_sa. * libc/iruserok.c: Remove file. * libc/rcmd.cc: New file implementing rcmd, rcmd_af, rresvport, rresvport_af, iruserok_sa, iruserok and ruserok. 2006-07-12 Corinna Vinschen <corinna@vinschen.de> * fhandler_socket.cc (fhandler_socket::getsockname): Return valid result for unbound sockets. 2006-07-11 Corinna Vinschen <corinna@vinschen.de> * fhandler_socket.cc (fhandler_socket::fixup_after_fork): Handle wsock_mtx and wsock_evt on fork, thus handling close_on_exec correctly. (fhandler_socket::fixup_after_exec): Drop misguided attempt to handle close_on_exec here. (fhandler_socket::dup): Call fixup_after_fork with NULL parent. Add comment. (fhandler_socket::set_close_on_exec): Handle wsock_mtx and wsock_evt. 2006-07-10 Corinna Vinschen <corinna@vinschen.de> * fhandler.h (class fhandler_socket): Add wsock_mtx, wsock_evt and wsock_events members. Remove closed status flag, add listener status flag. Accomodate new implementation of socket event handling methods. Declare recv* and send* functions ssize_t as the POSIX equivalents. (fhandler_socket::recv_internal): Declare. (fhandler_socket::send_internal): Ditto. * fhandler_socket.cc (EVENT_MASK): Define mask of selected events. (fhandler_socket::fhandler_socket): Initialize new members. (fhandler_socket::af_local_setblocking): Don't actually set the socket to blocking mode. Keep sane event selection. (fhandler_socket::af_local_unsetblocking): Don't actually set the socket to previous blocking setting, just remember it. (struct wsa_event): New structure to keep event data per shared socket. (NUM_SOCKS): Define number of shared sockets concurrently handled by all active Cygwin processes. (wsa_events): New shared datastructure keeping all wsa_event records. (socket_serial_number): New shared variable to identify shared sockets. (wsa_slot_mtx): Global mutex to serialize wsa_events access. (search_wsa_event_slot): New static function to select a new wsa_event slot for a new socket. (fhandler_socket::prepare): Rewrite. Prepare event selection per new socket. (fhandler_socket::wait): Rewrite. Wait for socket events in thread safe and multiple process safe. (fhandler_socket::release): Rewrite. Close per-socket descriptor mutex handle and event handle. (fhandler_socket::dup): Duplicate wsock_mtx and wsock_evt. Fix copy-paste error in debug output. (fhandler_socket::connect): Accomodate new event handling. (fhandler_socket::listen): Set listener flag on successful listen. (fhandler_socket::accept): Accomodate new event handling. (fhandler_socket::recv_internal): New inline method centralizing common recv code. (fhandler_socket::recvfrom): Call recv_internal now. (fhandler_socket::recvmsg): Ditto. Streamline copying from iovec to WSABUF. (fhandler_socket::send_internal): New inline method centralizing common send code. (fhandler_socket::sendto): Call send_internal now. (fhandler_socket::sendmsg): Ditto. Streamline copying from iovec to WSABUF. (fhandler_socket::close): Call release now. (fhandler_socket::ioctl): Never actually switch to blocking mode. Just keep track of the setting. * net.cc (fdsock): Call prepare now. (cygwin_connect): Revert again to event driven technique. (cygwin_accept): Ditto. * poll.cc (poll): Don't call recvfrom on a listening socket. Remove special case for failing recvfrom. * include/sys/socket.h: Declare recv* and send* functions ssize_t as requested by POSIX. 2006-07-07 Corinna Vinschen <corinna@vinschen.de> * net.cc (cygwin_inet_ntop): Fix data type of forth parameter. 2006-07-06 Corinna Vinschen <corinna@vinschen.de> * include/cygwin/in6.h (struct in6_addr): Fix typo. 2006-07-06 Corinna Vinschen <corinna@vinschen.de> * cygwin.din: Export in6addr_any, in6addr_loopback, freeaddrinfo, gai_strerror, getaddrinfo, getnameinfo. * fhandler_socket.cc: Include cygwin/in6.h. (get_inet_addr): Accomodate AF_INET6 usage. (fhandler_socket::connect): Ditto. (fhandler_socket::listen): Ditto. (fhandler_socket::sendto): Ditto. * net.cc: Include cygwin/in6.h. (in6addr_any): Define. (in6addr_loopback): Define. (cygwin_socket): Accomodate AF_INET6 usage. (socketpair): Bind socketpairs only to loopback for security. (inet_pton4): New static function. (inet_pton6): Ditto. (cygwin_inet_pton): New AF_INET6 aware inet_pton implementation. (inet_ntop4): New static function. (inet_ntop6): Ditto. (cygwin_inet_ntop): New AF_INET6 aware inet_ntop implementation. (ga_aistruct): New static function. (ga_clone): Ditto. (ga_echeck): Ditto. (ga_nsearch): Ditto. (ga_port): Ditto. (ga_serv): Ditto. (ga_unix): Ditto. (gn_ipv46): Ditto. (ipv4_freeaddrinfo): Ditto. (ipv4_getaddrinfo): Ditto. (ipv4_getnameinfo): Ditto. (gai_errmap_t): New structure holding error code - error string mapping. (cygwin_gai_strerror): New function implementing gai_strerror. (w32_to_gai_err): New static function. (get_ipv6_funcs): Ditto. (load_ipv6_funcs): Ditto. (cygwin_freeaddrinfo): New function implementing freeaddrinfo. (cygwin_getaddrinfo): New function implementing getaddrinfo. (cygwin_getnameinfo): New function implementing getnameinfo. * include/netdb.h: Include stdint.h and cygwin/socket.h. Define data types and macros used by getaddrinfo and friends. Declare freeaddrinfo, gai_strerror, getaddrinfo and getnameinfo. * include/cygwin/in.h: Add IPv6 related IPPROTOs. Remove definition of struct sockaddr_in6. Include cygwin/in6.h instead. * include/cygwin/in6.h: New header file defining IPv6 releated data types and macros. * include/cygwin/socket.h: Enable AF_INET6 and PF_INET6. Add IPv6 related socket options. * include/cygwin/version.h: Bump API minor number. 2006-07-06 Corinna Vinschen <corinna@vinschen.de> * autoload.cc (DsGetDcNameA): Define. (NetGetAnyDCName): Define. * security.cc: Include dsgetdc.h. (DsGetDcNameA): Declare. (DS_FORCE_REDISCOVERY): Define. (get_logon_server): Add bool parameter to control rediscovery of DC. Use DsGetDcNameA function if supported, NetGetDCName/NetGetAnyDCName otherwise. (get_server_groups): Rediscover DC if get_user_groups fails and try again. (get_reg_security): Use correct error code macro when testing RegGetKeySecurity return value. * security.h (get_logon_server): Remove default vaue from wserver parameter. Add rediscovery parameter. * uinfo.cc (cygheap_user::env_logsrv): Accomodate rediscovery parameter in call to get_logon_server.
This commit is contained in:
Corinna Vinschen
@@ -28,6 +28,7 @@ typedef uint32_t in_addr_t;
|
||||
enum
|
||||
{
|
||||
IPPROTO_IP = 0, /* Dummy protocol for TCP */
|
||||
IPPROTO_HOPOPTS = 0, /* IPv6 Hop-by-Hop options */
|
||||
IPPROTO_ICMP = 1, /* Internet Control Message Protocol */
|
||||
IPPROTO_IGMP = 2, /* Internet Gateway Management Protocol */
|
||||
IPPROTO_IPIP = 4, /* IPIP tunnels (older KA9Q tunnels use 94) */
|
||||
@@ -36,12 +37,21 @@ enum
|
||||
IPPROTO_PUP = 12, /* PUP protocol */
|
||||
IPPROTO_UDP = 17, /* User Datagram Protocol */
|
||||
IPPROTO_IDP = 22, /* XNS IDP protocol */
|
||||
IPPROTO_IPV6 = 41, /* IPv6 header */
|
||||
IPPROTO_ROUTING = 43, /* IPv6 Routing header */
|
||||
IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header */
|
||||
IPPROTO_ESP = 50, /* encapsulating security payload */
|
||||
IPPROTO_AH = 51, /* authentication header */
|
||||
IPPROTO_ICMPV6 = 58, /* ICMPv6 */
|
||||
IPPROTO_NONE = 59, /* IPv6 no next header */
|
||||
IPPROTO_DSTOPTS = 60, /* IPv6 Destination options */
|
||||
IPPROTO_RAW = 255, /* Raw IP packets */
|
||||
IPPROTO_MAX
|
||||
};
|
||||
|
||||
/* Define IPPROTO_xxx values to accomodate SUSv3 */
|
||||
#define IPPROTO_IP IPPROTO_IP
|
||||
#define IPPROTO_HOPOPTS IPPROTO_HOPOPTS
|
||||
#define IPPROTO_ICMP IPPROTO_ICMP
|
||||
#define IPPROTO_IGMP IPPROTO_IGMP
|
||||
#define IPPROTO_IPIP IPPROTO_IPIP
|
||||
@@ -51,6 +61,14 @@ enum
|
||||
#define IPPROTO_UDP IPPROTO_UDP
|
||||
#define IPPROTO_IDP IPPROTO_IDP
|
||||
#define IPPROTO_RAW IPPROTO_RAW
|
||||
#define IPPROTO_IPV6 IPPROTO_IPV6
|
||||
#define IPPROTO_ROUTING IPPROTO_ROUTING
|
||||
#define IPPROTO_FRAGMENT IPPROTO_FRAGMENT
|
||||
#define IPPROTO_ESP IPPROTO_ESP
|
||||
#define IPPROTO_AH IPPROTO_AH
|
||||
#define IPPROTO_ICMPV6 IPPROTO_ICMPV6
|
||||
#define IPPROTO_NONE IPPROTO_NONE
|
||||
#define IPPROTO_DSTOPTS IPPROTO_DSTOPTS
|
||||
|
||||
/* Standard well-known ports. *//* from winsup/include/netinet/in.h */
|
||||
enum
|
||||
@@ -185,21 +203,7 @@ struct sockaddr_in
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef USE_IPV6
|
||||
/* IPv6 definitions as we start to include them. This is just
|
||||
a beginning dont get excited 8) */
|
||||
struct in6_addr
|
||||
{
|
||||
uint8_t s6_addr[16];
|
||||
};
|
||||
|
||||
struct sockaddr_in6
|
||||
{
|
||||
sa_family_t sin6_family; /* AF_INET6 */
|
||||
in_port_t sin6_port; /* Port number. */
|
||||
uint32_t sin6_flowinfo; /* Traffic class and flow inf. */
|
||||
struct in6_addr sin6_addr; /* IPv6 address. */
|
||||
uint32_t sin6_scope_id; /* Set of interfaces for a scope. */
|
||||
};
|
||||
#ifdef AF_INET6
|
||||
#include <cygwin/in6.h>
|
||||
#endif
|
||||
#endif /* _CYGWIN_IN_H */
|
||||
|
||||
119
winsup/cygwin/include/cygwin/in6.h
Normal file
119
winsup/cygwin/include/cygwin/in6.h
Normal file
@@ -0,0 +1,119 @@
|
||||
/* cygwin/in6.h
|
||||
|
||||
Copyright 2006 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
This software is a copyrighted work licensed under the terms of the
|
||||
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
||||
details. */
|
||||
|
||||
/* NOTE: This file is NOT for direct inclusion. Use netinet/in.h. */
|
||||
|
||||
#ifndef _CYGWIN_IN6_H
|
||||
#define _CYGWIN_IN6_H
|
||||
|
||||
#define INET6_ADDRSTRLEN 46
|
||||
|
||||
#define IN6_ARE_ADDR_EQUAL(a, b) \
|
||||
(((const uint32_t *)(a))[0] == ((const uint32_t *)(b))[0] \
|
||||
&& ((const uint32_t *)(a))[1] == ((const uint32_t *)(b))[1] \
|
||||
&& ((const uint32_t *)(a))[2] == ((const uint32_t *)(b))[2] \
|
||||
&& ((const uint32_t *)(a))[3] == ((const uint32_t *)(b))[3])
|
||||
|
||||
#define IN6_IS_ADDR_UNSPECIFIED(addr) \
|
||||
(((const uint32_t *)(addr))[0] == 0 \
|
||||
&& ((const uint32_t *)(addr))[1] == 0 \
|
||||
&& ((const uint32_t *)(addr))[2] == 0 \
|
||||
&& ((const uint32_t *)(addr))[3] == 0)
|
||||
|
||||
#define IN6_IS_ADDR_LOOPBACK(addr) \
|
||||
(((const uint32_t *)(addr))[0] == 0 \
|
||||
&& ((const uint32_t *)(addr))[1] == 0 \
|
||||
&& ((const uint32_t *)(addr))[2] == 0 \
|
||||
&& ((const uint32_t *)(addr))[3] == htonl (1))
|
||||
|
||||
#define IN6_IS_ADDR_MULTICAST(addr) (((const uint8_t *) (addr))[0] == 0xff)
|
||||
|
||||
#define IN6_IS_ADDR_LINKLOCAL(addr) \
|
||||
((((const uint16_t *)(addr))[0] & htons (0xffc0)) == htons (0xfe80))
|
||||
|
||||
#define IN6_IS_ADDR_SITELOCAL(addr) \
|
||||
((((const uint16_t *)(addr))[0] & htons (0xffc0)) == htons (0xfec0))
|
||||
|
||||
#define IN6_IS_ADDR_V4MAPPED(addr) \
|
||||
(((const uint32_t *)(addr))[0] == 0 \
|
||||
&& ((const uint32_t *)(addr))[1] == 0 \
|
||||
&& ((const uint32_t *)(addr))[2] == htonl (0xffff))
|
||||
|
||||
#define IN6_IS_ADDR_V4COMPAT(addr) \
|
||||
(((const uint32_t *)(addr))[0] == 0 \
|
||||
&& ((const uint32_t *)(addr))[1] == 0 \
|
||||
&& ((const uint32_t *)(addr))[2] == 0 \
|
||||
&& ntohl (((const uint32_t *)(addr))[3]) > 1)
|
||||
|
||||
#define IN6_IS_ADDR_MC_NODELOCAL(addr) \
|
||||
(IN6_IS_ADDR_MULTICAST(addr) \
|
||||
&& (((const uint8_t *)(addr))[1] & 0xf) == 0x1)
|
||||
|
||||
#define IN6_IS_ADDR_MC_LINKLOCAL(addr) \
|
||||
(IN6_IS_ADDR_MULTICAST (addr) \
|
||||
&& (((const uint8_t *)(addr))[1] & 0xf) == 0x2)
|
||||
|
||||
#define IN6_IS_ADDR_MC_SITELOCAL(addr) \
|
||||
(IN6_IS_ADDR_MULTICAST(addr) \
|
||||
&& (((const uint8_t *)(addr))[1] & 0xf) == 0x5)
|
||||
|
||||
#define IN6_IS_ADDR_MC_ORGLOCAL(addr) \
|
||||
(IN6_IS_ADDR_MULTICAST(addr) \
|
||||
&& (((const uint8_t *)(addr))[1] & 0xf) == 0x8)
|
||||
|
||||
#define IN6_IS_ADDR_MC_GLOBAL(addr) \
|
||||
(IN6_IS_ADDR_MULTICAST(addr) \
|
||||
&& (((const uint8_t *)(addr))[1] & 0xf) == 0xe)
|
||||
|
||||
struct in6_addr
|
||||
{
|
||||
union
|
||||
{
|
||||
uint8_t __s6_addr[16];
|
||||
uint16_t __s6_addr16[8];
|
||||
uint32_t __s6_addr32[4];
|
||||
} __u6;
|
||||
#define s6_addr __u6.__s6_addr
|
||||
#define s6_addr16 __u6.__s6_addr16
|
||||
#define s6_addr32 __u6.__s6_addr32
|
||||
};
|
||||
|
||||
struct ipv6_mreq
|
||||
{
|
||||
struct in6_addr ipv6mr_multiaddr;
|
||||
unsigned int ipv6mr_interface;
|
||||
};
|
||||
|
||||
struct in6_pktinfo
|
||||
{
|
||||
struct in6_addr ipi6_addr;
|
||||
unsigned int ipi6_ifindex;
|
||||
};
|
||||
|
||||
#ifdef __INSIDE_CYGWIN__
|
||||
typedef uint16_t in_port_t;
|
||||
#endif
|
||||
|
||||
struct sockaddr_in6
|
||||
{
|
||||
sa_family_t sin6_family; /* AF_INET6 */
|
||||
in_port_t sin6_port; /* Port number. */
|
||||
uint32_t sin6_flowinfo; /* Traffic class and flow inf. */
|
||||
struct in6_addr sin6_addr; /* IPv6 address. */
|
||||
uint32_t sin6_scope_id; /* Set of interfaces for a scope. */
|
||||
};
|
||||
|
||||
#define IN6ADDR_ANY_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
|
||||
#define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }
|
||||
|
||||
extern const struct in6_addr in6addr_any;
|
||||
extern const struct in6_addr in6addr_loopback;
|
||||
|
||||
#endif /* _CYGWIN_IN6_H */
|
||||
@@ -152,9 +152,7 @@ struct OLD_msghdr
|
||||
#define AF_HYLINK 15 /* NSC Hyperchannel */
|
||||
#define AF_APPLETALK 16 /* AppleTalk */
|
||||
#define AF_NETBIOS 17 /* NetBios-style addresses */
|
||||
#if 0 /* Not yet */
|
||||
#define AF_INET6 23 /* IP version 6 */
|
||||
#endif
|
||||
|
||||
#define AF_MAX 32
|
||||
/*
|
||||
@@ -180,9 +178,7 @@ struct OLD_msghdr
|
||||
#define PF_HYLINK AF_HYLINK
|
||||
#define PF_APPLETALK AF_APPLETALK
|
||||
#define PF_NETBIOS AF_NETBIOS
|
||||
#if 0
|
||||
#define PF_INET6 AF_INET6
|
||||
#endif
|
||||
|
||||
#define PF_MAX AF_MAX
|
||||
|
||||
@@ -236,6 +232,17 @@ struct OLD_msghdr
|
||||
#define IP_UNBLOCK_SOURCE 18
|
||||
#define IP_PKTINFO 19
|
||||
|
||||
/* IPv6 options for use with getsockopt/setsockopt */
|
||||
#define IPV6_UNICAST_HOPS 4
|
||||
#define IPV6_MULTICAST_IF 9
|
||||
#define IPV6_MULTICAST_HOPS 10
|
||||
#define IPV6_MULTICAST_LOOP 11
|
||||
#define IPV6_ADD_MEMBERSHIP 12
|
||||
#define IPV6_DROP_MEMBERSHIP 13
|
||||
#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
|
||||
#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP
|
||||
#define IPV6_PKTINFO 19
|
||||
|
||||
/* Old WinSock1 values, needed internally */
|
||||
#ifdef __INSIDE_CYGWIN__
|
||||
#define _WS1_IP_OPTIONS 1
|
||||
|
||||
@@ -31,6 +31,8 @@ int grantpt (int);
|
||||
int unlockpt (int);
|
||||
#endif /*__STRICT_ANSI__*/
|
||||
|
||||
int posix_openpt (int);
|
||||
|
||||
#ifdef _COMPILING_NEWLIB
|
||||
#define unsetenv UNUSED_unsetenv
|
||||
#define _unsetenv_r UNUSED__unsetenv_r
|
||||
|
||||
@@ -42,8 +42,8 @@ details. */
|
||||
the Cygwin shared library". This version is used to track important
|
||||
changes to the DLL and is mainly informative in nature. */
|
||||
|
||||
#define CYGWIN_VERSION_DLL_MAJOR 1005
|
||||
#define CYGWIN_VERSION_DLL_MINOR 22
|
||||
#define CYGWIN_VERSION_DLL_MAJOR 1007
|
||||
#define CYGWIN_VERSION_DLL_MINOR 0
|
||||
|
||||
/* Major numbers before CYGWIN_VERSION_DLL_EPOCH are
|
||||
incompatible. */
|
||||
@@ -289,12 +289,17 @@ details. */
|
||||
154: Export sigset, sigignore.
|
||||
155: Export __isinff, __isinfd, __isnanf, __isnand.
|
||||
156: Export __srbuf_r, __swget_r.
|
||||
157: Export gai_strerror, getaddrinfo, getnameinfo, freeaddrinfo,
|
||||
in6addr_any, in6addr_loopback.
|
||||
158: Export bindresvport, bindresvport_sa, iruserok_sa, rcmd_af,
|
||||
rresvport_af.
|
||||
159: Export posix_openpt.
|
||||
*/
|
||||
|
||||
/* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
|
||||
|
||||
#define CYGWIN_VERSION_API_MAJOR 0
|
||||
#define CYGWIN_VERSION_API_MINOR 156
|
||||
#define CYGWIN_VERSION_API_MINOR 159
|
||||
|
||||
/* There is also a compatibity version number associated with the
|
||||
shared memory regions. It is incremented when incompatible
|
||||
|
||||
@@ -63,6 +63,9 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
#include <cygwin/socket.h>
|
||||
|
||||
/*
|
||||
* Structures returned by network data base library. All addresses are
|
||||
* supplied in host order, and returned in network order (suitable for
|
||||
@@ -88,7 +91,7 @@ struct netent {
|
||||
char *n_name; /* official name of net */
|
||||
char **n_aliases; /* alias list */
|
||||
short n_addrtype; /* net address type */
|
||||
unsigned long n_net; /* network # */
|
||||
uint32_t n_net; /* network # */
|
||||
};
|
||||
|
||||
struct servent {
|
||||
@@ -111,6 +114,17 @@ struct rpcent {
|
||||
int r_number; /* rpc program number */
|
||||
};
|
||||
|
||||
struct addrinfo {
|
||||
int ai_flags; /* input flags */
|
||||
int ai_family; /* address family of socket */
|
||||
int ai_socktype; /* socket type */
|
||||
int ai_protocol; /* ai_protocol */
|
||||
socklen_t ai_addrlen; /* length of socket address */
|
||||
char *ai_canonname; /* canonical name of service location */
|
||||
struct sockaddr *ai_addr; /* socket address of socket */
|
||||
struct addrinfo *ai_next; /* pointer to next in list */
|
||||
};
|
||||
|
||||
/*
|
||||
* Error return codes from gethostbyname() and gethostbyaddr()
|
||||
* (left in extern int h_errno).
|
||||
@@ -130,6 +144,45 @@ extern __declspec(dllimport) int h_errno;
|
||||
#define NO_DATA 4 /* Valid name, no data record of requested type */
|
||||
#define NO_ADDRESS NO_DATA /* no address, look for MX record */
|
||||
|
||||
#define AI_PASSIVE 1
|
||||
#define AI_CANONNAME 2
|
||||
#define AI_NUMERICHOST 4
|
||||
/*
|
||||
* These are not available in the WinSock implementation. It wouldn't make
|
||||
* sense to support them in the ipv4 only case, so we drop them entirely.
|
||||
* We can define them if we run into problems but they are non-functional, so...
|
||||
*/
|
||||
#if 0
|
||||
#define AI_V4MAPPED 16
|
||||
#define AI_ALL 32
|
||||
#define AI_ADDRCONFIG 64
|
||||
#endif
|
||||
|
||||
#define NI_NOFQDN 1
|
||||
#define NI_NUMERICHOST 2
|
||||
#define NI_NAMEREQD 4
|
||||
#define NI_NUMERICSERV 8
|
||||
#define NI_DGRAM 16
|
||||
|
||||
#define NI_MAXHOST 1025
|
||||
#define NI_MAXSERV 32
|
||||
|
||||
#define EAI_ADDRFAMILY 1
|
||||
#define EAI_AGAIN 2
|
||||
#define EAI_BADFLAGS 3
|
||||
#define EAI_FAIL 4
|
||||
#define EAI_FAMILY 5
|
||||
#define EAI_MEMORY 6
|
||||
#define EAI_NODATA 7
|
||||
#define EAI_NONAME 8
|
||||
#define EAI_SERVICE 9
|
||||
#define EAI_SOCKTYPE 10
|
||||
#define EAI_SYSTEM 11
|
||||
#define EAI_BADHINTS 12
|
||||
#define EAI_PROTOCOL 13
|
||||
|
||||
#define EAI_MAX 14
|
||||
|
||||
#ifndef __INSIDE_CYGWIN_NET__
|
||||
void endhostent (void);
|
||||
void endnetent (void);
|
||||
@@ -158,6 +211,24 @@ void setnetent (int);
|
||||
void setprotoent (int);
|
||||
void setservent (int);
|
||||
void setrpcent (int);
|
||||
void freeaddrinfo (struct addrinfo *);
|
||||
const char *gai_strerror (int);
|
||||
int getaddrinfo (const char *, const char *,
|
||||
const struct addrinfo *, struct addrinfo **);
|
||||
int getnameinfo (const struct sockaddr *, socklen_t, char *,
|
||||
socklen_t, char *, socklen_t, int);
|
||||
|
||||
int rcmd (char **, uint16_t, const char *, const char *,
|
||||
const char *, int *);
|
||||
int rcmd_af (char **, uint16_t, const char *, const char *,
|
||||
const char *, int *, int);
|
||||
int rexec (char **, uint16_t rport, char *, char *, char *, int *);
|
||||
int rresvport (int *);
|
||||
int rresvport_af (int *, int);
|
||||
int iruserok (unsigned long, int, const char *, const char *);
|
||||
int iruserok_sa (const void *, int, int, const char *,
|
||||
const char *);
|
||||
int ruserok (const char *, int, const char *, const char *);
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/* netinet/in.h
|
||||
|
||||
Copyright 1998, 2001 Red Hat, Inc.
|
||||
Copyright 1998, 2001, 2006 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
@@ -13,4 +13,16 @@ details. */
|
||||
|
||||
#include <cygwin/in.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
extern int bindresvport (int, struct sockaddr_in *);
|
||||
extern int bindresvport_sa (int, struct sockaddr *);
|
||||
|
||||
#ifdef __cplusplus
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif /* _NETINET_IN_H */
|
||||
|
||||
@@ -32,14 +32,14 @@ extern "C"
|
||||
int getpeername (int, struct sockaddr *__peer, socklen_t *);
|
||||
int getsockname (int, struct sockaddr *__addr, socklen_t *);
|
||||
int listen (int, int __n);
|
||||
int recv (int, void *__buff, size_t __len, int __flags);
|
||||
int recvfrom (int, void *__buff, size_t __len, int __flags,
|
||||
struct sockaddr *__from, socklen_t *__fromlen);
|
||||
int recvmsg(int s, struct msghdr *msg, int flags);
|
||||
int send (int, const void *__buff, size_t __len, int __flags);
|
||||
int sendmsg(int s, const struct msghdr *msg, int flags);
|
||||
int sendto (int, const void *, size_t __len, int __flags,
|
||||
const struct sockaddr *__to, socklen_t __tolen);
|
||||
ssize_t recv (int, void *__buff, size_t __len, int __flags);
|
||||
ssize_t recvfrom (int, void *__buff, size_t __len, int __flags,
|
||||
struct sockaddr *__from, socklen_t *__fromlen);
|
||||
ssize_t recvmsg(int s, struct msghdr *msg, int flags);
|
||||
ssize_t send (int, const void *__buff, size_t __len, int __flags);
|
||||
ssize_t sendmsg(int s, const struct msghdr *msg, int flags);
|
||||
ssize_t sendto (int, const void *, size_t __len, int __flags,
|
||||
const struct sockaddr *__to, socklen_t __tolen);
|
||||
int setsockopt (int __s, int __level, int __optname, const void *optval,
|
||||
socklen_t __optlen);
|
||||
int getsockopt (int __s, int __level, int __optname, void *__optval,
|
||||
|
||||
Reference in New Issue
Block a user