Changeset 183 for trunk/src/emx/include/arpa

Timestamp:

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

Author:

bird

Message:

#434: Initial tcpip header merges.

Location:

trunk/src/emx/include/arpa

Files:

• ftp.h (modified) (2 diffs, 1 prop)
• inet.h (modified) (2 diffs, 1 prop)
• nameser.h (modified) (15 diffs, 1 prop)
• telnet.h (modified) (10 diffs, 1 prop)

trunk/src/emx/include/arpa/ftp.h

@@ -1 @@
-/*
+/* Modified for gcc by bird 2003
+ *
  * Copyright (c) 1983, 1989 Regents of the University of California.
  * All rights reserved.
@@ -36 +37 @@
 #ifndef _FTP_H_
 #define _FTP_H_
+#define _ARPA_FTP_H_
 
 /* Definitions for FTP; see RFC-765. */

trunk/src/emx/include/arpa/inet.h

@@ -1 +1 @@
 /* Modified for emx by hv and em 1994
+ * Modified for gcc/os2 by bird 2003
  *
  * Copyright (c) 1983 Regents of the University of California.
@@ -44 +45 @@
 
 /* External definitions for functions in inet(3) */
-extern u_long           inet_addr(__const__ char*);
-extern u_long           inet_lnaof(struct in_addr);
-extern struct in_addr   inet_makeaddr(u_long, u_long);
-extern u_long           inet_netof(struct in_addr);
-extern u_long           inet_network(__const__ char*);
-extern char*            inet_ntoa(struct in_addr);
+
+#ifndef TCPV40HDRS
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/cdefs.h>
+int             _System inet_aton (const char *, struct in_addr *);
+char *          _System inet_neta (u_long, char *, size_t);
+char *          _System inet_net_ntop (int, const void *, int, char *, size_t);
+int             _System inet_net_pton (int, const char *, void *, size_t);
+int             _System inet_pton (int af, const char *src, void *dst);
+const char *    _System inet_ntop (int af, const void *src, char *dst, size_t s);
+u_int           _System inet_nsap_addr (const char *, u_char *, int maxlen);
+char *          _System inet_nsap_ntoa (int, const u_char *, char *ascii);
+#endif
+
+extern u_long   _System inet_addr(__const__ char*);
+extern u_long   _System inet_lnaof(struct in_addr);
+extern struct in_addr _System inet_makeaddr(u_long, u_long);
+extern u_long   _System inet_netof(struct in_addr);
+extern u_long   _System inet_network(__const__ char*);
+extern char*    _System inet_ntoa(struct in_addr);
 
 #if defined (__cplusplus)

trunk/src/emx/include/arpa/nameser.h

@@ -1 +1 @@
 /* Modified for emx by hv 1994,1996
+ * Modified for gcc/os2 by bird 2003
  *
  * Copyright (c) 1983, 1989 Regents of the University of California.
@@ -45 +46 @@
 #include <sys/param.h>          /* htons() etc. */
 #include <machine/endian.h>     /* BYTE ORDER etc. */
+#ifndef TCPV40HDRS
+#include <types.h>
+#include <sys/cdefs.h>
+#endif
 
 /*
@@ -50 +55 @@
  */
 #define PACKETSZ        512             /* maximum packet size */
+#ifdef TCPV40HDRS
 #define MAXDNAME        256             /* maximum domain name */
+#else
+#define MAXDNAME        1025            /* maximum presentation domain name */
+#endif
 #define MAXCDNAME       255             /* maximum compressed domain name */
 #define MAXLABEL        63              /* maximum length of domain label */
@@ -57 +66 @@
         /* number of bytes of fixed size data in resource record */
 #define RRFIXEDSZ       10
+#ifndef TCPV40HDRS
+#define HFIXEDSZ        12              /* #/bytes of fixed data in header */
+#define RRFIXEDSZ       10              /* #/bytes of fixed data in r record */
+#define INT32SZ         4               /* for systems without 32-bit ints */
+#define INT16SZ         2               /* for systems without 16-bit ints */
+#define INADDRSZ        4               /* IPv4 T_A */
+#define IN6ADDRSZ       16              /* IPv6 T_AAAA */
+#endif
 
 /*
@@ -68 +85 @@
 #define QUERY           0x0             /* standard query */
 #define IQUERY          0x1             /* inverse query */
