From e396e446c90af8654e10c38b4f049f5ef21549ec Mon Sep 17 00:00:00 2001
From: Bob Halley <source@isc.org>
Date: Thu, 8 Jul 1999 00:02:34 +0000
Subject: [PATCH] net.h is now generated

---
 lib/isc/unix/include/isc/net.h    | 67 -------------------------------
 lib/isc/unix/include/isc/net.h.in | 25 ++++++++++++
 2 files changed, 25 insertions(+), 67 deletions(-)
 delete mode 100644 lib/isc/unix/include/isc/net.h

diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
deleted file mode 100644
index ec4706be3f..0000000000
--- a/lib/isc/unix/include/isc/net.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 1999  Internet Software Consortium.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#ifndef ISC_NET_H
-#define ISC_NET_H 1
-
-/*****
- ***** Module Info
- *****/
-
-/*
- * Basic Networking Types
- *
- * This module is responsible for defining the following basic networking
- * types:
- *
- *		struct in_addr
- *		struct in6_addr
- *		struct sockaddr
- *		struct sockaddr_in
- *		struct sockaddr_in6
- *
- * It ensures that the AF_ and PF_ macros are defined.
- *
- * It declares ntoh[sl]() and hton[sl]().
- *
- * MP:
- *	No impact.
- *
- * Reliability:
- *	No anticipated impact.
- *
- * Resources:
- *	N/A.
- *
- * Security:
- *	No anticipated impact.
- *
- * Standards:
- *	BSD Socket API
- */
-
-
-/***
- *** Imports.
- ***/
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#endif /* ISC_NET_H */
diff --git a/lib/isc/unix/include/isc/net.h.in b/lib/isc/unix/include/isc/net.h.in
index ec4706be3f..1d44084d3a 100644
--- a/lib/isc/unix/include/isc/net.h.in
+++ b/lib/isc/unix/include/isc/net.h.in
@@ -52,6 +52,7 @@
  *
  * Standards:
  *	BSD Socket API
+ *	RFC 2553
  */
 
 
@@ -64,4 +65,28 @@
 
 #include <netinet/in.h>
 
+/*
+ * If sockaddrs on this system have an sa_len field, ISC_NET_HAVESALEN will
+ * be defined.
+ */
+@ISC_NET_HAVESALEN@
+
+/*
+ * If this system needs AF_INET6, ISC_NET_NEEDAFINET6 will be defined.
+ */
+@ISC_NET_NEEDAFINET6@
+#ifdef ISC_NET_NEEDAFINET6
+#define AF_INET6 99
+#define PF_INET6 AF_INET6
+#endif
+
+/*
+ * If this system needs the IPv6 structure definitions, ISC_NET_NEEDIPV6
+ * will be defined, and the structure definintions will be included.
+ */
+@ISC_NET_NEEDIPV6@
+#ifdef ISC_NET_NEEDIPV6
+#include <isc/ipv6.h>
+#endif
+
 #endif /* ISC_NET_H */