Changeset 183 for trunk/src/emx/include/sys/socket.h

Timestamp:

May 19, 2003, 4:41:00 AM (22 years ago)

Author:

bird

Message:

#434: Initial tcpip header merges.

File:

• trunk/src/emx/include/sys/socket.h (modified) (16 diffs, 1 prop)

trunk/src/emx/include/sys/socket.h

@@ -1 +1 @@
 /* Modified for emx by hv and em 1994-1997
+ * Modified for gcc/os2 by bird 2003
  *
  * Copyright (c) 1982,1985,1986,1988 Regents of the University of California.
@@ -39 +40 @@
 #define _SYS_SOCKET_H_
 
-#if !defined (_SYS_TYPES_H)
-#warning <sys/socket.h> requires <sys/types.h>
+#include <machine/ansi.h>
+#define _NO_NAMESPACE_POLLUTION
+#include <machine/param.h>
+#undef _NO_NAMESPACE_POLLUTION
+
+
+/* toolkit stuff */
 #include <sys/types.h>
-#endif
-
 #include <sys/uio.h>
+#include <sys/cdefs.h>
 
 #if defined (__cplusplus)
@@ -82 +87 @@
 #define SO_RCV_SHUTDOWN 0x0400          /* set if shut down called for rcv */
 #define SO_SND_SHUTDOWN 0x0800          /* set if shutdown called for send */
+#ifndef TCPV40HDRS
+#define SO_REUSEPORT    0x1000          /* allow local address & port reuse */
+#define SO_TTCP         0x2000          /* allow t/tcp on socket */
+#endif
 
 /*
@@ -90 +99 @@
 #define SO_SNDLOWAT     0x1003          /* send low-water mark */
 #define SO_RCVLOWAT     0x1004          /* receive low-water mark */
+#ifndef TCPV40HDRS
 #define SO_SNDTIMEO     0x1005          /* send timeout */
 #define SO_RCVTIMEO     0x1006          /* receive timeout */
+#endif
 #define SO_ERROR        0x1007          /* get error status and clear */
 #define SO_TYPE         0x1008          /* get socket type */
@@ -119 +130 @@
 #define AF_UNSPEC       0               /* unspecified */
 #define AF_UNIX         1               /* local to host (pipes, portals) */
+#ifndef TCPV40HDRS
+#define AF_LOCAL        AF_UNIX
+#endif
+#define AF_OS2          AF_UNIX
 #define AF_INET         2               /* internetwork: UDP, TCP, etc. */
 #define AF_IMPLINK      3               /* arpanet imp addresses */
@@ -124 +139 @@
 #define AF_CHAOS        5               /* mit CHAOS protocols */
 #define AF_NS           6               /* XEROX NS protocols */
+#ifdef TCPV40HDRS
 #define AF_NBS          7               /* IBM: nbs protocols */
                                         /* (hv: I think IBM is outdated here */
+#endif
 #define AF_ISO          7               /* ISO protocols */
 #define AF_OSI          AF_ISO
@@ -140 +157 @@
 #define AF_NETBIOS      AF_NB
 
-#define AF_OS2          AF_UNIX
-
+#ifdef TCPV40HDRS
 #define AF_MAX          18
+#else
+#define AF_LINK         18              /* Link layer interface */
+#define pseudo_AF_XTP   19              /* eXpress Transfer Protocol (no AF) */
+#define AF_COIP         20              /* connection-oriented IP, aka ST II */
+#define AF_CNT          21              /* Computer Network Technology */
+#define pseudo_AF_RTIP  22              /* Help Identify RTIP packets */
+#define AF_IPX          23              /* Novell Internet Protocol */
+#define AF_SIP          24              /* Simple Internet Protocol */
+#define AF_INET6        24
+#define pseudo_AF_PIP   25              /* Help Identify PIP packets */
+#define AF_ROUTE        39              /* Internal Routing Protocol */
+#define AF_FWIP         40              /* firewall support */
+#define AF_IPSEC        41              /* IPSEC and encryption techniques */
+#define AF_DES          42              /* DES */
+#define AF_MD5          43
+#define AF_CDMF         44
+
+#define AF_MAX          45
+#endif
+
 
 /*
@@ -150 +186 @@
  */
 struct sockaddr {
+#ifdef TCPV40HDRS
         u_short sa_family;              /* address family */
         char    sa_data[14];            /* up to 14 bytes of direct address */
+#else
+        u_char  sa_len;                 /* total length */
+        u_char  sa_family;              /* address family */
+        char    sa_data[14];            /* actually longer; address value */
+#endif
 };
 
