2016-09-23 Zack Weinberg <zackw@panix.com>
+ * bits/in.h, gmon/sys/gmon.h, inet/netinet/igmp.h
+ * inet/protocols/routed.h, inet/protocols/talkd.h
+ * inet/protocols/timed.h, io/fts.h, nptl_db/thread_db.h
+ * resolv/arpa/nameser.h, resolv/resolv.h, sunrpc/rpc/rpc_des.h
+ * sysdeps/generic/netinet/if_ether.h
+ * sysdeps/generic/netinet/in_systm.h
+ * sysdeps/generic/netinet/ip.h, sysdeps/generic/netinet/tcp.h
+ * sysdeps/gnu/netinet/ip_icmp.h, sysdeps/gnu/netinet/tcp.h
+ * sysdeps/gnu/netinet/udp.h, sysdeps/mach/hurd/net/ethernet.h
+ * sysdeps/mach/hurd/net/if_arp.h
+ * sysdeps/mach/hurd/net/if_ppp.h
+ * sysdeps/mach/hurd/net/route.h, sysdeps/mach/sys/reboot.h
+ * sysdeps/unix/sysv/linux/bits/in.h
+ * sysdeps/unix/sysv/linux/net/ethernet.h
+ * sysdeps/unix/sysv/linux/net/if_arp.h
+ * sysdeps/unix/sysv/linux/net/if_ppp.h
+ * sysdeps/unix/sysv/linux/net/if_shaper.h
+ * sysdeps/unix/sysv/linux/net/route.h
+ * sysdeps/unix/sysv/linux/netinet/if_ether.h
+ * sysdeps/unix/sysv/linux/netinet/if_fddi.h
+ * sysdeps/unix/sysv/linux/netinet/if_tr.h
+ * sysdeps/unix/sysv/linux/netipx/ipx.h
+ * sysdeps/unix/sysv/linux/sys/acct.h
+ * include/arpa/nameser.h, include/resolv.h:
+ Change all uses of u_char to unsigned char,
+ u_short and ushort to unsigned short, u_int and uint to unsigned int,
+ u_long and ulong to unsigned long, u_int8_t to uint8_t,
+ u_int16_t to uint16_t, u_int32_t to uint32_t, quad_t to int64_t,
+ and u_int64_t and u_quad_t to uint64_t.
+
+ * mach/sys/reboot.h: Remove two casts of integer literals
+ to the types they already have.
+
+ * bits/in.h: Correct error in description of IP_MULTICAST_LOOP.
+ * sysdeps/unix/sysv/linux/bits/in.h: Likewise.
+ * sysdeps/unix/sysv/linux/netinet/if_ether.h: Change a comment
+ from referring to 'unsigned char' to 'uint8_t' for consistency with
+ the macro definition below.
+
+ * gmon/sys/gmon.h, inet/netinet/igmp.h, inet/protocols/talkd.h
+ * io/fts.h, resolv/arpa/nameser.h, resolv/resolv.h
+ * sunrpc/rpc/rpc_des.h, sysdeps/generic/netinet/ip.h
+ * sysdeps/gnu/netinet/tcp.h, sysdeps/gnu/netinet/udp.h
+ * sysdeps/mach/hurd/net/if_ppp.h, sysdeps/unix/sysv/linux/net/if_ppp.h
+ * sysdeps/unix/sysv/linux/sys/acct.h
+ * include/arpa/nameser.h, include/resolv.h:
+ Fix indentation disrupted by mechanical edits.
+
+ * inet/protocols/talkd.h, resolv/arpa/nameser.h
+ * sysdeps/generic/netinet/in_systm.h
+ * sysdeps/gnu/netinet/ip_icmp.h, sysdeps/gnu/netinet/tcp.h
+ * sysdeps/gnu/netinet/udp.h
+ * sysdeps/unix/sysv/linux/net/ethernet.h
+ * sysdeps/unix/sysv/linux/net/if_arp.h
+ * sysdeps/unix/sysv/linux/net/if_ppp.h
+ * sysdeps/unix/sysv/linux/net/if_shaper.h
+ * sysdeps/unix/sysv/linux/netinet/if_fddi.h
+ * sysdeps/unix/sysv/linux/netinet/if_tr.h
+ * sysdeps/unix/sysv/linux/netipx/ipx.h
+ * sysdeps/unix/sysv/linux/sys/acct.h
+ Include stdint.h for uintNN_t definitions.
+ Don't include sys/cdefs.h, features.h, or asm/types.h directly.
+
+2016-09-23 Zack Weinberg <zackw@panix.com>
+
* rpcsvc/nislib.h: Include rpcsvc/nis.h.
* sysdeps/unix/sysv/linux/netrose/rose.h:
Include sys/socket.h and netax25/ax25.h.
#define IP_RECVDSTADDR 7 /* bool; Receive IP dst addr w/datagram. */
#define IP_RETOPTS 8 /* ip_opts; Set/get IP per-packet options. */
#define IP_MULTICAST_IF 9 /* in_addr; set/get IP multicast i/f */
-#define IP_MULTICAST_TTL 10 /* u_char; set/get IP multicast ttl */
-#define IP_MULTICAST_LOOP 11 /* i_char; set/get IP multicast loopback */
+#define IP_MULTICAST_TTL 10 /* unsigned char; set/get IP multicast ttl */
+#define IP_MULTICAST_LOOP 11 /* bool; set/get IP multicast loopback */
#define IP_ADD_MEMBERSHIP 12 /* ip_mreq; add an IP group membership */
#define IP_DROP_MEMBERSHIP 13 /* ip_mreq; drop an IP group membership */
/*
* The type used to represent indices into gmonparam.tos[].
*/
-#define ARCINDEX u_long
+#define ARCINDEX unsigned long
/*
* Maximum number of arcs we want to allow.
#define MAXARCS (1 << 20)
struct tostruct {
- u_long selfpc;
+ unsigned long selfpc;
long count;
ARCINDEX link;
};
* the called site and a count.
*/
struct rawarc {
- u_long raw_frompc;
- u_long raw_selfpc;
- long raw_count;
+ unsigned long raw_frompc;
+ unsigned long raw_selfpc;
+ long raw_count;
};
/*
*/
struct gmonparam {
long int state;
- u_short *kcount;
- u_long kcountsize;
+ unsigned short *kcount;
+ unsigned long kcountsize;
ARCINDEX *froms;
- u_long fromssize;
+ unsigned long fromssize;
struct tostruct *tos;
- u_long tossize;
+ unsigned long tossize;
long tolimit;
- u_long lowpc;
- u_long highpc;
- u_long textsize;
- u_long hashfraction;
+ unsigned long lowpc;
+ unsigned long highpc;
+ unsigned long textsize;
+ unsigned long hashfraction;
long log_hashfraction;
};
__BEGIN_DECLS
/* Set up data structures and start profiling. */
-extern void __monstartup (u_long __lowpc, u_long __highpc) __THROW;
-extern void monstartup (u_long __lowpc, u_long __highpc) __THROW;
+extern void __monstartup (unsigned long __lowpc, unsigned long __highpc) __THROW;
+extern void monstartup (unsigned long __lowpc, unsigned long __highpc) __THROW;
/* Clean up profiling and write out gmon.out. */
extern void _mcleanup (void) __THROW;
#endif
-extern u_int __ns_get16 (const u_char *) __THROW;
-extern u_long __ns_get32 (const u_char *) __THROW;
+extern unsigned int __ns_get16 (const unsigned char *) __THROW;
+extern unsigned long __ns_get32 (const unsigned char *) __THROW;
#define ns_msg_getflag(handle, flag) \
(((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift)
extern struct hostent *_gethtbyname (const char *__name);
extern struct hostent *_gethtbyname2 (const char *__name, int __af);
struct hostent *_gethtbyaddr (const char *addr, size_t __len, int __af);
-extern u_int32_t _getlong (const u_char *__src);
-extern u_int16_t _getshort (const u_char *__src);
-extern void res_pquery (const res_state __statp, const u_char *__msg,
+extern uint32_t _getlong (const unsigned char *__src);
+extern uint16_t _getshort (const unsigned char *__src);
+extern void res_pquery (const res_state __statp, const unsigned char *__msg,
int __len, FILE *__file);
extern int res_ourserver_p (const res_state __statp,
const struct sockaddr_in6 *__inp);
extern void __res_iclose (res_state statp, bool free_addr);
-extern int __res_nopt(res_state statp, int n0, u_char *buf, int buflen,
+extern int __res_nopt(res_state statp, int n0, unsigned char *buf, int buflen,
int anslen);
libc_hidden_proto (__res_ninit)
libc_hidden_proto (__res_maybe_init)
libc_hidden_proto (__res_randomid)
libc_hidden_proto (__res_state)
-int __libc_res_nquery (res_state, const char *, int, int, u_char *, int,
- u_char **, u_char **, int *, int *, int *);
-int __libc_res_nsearch (res_state, const char *, int, int, u_char *, int,
- u_char **, u_char **, int *, int *, int *);
-int __libc_res_nsend (res_state, const u_char *, int, const u_char *, int,
- u_char *, int, u_char **, u_char **, int *, int *, int *)
+int __libc_res_nquery (res_state, const char *, int, int,
+ unsigned char *, int, unsigned char **,
+ unsigned char **, int *, int *, int *);
+int __libc_res_nsearch (res_state, const char *, int, int,
+ unsigned char *, int, unsigned char **,
+ unsigned char **, int *, int *, int *);
+int __libc_res_nsend (res_state, const unsigned char *, int,
+ const unsigned char *, int, unsigned char *,
+ int, unsigned char **, unsigned char **,
+ int *, int *, int *)
attribute_hidden;
libresolv_hidden_proto (_sethtent)
*/
struct igmp {
- u_int8_t igmp_type; /* IGMP type */
- u_int8_t igmp_code; /* routing code */
- u_int16_t igmp_cksum; /* checksum */
- struct in_addr igmp_group; /* group address */
+ uint8_t igmp_type; /* IGMP type */
+ uint8_t igmp_code; /* routing code */
+ uint16_t igmp_cksum; /* checksum */
+ struct in_addr igmp_group; /* group address */
};
#define IGMP_MINLEN 8
};
struct rip {
- u_char rip_cmd; /* request/response */
- u_char rip_vers; /* protocol version # */
- u_char rip_res1[2]; /* pad to 32-bit boundary */
+ unsigned char rip_cmd; /* request/response */
+ unsigned char rip_vers; /* protocol version # */
+ unsigned char rip_res1[2]; /* pad to 32-bit boundary */
union {
struct netinfo ru_nets[1]; /* variable length... */
char ru_tracefile[1]; /* ditto ... */
#include <sys/types.h>
#include <sys/socket.h>
+#include <stdint.h>
/*
* Client->server request message format.
*/
typedef struct {
- u_char vers; /* protocol version */
- u_char type; /* request type, see below */
- u_char answer; /* not used */
- u_char pad;
- u_int32_t id_num; /* message id */
+ unsigned char vers; /* protocol version */
+ unsigned char type; /* request type, see below */
+ unsigned char answer; /* not used */
+ unsigned char pad;
+ uint32_t id_num; /* message id */
struct osockaddr addr; /* old (4.3) style */
struct osockaddr ctl_addr; /* old (4.3) style */
int32_t pid; /* caller's process id */
* Server->client response message format.
*/
typedef struct {
- u_char vers; /* protocol version */
- u_char type; /* type of request message, see below */
- u_char answer; /* response to request message, see below */
- u_char pad;
- u_int32_t id_num; /* message id */
+ unsigned char vers; /* protocol version */
+ unsigned char type; /* type of request message, see below */
+ unsigned char answer; /* response to request message, see below */
+ unsigned char pad;
+ uint32_t id_num; /* message id */
struct osockaddr addr; /* address for establishing conversation */
} CTL_RESPONSE;
#define MAXHOSTNAMELEN 64
struct tsp {
- u_char tsp_type;
- u_char tsp_vers;
- u_short tsp_seq;
+ unsigned char tsp_type;
+ unsigned char tsp_vers;
+ unsigned short tsp_seq;
union {
struct timeval tspu_time;
char tspu_hopcnt;
char *fts_path; /* root path */
int fts_errno; /* errno for this node */
int fts_symfd; /* fd for symlink */
- u_short fts_pathlen; /* strlen(fts_path) */
- u_short fts_namelen; /* strlen(fts_name) */
+ unsigned short fts_pathlen; /* strlen(fts_path) */
+ unsigned short fts_namelen; /* strlen(fts_name) */
ino_t fts_ino; /* inode */
dev_t fts_dev; /* device */
#define FTS_SL 12 /* symbolic link */
#define FTS_SLNONE 13 /* symbolic link without target */
#define FTS_W 14 /* whiteout object */
- u_short fts_info; /* user flags for FTSENT structure */
+ unsigned short fts_info; /* user flags for FTSENT structure */
#define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */
#define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */
- u_short fts_flags; /* private flags for FTSENT structure */
+ unsigned short fts_flags; /* private flags for FTSENT structure */
#define FTS_AGAIN 1 /* read node again */
#define FTS_FOLLOW 2 /* follow symbolic link */
#define FTS_NOINSTR 3 /* no instructions */
#define FTS_SKIP 4 /* discard node */
- u_short fts_instr; /* fts_set() instructions */
+ unsigned short fts_instr; /* fts_set() instructions */
struct stat *fts_statp; /* stat(2) information */
char fts_name[1]; /* file name */
char *fts_path; /* root path */
int fts_errno; /* errno for this node */
int fts_symfd; /* fd for symlink */
- u_short fts_pathlen; /* strlen(fts_path) */
- u_short fts_namelen; /* strlen(fts_name) */
+ unsigned short fts_pathlen; /* strlen(fts_path) */
+ unsigned short fts_namelen; /* strlen(fts_name) */
ino64_t fts_ino; /* inode */
dev_t fts_dev; /* device */
short fts_level; /* depth (-1 to N) */
- u_short fts_info; /* user flags for FTSENT structure */
+ unsigned short fts_info; /* user flags for FTSENT structure */
- u_short fts_flags; /* private flags for FTSENT structure */
+ unsigned short fts_flags; /* private flags for FTSENT structure */
- u_short fts_instr; /* fts_set() instructions */
+ unsigned short fts_instr; /* fts_set() instructions */
struct stat64 *fts_statp; /* stat(2) information */
char fts_name[1]; /* file name */
#define TD_EVENTSIZE 2
#define BT_UISHIFT 5 /* log base 2 of BT_NBIPUI, to extract word index */
-#define BT_NBIPUI (1 << BT_UISHIFT) /* n bits per uint */
+#define BT_NBIPUI (1 << BT_UISHIFT) /* n bits per unsigned int */
#define BT_UIMASK (BT_NBIPUI - 1) /* to extract bit index */
/* Bitmask of enabled events. */
#include <sys/param.h>
#include <sys/types.h>
-#include <sys/cdefs.h>
+#include <stdint.h>
/*
* Define constants based on RFC 883, RFC 1034, RFC 1035
#define NS_HFIXEDSZ 12 /*%< #/bytes of fixed data in header */
#define NS_QFIXEDSZ 4 /*%< #/bytes of fixed data in query */
#define NS_RRFIXEDSZ 10 /*%< #/bytes of fixed data in r record */
-#define NS_INT32SZ 4 /*%< #/bytes of data in a u_int32_t */
-#define NS_INT16SZ 2 /*%< #/bytes of data in a u_int16_t */
-#define NS_INT8SZ 1 /*%< #/bytes of data in a u_int8_t */
+#define NS_INT32SZ 4 /*%< #/bytes of data in a uint32_t */
+#define NS_INT16SZ 2 /*%< #/bytes of data in a uint16_t */
+#define NS_INT8SZ 1 /*%< #/bytes of data in a uint8_t */
#define NS_INADDRSZ 4 /*%< IPv4 T_A */
#define NS_IN6ADDRSZ 16 /*%< IPv6 T_AAAA */
#define NS_CMPRSFLGS 0xc0 /*%< Flag bits indicating name compression. */
* leading _'s on the member names. Use the accessor functions, not the _'s.
*/
typedef struct __ns_msg {
- const u_char *_msg, *_eom;
- u_int16_t _id, _flags, _counts[ns_s_max];
- const u_char *_sections[ns_s_max];
- ns_sect _sect;
- int _rrnum;
- const u_char *_msg_ptr;
+ const unsigned char *_msg, *_eom;
+ uint16_t _id, _flags, _counts[ns_s_max];
+ const unsigned char *_sections[ns_s_max];
+ ns_sect _sect;
+ int _rrnum;
+ const unsigned char *_msg_ptr;
} ns_msg;
/* Private data structure - do not use from outside library. */
* This is a parsed record. It is caller allocated and has no dynamic data.
*/
typedef struct __ns_rr {
- char name[NS_MAXDNAME];
- u_int16_t type;
- u_int16_t rr_class;
- u_int32_t ttl;
- u_int16_t rdlength;
- const u_char * rdata;
+ char name[NS_MAXDNAME];
+ uint16_t type;
+ uint16_t rr_class;
+ uint32_t ttl;
+ uint16_t rdlength;
+ const unsigned char * rdata;
} ns_rr;
/* Accessor macros - this is part of the public interface. */
* Inline versions of get/put short/long. Pointer is advanced.
*/
#define NS_GET16(s, cp) do { \
- const u_char *t_cp = (const u_char *)(cp); \
- (s) = ((u_int16_t)t_cp[0] << 8) \
- | ((u_int16_t)t_cp[1]) \
+ const unsigned char *t_cp = (const unsigned char *)(cp); \
+ (s) = ((uint16_t)t_cp[0] << 8) \
+ | ((uint16_t)t_cp[1]) \
; \
(cp) += NS_INT16SZ; \
} while (0)
#define NS_GET32(l, cp) do { \
- const u_char *t_cp = (const 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]) \
+ const unsigned char *t_cp = (const unsigned char *)(cp); \
+ (l) = ((uint32_t)t_cp[0] << 24) \
+ | ((uint32_t)t_cp[1] << 16) \
+ | ((uint32_t)t_cp[2] << 8) \
+ | ((uint32_t)t_cp[3]) \
; \
(cp) += NS_INT32SZ; \
} while (0)
#define NS_PUT16(s, cp) do { \
- u_int16_t t_s = (u_int16_t)(s); \
- u_char *t_cp = (u_char *)(cp); \
+ uint16_t t_s = (uint16_t)(s); \
+ unsigned char *t_cp = (unsigned char *)(cp); \
*t_cp++ = t_s >> 8; \
*t_cp = t_s; \
(cp) += NS_INT16SZ; \
} while (0)
#define NS_PUT32(l, cp) do { \
- u_int32_t t_l = (u_int32_t)(l); \
- u_char *t_cp = (u_char *)(cp); \
+ uint32_t t_l = (uint32_t)(l); \
+ unsigned char *t_cp = (unsigned char *)(cp); \
*t_cp++ = t_l >> 24; \
*t_cp++ = t_l >> 16; \
*t_cp++ = t_l >> 8; \
__BEGIN_DECLS
int ns_msg_getflag (ns_msg, int) __THROW;
-u_int ns_get16 (const u_char *) __THROW;
-u_long ns_get32 (const u_char *) __THROW;
-void ns_put16 (u_int, u_char *) __THROW;
-void ns_put32 (u_long, u_char *) __THROW;
-int ns_initparse (const u_char *, int, ns_msg *) __THROW;
-int ns_skiprr (const u_char *, const u_char *, ns_sect, int)
- __THROW;
+unsigned int ns_get16 (const unsigned char *) __THROW;
+unsigned long ns_get32 (const unsigned char *) __THROW;
+void ns_put16 (unsigned int, unsigned char *) __THROW;
+void ns_put32 (unsigned long, unsigned char *) __THROW;
+int ns_initparse (const unsigned char *, int, ns_msg *) __THROW;
+int ns_skiprr (const unsigned char *, const unsigned char *,
+ ns_sect, int) __THROW;
int ns_parserr (ns_msg *, ns_sect, int, ns_rr *) __THROW;
int ns_sprintrr (const ns_msg *, const ns_rr *,
const char *, const char *, char *, size_t)
__THROW;
-int ns_sprintrrf (const u_char *, size_t, const char *,
- ns_class, ns_type, u_long, const u_char *,
- size_t, const char *, const char *,
- char *, size_t) __THROW;
-int ns_format_ttl (u_long, char *, size_t) __THROW;
-int ns_parse_ttl (const char *, u_long *) __THROW;
-u_int32_t ns_datetosecs (const char *, int *) __THROW;
-int ns_name_ntol (const u_char *, u_char *, size_t) __THROW;
-int ns_name_ntop (const u_char *, char *, size_t) __THROW;
-int ns_name_pton (const char *, u_char *, size_t) __THROW;
-int ns_name_unpack (const u_char *, const u_char *,
- const u_char *, u_char *, size_t) __THROW;
-int ns_name_pack (const u_char *, u_char *, int,
- const u_char **, const u_char **) __THROW;
-int ns_name_uncompress (const u_char *, const u_char *,
- const u_char *, char *, size_t) __THROW;
-int ns_name_compress (const char *, u_char *, size_t,
- const u_char **, const u_char **) __THROW;
-int ns_name_skip (const u_char **, const u_char *) __THROW;
-void ns_name_rollback (const u_char *, const u_char **,
- const u_char **) __THROW;
+int ns_sprintrrf (const unsigned char *, size_t, const char *,
+ ns_class, ns_type, unsigned long,
+ const unsigned char *, size_t, const char *,
+ const char *, char *, size_t) __THROW;
+int ns_format_ttl (unsigned long, char *, size_t) __THROW;
+int ns_parse_ttl (const char *, unsigned long *) __THROW;
+uint32_t ns_datetosecs (const char *, int *) __THROW;
+int ns_name_ntol (const unsigned char *, unsigned char *, size_t)
+ __THROW;
+int ns_name_ntop (const unsigned char *, char *, size_t) __THROW;
+int ns_name_pton (const char *, unsigned char *, size_t) __THROW;
+int ns_name_unpack (const unsigned char *, const unsigned char *,
+ const unsigned char *, unsigned char *, size_t)
+ __THROW;
+int ns_name_pack (const unsigned char *, unsigned char *, int,
+ const unsigned char **, const unsigned char **)
+ __THROW;
+int ns_name_uncompress (const unsigned char *,
+ const unsigned char *,
+ const unsigned char *,
+ char *, size_t) __THROW;
+int ns_name_compress (const char *, unsigned char *, size_t,
+ const unsigned char **,
+ const unsigned char **) __THROW;
+int ns_name_skip (const unsigned char **, const unsigned char *)
+ __THROW;
+void ns_name_rollback (const unsigned char *,
+ const unsigned char **,
+ const unsigned char **) __THROW;
int ns_samedomain (const char *, const char *) __THROW;
int ns_subdomain (const char *, const char *) __THROW;
int ns_makecanon (const char *, char *, size_t) __THROW;
struct __res_state {
int retrans; /* retransmition time interval */
int retry; /* number of times to retransmit */
- u_long options; /* option flags - see below. */
+ unsigned long options; /* option flags - see below. */
int nscount; /* number of name servers */
struct sockaddr_in
nsaddr_list[MAXNS]; /* address of name server */
# define nsaddr nsaddr_list[0] /* for backward compatibility */
- u_short id; /* current message id */
+ unsigned short id; /* current message id */
/* 2 byte hole here. */
char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */
char defdname[256]; /* default domain (deprecated) */
- u_long pfcode; /* RES_PRF_ flags - see below. */
+ unsigned long pfcode; /* RES_PRF_ flags - see below. */
unsigned ndots:4; /* threshold for initial abs. query */
unsigned nsort:4; /* number of elements in sort_list[] */
unsigned ipv6_unavail:1; /* connecting to IPv6 server failed */
unsigned unused:23;
struct {
struct in_addr addr;
- u_int32_t mask;
+ uint32_t mask;
} sort_list[MAXRESOLVSORT];
/* 4 byte hole here on 64-bit architectures. */
void * __glibc_unused_qhook;
void * __glibc_unused_rhook;
int res_h_errno; /* last one set for this context */
int _vcsock; /* PRIVATE: for res_send VC i/o */
- u_int _flags; /* PRIVATE: see below */
+ unsigned int _flags; /* PRIVATE: see below */
/* 4 byte hole here on 64-bit architectures. */
union {
char pad[52]; /* On an i386 this means 512b total. */
struct {
- u_int16_t nscount;
- u_int16_t nsmap[MAXNS];
+ uint16_t nscount;
+ uint16_t nsmap[MAXNS];
int nssocks[MAXNS];
- u_int16_t nscount6;
- u_int16_t nsinit;
+ uint16_t nscount6;
+ uint16_t nsinit;
struct sockaddr_in6 *nsaddrs[MAXNS];
#ifdef _LIBC
unsigned long long int initstamp
#define res_send __res_send
__BEGIN_DECLS
-void fp_nquery (const u_char *, int, FILE *) __THROW;
-void fp_query (const u_char *, FILE *) __THROW;
+void fp_nquery (const unsigned char *, int, FILE *) __THROW;
+void fp_query (const unsigned char *, FILE *) __THROW;
const char * hostalias (const char *) __THROW;
-void p_query (const u_char *) __THROW;
+void p_query (const unsigned char *) __THROW;
void res_close (void) __THROW;
int res_init (void) __THROW;
int res_isourserver (const struct sockaddr_in *) __THROW;
-int res_mkquery (int, const char *, int, int, const u_char *,
- int, const u_char *, u_char *, int) __THROW;
-int res_query (const char *, int, int, u_char *, int) __THROW;
+int res_mkquery (int, const char *, int, int,
+ const unsigned char *, int, const unsigned char *,
+ unsigned char *, int) __THROW;
+int res_query (const char *, int, int, unsigned char *, int)
+ __THROW;
int res_querydomain (const char *, const char *, int, int,
- u_char *, int) __THROW;
-int res_search (const char *, int, int, u_char *, int) __THROW;
-int res_send (const u_char *, int, u_char *, int) __THROW;
+ unsigned char *, int) __THROW;
+int res_search (const char *, int, int, unsigned char *, int)
+ __THROW;
+int res_send (const unsigned char *, int, unsigned char *, int)
+ __THROW;
__END_DECLS
#define b64_ntop __b64_ntop
int sym_ston (const struct res_sym *, const char *, int *) __THROW;
const char * sym_ntos (const struct res_sym *, int, int *) __THROW;
const char * sym_ntop (const struct res_sym *, int, int *) __THROW;
-int b64_ntop (u_char const *, size_t, char *, size_t) __THROW;
-int b64_pton (char const *, u_char *, size_t) __THROW;
-int loc_aton (const char *__ascii, u_char *__binary) __THROW;
-const char * loc_ntoa (const u_char *__binary, char *__ascii) __THROW;
-int dn_skipname (const u_char *, const u_char *) __THROW;
-void putlong (u_int32_t, u_char *) __THROW;
-void putshort (u_int16_t, u_char *) __THROW;
+int b64_ntop (const unsigned char *, size_t, char *, size_t)
+ __THROW;
+int b64_pton (char const *, unsigned char *, size_t) __THROW;
+int loc_aton (const char *__ascii, unsigned char *__binary) __THROW;
+const char * loc_ntoa (const unsigned char *__binary, char *__ascii) __THROW;
+int dn_skipname (const unsigned char *, const unsigned char *)
+ __THROW;
+void putlong (uint32_t, unsigned char *) __THROW;
+void putshort (uint16_t, unsigned char *) __THROW;
const char * p_class (int) __THROW;
-const char * p_time (u_int32_t) __THROW;
+const char * p_time (uint32_t) __THROW;
const char * p_type (int) __THROW;
const char * p_rcode (int) __THROW;
-const u_char * p_cdnname (const u_char *, const u_char *, int, FILE *)
- __THROW;
-const u_char * p_cdname (const u_char *, const u_char *, FILE *) __THROW;
-const u_char * p_fqnname (const u_char *__cp, const u_char *__msg,
- int, char *, int) __THROW;
-const u_char * p_fqname (const u_char *, const u_char *, FILE *) __THROW;
-const char * p_option (u_long __option) __THROW;
-char * p_secstodate (u_long) __THROW;
+const unsigned char * p_cdnname (const unsigned char *,
+ const unsigned char *, int, FILE *) __THROW;
+const unsigned char * p_cdname (const unsigned char *, const unsigned char *,
+ FILE *) __THROW;
+const unsigned char * p_fqnname (const unsigned char *__cp,
+ const unsigned char *__msg,
+ int, char *, int) __THROW;
+const unsigned char * p_fqname (const unsigned char *,
+ const unsigned char *, FILE *) __THROW;
+const char * p_option (unsigned long __option) __THROW;
+char * p_secstodate (unsigned long) __THROW;
int dn_count_labels (const char *) __THROW;
-int dn_comp (const char *, u_char *, int, u_char **, u_char **)
- __THROW;
-int dn_expand (const u_char *, const u_char *, const u_char *,
- char *, int) __THROW;
-u_int res_randomid (void) __THROW;
+int dn_comp (const char *, unsigned char *, int, unsigned char **,
+ unsigned char **) __THROW;
+int dn_expand (const unsigned char *, const unsigned char *,
+ const unsigned char *, char *, int) __THROW;
+unsigned int res_randomid (void) __THROW;
int res_nameinquery (const char *, int, int,
- const u_char *, const u_char *) __THROW;
-int res_queriesmatch (const u_char *, const u_char *,
- const u_char *, const u_char *) __THROW;
+ const unsigned char *,
+ const unsigned char *) __THROW;
+int res_queriesmatch (const unsigned char *,
+ const unsigned char *,
+ const unsigned char *,
+ const unsigned char *) __THROW;
const char * p_section (int __section, int __opcode) __THROW;
/* Things involving a resolver context. */
int res_ninit (res_state) __THROW;
int res_nisourserver (const res_state,
const struct sockaddr_in *) __THROW;
void fp_resstat (const res_state, FILE *) __THROW;
-void res_npquery (const res_state, const u_char *, int, FILE *)
- __THROW;
+void res_npquery (const res_state, const unsigned char *, int,
+ FILE *) __THROW;
const char * res_hostalias (const res_state, const char *, char *, size_t)
__THROW;
-int res_nquery (res_state, const char *, int, int, u_char *, int)
- __THROW;
-int res_nsearch (res_state, const char *, int, int, u_char *, int)
- __THROW;
+int res_nquery (res_state, const char *, int, int,
+ unsigned char *, int) __THROW;
+int res_nsearch (res_state, const char *, int, int,
+ unsigned char *, int) __THROW;
int res_nquerydomain (res_state, const char *, const char *, int,
- int, u_char *, int) __THROW;
+ int, unsigned char *, int) __THROW;
int res_nmkquery (res_state, int, const char *, int, int,
- const u_char *, int, const u_char *, u_char *,
- int) __THROW;
-int res_nsend (res_state, const u_char *, int, u_char *, int)
+ const unsigned char *, int,
+ const unsigned char *, unsigned char *, int)
__THROW;
+int res_nsend (res_state, const unsigned char *, int,
+ unsigned char *, int) __THROW;
void res_nclose (res_state) __THROW;
__END_DECLS
#endif
*/
struct desparams
{
- u_char des_key[8]; /* key (with low bit parity) */
+ unsigned char des_key[8]; /* key (with low bit parity) */
enum desdir des_dir; /* direction */
enum desmode des_mode; /* mode */
- u_char des_ivec[8]; /* input vector */
+ unsigned char des_ivec[8]; /* input vector */
unsigned des_len; /* number of bytes to crypt */
union
{
- u_char UDES_data[DES_QUICKLEN];
- u_char *UDES_buf;
+ unsigned char UDES_data[DES_QUICKLEN];
+ unsigned char *UDES_buf;
}
UDES;
#define des_data UDES.UDES_data /* direct data here if quick */
systems. */
struct ether_addr
{
- u_int8_t ether_addr_octet[ETH_ALEN];
+ uint8_t ether_addr_octet[ETH_ALEN];
} __attribute__ ((__packed__));
#endif /* netinet/if_ether.h */
#ifndef _NETINET_IN_SYSTM_H
#define _NETINET_IN_SYSTM_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
+#include <stdint.h>
__BEGIN_DECLS
* may not reflect the actual size of the native data types.
*/
-typedef u_int16_t n_short; /* short as received from the net */
-typedef u_int32_t n_long; /* long as received from the net */
-typedef u_int32_t n_time; /* ms since 00:00 GMT, byte rev */
+typedef uint16_t n_short; /* short as received from the net */
+typedef uint32_t n_long; /* long as received from the net */
+typedef uint32_t n_time; /* ms since 00:00 GMT, byte rev */
__END_DECLS
struct timestamp
{
- u_int8_t len;
- u_int8_t ptr;
+ uint8_t len;
+ uint8_t ptr;
#if __BYTE_ORDER == __LITTLE_ENDIAN
unsigned int flags:4;
unsigned int overflow:4;
#else
# error "Please fix <bits/endian.h>"
#endif
- u_int32_t data[9];
+ uint32_t data[9];
};
struct iphdr
#else
# error "Please fix <bits/endian.h>"
#endif
- u_int8_t tos;
- u_int16_t tot_len;
- u_int16_t id;
- u_int16_t frag_off;
- u_int8_t ttl;
- u_int8_t protocol;
- u_int16_t check;
- u_int32_t saddr;
- u_int32_t daddr;
+ uint8_t tos;
+ uint16_t tot_len;
+ uint16_t id;
+ uint16_t frag_off;
+ uint8_t ttl;
+ uint8_t protocol;
+ uint16_t check;
+ uint32_t saddr;
+ uint32_t daddr;
/*The options start here. */
};
unsigned int ip_v:4; /* version */
unsigned int ip_hl:4; /* header length */
#endif
- u_int8_t ip_tos; /* type of service */
- u_short ip_len; /* total length */
- u_short ip_id; /* identification */
- u_short ip_off; /* fragment offset field */
+ uint8_t ip_tos; /* type of service */
+ unsigned short ip_len; /* total length */
+ unsigned short ip_id; /* identification */
+ unsigned short ip_off; /* fragment offset field */
#define IP_RF 0x8000 /* reserved fragment flag */
#define IP_DF 0x4000 /* dont fragment flag */
#define IP_MF 0x2000 /* more fragments flag */
#define IP_OFFMASK 0x1fff /* mask for fragmenting bits */
- u_int8_t ip_ttl; /* time to live */
- u_int8_t ip_p; /* protocol */
- u_short ip_sum; /* checksum */
+ uint8_t ip_ttl; /* time to live */
+ uint8_t ip_p; /* protocol */
+ unsigned short ip_sum; /* checksum */
struct in_addr ip_src, ip_dst; /* source and dest address */
};
*/
struct ip_timestamp
{
- u_int8_t ipt_code; /* IPOPT_TS */
- u_int8_t ipt_len; /* size of structure (variable) */
- u_int8_t ipt_ptr; /* index of current entry */
+ uint8_t ipt_code; /* IPOPT_TS */
+ uint8_t ipt_len; /* size of structure (variable) */
+ uint8_t ipt_ptr; /* index of current entry */
#if __BYTE_ORDER == __LITTLE_ENDIAN
unsigned int ipt_flg:4; /* flags, see below */
unsigned int ipt_oflw:4; /* overflow counter */
unsigned int ipt_oflw:4; /* overflow counter */
unsigned int ipt_flg:4; /* flags, see below */
#endif
- u_int32_t data[9];
+ uint32_t data[9];
};
#endif /* __USE_MISC */
* Per RFC 793, September, 1981.
*/
struct tcphdr {
- u_short th_sport; /* source port */
- u_short th_dport; /* destination port */
- tcp_seq th_seq; /* sequence number */
- tcp_seq th_ack; /* acknowledgement number */
+ unsigned short th_sport; /* source port */
+ unsigned short th_dport; /* destination port */
+ tcp_seq th_seq; /* sequence number */
+ tcp_seq th_ack; /* acknowledgement number */
#if __BYTE_ORDER == __LITTLE_ENDIAN
- u_char th_x2:4, /* (unused) */
- th_off:4; /* data offset */
+ unsigned char th_x2:4, /* (unused) */
+ th_off:4; /* data offset */
#endif
#if __BYTE_ORDER == __BIG_ENDIAN
- u_char th_off:4, /* data offset */
- th_x2:4; /* (unused) */
+ unsigned char th_off:4, /* data offset */
+ th_x2:4; /* (unused) */
#endif
- u_char th_flags;
+ unsigned char th_flags;
#define TH_FIN 0x01
#define TH_SYN 0x02
#define TH_RST 0x04
#define TH_PUSH 0x08
#define TH_ACK 0x10
#define TH_URG 0x20
- u_short th_win; /* window */
- u_short th_sum; /* checksum */
- u_short th_urp; /* urgent pointer */
+ unsigned short th_win; /* window */
+ unsigned short th_sum; /* checksum */
+ unsigned short th_urp; /* urgent pointer */
};
#define TCPOPT_EOL 0
#define TCPOPT_NOP 1
#define TCPOPT_MAXSEG 2
-#define TCPOLEN_MAXSEG 4
+#define TCPOLEN_MAXSEG 4
#define TCPOPT_WINDOW 3
-#define TCPOLEN_WINDOW 3
+#define TCPOLEN_WINDOW 3
#define TCPOPT_SACK_PERMITTED 4 /* Experimental */
-#define TCPOLEN_SACK_PERMITTED 2
+#define TCPOLEN_SACK_PERMITTED 2
#define TCPOPT_SACK 5 /* Experimental */
#define TCPOPT_TIMESTAMP 8
-#define TCPOLEN_TIMESTAMP 10
-#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */
+#define TCPOLEN_TIMESTAMP 10
+#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */
#define TCPOPT_TSTAMP_HDR \
(TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
#ifndef __NETINET_IP_ICMP_H
#define __NETINET_IP_ICMP_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
+#include <stdint.h>
__BEGIN_DECLS
struct icmphdr
{
- u_int8_t type; /* message type */
- u_int8_t code; /* type sub-code */
- u_int16_t checksum;
+ uint8_t type; /* message type */
+ uint8_t code; /* type sub-code */
+ uint16_t checksum;
union
{
struct
{
- u_int16_t id;
- u_int16_t sequence;
+ uint16_t id;
+ uint16_t sequence;
} echo; /* echo datagram */
- u_int32_t gateway; /* gateway address */
+ uint32_t gateway; /* gateway address */
struct
{
- u_int16_t __glibc_reserved;
- u_int16_t mtu;
+ uint16_t __glibc_reserved;
+ uint16_t mtu;
} frag; /* path mtu discovery */
} un;
};
*/
struct icmp_ra_addr
{
- u_int32_t ira_addr;
- u_int32_t ira_preference;
+ uint32_t ira_addr;
+ uint32_t ira_preference;
};
struct icmp
{
- u_int8_t icmp_type; /* type of message, see below */
- u_int8_t icmp_code; /* type sub code */
- u_int16_t icmp_cksum; /* ones complement checksum of struct */
+ uint8_t icmp_type; /* type of message, see below */
+ uint8_t icmp_code; /* type sub code */
+ uint16_t icmp_cksum; /* ones complement checksum of struct */
union
{
- u_char ih_pptr; /* ICMP_PARAMPROB */
+ unsigned char ih_pptr; /* ICMP_PARAMPROB */
struct in_addr ih_gwaddr; /* gateway address */
struct ih_idseq /* echo datagram */
{
- u_int16_t icd_id;
- u_int16_t icd_seq;
+ uint16_t icd_id;
+ uint16_t icd_seq;
} ih_idseq;
- u_int32_t ih_void;
+ uint32_t ih_void;
/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
struct ih_pmtu
{
- u_int16_t ipm_void;
- u_int16_t ipm_nextmtu;
+ uint16_t ipm_void;
+ uint16_t ipm_nextmtu;
} ih_pmtu;
struct ih_rtradv
{
- u_int8_t irt_num_addrs;
- u_int8_t irt_wpa;
- u_int16_t irt_lifetime;
+ uint8_t irt_num_addrs;
+ uint8_t irt_wpa;
+ uint16_t irt_lifetime;
} ih_rtradv;
} icmp_hun;
#define icmp_pptr icmp_hun.ih_pptr
{
struct
{
- u_int32_t its_otime;
- u_int32_t its_rtime;
- u_int32_t its_ttime;
+ uint32_t its_otime;
+ uint32_t its_rtime;
+ uint32_t its_ttime;
} id_ts;
struct
{
/* options and then 64 bits of data */
} id_ip;
struct icmp_ra_addr id_radv;
- u_int32_t id_mask;
- u_int8_t id_data[1];
+ uint32_t id_mask;
+ uint8_t id_data[1];
} icmp_dun;
#define icmp_otime icmp_dun.id_ts.its_otime
#define icmp_rtime icmp_dun.id_ts.its_rtime
#ifdef __USE_MISC
# include <sys/types.h>
# include <sys/socket.h>
+# include <stdint.h>
-typedef u_int32_t tcp_seq;
+typedef uint32_t tcp_seq;
/*
* TCP header.
* Per RFC 793, September, 1981.
{
struct
{
- u_int16_t th_sport; /* source port */
- u_int16_t th_dport; /* destination port */
+ uint16_t th_sport; /* source port */
+ uint16_t th_dport; /* destination port */
tcp_seq th_seq; /* sequence number */
tcp_seq th_ack; /* acknowledgement number */
# if __BYTE_ORDER == __LITTLE_ENDIAN
- u_int8_t th_x2:4; /* (unused) */
- u_int8_t th_off:4; /* data offset */
+ uint8_t th_x2:4; /* (unused) */
+ uint8_t th_off:4; /* data offset */
# endif
# if __BYTE_ORDER == __BIG_ENDIAN
- u_int8_t th_off:4; /* data offset */
- u_int8_t th_x2:4; /* (unused) */
+ uint8_t th_off:4; /* data offset */
+ uint8_t th_x2:4; /* (unused) */
# endif
- u_int8_t th_flags;
+ uint8_t th_flags;
# define TH_FIN 0x01
# define TH_SYN 0x02
# define TH_RST 0x04
# define TH_PUSH 0x08
# define TH_ACK 0x10
# define TH_URG 0x20
- u_int16_t th_win; /* window */
- u_int16_t th_sum; /* checksum */
- u_int16_t th_urp; /* urgent pointer */
+ uint16_t th_win; /* window */
+ uint16_t th_sum; /* checksum */
+ uint16_t th_urp; /* urgent pointer */
};
struct
{
- u_int16_t source;
- u_int16_t dest;
- u_int32_t seq;
- u_int32_t ack_seq;
+ uint16_t source;
+ uint16_t dest;
+ uint32_t seq;
+ uint32_t ack_seq;
# if __BYTE_ORDER == __LITTLE_ENDIAN
- u_int16_t res1:4;
- u_int16_t doff:4;
- u_int16_t fin:1;
- u_int16_t syn:1;
- u_int16_t rst:1;
- u_int16_t psh:1;
- u_int16_t ack:1;
- u_int16_t urg:1;
- u_int16_t res2:2;
+ uint16_t res1:4;
+ uint16_t doff:4;
+ uint16_t fin:1;
+ uint16_t syn:1;
+ uint16_t rst:1;
+ uint16_t psh:1;
+ uint16_t ack:1;
+ uint16_t urg:1;
+ uint16_t res2:2;
# elif __BYTE_ORDER == __BIG_ENDIAN
- u_int16_t doff:4;
- u_int16_t res1:4;
- u_int16_t res2:2;
- u_int16_t urg:1;
- u_int16_t ack:1;
- u_int16_t psh:1;
- u_int16_t rst:1;
- u_int16_t syn:1;
- u_int16_t fin:1;
+ uint16_t doff:4;
+ uint16_t res1:4;
+ uint16_t res2:2;
+ uint16_t urg:1;
+ uint16_t ack:1;
+ uint16_t psh:1;
+ uint16_t rst:1;
+ uint16_t syn:1;
+ uint16_t fin:1;
# else
# error "Adjust your <bits/endian.h> defines"
# endif
- u_int16_t window;
- u_int16_t check;
- u_int16_t urg_ptr;
+ uint16_t window;
+ uint16_t check;
+ uint16_t urg_ptr;
};
};
};
struct tcp_info
{
- u_int8_t tcpi_state;
- u_int8_t tcpi_ca_state;
- u_int8_t tcpi_retransmits;
- u_int8_t tcpi_probes;
- u_int8_t tcpi_backoff;
- u_int8_t tcpi_options;
- u_int8_t tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
-
- u_int32_t tcpi_rto;
- u_int32_t tcpi_ato;
- u_int32_t tcpi_snd_mss;
- u_int32_t tcpi_rcv_mss;
-
- u_int32_t tcpi_unacked;
- u_int32_t tcpi_sacked;
- u_int32_t tcpi_lost;
- u_int32_t tcpi_retrans;
- u_int32_t tcpi_fackets;
+ uint8_t tcpi_state;
+ uint8_t tcpi_ca_state;
+ uint8_t tcpi_retransmits;
+ uint8_t tcpi_probes;
+ uint8_t tcpi_backoff;
+ uint8_t tcpi_options;
+ uint8_t tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
+
+ uint32_t tcpi_rto;
+ uint32_t tcpi_ato;
+ uint32_t tcpi_snd_mss;
+ uint32_t tcpi_rcv_mss;
+
+ uint32_t tcpi_unacked;
+ uint32_t tcpi_sacked;
+ uint32_t tcpi_lost;
+ uint32_t tcpi_retrans;
+ uint32_t tcpi_fackets;
/* Times. */
- u_int32_t tcpi_last_data_sent;
- u_int32_t tcpi_last_ack_sent; /* Not remembered, sorry. */
- u_int32_t tcpi_last_data_recv;
- u_int32_t tcpi_last_ack_recv;
+ uint32_t tcpi_last_data_sent;
+ uint32_t tcpi_last_ack_sent; /* Not remembered, sorry. */
+ uint32_t tcpi_last_data_recv;
+ uint32_t tcpi_last_ack_recv;
/* Metrics. */
- u_int32_t tcpi_pmtu;
- u_int32_t tcpi_rcv_ssthresh;
- u_int32_t tcpi_rtt;
- u_int32_t tcpi_rttvar;
- u_int32_t tcpi_snd_ssthresh;
- u_int32_t tcpi_snd_cwnd;
- u_int32_t tcpi_advmss;
- u_int32_t tcpi_reordering;
-
- u_int32_t tcpi_rcv_rtt;
- u_int32_t tcpi_rcv_space;
-
- u_int32_t tcpi_total_retrans;
+ uint32_t tcpi_pmtu;
+ uint32_t tcpi_rcv_ssthresh;
+ uint32_t tcpi_rtt;
+ uint32_t tcpi_rttvar;
+ uint32_t tcpi_snd_ssthresh;
+ uint32_t tcpi_snd_cwnd;
+ uint32_t tcpi_advmss;
+ uint32_t tcpi_reordering;
+
+ uint32_t tcpi_rcv_rtt;
+ uint32_t tcpi_rcv_space;
+
+ uint32_t tcpi_total_retrans;
};
struct tcp_md5sig
{
struct sockaddr_storage tcpm_addr; /* Address associated. */
- u_int16_t __tcpm_pad1; /* Zero. */
- u_int16_t tcpm_keylen; /* Key length. */
- u_int32_t __tcpm_pad2; /* Zero. */
- u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
+ uint16_t __tcpm_pad1; /* Zero. */
+ uint16_t tcpm_keylen; /* Key length. */
+ uint32_t __tcpm_pad2; /* Zero. */
+ uint8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
};
/* For socket repair options. */
struct tcp_repair_opt
{
- u_int32_t opt_code;
- u_int32_t opt_val;
+ uint32_t opt_code;
+ uint32_t opt_val;
};
/* Queue to repair, for TCP_REPAIR_QUEUE. */
struct tcp_cookie_transactions
{
- u_int16_t tcpct_flags;
- u_int8_t __tcpct_pad1;
- u_int8_t tcpct_cookie_desired;
- u_int16_t tcpct_s_data_desired;
- u_int16_t tcpct_used;
- u_int8_t tcpct_value[TCP_MSS_DEFAULT];
+ uint16_t tcpct_flags;
+ uint8_t __tcpct_pad1;
+ uint8_t tcpct_cookie_desired;
+ uint16_t tcpct_s_data_desired;
+ uint16_t tcpct_used;
+ uint8_t tcpct_value[TCP_MSS_DEFAULT];
};
#endif /* Misc. */
#ifndef __NETINET_UDP_H
#define __NETINET_UDP_H 1
-#include <features.h>
#include <sys/types.h>
-
+#include <stdint.h>
/* UDP header as specified by RFC 768, August 1980. */
{
struct
{
- u_int16_t uh_sport; /* source port */
- u_int16_t uh_dport; /* destination port */
- u_int16_t uh_ulen; /* udp length */
- u_int16_t uh_sum; /* udp checksum */
+ uint16_t uh_sport; /* source port */
+ uint16_t uh_dport; /* destination port */
+ uint16_t uh_ulen; /* udp length */
+ uint16_t uh_sum; /* udp checksum */
};
struct
{
- u_int16_t source;
- u_int16_t dest;
- u_int16_t len;
- u_int16_t check;
+ uint16_t source;
+ uint16_t dest;
+ uint16_t len;
+ uint16_t check;
};
};
};
systems. */
struct ether_addr
{
- u_int8_t ether_addr_octet[ETH_ALEN];
+ uint8_t ether_addr_octet[ETH_ALEN];
};
/* 10Mb/s ethernet header */
struct ether_header
{
- u_int8_t ether_dhost[ETH_ALEN]; /* destination eth addr */
- u_int8_t ether_shost[ETH_ALEN]; /* source ether addr */
- u_int16_t ether_type; /* packet type ID field */
+ uint8_t ether_dhost[ETH_ALEN]; /* destination eth addr */
+ uint8_t ether_shost[ETH_ALEN]; /* source ether addr */
+ uint16_t ether_type; /* packet type ID field */
};
/* Ethernet protocol ID's */
struct arpd_request
{
unsigned short int req; /* Request type. */
- u_int32_t ip; /* IP address of entry. */
+ uint32_t ip; /* IP address of entry. */
unsigned long int dev; /* Device entry is tied to. */
unsigned long int stamp;
unsigned long int updated;
/* Structure describing a CCP configuration option, for PPPIOCSCOMPRESS */
struct ppp_option_data {
- u_int8_t *ptr;
- u_int32_t length;
+ uint8_t *ptr;
+ uint32_t length;
int transmit;
};
struct in6_addr rtmsg_dst;
struct in6_addr rtmsg_src;
struct in6_addr rtmsg_gateway;
- u_int32_t rtmsg_type;
- u_int16_t rtmsg_dst_len;
- u_int16_t rtmsg_src_len;
- u_int32_t rtmsg_metric;
+ uint32_t rtmsg_type;
+ uint16_t rtmsg_dst_len;
+ uint16_t rtmsg_src_len;
+ uint32_t rtmsg_metric;
unsigned long int rtmsg_info;
- u_int32_t rtmsg_flags;
+ uint32_t rtmsg_flags;
int rtmsg_ifindex;
};
#define RTF_NAT 0x08000000
#define RTF_ADDRCLASSMASK 0xF8000000
-#define RT_ADDRCLASS(flags) ((__u_int32_t) flags >> 23)
+#define RT_ADDRCLASS(flags) ((uint32_t) flags >> 23)
#define RT_TOS(tos) ((tos) & IPTOS_TOS_MASK)
* (pre-GNU) HISTORY
*
* Revision 2.8 93/03/11 13:46:40 danner
- * u_long -> u_int.
+ * unsigned long -> unsigned int.
* [93/03/09 danner]
*
* Revision 2.7 92/05/21 17:25:11 jfriedl
#define B_TYPEMASK 0xff
#define B_TYPE(val) (((val) >> B_TYPESHIFT) & B_TYPEMASK)
-#define B_MAGICMASK ((u_int)0xf0000000U)
-#define B_DEVMAGIC ((u_int)0xa0000000U)
+#define B_MAGICMASK 0xf0000000U
+#define B_DEVMAGIC 0xa0000000U
#define MAKEBOOTDEV(type, adaptor, controller, unit, partition) \
(((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \
#define IP_RECVRETOPTS IP_RETOPTS /* bool; Receive IP options for response. */
#define IP_RETOPTS 7 /* ip_opts; Set/get IP per-packet options. */
#define IP_MULTICAST_IF 32 /* in_addr; set/get IP multicast i/f */
-#define IP_MULTICAST_TTL 33 /* u_char; set/get IP multicast ttl */
-#define IP_MULTICAST_LOOP 34 /* i_char; set/get IP multicast loopback */
+#define IP_MULTICAST_TTL 33 /* unsigned char; set/get IP multicast ttl */
+#define IP_MULTICAST_LOOP 34 /* bool; set/get IP multicast loopback */
#define IP_ADD_MEMBERSHIP 35 /* ip_mreq; add an IP group membership */
#define IP_DROP_MEMBERSHIP 36 /* ip_mreq; drop an IP group membership */
#define IP_UNBLOCK_SOURCE 37 /* ip_mreq_source: unblock data from source */
#ifndef __NET_ETHERNET_H
#define __NET_ETHERNET_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
+#include <stdint.h>
+
#include <linux/if_ether.h> /* IEEE 802.3 Ethernet constants */
__BEGIN_DECLS
systems. */
struct ether_addr
{
- u_int8_t ether_addr_octet[ETH_ALEN];
+ uint8_t ether_addr_octet[ETH_ALEN];
} __attribute__ ((__packed__));
/* 10Mb/s ethernet header */
struct ether_header
{
- u_int8_t ether_dhost[ETH_ALEN]; /* destination eth addr */
- u_int8_t ether_shost[ETH_ALEN]; /* source ether addr */
- u_int16_t ether_type; /* packet type ID field */
+ uint8_t ether_dhost[ETH_ALEN]; /* destination eth addr */
+ uint8_t ether_shost[ETH_ALEN]; /* source ether addr */
+ uint16_t ether_type; /* packet type ID field */
} __attribute__ ((__packed__));
/* Ethernet protocol ID's */
/* Based on the 4.4BSD and Linux version of this file. */
#ifndef _NET_IF_ARP_H
-
#define _NET_IF_ARP_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <stdint.h>
__BEGIN_DECLS
struct arpd_request
{
unsigned short int req; /* Request type. */
- u_int32_t ip; /* IP address of entry. */
+ uint32_t ip; /* IP address of entry. */
unsigned long int dev; /* Device entry is tied to. */
unsigned long int stamp;
unsigned long int updated;
#define __NET_IF_PPP_H 1
#include <sys/types.h>
-#include <sys/cdefs.h>
-
+#include <stdint.h>
#include <net/if.h>
#include <sys/ioctl.h>
#include <net/ppp_defs.h>
/* Structure describing a CCP configuration option, for PPPIOCSCOMPRESS */
struct ppp_option_data {
- u_int8_t *ptr;
- u_int32_t length;
- int transmit;
+ uint8_t *ptr;
+ uint32_t length;
+ int transmit;
};
struct ifpppstatsreq {
#ifndef _NET_IF_SHAPER_H
#define _NET_IF_SHAPER_H 1
-#include <features.h>
#include <sys/types.h>
+#include <stdint.h>
#include <net/if.h>
#include <sys/ioctl.h>
struct shaperconf
{
- u_int16_t ss_cmd;
+ uint16_t ss_cmd;
union
{
char ssu_name[14];
- u_int32_t ssu_speed;
+ uint32_t ssu_speed;
} ss_u;
#define ss_speed ss_u.ssu_speed
#define ss_name ss_u.ssu_name
struct in6_addr rtmsg_dst;
struct in6_addr rtmsg_src;
struct in6_addr rtmsg_gateway;
- u_int32_t rtmsg_type;
- u_int16_t rtmsg_dst_len;
- u_int16_t rtmsg_src_len;
- u_int32_t rtmsg_metric;
+ uint32_t rtmsg_type;
+ uint16_t rtmsg_dst_len;
+ uint16_t rtmsg_src_len;
+ uint32_t rtmsg_metric;
unsigned long int rtmsg_info;
- u_int32_t rtmsg_flags;
+ uint32_t rtmsg_flags;
int rtmsg_ifindex;
};
#define RTF_NAT 0x08000000
#define RTF_ADDRCLASSMASK 0xF8000000
-#define RT_ADDRCLASS(flags) ((__u_int32_t) flags >> 23)
+#define RT_ADDRCLASS(flags) ((uint32_t) flags >> 23)
#define RT_TOS(tos) ((tos) & IPTOS_TOS_MASK)
*/
struct ether_arp {
struct arphdr ea_hdr; /* fixed-size header */
- u_int8_t arp_sha[ETH_ALEN]; /* sender hardware address */
- u_int8_t arp_spa[4]; /* sender protocol address */
- u_int8_t arp_tha[ETH_ALEN]; /* target hardware address */
- u_int8_t arp_tpa[4]; /* target protocol address */
+ uint8_t arp_sha[ETH_ALEN]; /* sender hardware address */
+ uint8_t arp_spa[4]; /* sender protocol address */
+ uint8_t arp_tha[ETH_ALEN]; /* target hardware address */
+ uint8_t arp_tpa[4]; /* target protocol address */
};
#define arp_hrd ea_hdr.ar_hrd
#define arp_pro ea_hdr.ar_pro
*/
#define ETHER_MAP_IP_MULTICAST(ipaddr, enaddr) \
/* struct in_addr *ipaddr; */ \
- /* u_char enaddr[ETH_ALEN]; */ \
+ /* uint8_t enaddr[ETH_ALEN]; */ \
{ \
(enaddr)[0] = 0x01; \
(enaddr)[1] = 0x00; \
(enaddr)[2] = 0x5e; \
- (enaddr)[3] = ((u_int8_t *)ipaddr)[1] & 0x7f; \
- (enaddr)[4] = ((u_int8_t *)ipaddr)[2]; \
- (enaddr)[5] = ((u_int8_t *)ipaddr)[3]; \
+ (enaddr)[3] = ((uint8_t *)ipaddr)[1] & 0x7f; \
+ (enaddr)[4] = ((uint8_t *)ipaddr)[2]; \
+ (enaddr)[5] = ((uint8_t *)ipaddr)[3]; \
}
__END_DECLS
#ifndef _NETINET_IF_FDDI_H
#define _NETINET_IF_FDDI_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
-#include <asm/types.h>
-
+#include <stdint.h>
#include <linux/if_fddi.h>
#ifdef __USE_MISC
struct fddi_header {
- u_int8_t fddi_fc; /* Frame Control (FC) value */
- u_int8_t fddi_dhost[FDDI_K_ALEN]; /* Destination host */
- u_int8_t fddi_shost[FDDI_K_ALEN]; /* Source host */
+ uint8_t fddi_fc; /* Frame Control (FC) value */
+ uint8_t fddi_dhost[FDDI_K_ALEN]; /* Destination host */
+ uint8_t fddi_shost[FDDI_K_ALEN]; /* Source host */
};
#endif
#ifndef _NETINET_IF_TR_H
#define _NETINET_IF_TR_H 1
-#include <sys/cdefs.h>
#include <sys/types.h>
+#include <stdint.h>
/* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble
and FCS/CRC (frame check sequence). */
/* This is an Token-Ring frame header. */
struct trh_hdr
{
- u_int8_t ac; /* access control field */
- u_int8_t fc; /* frame control field */
- u_int8_t daddr[TR_ALEN]; /* destination address */
- u_int8_t saddr[TR_ALEN]; /* source address */
- u_int16_t rcf; /* route control field */
- u_int16_t rseg[8]; /* routing registers */
+ uint8_t ac; /* access control field */
+ uint8_t fc; /* frame control field */
+ uint8_t daddr[TR_ALEN]; /* destination address */
+ uint8_t saddr[TR_ALEN]; /* source address */
+ uint16_t rcf; /* route control field */
+ uint16_t rseg[8]; /* routing registers */
};
/* This is an Token-Ring LLC structure */
struct trllc
{
- u_int8_t dsap; /* destination SAP */
- u_int8_t ssap; /* source SAP */
- u_int8_t llc; /* LLC control field */
- u_int8_t protid[3]; /* protocol id */
- u_int16_t ethertype; /* ether type field */
+ uint8_t dsap; /* destination SAP */
+ uint8_t ssap; /* source SAP */
+ uint8_t llc; /* LLC control field */
+ uint8_t protid[3]; /* protocol id */
+ uint16_t ethertype; /* ether type field */
};
/* Token-Ring statistics collection data. */
struct trn_hdr
{
- u_int8_t trn_ac; /* access control field */
- u_int8_t trn_fc; /* field control field */
- u_int8_t trn_dhost[TR_ALEN]; /* destination host */
- u_int8_t trn_shost[TR_ALEN]; /* source host */
- u_int16_t trn_rcf; /* route control field */
- u_int16_t trn_rseg[8]; /* routing registers */
+ uint8_t trn_ac; /* access control field */
+ uint8_t trn_fc; /* field control field */
+ uint8_t trn_dhost[TR_ALEN]; /* destination host */
+ uint8_t trn_shost[TR_ALEN]; /* source host */
+ uint16_t trn_rcf; /* route control field */
+ uint16_t trn_rseg[8]; /* routing registers */
};
#endif
#ifndef __NETIPX_IPX_H
#define __NETIPX_IPX_H 1
-#include <features.h>
-
#include <sys/types.h>
+#include <stdint.h>
#include <bits/sockaddr.h>
__BEGIN_DECLS
struct sockaddr_ipx
{
sa_family_t sipx_family;
- u_int16_t sipx_port;
- u_int32_t sipx_network;
+ uint16_t sipx_port;
+ uint32_t sipx_network;
unsigned char sipx_node[IPX_NODE_LEN];
- u_int8_t sipx_type;
+ uint8_t sipx_type;
unsigned char sipx_zero; /* 16 byte fill */
};
#ifndef _SYS_ACCT_H
#define _SYS_ACCT_H 1
-#include <features.h>
-
+#include <sys/types.h>
+#include <stdint.h>
#include <endian.h>
#define __need_time_t
#include <time.h>
-#include <sys/types.h>
__BEGIN_DECLS
specific encoding system used.
*/
-typedef u_int16_t comp_t;
+typedef uint16_t comp_t;
struct acct
{
char ac_flag; /* Flags. */
- u_int16_t ac_uid; /* Real user ID. */
- u_int16_t ac_gid; /* Real group ID. */
- u_int16_t ac_tty; /* Controlling terminal. */
- u_int32_t ac_btime; /* Beginning time. */
+ uint16_t ac_uid; /* Real user ID. */
+ uint16_t ac_gid; /* Real group ID. */
+ uint16_t ac_tty; /* Controlling terminal. */
+ uint32_t ac_btime; /* Beginning time. */
comp_t ac_utime; /* User time. */
comp_t ac_stime; /* System time. */
comp_t ac_etime; /* Elapsed time. */
comp_t ac_minflt; /* Minor pagefaults. */
comp_t ac_majflt; /* Major pagefaults. */
comp_t ac_swaps; /* Number of swaps. */
- u_int32_t ac_exitcode; /* Process exitcode. */
+ uint32_t ac_exitcode; /* Process exitcode. */
char ac_comm[ACCT_COMM+1]; /* Command name. */
char ac_pad[10]; /* Padding bytes. */
};
{
char ac_flag; /* Flags */
char ac_version; /* Always set to ACCT_VERSION */
- u_int16_t ac_tty; /* Control Terminal */
- u_int32_t ac_exitcode; /* Exitcode */
- u_int32_t ac_uid; /* Real User ID */
- u_int32_t ac_gid; /* Real Group ID */
- u_int32_t ac_pid; /* Process ID */
- u_int32_t ac_ppid; /* Parent Process ID */
- u_int32_t ac_btime; /* Process Creation Time */
+ uint16_t ac_tty; /* Control Terminal */
+ uint32_t ac_exitcode; /* Exitcode */
+ uint32_t ac_uid; /* Real User ID */
+ uint32_t ac_gid; /* Real Group ID */
+ uint32_t ac_pid; /* Process ID */
+ uint32_t ac_ppid; /* Parent Process ID */
+ uint32_t ac_btime; /* Process Creation Time */
float ac_etime; /* Elapsed Time */
comp_t ac_utime; /* User Time */
comp_t ac_stime; /* System Time */
projects / platform / upstream / glibc.git / commitdiff