+#ifdef TCPV40HDRS
+#define CQUERYM         2               /* completion query (multiple) */
+#define CQUERYU         3               /* completion query (unique) */
+#endif
 #define STATUS          0x2             /* nameserver status query */
 /*#define xxx           0x3                0x3 reserved */
         /* non standard */
+#ifdef TCPV40HDRS
 /* IBM has changed these codes in TCP/IP for OS/2 */
 #define UPDATEA         100             /* add resource record */
@@ -77 +99 @@
 #define ZONEINIT        103             /* initial zone transfer */
 #define ZONEREF         104             /* incremental zone referesh */
+#else
+#define NS_NOTIFY_OP    0x4             /* notify secondary of SOA change */
+#endif
 
 /*
@@ -88 +113 @@
 #define REFUSED         5               /* query refused */
         /* non standard */
+#ifdef TCPV40HDRS
 #define NOCHANGE        100             /* update failed to change db */
+#endif
 
 /*
@@ -108 +135 @@
 #define T_MINFO         14              /* mailbox information */
 #define T_MX            15              /* mail routing information */
+#ifndef TCPV40HDRS
 #define T_TXT           16              /* text strings */
+#define T_RP            17              /* responsible person */
+#define T_AFSDB         18              /* AFS cell database */
+#define T_X25           19              /* X_25 calling address */
+#define T_ISDN          20              /* ISDN calling address */
+#define T_RT            21              /* router */
+#define T_NSAP          22              /* NSAP address */
+#define T_NSAP_PTR      23              /* reverse NSAP lookup (deprecated) */
+#define T_SIG           24              /* security signature */
+#define T_KEY           25              /* security key */
+#define T_PX            26              /* X.400 mail mapping */
+#define T_GPOS          27              /* geographical position (withdrawn) */
+#define T_AAAA          28              /* IP6 Address */
+#define T_LOC           29              /* Location Information */
+#define T_NXT           30              /* Next Valid Name in Zone */
+#define T_EID           31              /* Endpoint identifier */
+#define T_NIMLOC        32              /* Nimrod locator */
+#define T_SRV           33              /* Server selection */
+#define T_ATMA          34              /* ATM Address */
+#define T_NAPTR         35              /* Naming Authority PoinTeR */
+#endif
         /* non standard */
 #define T_UINFO         100             /* user (finger) information */
 #define T_UID           101             /* user ID */
 #define T_GID           102             /* group ID */
+#ifndef TCPV40HDRS
 #define T_UNSPEC        103             /* Unspecified format (binary data) */
+#endif
         /* Query type values which do not appear in resource records */
+#ifndef TCPV40HDRS
+#define T_IXFR          251             /* incremental zone transfer */
+#endif
 #define T_AXFR          252             /* transfer zone of authority */
 #define T_MAILB         253             /* transfer mailbox records */
@@ -125 +178 @@
 #define C_IN            1               /* the arpa internet */
 #define C_CHAOS         3               /* for chaos net at MIT */
+#ifndef TCPV40HDRS
 #define C_HS            4               /* for Hesiod name server at MIT */
+#endif
         /* Query class values which do not appear in resource records */
 #define C_ANY           255             /* wildcard match */
 