@@ -168 +210 @@
 #define PF_UNSPEC       AF_UNSPEC
 #define PF_UNIX         AF_UNIX
+#ifndef TCPV40HDRS
+#define PF_LOCAL        AF_LOCAL
+#endif
+#define PF_OS2          AF_UNIX
 #define PF_INET         AF_INET
 #define PF_IMPLINK      AF_IMPLINK
@@ -173 +219 @@
 #define PF_CHAOS        AF_CHAOS
 #define PF_NS           AF_NS
+#ifdef TCPV40HDRS
 #define PF_NBS          AF_NBS
+#endif
 #define PF_ISO          AF_ISO
-#define PF_OSI          AF_ISO
+#define PF_OSI          AF_OSI
 #define PF_ECMA         AF_ECMA
 #define PF_DATAKIT      AF_DATAKIT
@@ -185 +233 @@
 #define PF_HYLINK       AF_HYLINK
 #define PF_APPLETALK    AF_APPLETALK
+#define PF_NETBIOS      AF_NB
 #define PF_NB           AF_NB
-#define PF_NETBIOS      AF_NB
-#define PF_OS2          AF_UNIX
+#ifndef TCPV40HDRS
+#define PF_ROUTE        AF_ROUTE
+#define PF_LINK         AF_LINK
+#define PF_XTP          pseudo_AF_XTP   /* really just proto family, no AF */
+#define PF_COIP         AF_COIP
+#define PF_CNT          AF_CNT
+#define PF_SIP          AF_SIP
+#define PF_INET6        AF_INET6
+#define PF_IPX          AF_IPX          /* same format as AF_NS */
+#define PF_RTIP         pseudo_AF_FTIP  /* same format as AF_INET */
+#define PF_PIP          pseudo_AF_PIP
+#endif /* !TCPV40HDRS */
+
 #define PF_MAX          AF_MAX
 
+
+#ifndef TCPV40HDRS
+/*
+ * Definitions for network related sysctl, CTL_NET.
+ *
+ * Second level is protocol family.
+ * Third level is protocol number.
+ *
+ * Further levels are defined by the individual families below.
+ */
+#define NET_MAXID       AF_MAX
+
+#define CTL_NET_NAMES { \
+        { 0, 0 }, \
+        { "local", CTLTYPE_NODE }, \
+        { "inet", CTLTYPE_NODE }, \
+        { "implink", CTLTYPE_NODE }, \
+        { "pup", CTLTYPE_NODE }, \
+        { "chaos", CTLTYPE_NODE }, \
+        { "xerox_ns", CTLTYPE_NODE }, \
+        { "iso", CTLTYPE_NODE }, \
+        { "emca", CTLTYPE_NODE }, \
+        { "datakit", CTLTYPE_NODE }, \
+        { "ccitt", CTLTYPE_NODE }, \
+        { "ibm_sna", CTLTYPE_NODE }, \
+        { "decnet", CTLTYPE_NODE }, \
+        { "dec_dli", CTLTYPE_NODE }, \
+        { "lat", CTLTYPE_NODE }, \
+        { "hylink", CTLTYPE_NODE }, \
+        { "appletalk", CTLTYPE_NODE }, \
+        { "netbios", CTLTYPE_NODE }, \
+        { "route", CTLTYPE_NODE }, \
+        { "link_layer", CTLTYPE_NODE }, \
+        { "xtp", CTLTYPE_NODE }, \
+        { "coip", CTLTYPE_NODE }, \
+        { "cnt", CTLTYPE_NODE }, \
+        { "rtip", CTLTYPE_NODE }, \
+        { "ipx", CTLTYPE_NODE }, \
+        { "sip", CTLTYPE_NODE }, \
+        { "pip", CTLTYPE_NODE }, \
+}
+
+/*
+ * PF_ROUTE - Routing table
+ *
+ * Three additional levels are defined:
+ *      Fourth: address family, 0 is wildcard
+ *      Fifth: type of info, defined below
+ *      Sixth: flag(s) to mask with for NET_RT_FLAGS
+ */
+#define NET_RT_DUMP     1               /* dump; may limit to a.f. */
+#define NET_RT_FLAGS    2               /* by flags, e.g. RESOLVING */
+#define NET_RT_IFLIST   3               /* survey interface list */
+#define NET_RT_MAXID    4
+
+#define CTL_NET_RT_NAMES { \
+        { 0, 0 }, \
+        { "dump", CTLTYPE_STRUCT }, \
+        { "flags", CTLTYPE_STRUCT }, \
+        { "iflist", CTLTYPE_STRUCT }, \
+}
+
+#endif /* !TCPV40HDRS */
+
+
 /*
  * Maximum queue length specifiable by listen.
  */
