Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/include define IPv6 library functions and structures, as def...



details:   https://anonhg.NetBSD.org/src/rev/b1658b96349b
branches:  trunk
changeset: 474205:b1658b96349b
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Jul 01 18:15:41 1999 +0000

description:
define IPv6 library functions and structures, as defined in
RFC2292 and RFC2553.
define internal state structure for IPv6-transport resolver.

Commits for source code will follow.

diffstat:

 include/netdb.h  |  101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 include/resolv.h |   52 +++++++++++++++++++++++++++-
 include/unistd.h |    8 +++-
 3 files changed, 158 insertions(+), 3 deletions(-)

diffs (249 lines):

diff -r e81a6cfe69b5 -r b1658b96349b include/netdb.h
--- a/include/netdb.h   Thu Jul 01 16:43:18 1999 +0000
+++ b/include/netdb.h   Thu Jul 01 18:15:41 1999 +0000
@@ -1,4 +1,33 @@
-/*     $NetBSD: netdb.h,v 1.11 1998/05/10 17:32:39 kleink Exp $        */
+/*     $NetBSD: netdb.h,v 1.12 1999/07/01 18:15:41 itojun Exp $        */
+
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
 
 /*-
  * Copyright (c) 1980, 1983, 1988, 1993
@@ -60,6 +89,7 @@
 #define _NETDB_H_
 
 #include <sys/cdefs.h>
+#include <sys/types.h>
 
 #include <inttypes.h>
 
@@ -111,6 +141,17 @@
        int     p_proto;        /* protocol # */
 };
 
+struct addrinfo {
+       int     ai_flags;       /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
+       int     ai_family;      /* PF_xxx */
+       int     ai_socktype;    /* SOCK_xxx */
+       int     ai_protocol;    /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+       size_t  ai_addrlen;     /* length of ai_addr */
+       char    *ai_canonname;  /* canonical name for hostname */
+       struct sockaddr *ai_addr;       /* binary address */
+       struct addrinfo *ai_next;       /* next structure in linked list */
+};
+
 /*
  * Error return codes from gethostbyname() and gethostbyaddr()
  * (left in extern int h_errno).
@@ -128,17 +169,69 @@
 #define        NO_ADDRESS      NO_DATA         /* no address, look for MX record */
 #endif
 
+/*
+ * Error return codes from getaddrinfo()
+ */
+#define        EAI_ADDRFAMILY   1      /* address family for hostname not supported */
+#define        EAI_AGAIN        2      /* temporary failure in name resolution */
+#define        EAI_BADFLAGS     3      /* invalid value for ai_flags */
+#define        EAI_FAIL         4      /* non-recoverable failure in name resolution */
+#define        EAI_FAMILY       5      /* ai_family not supported */
+#define        EAI_MEMORY       6      /* memory allocation failure */
+#define        EAI_NODATA       7      /* no address associated with hostname */
+#define        EAI_NONAME       8      /* hostname nor servname provided, or not known */
+#define        EAI_SERVICE      9      /* servname not supported for ai_socktype */
+#define        EAI_SOCKTYPE    10      /* ai_socktype not supported */
+#define        EAI_SYSTEM      11      /* system error returned in errno */
+#define EAI_BADHINTS   12
+#define EAI_PROTOCOL   13
+#define EAI_MAX                14
+
+/*
+ * Flag values for getaddrinfo()
+ */
+#define        AI_PASSIVE      0x00000001 /* get address to use bind() */
+#define        AI_CANONNAME    0x00000002 /* fill ai_canonname */
+#define        AI_NUMERICHOST  0x00000004 /* prevent name resolution */
+/* valid flags for addrinfo */
+#define        AI_MASK         (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST)
+
+#define        AI_ALL          0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */
+#define        AI_V4MAPPED_CFG 0x00000200 /* accept IPv4-mapped if kernel supports */
+#define        AI_ADDRCONFIG   0x00000400 /* only if any address is assigned */
+#define        AI_V4MAPPED     0x00000800 /* accept IPv4-mapped IPv6 address */
+/* special recommended flags for getipnodebyname */
+#define        AI_DEFAULT      (AI_V4MAPPED_CFG | AI_ADDRCONFIG)
+
+/*
+ * Constants for getnameinfo()
+ */
+#define        NI_MAXHOST      1025
+#define        NI_MAXSERV      32
+
+/*
+ * Flag values for getnameinfo()
+ */
+#define        NI_NOFQDN       0x00000001
+#define        NI_NUMERICHOST  0x00000002
+#define        NI_NAMEREQD     0x00000004
+#define        NI_NUMERICSERV  0x00000008
+#define        NI_DGRAM        0x00000010
+
 __BEGIN_DECLS
 void           endhostent __P((void));
 void           endnetent __P((void));
 void           endprotoent __P((void));
 void           endservent __P((void));