+/*
+ * Flags field of the KEY RR rdata
+ */
+#define KEYFLAG_TYPEMASK        0xC000  /* Mask for "type" bits */
+#define KEYFLAG_TYPE_AUTH_CONF  0x0000  /* Key usable for both */
+#define KEYFLAG_TYPE_CONF_ONLY  0x8000  /* Key usable for confidentiality */
+#define KEYFLAG_TYPE_AUTH_ONLY  0x4000  /* Key usable for authentication */
+#define KEYFLAG_TYPE_NO_KEY     0xC000  /* No key usable for either; no key */
+/* The type bits can also be interpreted independently, as single bits: */
+#define KEYFLAG_NO_AUTH         0x8000  /* Key not usable for authentication */
+#define KEYFLAG_NO_CONF         0x4000  /* Key not usable for confidentiality */
+
+#define KEYFLAG_EXPERIMENTAL    0x2000  /* Security is *mandatory* if bit=0 */
+#define KEYFLAG_RESERVED3       0x1000  /* reserved - must be zero */
+#define KEYFLAG_RESERVED4       0x0800  /* reserved - must be zero */
+#define KEYFLAG_USERACCOUNT     0x0400  /* key is assoc. with a user acct */
+#define KEYFLAG_ENTITY          0x0200  /* key is assoc. with entity eg host */
+#define KEYFLAG_ZONEKEY         0x0100  /* key is zone key for the zone named */
+#define KEYFLAG_IPSEC           0x0080  /* key is for IPSEC use (host or user)*/
+#define KEYFLAG_EMAIL           0x0040  /* key is for email (MIME security) */
+#define KEYFLAG_RESERVED10      0x0020  /* reserved - must be zero */
+#define KEYFLAG_RESERVED11      0x0010  /* reserved - must be zero */
+#define KEYFLAG_SIGNATORYMASK   0x000F  /* key can sign DNS RR's of same name */
+
+#define  KEYFLAG_RESERVED_BITMASK ( KEYFLAG_RESERVED3 | \
+                                    KEYFLAG_RESERVED4 | \
+                                    KEYFLAG_RESERVED10| KEYFLAG_RESERVED11)
+
+/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
+#define ALGORITHM_MD5RSA        1       /* MD5 with RSA */
+#define ALGORITHM_EXPIRE_ONLY   253     /* No alg, no security */
+#define ALGORITHM_PRIVATE_OID   254     /* Key begins with OID indicating alg */
+
+/* Signatures */
+                                        /* Size of a mod or exp in bits */
+#define MIN_MD5RSA_KEY_PART_BITS         512
+#define MAX_MD5RSA_KEY_PART_BITS        2552
+                                        /* Total of binary mod and exp, bytes */
+#define MAX_MD5RSA_KEY_BYTES            ((MAX_MD5RSA_KEY_PART_BITS+7/8)*2+3)
+                                        /* Max length of text sig block */
+#define MAX_KEY_BASE64                  (((MAX_MD5RSA_KEY_BYTES+2)/3)*4)
+
+#ifndef TCPV40HDRS
 /*
  * Status return codes for T_UNSPEC conversion routines
@@ -137 +235 @@
 #define CONV_BADCKSUM -3
 #define CONV_BADBUFLEN -4
+#endif
 
 /*
  * Structure for query header, the order of the fields is machine and
- * compiler dependent, in our case, the bits within a byte are assignd 
- * least significant first, while the order of transmition is most 
+ * compiler dependent, in our case, the bits within a byte are assignd
+ * least significant first, while the order of transmition is most
  * significant first.  This requires a somewhat confusing rearrangement.
  */
+#ifndef TCPV40HDRS
+#pragma pack(1)
+#endif
 typedef struct {
         u_short id;             /* query identification number */
@@ -155 +257 @@
                         /* fields in fourth byte */
         u_char  ra:1;           /* recursion available */
+#ifdef TCPV40HDRS
         u_char  pr:1;           /* primary server required (non standard) */
         u_char  unused:2;       /* unused bits */
+#else
+        u_char  unused :1;      /* unused bits (MBZ as of 4.9.3a3) */
+        u_char  ad: 1;          /* authentic data from named */
+        u_char  cd: 1;          /* checking disabled by resolver */
+#endif
         u_char  rcode:4;        /* response code */
 #endif
@@ -168 +276 @@
                         /* fields in fourth byte */
         u_char  rcode:4;        /* response code */
+#ifdef TCPV40HDRS
         u_char  unused:2;       /* unused bits */
         u_char  pr:1;           /* primary server required (non standard) */
+#else
+        u_char  cd: 1;          /* checking disabled by resolver */
+        u_char  ad: 1;          /* authentic data from named */
+        u_char  unused :1;      /* unused bits (MBZ as of 4.9.3a3) */
+#endif
         u_char  ra:1;           /* recursion available */
 #endif
@@ -178 +292 @@
         u_short arcount;        /* number of resource entries */
 } HEADER;
+#ifndef TCPV40HDRS
+#pragma pack()
+#endif
 
 /*
@@ -184 +301 @@
 #define INDIR_MASK      0xc0
 
+#ifdef TCPV40HDRS
 /*
  * Structure for passing resource records around.
@@ -197 +315 @@
 };
 #pragma pack()
-
-/*
- * Inline versions of get/put short/long.
- * Pointer is advanced; we assume that both arguments
- * are lvalues and will already be in registers.
- * cp MUST be u_char *.
+#endif
+
+#ifndef TCPV40HDRS
+/*
+ * Inline versions of get/put short/long.  Pointer is advanced.
+ *
+ * These macros demonstrate the property of C whereby it can be
+ * portable or it can be elegant but rarely both.
  */
 #define GETSHORT(s, cp) { \
