From e4dfb78299fc7e3ac08fce085c44d7a75310d463 Mon Sep 17 00:00:00 2001
From: Mike Karels <karels@ucbvax.Berkeley.EDU>
Date: Mon, 18 Mar 1985 23:28:39 -0800
Subject: [PATCH] distinguish INADDR_BROADCAST from INADDR_ANY; remove old
 stuff

SCCS-vsn: sys/netinet/in.h 6.4
---
 usr/src/sys/netinet/in.h | 60 ++++------------------------------------
 1 file changed, 6 insertions(+), 54 deletions(-)

diff --git a/usr/src/sys/netinet/in.h b/usr/src/sys/netinet/in.h
index ab67e81804..97c108f25d 100644
--- a/usr/src/sys/netinet/in.h
+++ b/usr/src/sys/netinet/in.h
@@ -1,4 +1,4 @@
-/*	in.h	6.3	84/07/31	*/
+/*	in.h	6.4	85/03/18	*/
 
 /*
  * Constants and structures defined by the internet system,
@@ -14,50 +14,10 @@
 #define	IPPROTO_EGP		8		/* exterior gateway protocol */
 #define	IPPROTO_PUP		12		/* pup */
 #define	IPPROTO_UDP		17		/* user datagram protocol */
-#define	IPPROTO_ND		77		/* UNOFFICIAL net disk proto */
 
 #define	IPPROTO_RAW		255		/* raw IP packet */
 #define	IPPROTO_MAX		256
 
-/*
- * Port/socket numbers: network standard functions
- */
-#define	IPPORT_ECHO		7
-#define	IPPORT_DISCARD		9
-#define	IPPORT_SYSTAT		11
-#define	IPPORT_DAYTIME		13
-#define	IPPORT_NETSTAT		15
-#define	IPPORT_FTP		21
-#define	IPPORT_TELNET		23
-#define	IPPORT_SMTP		25
-#define	IPPORT_TIMESERVER	37
-#define	IPPORT_NAMESERVER	42
-#define	IPPORT_WHOIS		43
-#define	IPPORT_MTP		57
-
-/*
- * Port/socket numbers: host specific functions
- */
-#define	IPPORT_TFTP		69
-#define	IPPORT_RJE		77
-#define	IPPORT_FINGER		79
-#define	IPPORT_TTYLINK		87
-#define	IPPORT_SUPDUP		95
-
-/*
- * UNIX TCP sockets
- */
-#define	IPPORT_EXECSERVER	512
-#define	IPPORT_LOGINSERVER	513
-#define	IPPORT_CMDSERVER	514
-#define	IPPORT_EFSSERVER	520
-
-/*
- * UNIX UDP sockets
- */
-#define	IPPORT_BIFFUDP		512
-#define	IPPORT_WHOSERVER	513
-#define	IPPORT_ROUTESERVER	520	/* 520+1 also used */
 
 /*
  * Ports < IPPORT_RESERVED are reserved for
@@ -73,20 +33,10 @@
 #define	IMPLINK_HIGHEXPER	158
 
 /*
- * Internet address (old style... should be updated)
+ * Internet address (a structure for historical reasons)
  */
 struct in_addr {
-	union {
-		struct { u_char s_b1,s_b2,s_b3,s_b4; } S_un_b;
-		struct { u_short s_w1,s_w2; } S_un_w;
-		u_long S_addr;
-	} S_un;
-#define	s_addr	S_un.S_addr	/* can be used for most tcp & ip code */
-#define	s_host	S_un.S_un_b.s_b2	/* host on imp */
-#define	s_net	S_un.S_un_b.s_b1	/* network */
-#define	s_imp	S_un.S_un_w.s_w2	/* imp */
-#define	s_impno	S_un.S_un_b.s_b4	/* imp # */
-#define	s_lh	S_un.S_un_b.s_b3	/* logical host */
+	u_long s_addr;
 };
 
 /*
@@ -109,7 +59,8 @@ struct in_addr {
 #define	IN_CLASSC_NSHIFT	8
 #define	IN_CLASSC_HOST		0x000000ff
 
-#define	INADDR_ANY	0x00000000
+#define	INADDR_ANY		0x00000000
+#define	INADDR_BROADCAST	0xffffffff
 
 /*
  * Macros for subnetworks.  A subnet is distinguished by
@@ -157,4 +108,5 @@ struct sockaddr_in {
 #ifdef KERNEL
 extern	struct domain inetdomain;
 extern	struct protosw inetsw[];
+struct	in_addr in_makeaddr();
 #endif
-- 
2.20.1