BSD 4_3_Reno release

[unix-history] / usr / src / sbin / routed / defs.h

diff --git a/usr/src/sbin/routed/defs.h b/usr/src/sbin/routed/defs.h
index c7726eb..1145801 100644 (file)
--- a/usr/src/sbin/routed/defs.h
+++ b/usr/src/sbin/routed/defs.h
@@ -3,13 +3,20 @@
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted

- * provided that this notice is preserved and that due credit is given
- * to the University of California at 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'' without express or implied warranty.
+ * 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.

  *
  *

- *     @(#)defs.h      5.5 (Berkeley) %G%
+ *     @(#)defs.h      5.9 (Berkeley) 6/1/90

  */
 
 /*
  */
 
 /*


@@ -18,8 +25,9 @@
  * protocol specs with mods relevant to more
  * general addressing scheme.
  */
  * protocol specs with mods relevant to more
  * general addressing scheme.
  */

-#include <sys/types.h>
+#include <sys/param.h>

 #include <sys/socket.h>
 #include <sys/socket.h>

+#include <sys/time.h>

 
 #include <net/route.h>
 #include <netinet/in.h>
 
 #include <net/route.h>
 #include <netinet/in.h>


@@ -42,7 +50,6 @@
 
 #define equal(a1, a2) \
        (bcmp((caddr_t)(a1), (caddr_t)(a2), sizeof (struct sockaddr)) == 0)
 
 #define equal(a1, a2) \
        (bcmp((caddr_t)(a1), (caddr_t)(a2), sizeof (struct sockaddr)) == 0)

-#define        min(a,b)        ((a)>(b)?(b):(a))

 
 struct sockaddr_in addr;       /* address of daemon's socket */
 
 
 struct sockaddr_in addr;       /* address of daemon's socket */
 


@@ -53,7 +60,11 @@ int  install;                /* if 1 call kernel */
 int    lookforinterfaces;      /* if 1 probe kernel for new up interfaces */
 int    performnlist;           /* if 1 check if /vmunix has changed */
 int    externalinterfaces;     /* # of remote and local interfaces */
 int    lookforinterfaces;      /* if 1 probe kernel for new up interfaces */
 int    performnlist;           /* if 1 check if /vmunix has changed */
 int    externalinterfaces;     /* # of remote and local interfaces */

-int    timeval;                /* local idea of time */
+struct timeval now;            /* current idea of time */
+struct timeval lastbcast;      /* last time all/changes broadcast */
+struct timeval lastfullupdate; /* last time full table broadcast */
+struct timeval nextbcast;      /* time to wait before changes broadcast */
+int    needupdate;             /* true if we need update at nextbcast */

 
 char   packet[MAXPACKETSIZE+1];
 struct rip *msg;
 
 char   packet[MAXPACKETSIZE+1];
 struct rip *msg;


@@ -61,7 +72,6 @@ struct        rip *msg;
 char   **argv0;
 struct servent *sp;
 
 char   **argv0;
 struct servent *sp;
 

-extern char *sys_errlist[];

 extern int errno;
 
 struct in_addr inet_makeaddr();
 extern int errno;
 
 struct in_addr inet_makeaddr();