-        (s) = *(cp)++ << 8; \
-        (s) |= *(cp)++; \
+        register u_char *t_cp = (u_char *)(cp); \
+        (s) = ((u_int16_t)t_cp[0] << 8) \
+            | ((u_int16_t)t_cp[1]) \
+            ; \
+        (cp) += INT16SZ; \
 }
 
 #define GETLONG(l, cp) { \
-        (l) = *(cp)++ << 8; \
-        (l) |= *(cp)++; (l) <<= 8; \
-        (l) |= *(cp)++; (l) <<= 8; \
-        (l) |= *(cp)++; \
-}
-
+        register u_char *t_cp = (u_char *)(cp); \
+        (l) = ((u_int32_t)t_cp[0] << 24) \
+            | ((u_int32_t)t_cp[1] << 16) \
+            | ((u_int32_t)t_cp[2] << 8) \
+            | ((u_int32_t)t_cp[3]) \
+            ; \
+        (cp) += INT32SZ; \
+}
 
 #define PUTSHORT(s, cp) { \
-        *(cp)++ = (s) >> 8; \
-        *(cp)++ = (s); \
-}
-
-/*
- * Warning: PUTLONG destroys its first argument.
- */
+        register u_int16_t t_s = (u_int16_t)(s); \
+        register u_char *t_cp = (u_char *)(cp); \
+        *t_cp++ = t_s >> 8; \
+        *t_cp   = t_s; \
+        (cp) += INT16SZ; \
+}
+
 #define PUTLONG(l, cp) { \
-        (cp)[3] = l; \
-        (cp)[2] = (l >>= 8); \
-        (cp)[1] = (l >>= 8); \
-        (cp)[0] = l >> 8; \
-        (cp) += sizeof(u_long); \
-}
+        register u_int32_t t_l = (u_int32_t)(l); \
+        register u_char *t_cp = (u_char *)(cp); \
+        *t_cp++ = t_l >> 24; \
+        *t_cp++ = t_l >> 16; \
+        *t_cp++ = t_l >> 8; \
+        *t_cp   = t_l; \
+        (cp) += INT32SZ; \
+}
+#endif /*!TCPV40HDRS*/
 
 /* function prototypes */
-u_short _getshort(u_char*);
-u_long  _getlong(u_char*);
-void    putshort(u_short, u_char *);
-void    putlong(u_long, u_char *);
-int     dn_expand(__const__ u_char*, __const__ u_char*, __const__ u_char*, 
-                  u_char*, int);
-int     dn_comp(__const__ u_char*, u_char*, int, u_char**, u_char**);
-int     dn_find(u_char*, u_char*, u_char**, u_char**);
-int     dn_skipname(__const__ u_char*, __const__ u_char*);
-int     res_init(void);
-int     res_mkquery(int, __const__ char*, int, int, __const__ char*, 
-                    int, __const__ struct rrec*, char*, int);
-int     res_send(__const__ char*, int, char*, int);
-int     res_query(char*, int, int, u_char*, int);
-int     res_search(char*, int, int, u_char*, int);
-int     res_querydomain(char*, char*, int, int, u_char*, int);
+u_short _System _getshort(u_char*);
+u_long  _System _getlong(u_char*);
+#ifdef TCPV40HDRS /* newer have this in resolver */
+void    _System putshort(u_short, u_char *);
+void    _System putlong(u_long, u_char *);
+int     _System dn_expand(__const__ u_char*, __const__ u_char*, __const__ u_char*, u_char*, int);
+int     _System dn_comp(__const__ u_char*, u_char*, int, u_char**, u_char**);
+int     _System dn_find(u_char*, u_char*, u_char**, u_char**);
+int     _System dn_skipname(__const__ u_char*, __const__ u_char*);
+int     _System res_init(void);
+int     _System res_mkquery(int, __const__ char*, int, int, __const__ char*, int, __const__ struct rrec*, char*, int);
+int     _System res_send(__const__ char*, int, char*, int);
+int     _System res_query(char*, int, int, u_char*, int);
+int     _System res_search(char*, int, int, u_char*, int);
+int     _System res_querydomain(char*, char*, int, int, u_char*, int);
+#endif
 
 #if defined (__cplusplus)

trunk/src/emx/include/arpa/telnet.h

