diff options
Diffstat (limited to 'include/arpa')
| -rw-r--r-- | include/arpa/inet.h | 37 | ||||
| -rw-r--r-- | include/arpa/nameser.h | 19 | ||||
| -rw-r--r-- | include/arpa/nameser_compat.h | 4 |
3 files changed, 36 insertions, 24 deletions
diff --git a/include/arpa/inet.h b/include/arpa/inet.h index 02233d4e7..4a90cf2cf 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -12,9 +12,8 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ #ifndef _ARPA_INET_H #define _ARPA_INET_H 1 @@ -32,7 +31,8 @@ __BEGIN_DECLS /* Convert Internet host address from numbers-and-dots notation in CP into binary data in network byte order. */ -extern in_addr_t inet_addr (__const char *__cp) __THROW; +extern in_addr_t inet_addr (const char *__cp) __THROW; +libc_hidden_proto(inet_addr) /* Return the local host address part of the Internet address in IN. */ extern in_addr_t inet_lnaof (struct in_addr __in) __THROW; @@ -41,40 +41,50 @@ extern in_addr_t inet_lnaof (struct in_addr __in) __THROW; network number NET with the local address HOST. */ extern struct in_addr inet_makeaddr (in_addr_t __net, in_addr_t __host) __THROW; +libc_hidden_proto(inet_makeaddr) /* Return network number part of the Internet address IN. */ extern in_addr_t inet_netof (struct in_addr __in) __THROW; +libc_hidden_proto(inet_netof) /* Extract the network number in network byte order from the address in numbers-and-dots natation starting at CP. */ -extern in_addr_t inet_network (__const char *__cp) __THROW; +extern in_addr_t inet_network (const char *__cp) __THROW; +libc_hidden_proto(inet_network) /* Convert Internet number in IN to ASCII representation. The return value is a pointer to an internal array containing the string. */ extern char *inet_ntoa (struct in_addr __in) __THROW; +libc_hidden_proto(inet_ntoa) +#ifdef __UCLIBC__ /* Recursion-safe flavor */ extern char *inet_ntoa_r (struct in_addr __in, char *__buf) __THROW; +#endif /* Convert from presentation format of an Internet number in buffer starting at CP to the binary network format and store result for interface type AF in buffer starting at BUF. */ -extern int inet_pton (int __af, __const char *__restrict __cp, +extern int inet_pton (int __af, const char *__restrict __cp, void *__restrict __buf) __THROW; +libc_hidden_proto(inet_pton) /* Convert a Internet address in binary network format for interface type AF in buffer starting at CP to presentation form and place result in buffer of length LEN astarting at BUF. */ -extern __const char *inet_ntop (int __af, __const void *__restrict __cp, +extern const char *inet_ntop (int __af, const void *__restrict __cp, char *__restrict __buf, socklen_t __len) __THROW; +libc_hidden_proto(inet_ntop) /* The following functions are not part of XNS 5.2. */ #ifdef __USE_MISC /* Convert Internet host address from numbers-and-dots notation in CP into binary data and store the result in the structure INP. */ -extern int inet_aton (__const char *__cp, struct in_addr *__inp) __THROW; +extern int inet_aton (const char *__cp, struct in_addr *__inp) __THROW; +libc_hidden_proto(inet_aton) +#if 0 /* Format a network number NET into presentation format and place result in buffer starting at BUF with length of LEN bytes. */ extern char *inet_neta (in_addr_t __net, char *__buf, size_t __len) __THROW; @@ -82,26 +92,27 @@ extern char *inet_neta (in_addr_t __net, char *__buf, size_t __len) __THROW; /* Convert network number for interface type AF in buffer starting at CP to presentation format. The result will specifiy BITS bits of the number. */ -extern char *inet_net_ntop (int __af, __const void *__cp, int __bits, +extern char *inet_net_ntop (int __af, const void *__cp, int __bits, char *__buf, size_t __len) __THROW; /* Convert network number for interface type AF from presentation in buffer starting at CP to network format and store result int buffer starting at BUF of size LEN. */ -extern int inet_net_pton (int __af, __const char *__cp, +extern int inet_net_pton (int __af, const char *__cp, void *__buf, size_t __len) __THROW; /* Convert ASCII representation in hexadecimal form of the Internet address to binary form and place result in buffer of length LEN starting at BUF. */ -extern unsigned int inet_nsap_addr (__const char *__cp, +extern unsigned int inet_nsap_addr (const char *__cp, unsigned char *__buf, int __len) __THROW; /* Convert internet address in binary form in LEN bytes starting at CP a presentation form and place result in BUF. */ -extern char *inet_nsap_ntoa (int __len, __const unsigned char *__cp, +extern char *inet_nsap_ntoa (int __len, const unsigned char *__cp, char *__buf) __THROW; #endif +#endif __END_DECLS diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index 496c8dbe8..17c68f595 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -118,15 +118,7 @@ typedef struct __ns_msg { const u_char *_ptr; } ns_msg; -/* Private data structure - do not use from outside library. */ -struct _ns_flagdata { int mask, shift; }; -extern struct _ns_flagdata _ns_flagdata[]; - /* Accessor macros - this is part of the public interface. */ -#define ns_msg_getflag(handle, flag) ( \ - ((handle)._flags & _ns_flagdata[flag].mask) \ - >> _ns_flagdata[flag].shift \ - ) #define ns_msg_id(handle) ((handle)._id + 0) #define ns_msg_base(handle) ((handle)._msg + 0) #define ns_msg_end(handle) ((handle)._eom + 0) @@ -287,7 +279,7 @@ typedef enum __ns_type { ns_t_naptr = 35, /* Naming Authority PoinTeR */ ns_t_kx = 36, /* Key Exchange */ ns_t_cert = 37, /* Certification record */ - ns_t_a6 = 38, /* IPv6 address (deprecates AAAA) */ + ns_t_a6 = 38, /* IPv6 address (deprecated, use ns_t_aaaa) */ ns_t_dname = 39, /* Non-terminal DNAME (for IPv6) */ ns_t_sink = 40, /* Kitchen sink (experimentatl) */ ns_t_opt = 41, /* EDNS0 option (meta-RR) */ @@ -499,6 +491,7 @@ typedef enum __ns_cert_types { #define ns_samename __ns_samename __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; @@ -506,6 +499,7 @@ 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; +libc_hidden_proto(ns_skiprr) 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) @@ -519,16 +513,23 @@ int ns_parse_ttl (const char *, u_long *) __THROW; u_int32_t ns_datetosecs (const char *cp, int *errp) __THROW; int ns_name_ntol (const u_char *, u_char *, size_t) __THROW; int ns_name_ntop (const u_char *, char *, size_t) __THROW; +libc_hidden_proto(ns_name_ntop) int ns_name_pton (const char *, u_char *, size_t) __THROW; +libc_hidden_proto(ns_name_pton) int ns_name_unpack (const u_char *, const u_char *, const u_char *, u_char *, size_t) __THROW; +libc_hidden_proto(ns_name_unpack) int ns_name_pack (const u_char *, u_char *, int, const u_char **, const u_char **) __THROW; +libc_hidden_proto(ns_name_pack) int ns_name_uncompress (const u_char *, const u_char *, const u_char *, char *, size_t) __THROW; +libc_hidden_proto(ns_name_uncompress) int ns_name_compress (const char *, u_char *, size_t, const u_char **, const u_char **) __THROW; +libc_hidden_proto(ns_name_compress) int ns_name_skip (const u_char **, const u_char *) __THROW; +libc_hidden_proto(ns_name_skip) void ns_name_rollback (const u_char *, const u_char **, const u_char **) __THROW; int ns_sign (u_char *, int *, int, int, void *, diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h index e3ef864cd..7fe46a16d 100644 --- a/include/arpa/nameser_compat.h +++ b/include/arpa/nameser_compat.h @@ -47,7 +47,7 @@ typedef struct { unsigned id :16; /* query identification number */ -#if BYTE_ORDER == BIG_ENDIAN +#if __BYTE_ORDER == __BIG_ENDIAN /* fields in third byte */ unsigned qr: 1; /* response flag */ unsigned opcode: 4; /* purpose of message */ @@ -61,7 +61,7 @@ typedef struct { unsigned cd: 1; /* checking disabled by resolver */ unsigned rcode :4; /* response code */ #endif -#if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN +#if __BYTE_ORDER == __LITTLE_ENDIAN || __BYTE_ORDER == __PDP_ENDIAN /* fields in third byte */ unsigned rd :1; /* recursion desired */ unsigned tc :1; /* truncated message */ |