+void           freehostent __P((struct hostent *));
 struct hostent *gethostbyaddr __P((const char *, int, int));
 struct hostent *gethostbyname __P((const char *));
 #if !defined(_XOPEN_SOURCE)
 struct hostent *gethostbyname2 __P((const char *, int));
 #endif
 struct hostent *gethostent __P((void));
+struct hostent *getipnodebyaddr __P((const void *, size_t, int, int *));
+struct hostent *getipnodebyname __P((const char *, int, int, int *));
 struct netent  *getnetbyaddr __P((unsigned long, int));
 struct netent  *getnetbyname __P((const char *));
 struct netent  *getnetent __P((void));
@@ -158,6 +251,12 @@
 #endif
 void           setnetent __P((int));
 void           setprotoent __P((int));
+int            getaddrinfo __P((const char *, const char *,
+                                const struct addrinfo *, struct addrinfo **));
+int            getnameinfo __P((const struct sockaddr *, size_t, char *,
+                                size_t, char *, size_t, int));
+void           freeaddrinfo __P((struct addrinfo *));
+char           *gai_strerror __P((int));
 void           setservent __P((int));
 __END_DECLS
 
diff -r e81a6cfe69b5 -r b1658b96349b include/resolv.h
--- a/include/resolv.h  Thu Jul 01 16:43:18 1999 +0000
+++ b/include/resolv.h  Thu Jul 01 18:15:41 1999 +0000
@@ -1,4 +1,33 @@
-/*     $NetBSD: resolv.h,v 1.17 1999/01/17 05:08:10 lukem Exp $        */
+/*     $NetBSD: resolv.h,v 1.18 1999/07/01 18:15:41 itojun Exp $       */
+
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
 
 /*-
  * Copyright (c) 1983, 1987, 1989, 1993
@@ -62,6 +91,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/cdefs.h>
+#include <sys/socket.h>
 #include <stdio.h>
 
 /*
@@ -118,6 +148,23 @@
        char    lookups[4];
 };
 
+#if 1 /* INET6 */
+/*
+ * replacement of __res_state, separated to keep binary compatibility.
+ */
+struct __res_state_ext {
+       struct sockaddr_storage nsaddr_list[MAXNS];
+       struct {
+               int     af;             /* address family for addr, mask */
+               union {
+                       struct in_addr ina;
+                       struct in6_addr in6a;
+               } addr, mask;
+       } sort_list[MAXRESOLVSORT];
+};
+#endif
+
+
 /*
  * Resolver options (keep these in synch with res_debug.c, please)
  */
@@ -183,6 +230,9 @@
 };
 
 extern struct __res_state _res;
+#if 1 /* INET6 */
+extern struct __res_state_ext _res_ext;
+#endif
 extern const struct res_sym __p_class_syms[];
 extern const struct res_sym __p_type_syms[];
 
diff -r e81a6cfe69b5 -r b1658b96349b include/unistd.h
--- a/include/unistd.h  Thu Jul 01 16:43:18 1999 +0000
+++ b/include/unistd.h  Thu Jul 01 18:15:41 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: unistd.h,v 1.74 1999/04/20 20:15:48 kleink Exp $       */
+/*     $NetBSD: unistd.h,v 1.75 1999/07/01 18:15:41 itojun Exp $       */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -331,6 +331,12 @@
 extern  char *suboptarg;       /* getsubopt(3) external variable */
 #endif
 
+#if 1 /*INET6*/
+int    rresvport_af __P((int *, int));
+int    ruserok_af __P((const char *, int, const char *, const char *, int));
+int    iruserok_af __P((const void *, int, const char *, const char *, int));
+#endif
+
 __END_DECLS
 
 #endif /* !_UNISTD_H_ */



Home | Main Index | Thread Index | Old Index