+#ifdef TCPV40HDRS
 #define SOMAXCONN       5
+#else
+#define SOMAXCONN       1024
+#endif
 
 /*
@@ -201 +330 @@
 struct msghdr {
         caddr_t msg_name;               /* optional address */
+#ifdef TCPV40HDRS
         int     msg_namelen;            /* size of address */
         struct  iovec *msg_iov;         /* scatter/gather array */
@@ -206 +336 @@
         caddr_t msg_accrights;          /* access rights sent/received */
         int     msg_accrightslen;
+#else
+        u_int   msg_namelen;            /* size of address */
+        struct  iovec *msg_iov;         /* scatter/gather array */
+        u_int   msg_iovlen;             /* # elements in msg_iov */
+        caddr_t msg_control;            /* ancillary data, see below */
+        u_int   msg_controllen;         /* ancillary data buffer len */
+        long    msg_flags;              /* flags on received message */
+#endif
 };
 
@@ -211 +349 @@
 #define MSG_PEEK        0x2             /* peek at incoming message */
 #define MSG_DONTROUTE   0x4             /* send without using routing tables */
-#define MSG_EOR         0x8             /* data completes record */
-#define MSG_TRUNC       0x10            /* data discarded before delivery */
-#define MSG_CTRUNC      0x20            /* control data lost before delivery */
-#define MSG_WAITALL     0x40            /* wait for full request or error */
-
+#define MSG_FULLREAD    0x8             /* send without using routing tables */
+#ifndef TCPV40HDRS
+#define MSG_EOR         0x10            /* data completes record */
+#define MSG_TRUNC       0x20            /* data discarded before delivery */
+#define MSG_CTRUNC      0x40            /* control data lost before delivery */
+#define MSG_WAITALL     0x80            /* wait for full request or error */
+#define MSG_DONTWAIT    0x100           /* this message should be nonblocking */
+#ifdef TTCP
+#define MSG_EOF         0x200
+#endif
+#define MSG_MAPIO       0x400           /* mem mapped io */
+#define MSG_CLOSE       0x800           /* close connection after succesful send_file */
+#endif
+
+#ifdef TCPV40HDRS
 #define MSG_MAXIOVLEN   16
+#endif
 
 /*
@@ -246 +395 @@
 #define SCM_RIGHTS      0x01            /* access rights (array of int) */
 
