BSD 4_3_Tahoe release

[unix-history] / usr / src / etc / htable / htable.h

diff --git a/usr/src/etc/htable/htable.h b/usr/src/etc/htable/htable.h
index 5a19e19..2c1e79d 100644 (file)
--- a/usr/src/etc/htable/htable.h
+++ b/usr/src/etc/htable/htable.h
@@ -1,19 +1,31 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.

  *
  *

- *     @(#)htable.h    5.1 (Berkeley) 5/28/85
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)htable.h    5.3 (Berkeley) 6/18/88

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>

+#include <netinet/in.h>

 
 /*
  * common definitions for htable
  */
 
 struct addr {
 
 /*
  * common definitions for htable
  */
 
 struct addr {

-       u_long  addr_val;
+       struct  in_addr addr_val;

        struct  addr *addr_link;
 };
 
        struct  addr *addr_link;
 };
 


@@ -28,7 +40,7 @@ struct gateway {
        struct  gateway *g_firstent;    /* first entry for this gateway */
        struct  name    *g_name;
        int     g_net;
        struct  gateway *g_firstent;    /* first entry for this gateway */
        struct  name    *g_name;
        int     g_net;

-       u_long  g_addr;                 /* address on g_net */
+       struct  in_addr g_addr;         /* address on g_net */

        int     g_metric;               /* hops to this net */
 };
 
        int     g_metric;               /* hops to this net */
 };