ape: initial IPv6 support, inet_pton()/inet_ntop(), getaddrinfo()/getnameinfo()

4 files changed, 92 insertions, 150 deletions

diff --git a/sys/include/ape/arpa/inet.h b/sys/include/ape/arpa/inet.h
index 5417eb094..260020a6a 100644
--- a/sys/include/ape/arpa/inet.h
+++ b/sys/include/ape/arpa/inet.h
@@ -1,146 +1 @@
-#ifndef __netinet_in__
-#define __netinet_in__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Copyright (c) 1982, 1986, 1990 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution is only permitted until one year after the first shipment
- * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
- * binary forms are permitted provided that: (1) source distributions retain
- * this entire copyright notice and comment, and (2) distributions including
- * binaries display the following acknowledgement:  This product includes
- * software developed by the University of California, Berkeley and its
- * contributors'' in the documentation or other materials provided with the
- * distribution and in all advertising materials mentioning features or use
- * of this software.  Neither the name of the University 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 AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- *	@(#)in.h	7.10 (Berkeley) 6/28/90 plus MULTICAST 1.1
- */
-
-/*
- * Constants and structures defined by the internet system,
- * Per RFC 790, September 1981.
- */
-
-/*
- * Protocols
- */
-#define	IPPROTO_IP		0		/* dummy for IP */
-#define	IPPROTO_ICMP		1		/* control message protocol */
-#define	IPPROTO_GGP		3		/* gateway^2 (deprecated) */
-#define	IPPROTO_TCP		6		/* tcp */
-#define	IPPROTO_EGP		8		/* exterior gateway protocol */
-#define	IPPROTO_PUP		12		/* pup */
-#define	IPPROTO_UDP		17		/* user datagram protocol */
-#define	IPPROTO_IDP		22		/* xns idp */
-#define	IPPROTO_TP		29 		/* tp-4 w/ class negotiation */
-#define	IPPROTO_EON		80		/* ISO cnlp */
-
-#define	IPPROTO_RAW		255		/* raw IP packet */
-#define	IPPROTO_MAX		256
-
-
-/*
- * Local port number conventions:
- * Ports < IPPORT_RESERVED are reserved for
- * privileged processes (e.g. root).
- * Ports > IPPORT_USERRESERVED are reserved
- * for servers, not necessarily privileged.
- */
-#define	IPPORT_RESERVED		1024
-#define	IPPORT_USERRESERVED	5000
-
-/*
- * Internet address (a structure for historical reasons)
- */
-struct in_addr {
-	unsigned long s_addr;
-};
-
-/*
- * Definitions of bits in internet address integers.
- * On subnets, the decomposition of addresses to host and net parts
- * is done according to subnet mask, not the masks here.
- */
-#define	IN_CLASSA(i)		(((long)(i) & 0x80000000) == 0)
-#define	IN_CLASSA_NET		0xff000000
-#define	IN_CLASSA_NSHIFT	24
-#define	IN_CLASSA_HOST		0x00ffffff
-#define	IN_CLASSA_MAX		128
-
-#define	IN_CLASSB(i)		(((long)(i) & 0xc0000000) == 0x80000000)
-#define	IN_CLASSB_NET		0xffff0000
-#define	IN_CLASSB_NSHIFT	16
-#define	IN_CLASSB_HOST		0x0000ffff
-#define	IN_CLASSB_MAX		65536
-
-#define	IN_CLASSC(i)		(((long)(i) & 0xe0000000) == 0xc0000000)
-#define	IN_CLASSC_NET		0xffffff00
-#define	IN_CLASSC_NSHIFT	8
-#define	IN_CLASSC_HOST		0x000000ff
-
-#define	IN_CLASSD(i)		(((long)(i) & 0xf0000000) == 0xe0000000)
-#define	IN_MULTICAST(i)		IN_CLASSD(i)
-
-#define	IN_EXPERIMENTAL(i)	(((long)(i) & 0xe0000000) == 0xe0000000)
-#define	IN_BADCLASS(i)		(((long)(i) & 0xf0000000) == 0xf0000000)
-
-#define	INADDR_ANY		(unsigned long)0x00000000
-#define	INADDR_BROADCAST	(unsigned long)0xffffffff	/* must be masked */
-
-#define	IN_LOOPBACKNET		127			/* official! */
-
-/*
- * Socket address, internet style.
- */
-struct sockaddr_in {
-	short	sin_family;
-	unsigned short	sin_port;
-	struct	in_addr sin_addr;
-	char	sin_zero[8];
-};
-
-/*
- * Structure used to describe IP options.
- * Used to store options internally, to pass them to a process,
- * or to restore options retrieved earlier.
- * The ip_dst is used for the first-hop gateway when using a source route
- * (this gets put into the header proper).
- */
-struct ip_opts {
-	struct	in_addr ip_dst;		/* first hop, 0 w/o src rt */
-	char	ip_opts[40];		/* actually variable in size */
-};
-
-/*
- * Options for use with [gs]etsockopt at the IP level.
- * First word of comment is data type; bool is stored in int.
- */
-#define	IP_OPTIONS	1	/* buf/ip_opts; set/get IP per-packet options */
-#define	IP_HDRINCL	7	/* int; header is included with data (raw) */
-#define	IP_TOS		8	/* int; IP type of service and precedence */
-#define	IP_TTL		9	/* int; IP time to live */
-
-extern unsigned long	ntohl(unsigned long x);
-extern unsigned short	ntohs(unsigned short x);
-extern unsigned long	htonl(unsigned long x);
-extern unsigned short	htons(unsigned short x);
-extern unsigned long	inet_addr(char*);
-extern char*		inet_ntoa(struct in_addr);
-extern unsigned long	nptohl(void*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __netinet_in__ */
+#include <netinet/in.h>
diff --git a/sys/include/ape/netdb.h b/sys/include/ape/netdb.h
index 5885c3ab3..2f5fd7539 100644
--- a/sys/include/ape/netdb.h
+++ b/sys/include/ape/netdb.h
@@ -114,6 +114,54 @@ extern char *hstrerror(int);
 
 #define __HOST_SVC_NOT_AVAIL 99		/* libc internal use only */
 
+struct	addrinfo {
+	int		ai_flags;	/* Input flags.  */
+	int		ai_family;	/* Protocol family for socket.  */
+	int		ai_socktype;	/* Socket type.  */
+	int		ai_protocol;	/* Protocol for socket.  */
+	int		ai_addrlen;	/* Length of socket address.  */
+	struct sockaddr	*ai_addr;	/* Socket address for socket.  */
+	char		*ai_canonname;	/* Canonical name for service location.  */
+	struct addrinfo	*ai_next;	/* Pointer to next in list.  */
+};
+
+extern int	getaddrinfo(char *, char *, struct addrinfo *, struct addrinfo **);
+extern void	freeaddrinfo(struct addrinfo *);
+extern int	getnameinfo(struct sockaddr *, int, char *, int, char *, int, unsigned int);
+extern char	*gai_strerror(int);
+
+/* Possible values for `ai_flags' field in `addrinfo' structure.  */
+#define AI_PASSIVE	0x0001	/* Socket address is intended for `bind'.  */
+#define AI_CANONNAME	0x0002	/* Request for canonical name.  */
+#define AI_NUMERICHOST	0x0004	/* Don't use name resolution.  */
+#define AI_V4MAPPED	0x0008	/* IPv4 mapped addresses are acceptable.  */
+#define AI_ALL		0x0010	/* Return IPv4 mapped and IPv6 addresses.  */
+#define AI_ADDRCONFIG	0x0020	/* Use configuration of this host to choose returned address type..  */
+#define AI_NUMERICSERV	0x0400	/* Don't use name resolution.  */
+
+/* getnameinfo flags */
+#define NI_NOFQDN	0x0001	/* Only the nodename portion of the FQDN is returned for local hosts. */
+#define NI_NUMERICHOST	0x0002	/* The numeric form of the node's address is returned instead of its name. */
+#define NI_NAMEREQD	0x0004	/* Return an error if the node's name cannot be located in the database. */
+#define NI_NUMERICSERV	0x0008	/* The numeric form of the service address is returned instead of its name. */
+#define NI_NUMERICSCOPE	0x0010	/* For IPv6 addresses, the numeric form of the scope identifier is returned
+				   instead of its name. */
+#define NI_DGRAM	0x0020	/* Indicates that the service is a datagram service (SOCK_DGRAM). */
+
+/* Error values for `getaddrinfo' and `getnameinfo' functions.  */
+#define EAI_BADFLAGS	  -1	/* Invalid value for `ai_flags' field */
+#define EAI_NONAME	  -2	/* NAME or SERVICE is unknown */
+#define EAI_AGAIN	  -3	/* Temporary failure in name resolution */
+#define EAI_FAIL	  -4	/* Non-recoverable failure in name resolution */
+#define EAI_NODATA	  -5	/* No address associated with NAME */
+#define EAI_FAMILY	  -6	/* `ai_family' not supported */
+#define EAI_SOCKTYPE	  -7	/* `ai_socktype' not supported */
+#define EAI_SERVICE	  -8	/* SERVICE not supported for `ai_socktype' */
+#define EAI_ADDRFAMILY	  -9	/* Address family for NAME not supported */
+#define EAI_MEMORY	  -10	/* Memory allocation failure */
+#define EAI_SYSTEM	  -11	/* System error returned in `errno' */
+#define EAI_OVERFLOW	  -12	/* Argument buffer overflow */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/sys/include/ape/netinet/in.h b/sys/include/ape/netinet/in.h
index 3d04f8ee1..8444c1bcf 100644
--- a/sys/include/ape/netinet/in.h
+++ b/sys/include/ape/netinet/in.h
@@ -102,13 +102,39 @@ struct in_addr {
 #define	IN_LOOPBACKNET		127			/* official! */
 
 /*
+ * IPv6 internet address.
+ */ 
+struct in6_addr {
+	unsigned char s6_addr[16];
+};
+
+extern struct in6_addr in6addr_any;
+extern struct in6_addr in6addr_loopback;
+
+#define IN6ADDR_ANY_INIT \
+	{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+	   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}
+
+#define IN6ADDR_LOOPBACK_INIT \
+	{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+	   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}
+
+/*
  * Socket address, internet style.
  */
 struct sockaddr_in {
-	short	sin_family;
+	short		sin_family;
 	unsigned short	sin_port;
-	struct	in_addr sin_addr;
-	char	sin_zero[8];
+	struct in_addr	sin_addr;
+	char		sin_zero[8];
+};
+
+struct sockaddr_in6 {
+	short		sin6_family;
+	unsigned short	sin6_port;
+	unsigned long	sin6_flowinfo;
+	struct in6_addr	sin6_addr;
+	unsigned long	sin6_scope_id;
 };
 
 /*
@@ -140,6 +166,12 @@ extern unsigned long	inet_addr(char*);
 extern char*		inet_ntoa(struct in_addr);
 extern unsigned long	nptohl(void*);
 
+extern char*		inet_ntop(int af, void *src, char *dst, int size);
+extern int		inet_pton(int af, char *src, void *dst);
+
+#define INET_ADDRSTRLEN		16
+#define INET6_ADDRSTRLEN	46
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/sys/include/ape/sys/socket.h b/sys/include/ape/sys/socket.h
index df7ad5849..5d60c77a7 100644
--- a/sys/include/ape/sys/socket.h
+++ b/sys/include/ape/sys/socket.h
@@ -22,6 +22,8 @@ extern "C" {
 /*
  * Definitions related to sockets: types, address families, options.
  */
+typedef int socklen_t;
+typedef unsigned short sa_family_t;
 
 /*
  * Types
@@ -108,7 +110,12 @@ struct	linger {
  */
 struct sockaddr {
 	unsigned short	sa_family;	/* address family */
-	char	sa_data[108];
+	char		sa_data[108];
+};
+
+struct sockaddr_storage {
+	unsigned short	ss_family;
+	char		ss_data[108];
 };
 
 /*