-extern  int     accept (int, struct sockaddr *, int *);
-extern  int     bind (int, __const__ struct sockaddr *, int);
-extern  int     connect (int, __const__ struct sockaddr *, int);
-extern  int     gethostid (void);
-extern  int     getpeername (int, struct sockaddr *, int *);
-extern  int     getsockname (int, struct sockaddr *, int *);
-extern  int     getsockopt (int, int, int, void *, int *);
-extern  int     listen (int, int);
-extern  int     recv (int, void *, int, int);
-extern  int     recvfrom (int, void *, int, int, struct sockaddr *, int *);
-extern  int     recvmsg (int, struct msghdr *, int);
-extern  int     send (int, __const__ void *, int, int);
-extern  int     sendto (int, __const__ void *, int, int, __const__ struct sockaddr *, int);
-extern  int     sendmsg (int, __const__ struct msghdr *, int);
-extern  int     setsockopt (int, int, int, __const__ void *, int);
-extern  int     shutdown (int, int);
-extern  int     socket (int, int, int);
-extern  int     socketpair (int, int, int, int *);
-
-extern  int     _impsockhandle (int, int);
-
-/* special IBM prototypes 
- * hv: warning: usage of these routines may interfere with EMX operation
- * usage is not recommended.
- */
-extern  void    psock_errno(__const__ char*);
-extern  int     soabort(int);
-extern  int     soclose(int);
-extern  int     sock_init(void);
-extern  int     sock_errno(void);
-extern  int     so_cancel(int);
-extern  int     getinetversion(char*);
-
-/* hv: these are new TCPIPV4 data structures. Consult IBM doc on that */
-#ifdef TCPIPV4
+#ifndef TCPV40HDRS
+/*
+ * 4.3 compat sockaddr, move to compat file later
+ */
+struct osockaddr {
+        u_short sa_family;              /* address family */
+        char    sa_data[14];            /* up to 14 bytes of direct address */
+};
+
+/*
+ * 4.3-compat message header (move to compat file later).
+ */
+struct omsghdr {
+        caddr_t msg_name;               /* optional address */
+        int     msg_namelen;            /* size of address */
+        struct  iovec *msg_iov;         /* scatter/gather array */
+        int     msg_iovlen;             /* # elements in msg_iov */
+        caddr_t msg_accrights;          /* access rights sent/received */
+        int     msg_accrightslen;
+};
+
+/*
+ * send_file parameter structure
+ */
+struct sf_parms {
+        void   *header_data;      /* ptr to header data */
+        size_t header_length;     /* size of header data */
+        int    file_handle;       /* file handle to send from */
+        size_t file_size;         /* size of file */
+        int    file_offset;       /* byte offset in file to send from */
+        size_t file_bytes;        /* bytes of file to be sent */
+        void   *trailer_data;     /* ptr to trailer data */
+        size_t trailer_length;    /* size of trailer data */
+        size_t bytes_sent;        /* bytes sent in this send_file call */
+};
+#endif
+
+int     _System accept (int, struct sockaddr *, int *);
+int     _System bind (int, __const__ struct sockaddr *, int);
+int     _System connect (int, __const__ struct sockaddr *, int);
+int     _System gethostid (void);
+int     _System getpeername (int, struct sockaddr *, int *);
+int     _System getsockname (int, struct sockaddr *, int *);
+int     _System getsockopt (int, int, int, void *, int *);
+int     _System listen (int, int);
+int     _System recv (int, void *, int, int);
+int     _System recvfrom (int, void *, int, int, struct sockaddr *, int *);
+int     _System recvmsg (int, struct msghdr *, int);
+int     _System send (int, __const__ void *, int, int);
+int     _System sendto (int, __const__ void *, int, int, __const__ struct sockaddr *, int);
+int     _System sendmsg (int, __const__ struct msghdr *, int);
+int     _System setsockopt (int, int, int, __const__ void *, int);
+int     _System shutdown (int, int);
+int     _System socket (int, int, int);
+int     _System socketpair (int, int, int, int *);
+
+/* EMX addition */
+int    _impsockhandle (int, int);
+
+#ifndef TCPV40HDRS
+int     _System accept_and_recv (long, long*, struct sockaddr *, long*, struct sockaddr*, long*, caddr_t, size_t);
+#endif
+
+/* OS/2 additions */
+void    _System addsockettolist(int);
+int     _System removesocketfromlist(int);
+#include <sys/ioccom.h>
+#ifdef TCPV40HDRS
+#include <sys/select.h>
+#endif
+int     _System sock_init( void );
+int     _System sock_errno( void );
+void    _System psock_errno( char * );
+int     _System soclose( int );
+int     _System so_cancel(int);
+int     _System Raccept(int, struct sockaddr *, int *);
+#ifdef TCPV40HDRS
+struct sockaddr_in;
+int     _System Rbind(int, struct sockaddr_in *, int, struct sockaddr_in *);
+#else
+int     _System Rbind(int, struct sockaddr *, int, struct sockaddr *);
+#endif
+int     _System Rconnect(int, const struct sockaddr *, int);
+int     _System Rgetsockname(int, struct sockaddr *, int *);
+int     _System Rlisten(int, int);
+#ifndef TCPV40HDRS
+ssize_t _System send_file(int *, struct sf_parms *, int );
+char *  _System sock_strerror(int);
+int     _System getinetversion(char *);
+#endif
+
+
+/* more OS/2 stuff. */
+#ifndef MAXSOCKETS
+#define MAXSOCKETS      2048
+#endif
+
 #define MT_FREE         0
 #define MT_DATA         1
@@ -305 +516 @@
 };
 
-#define MAXSOCKETS      2048
 
 struct sostats {
         short count;
-        short socketdata[9*MAXSOCKETS];
-};
-#endif
+#ifdef TCPV40HDRS
+        short socketdata[9*MAXSOCKETS];
+#else
+        short socketdata[13*MAXSOCKETS];
+#endif
+};
 
 #if defined (__cplusplus)