yann@1625: 2009-08-16 Aurelien Jarno yann@1625: yann@1625: * ports/sysdeps/unix/sysv/linux/alpha/bits/socket.h: New file based on yann@1625: the generic version, with SOCK_NONBLOCK matching the kernel value. yann@1625: yann@1625: diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/bits/socket.h glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/bits/socket.h yann@1625: --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/bits/socket.h 1970-01-01 01:00:00.000000000 +0100 yann@1625: +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/bits/socket.h 2009-11-13 00:51:17.000000000 +0100 yann@1625: @@ -0,0 +1,407 @@ yann@1625: +/* System-specific socket constants and types. Linux version. yann@1625: + Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009 yann@1625: + Free Software Foundation, Inc. yann@1625: + This file is part of the GNU C Library. yann@1625: + yann@1625: + The GNU C Library is free software; you can redistribute it and/or yann@1625: + modify it under the terms of the GNU Lesser General Public yann@1625: + License as published by the Free Software Foundation; either yann@1625: + version 2.1 of the License, or (at your option) any later version. yann@1625: + yann@1625: + The GNU C Library is distributed in the hope that it will be useful, yann@1625: + but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1625: + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU yann@1625: + Lesser General Public License for more details. yann@1625: + yann@1625: + You should have received a copy of the GNU Lesser General Public yann@1625: + License along with the GNU C Library; if not, write to the Free yann@1625: + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA yann@1625: + 02111-1307 USA. */ yann@1625: + yann@1625: +#ifndef __BITS_SOCKET_H yann@1625: +#define __BITS_SOCKET_H yann@1625: + yann@1625: +#ifndef _SYS_SOCKET_H yann@1625: +# error "Never include directly; use instead." yann@1625: +#endif yann@1625: + yann@1625: +#define __need_size_t yann@1625: +#include yann@1625: + yann@1625: +#include yann@1625: + yann@1625: +/* Type for length arguments in socket calls. */ yann@1625: +#ifndef __socklen_t_defined yann@1625: +typedef __socklen_t socklen_t; yann@1625: +# define __socklen_t_defined yann@1625: +#endif yann@1625: + yann@1625: +/* Types of sockets. */ yann@1625: +enum __socket_type yann@1625: +{ yann@1625: + SOCK_STREAM = 1, /* Sequenced, reliable, connection-based yann@1625: + byte streams. */ yann@1625: +#define SOCK_STREAM SOCK_STREAM yann@1625: + SOCK_DGRAM = 2, /* Connectionless, unreliable datagrams yann@1625: + of fixed maximum length. */ yann@1625: +#define SOCK_DGRAM SOCK_DGRAM yann@1625: + SOCK_RAW = 3, /* Raw protocol interface. */ yann@1625: +#define SOCK_RAW SOCK_RAW yann@1625: + SOCK_RDM = 4, /* Reliably-delivered messages. */ yann@1625: +#define SOCK_RDM SOCK_RDM yann@1625: + SOCK_SEQPACKET = 5, /* Sequenced, reliable, connection-based, yann@1625: + datagrams of fixed maximum length. */ yann@1625: +#define SOCK_SEQPACKET SOCK_SEQPACKET yann@1625: + SOCK_DCCP = 6, /* Datagram Congestion Control Protocol. */ yann@1625: +#define SOCK_DCCP SOCK_DCCP yann@1625: + SOCK_PACKET = 10, /* Linux specific way of getting packets yann@1625: + at the dev level. For writing rarp and yann@1625: + other similar things on the user level. */ yann@1625: +#define SOCK_PACKET SOCK_PACKET yann@1625: + yann@1625: + /* Flags to be ORed into the type parameter of socket and socketpair and yann@1625: + used for the flags parameter of paccept. */ yann@1625: + yann@1625: + SOCK_CLOEXEC = 02000000, /* Atomically set close-on-exec flag for the yann@1625: + new descriptor(s). */ yann@1625: +#define SOCK_CLOEXEC SOCK_CLOEXEC yann@1625: +#undef SOCK_NONBLOCK yann@1625: + SOCK_NONBLOCK = 0x40000000 /* Atomically mark descriptor(s) as yann@1625: + non-blocking. */ yann@1625: +#define SOCK_NONBLOCK SOCK_NONBLOCK yann@1625: +}; yann@1625: + yann@1625: +/* Protocol families. */ yann@1625: +#define PF_UNSPEC 0 /* Unspecified. */ yann@1625: +#define PF_LOCAL 1 /* Local to host (pipes and file-domain). */ yann@1625: +#define PF_UNIX PF_LOCAL /* POSIX name for PF_LOCAL. */ yann@1625: +#define PF_FILE PF_LOCAL /* Another non-standard name for PF_LOCAL. */ yann@1625: +#define PF_INET 2 /* IP protocol family. */ yann@1625: +#define PF_AX25 3 /* Amateur Radio AX.25. */ yann@1625: +#define PF_IPX 4 /* Novell Internet Protocol. */ yann@1625: +#define PF_APPLETALK 5 /* Appletalk DDP. */ yann@1625: +#define PF_NETROM 6 /* Amateur radio NetROM. */ yann@1625: +#define PF_BRIDGE 7 /* Multiprotocol bridge. */ yann@1625: +#define PF_ATMPVC 8 /* ATM PVCs. */ yann@1625: +#define PF_X25 9 /* Reserved for X.25 project. */ yann@1625: +#define PF_INET6 10 /* IP version 6. */ yann@1625: +#define PF_ROSE 11 /* Amateur Radio X.25 PLP. */ yann@1625: +#define PF_DECnet 12 /* Reserved for DECnet project. */ yann@1625: +#define PF_NETBEUI 13 /* Reserved for 802.2LLC project. */ yann@1625: +#define PF_SECURITY 14 /* Security callback pseudo AF. */ yann@1625: +#define PF_KEY 15 /* PF_KEY key management API. */ yann@1625: +#define PF_NETLINK 16 yann@1625: +#define PF_ROUTE PF_NETLINK /* Alias to emulate 4.4BSD. */ yann@1625: +#define PF_PACKET 17 /* Packet family. */ yann@1625: +#define PF_ASH 18 /* Ash. */ yann@1625: +#define PF_ECONET 19 /* Acorn Econet. */ yann@1625: +#define PF_ATMSVC 20 /* ATM SVCs. */ yann@1625: +#define PF_RDS 21 /* RDS sockets. */ yann@1625: +#define PF_SNA 22 /* Linux SNA Project */ yann@1625: +#define PF_IRDA 23 /* IRDA sockets. */ yann@1625: +#define PF_PPPOX 24 /* PPPoX sockets. */ yann@1625: +#define PF_WANPIPE 25 /* Wanpipe API sockets. */ yann@1625: +#define PF_LLC 26 /* Linux LLC. */ yann@1625: +#define PF_CAN 29 /* Controller Area Network. */ yann@1625: +#define PF_TIPC 30 /* TIPC sockets. */ yann@1625: +#define PF_BLUETOOTH 31 /* Bluetooth sockets. */ yann@1625: +#define PF_IUCV 32 /* IUCV sockets. */ yann@1625: +#define PF_RXRPC 33 /* RxRPC sockets. */ yann@1625: +#define PF_ISDN 34 /* mISDN sockets. */ yann@1625: +#define PF_PHONET 35 /* Phonet sockets. */ yann@1625: +#define PF_IEEE802154 36 /* IEEE 802.15.4 sockets. */ yann@1625: +#define PF_MAX 37 /* For now.. */ yann@1625: + yann@1625: +/* Address families. */ yann@1625: +#define AF_UNSPEC PF_UNSPEC yann@1625: +#define AF_LOCAL PF_LOCAL yann@1625: +#define AF_UNIX PF_UNIX yann@1625: +#define AF_FILE PF_FILE yann@1625: +#define AF_INET PF_INET yann@1625: +#define AF_AX25 PF_AX25 yann@1625: +#define AF_IPX PF_IPX yann@1625: +#define AF_APPLETALK PF_APPLETALK yann@1625: +#define AF_NETROM PF_NETROM yann@1625: +#define AF_BRIDGE PF_BRIDGE yann@1625: +#define AF_ATMPVC PF_ATMPVC yann@1625: +#define AF_X25 PF_X25 yann@1625: +#define AF_INET6 PF_INET6 yann@1625: +#define AF_ROSE PF_ROSE yann@1625: +#define AF_DECnet PF_DECnet yann@1625: +#define AF_NETBEUI PF_NETBEUI yann@1625: +#define AF_SECURITY PF_SECURITY yann@1625: +#define AF_KEY PF_KEY yann@1625: +#define AF_NETLINK PF_NETLINK yann@1625: +#define AF_ROUTE PF_ROUTE yann@1625: +#define AF_PACKET PF_PACKET yann@1625: +#define AF_ASH PF_ASH yann@1625: +#define AF_ECONET PF_ECONET yann@1625: +#define AF_ATMSVC PF_ATMSVC yann@1625: +#define AF_RDS PF_RDS yann@1625: +#define AF_SNA PF_SNA yann@1625: +#define AF_IRDA PF_IRDA yann@1625: +#define AF_PPPOX PF_PPPOX yann@1625: +#define AF_WANPIPE PF_WANPIPE yann@1625: +#define AF_LLC PF_LLC yann@1625: +#define AF_CAN PF_CAN yann@1625: +#define AF_TIPC PF_TIPC yann@1625: +#define AF_BLUETOOTH PF_BLUETOOTH yann@1625: +#define AF_IUCV PF_IUCV yann@1625: +#define AF_RXRPC PF_RXRPC yann@1625: +#define AF_ISDN PF_ISDN yann@1625: +#define AF_PHONET PF_PHONET yann@1625: +#define AF_IEEE802154 PF_IEEE802154 yann@1625: +#define AF_MAX PF_MAX yann@1625: + yann@1625: +/* Socket level values. Others are defined in the appropriate headers. yann@1625: + yann@1625: + XXX These definitions also should go into the appropriate headers as yann@1625: + far as they are available. */ yann@1625: +#define SOL_RAW 255 yann@1625: +#define SOL_DECNET 261 yann@1625: +#define SOL_X25 262 yann@1625: +#define SOL_PACKET 263 yann@1625: +#define SOL_ATM 264 /* ATM layer (cell level). */ yann@1625: +#define SOL_AAL 265 /* ATM Adaption Layer (packet level). */ yann@1625: +#define SOL_IRDA 266 yann@1625: + yann@1625: +/* Maximum queue length specifiable by listen. */ yann@1625: +#define SOMAXCONN 128 yann@1625: + yann@1625: +/* Get the definition of the macro to define the common sockaddr members. */ yann@1625: +#include yann@1625: + yann@1625: +/* Structure describing a generic socket address. */ yann@1625: +struct sockaddr yann@1625: + { yann@1625: + __SOCKADDR_COMMON (sa_); /* Common data: address family and length. */ yann@1625: + char sa_data[14]; /* Address data. */ yann@1625: + }; yann@1625: + yann@1625: + yann@1625: +/* Structure large enough to hold any socket address (with the historical yann@1625: + exception of AF_UNIX). We reserve 128 bytes. */ yann@1625: +#define __ss_aligntype unsigned long int yann@1625: +#define _SS_SIZE 128 yann@1625: +#define _SS_PADSIZE (_SS_SIZE - (2 * sizeof (__ss_aligntype))) yann@1625: + yann@1625: +struct sockaddr_storage yann@1625: + { yann@1625: + __SOCKADDR_COMMON (ss_); /* Address family, etc. */ yann@1625: + __ss_aligntype __ss_align; /* Force desired alignment. */ yann@1625: + char __ss_padding[_SS_PADSIZE]; yann@1625: + }; yann@1625: + yann@1625: + yann@1625: +/* Bits in the FLAGS argument to `send', `recv', et al. */ yann@1625: +enum yann@1625: + { yann@1625: + MSG_OOB = 0x01, /* Process out-of-band data. */ yann@1625: +#define MSG_OOB MSG_OOB yann@1625: + MSG_PEEK = 0x02, /* Peek at incoming messages. */ yann@1625: +#define MSG_PEEK MSG_PEEK yann@1625: + MSG_DONTROUTE = 0x04, /* Don't use local routing. */ yann@1625: +#define MSG_DONTROUTE MSG_DONTROUTE yann@1625: +#ifdef __USE_GNU yann@1625: + /* DECnet uses a different name. */ yann@1625: + MSG_TRYHARD = MSG_DONTROUTE, yann@1625: +# define MSG_TRYHARD MSG_DONTROUTE yann@1625: +#endif yann@1625: + MSG_CTRUNC = 0x08, /* Control data lost before delivery. */ yann@1625: +#define MSG_CTRUNC MSG_CTRUNC yann@1625: + MSG_PROXY = 0x10, /* Supply or ask second address. */ yann@1625: +#define MSG_PROXY MSG_PROXY yann@1625: + MSG_TRUNC = 0x20, yann@1625: +#define MSG_TRUNC MSG_TRUNC yann@1625: + MSG_DONTWAIT = 0x40, /* Nonblocking IO. */ yann@1625: +#define MSG_DONTWAIT MSG_DONTWAIT yann@1625: + MSG_EOR = 0x80, /* End of record. */ yann@1625: +#define MSG_EOR MSG_EOR yann@1625: + MSG_WAITALL = 0x100, /* Wait for a full request. */ yann@1625: +#define MSG_WAITALL MSG_WAITALL yann@1625: + MSG_FIN = 0x200, yann@1625: +#define MSG_FIN MSG_FIN yann@1625: + MSG_SYN = 0x400, yann@1625: +#define MSG_SYN MSG_SYN yann@1625: + MSG_CONFIRM = 0x800, /* Confirm path validity. */ yann@1625: +#define MSG_CONFIRM MSG_CONFIRM yann@1625: + MSG_RST = 0x1000, yann@1625: +#define MSG_RST MSG_RST yann@1625: + MSG_ERRQUEUE = 0x2000, /* Fetch message from error queue. */ yann@1625: +#define MSG_ERRQUEUE MSG_ERRQUEUE yann@1625: + MSG_NOSIGNAL = 0x4000, /* Do not generate SIGPIPE. */ yann@1625: +#define MSG_NOSIGNAL MSG_NOSIGNAL yann@1625: + MSG_MORE = 0x8000, /* Sender will send more. */ yann@1625: +#define MSG_MORE MSG_MORE yann@1625: + yann@1625: + MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file yann@1625: + descriptor received through yann@1625: + SCM_RIGHTS. */ yann@1625: +#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC yann@1625: + }; yann@1625: + yann@1625: + yann@1625: +/* Structure describing messages sent by yann@1625: + `sendmsg' and received by `recvmsg'. */ yann@1625: +struct msghdr yann@1625: + { yann@1625: + void *msg_name; /* Address to send to/receive from. */ yann@1625: + socklen_t msg_namelen; /* Length of address data. */ yann@1625: + yann@1625: + struct iovec *msg_iov; /* Vector of data to send/receive into. */ yann@1625: + size_t msg_iovlen; /* Number of elements in the vector. */ yann@1625: + yann@1625: + void *msg_control; /* Ancillary data (eg BSD filedesc passing). */ yann@1625: + size_t msg_controllen; /* Ancillary data buffer length. yann@1625: + !! The type should be socklen_t but the yann@1625: + definition of the kernel is incompatible yann@1625: + with this. */ yann@1625: + yann@1625: + int msg_flags; /* Flags on received message. */ yann@1625: + }; yann@1625: + yann@1625: +/* Structure used for storage of ancillary data object information. */ yann@1625: +struct cmsghdr yann@1625: + { yann@1625: + size_t cmsg_len; /* Length of data in cmsg_data plus length yann@1625: + of cmsghdr structure. yann@1625: + !! The type should be socklen_t but the yann@1625: + definition of the kernel is incompatible yann@1625: + with this. */ yann@1625: + int cmsg_level; /* Originating protocol. */ yann@1625: + int cmsg_type; /* Protocol specific type. */ yann@1625: +#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L yann@1625: + __extension__ unsigned char __cmsg_data __flexarr; /* Ancillary data. */ yann@1625: +#endif yann@1625: + }; yann@1625: + yann@1625: +/* Ancillary data object manipulation macros. */ yann@1625: +#if (!defined __STRICT_ANSI__ && __GNUC__ >= 2) || __STDC_VERSION__ >= 199901L yann@1625: +# define CMSG_DATA(cmsg) ((cmsg)->__cmsg_data) yann@1625: +#else yann@1625: +# define CMSG_DATA(cmsg) ((unsigned char *) ((struct cmsghdr *) (cmsg) + 1)) yann@1625: +#endif yann@1625: +#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg) yann@1625: +#define CMSG_FIRSTHDR(mhdr) \ yann@1625: + ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr) \ yann@1625: + ? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) 0) yann@1625: +#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \ yann@1625: + & (size_t) ~(sizeof (size_t) - 1)) yann@1625: +#define CMSG_SPACE(len) (CMSG_ALIGN (len) \ yann@1625: + + CMSG_ALIGN (sizeof (struct cmsghdr))) yann@1625: +#define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len)) yann@1625: + yann@1625: +extern struct cmsghdr *__cmsg_nxthdr (struct msghdr *__mhdr, yann@1625: + struct cmsghdr *__cmsg) __THROW; yann@1625: +#ifdef __USE_EXTERN_INLINES yann@1625: +# ifndef _EXTERN_INLINE yann@1625: +# define _EXTERN_INLINE __extern_inline yann@1625: +# endif yann@1625: +_EXTERN_INLINE struct cmsghdr * yann@1625: +__NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)) yann@1625: +{ yann@1625: + if ((size_t) __cmsg->cmsg_len < sizeof (struct cmsghdr)) yann@1625: + /* The kernel header does this so there may be a reason. */ yann@1625: + return 0; yann@1625: + yann@1625: + __cmsg = (struct cmsghdr *) ((unsigned char *) __cmsg yann@1625: + + CMSG_ALIGN (__cmsg->cmsg_len)); yann@1625: + if ((unsigned char *) (__cmsg + 1) > ((unsigned char *) __mhdr->msg_control yann@1625: + + __mhdr->msg_controllen) yann@1625: + || ((unsigned char *) __cmsg + CMSG_ALIGN (__cmsg->cmsg_len) yann@1625: + > ((unsigned char *) __mhdr->msg_control + __mhdr->msg_controllen))) yann@1625: + /* No more entries. */ yann@1625: + return 0; yann@1625: + return __cmsg; yann@1625: +} yann@1625: +#endif /* Use `extern inline'. */ yann@1625: + yann@1625: +/* Socket level message types. This must match the definitions in yann@1625: + . */ yann@1625: +enum yann@1625: + { yann@1625: + SCM_RIGHTS = 0x01 /* Transfer file descriptors. */ yann@1625: +#define SCM_RIGHTS SCM_RIGHTS yann@1625: +#ifdef __USE_GNU yann@1625: + , SCM_CREDENTIALS = 0x02 /* Credentials passing. */ yann@1625: +# define SCM_CREDENTIALS SCM_CREDENTIALS yann@1625: +#endif yann@1625: + }; yann@1625: + yann@1625: +#ifdef __USE_GNU yann@1625: +/* User visible structure for SCM_CREDENTIALS message */ yann@1625: +struct ucred yann@1625: +{ yann@1625: + pid_t pid; /* PID of sending process. */ yann@1625: + uid_t uid; /* UID of sending process. */ yann@1625: + gid_t gid; /* GID of sending process. */ yann@1625: +}; yann@1625: +#endif yann@1625: + yann@1625: +/* Ugly workaround for unclean kernel headers. */ yann@1625: +#if !defined __USE_MISC && !defined __USE_GNU yann@1625: +# ifndef FIOGETOWN yann@1625: +# define __SYS_SOCKET_H_undef_FIOGETOWN yann@1625: +# endif yann@1625: +# ifndef FIOSETOWN yann@1625: +# define __SYS_SOCKET_H_undef_FIOSETOWN yann@1625: +# endif yann@1625: +# ifndef SIOCATMARK yann@1625: +# define __SYS_SOCKET_H_undef_SIOCATMARK yann@1625: +# endif yann@1625: +# ifndef SIOCGPGRP yann@1625: +# define __SYS_SOCKET_H_undef_SIOCGPGRP yann@1625: +# endif yann@1625: +# ifndef SIOCGSTAMP yann@1625: +# define __SYS_SOCKET_H_undef_SIOCGSTAMP yann@1625: +# endif yann@1625: +# ifndef SIOCGSTAMPNS yann@1625: +# define __SYS_SOCKET_H_undef_SIOCGSTAMPNS yann@1625: +# endif yann@1625: +# ifndef SIOCSPGRP yann@1625: +# define __SYS_SOCKET_H_undef_SIOCSPGRP yann@1625: +# endif yann@1625: +#endif yann@1625: + yann@1625: +/* Get socket manipulation related informations from kernel headers. */ yann@1625: +#include yann@1625: + yann@1625: +#if !defined __USE_MISC && !defined __USE_GNU yann@1625: +# ifdef __SYS_SOCKET_H_undef_FIOGETOWN yann@1625: +# undef __SYS_SOCKET_H_undef_FIOGETOWN yann@1625: +# undef FIOGETOWN yann@1625: +# endif yann@1625: +# ifdef __SYS_SOCKET_H_undef_FIOSETOWN yann@1625: +# undef __SYS_SOCKET_H_undef_FIOSETOWN yann@1625: +# undef FIOSETOWN yann@1625: +# endif yann@1625: +# ifdef __SYS_SOCKET_H_undef_SIOCATMARK yann@1625: +# undef __SYS_SOCKET_H_undef_SIOCATMARK yann@1625: +# undef SIOCATMARK yann@1625: +# endif yann@1625: +# ifdef __SYS_SOCKET_H_undef_SIOCGPGRP yann@1625: +# undef __SYS_SOCKET_H_undef_SIOCGPGRP yann@1625: +# undef SIOCGPGRP yann@1625: +# endif yann@1625: +# ifdef __SYS_SOCKET_H_undef_SIOCGSTAMP yann@1625: +# undef __SYS_SOCKET_H_undef_SIOCGSTAMP yann@1625: +# undef SIOCGSTAMP yann@1625: +# endif yann@1625: +# ifdef __SYS_SOCKET_H_undef_SIOCGSTAMPNS yann@1625: +# undef __SYS_SOCKET_H_undef_SIOCGSTAMPNS yann@1625: +# undef SIOCGSTAMPNS yann@1625: +# endif yann@1625: +# ifdef __SYS_SOCKET_H_undef_SIOCSPGRP yann@1625: +# undef __SYS_SOCKET_H_undef_SIOCSPGRP yann@1625: +# undef SIOCSPGRP yann@1625: +# endif yann@1625: +#endif yann@1625: + yann@1625: +/* Structure used to manipulate the SO_LINGER option. */ yann@1625: +struct linger yann@1625: + { yann@1625: + int l_onoff; /* Nonzero to linger on close. */ yann@1625: + int l_linger; /* Time to linger. */ yann@1625: + }; yann@1625: + yann@1625: +#endif /* bits/socket.h */ yann@1625: diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/bits/socket.h glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/bits/socket.h