This commit was generated by cvs2svn to track changes on a CVS vendor

[unix-history] / sys / netinet / in.h

diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index be63cbf..13499d8 100644 (file)
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -30,9 +30,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     @(#)in.h        7.11 (Berkeley) 4/20/91
+ *     from: @(#)in.h  7.11 (Berkeley) 4/20/91
+ *     $Id: in.h,v 1.3 1993/10/16 18:25:58 rgrimes Exp $

  */
 
  */
 

+#ifndef _NETINET_IN_H_
+#define _NETINET_IN_H_
+

 /*
  * Constants and structures defined by the internet system,
  * Per RFC 790, September 1981.
 /*
  * Constants and structures defined by the internet system,
  * Per RFC 790, September 1981.


@@ -78,33 +82,33 @@ struct in_addr {
  * On subnets, the decomposition of addresses to host and net parts
  * is done according to subnet mask, not the masks here.
  */
  * 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(i)            (((u_long)(i) & 0x80000000UL) == 0)
+#define        IN_CLASSA_NET           0xff000000UL

 #define        IN_CLASSA_NSHIFT        24
 #define        IN_CLASSA_NSHIFT        24

-#define        IN_CLASSA_HOST          0x00ffffff
+#define        IN_CLASSA_HOST          0x00ffffffUL

 #define        IN_CLASSA_MAX           128
 
 #define        IN_CLASSA_MAX           128
 

-#define        IN_CLASSB(i)            (((long)(i) & 0xc0000000) == 0x80000000)
-#define        IN_CLASSB_NET           0xffff0000
+#define        IN_CLASSB(i)            (((u_long)(i) & 0xc0000000UL) == 0x80000000UL)
+#define        IN_CLASSB_NET           0xffff0000UL

 #define        IN_CLASSB_NSHIFT        16
 #define        IN_CLASSB_NSHIFT        16

-#define        IN_CLASSB_HOST          0x0000ffff
+#define        IN_CLASSB_HOST          0x0000ffffUL

 #define        IN_CLASSB_MAX           65536
 
 #define        IN_CLASSB_MAX           65536
 

-#define        IN_CLASSC(i)            (((long)(i) & 0xe0000000) == 0xc0000000)
-#define        IN_CLASSC_NET           0xffffff00
+#define        IN_CLASSC(i)            (((u_long)(i) & 0xe0000000UL) == 0xc0000000UL)
+#define        IN_CLASSC_NET           0xffffff00UL

 #define        IN_CLASSC_NSHIFT        8
 #define        IN_CLASSC_NSHIFT        8

-#define        IN_CLASSC_HOST          0x000000ff
+#define        IN_CLASSC_HOST          0x000000ffUL

 
 

-#define        IN_CLASSD(i)            (((long)(i) & 0xf0000000) == 0xe0000000)
+#define        IN_CLASSD(i)            (((u_long)(i) & 0xf0000000UL) == 0xe0000000UL)

 #define        IN_MULTICAST(i)         IN_CLASSD(i)
 
 #define        IN_MULTICAST(i)         IN_CLASSD(i)
 

-#define        IN_EXPERIMENTAL(i)      (((long)(i) & 0xe0000000) == 0xe0000000)
-#define        IN_BADCLASS(i)          (((long)(i) & 0xf0000000) == 0xf0000000)
+#define        IN_EXPERIMENTAL(i)      (((u_long)(i) & 0xe0000000UL) == 0xe0000000UL)
+#define        IN_BADCLASS(i)          (((u_long)(i) & 0xf0000000UL) == 0xf0000000UL)

 
 

-#define        INADDR_ANY              (u_long)0x00000000
-#define        INADDR_BROADCAST        (u_long)0xffffffff      /* must be masked */
+#define        INADDR_ANY              0x00000000UL
+#define        INADDR_BROADCAST        0xffffffffUL    /* must be masked */

 #ifndef KERNEL
 #ifndef KERNEL

-#define        INADDR_NONE             0xffffffff              /* -1 return */
+#define        INADDR_NONE             0xffffffffUL            /* -1 return */

 #endif
 
 #define        IN_LOOPBACKNET          127                     /* official! */
 #endif
 
 #define        IN_LOOPBACKNET          127                     /* official! */


@@ -146,6 +150,18 @@ struct ip_opts {
 #define        IP_RETOPTS      8       /* ip_opts; set/get IP per-packet options */
 
 #ifdef KERNEL
 #define        IP_RETOPTS      8       /* ip_opts; set/get IP per-packet options */
 
 #ifdef KERNEL

-struct in_addr in_makeaddr();
-u_long in_netof(), in_lnaof();
-#endif
+/* From in.c: */
+extern struct in_addr in_makeaddr(u_long, u_long);
+extern u_long in_netof(struct in_addr);
+extern void in_sockmaskof(struct in_addr, struct sockaddr_in *);
+extern u_long in_lnaof(struct in_addr);
+extern int in_localaddr(struct in_addr);
+extern int in_canforward(struct in_addr);
+struct socket; struct ifnet;
+extern int in_control(struct socket *, int, caddr_t, struct ifnet *);
+struct in_ifaddr;
+extern int in_broadcast(struct in_addr);
+
+#endif /* KERNEL */
+
+#endif /* _NETINET_IN_H_ */