@@ -1 @@
-/*
+/* Modified for gcc by bird 2003
+ *
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
@@ -36 +37 @@
 #ifndef _TELNET_H_
 #define _TELNET_H_
+#define _ARPA_TELNET_H_
 
 /*
@@ -75 +77 @@
 #define TELCMD_FIRST    xEOF
 #define TELCMD_LAST     IAC
-#define TELCMD_OK(x)    ((x) <= TELCMD_LAST && (x) >= TELCMD_FIRST)
+#define TELCMD_OK(x)    ((unsigned int)(x) <= TELCMD_LAST && (unsigned int)(x) >= TELCMD_FIRST)
 #define TELCMD(x)       telcmds[(x)-TELCMD_FIRST]
 
@@ -115 +117 @@
 #define TELOPT_LINEMODE 34      /* Linemode option */
 #define TELOPT_XDISPLOC 35      /* X Display Location */
-#define TELOPT_ENVIRON  36      /* Environment variables */
+#define TELOPT_OLD_ENVIRON 36   /* Old - Environment variables */
 #define TELOPT_AUTHENTICATION 37/* Authenticate */
 #define TELOPT_ENCRYPT  38      /* Encryption option */
+#define TELOPT_NEW_ENVIRON 39   /* New - Environment variables */
 #define TELOPT_EXOPL    255     /* extended-options-list */
 
 
-#define NTELOPTS        (1+TELOPT_ENCRYPT)
+#define NTELOPTS        (1+TELOPT_NEW_ENVIRON)
 #ifdef TELOPTS
 char *telopts[NTELOPTS+1] = {
@@ -132 +135 @@
         "TACACS UID", "OUTPUT MARKING", "TTYLOC",
         "3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
-        "LINEMODE", "XDISPLOC", "ENVIRON", "AUTHENTICATION",
-        "ENCRYPT",
+        "LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
+        "ENCRYPT", "NEW-ENVIRON",
         0,
 };
 #define TELOPT_FIRST    TELOPT_BINARY
-#define TELOPT_LAST     TELOPT_ENCRYPT
-#define TELOPT_OK(x)    ((x) <= TELOPT_LAST && (x) >= TELOPT_FIRST)
+#define TELOPT_LAST     TELOPT_NEW_ENVIRON
+#define TELOPT_OK(x)    ((unsigned int)(x) <= TELOPT_LAST)
 #define TELOPT(x)       telopts[(x)-TELOPT_FIRST]
 #endif
@@ -148 +151 @@
 #define TELQUAL_REPLY   2       /* AUTHENTICATION: client version of IS */
 #define TELQUAL_NAME    3       /* AUTHENTICATION: client version of IS */
+
+#define LFLOW_OFF               0       /* Disable remote flow control */
+#define LFLOW_ON                1       /* Enable remote flow control */
+#define LFLOW_RESTART_ANY       2       /* Restart output on any char */
+#define LFLOW_RESTART_XON       3       /* Restart output only on XON */
 
 /*
@@ -209 +217 @@
 #endif
 
-#define SLC_NAME_OK(x)  ((x) >= 0 && (x) < NSLC)
+#define SLC_NAME_OK(x)  ((unsigned int)(x) <= NSLC)
 #define SLC_NAME(x)     slc_names[x]
 
@@ -226 +234 @@
 #define SLC_FLUSHOUT    0x20
 
-#define ENV_VALUE       0
-#define ENV_VAR         1
-#define ENV_ESC         2
+#define OLD_ENV_VALUE   0
+#define OLD_ENV_VAR     1
+#define NEW_ENV_VAR     0
+#define NEW_ENV_VALUE   1
+#define ENV_ESC         2
+#define ENV_USERVAR     3
 
 /*
@@ -265 +276 @@
 #endif
 
-#define AUTHTYPE_NAME_OK(x)     ((x) >= 0 && (x) < AUTHTYPE_CNT)
+#define AUTHTYPE_NAME_OK(x)     ((unsigned int)(x) < AUTHTYPE_CNT)
 #define AUTHTYPE_NAME(x)        authtype_names[x]
 
@@ -302 +313 @@
 
 
-#define ENCRYPT_NAME_OK(x)      ((x) >= 0 && (x) < ENCRYPT_CNT)
+#define ENCRYPT_NAME_OK(x)      ((unsigned int)(x) < ENCRYPT_CNT)
 #define ENCRYPT_NAME(x)         encrypt_names[x]
 
-#define ENCTYPE_NAME_OK(x)      ((x) >= 0 && (x) < ENCTYPE_CNT)
+#define ENCTYPE_NAME_OK(x)      ((unsigned int)(x) < ENCTYPE_CNT)
 #define ENCTYPE_NAME(x)         enctype_names[x]