BSD 4_3_Reno release

[unix-history] / usr / src / usr.sbin / timed / timed / timed.c

diff --git a/usr/src/usr.sbin/timed/timed/timed.c b/usr/src/usr.sbin/timed/timed/timed.c
index 9c50b4f..2ba21a8 100644 (file)
--- a/usr/src/usr.sbin/timed/timed/timed.c
+++ b/usr/src/usr.sbin/timed/timed/timed.c
@@ -1,18 +1,31 @@
 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1985 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted 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.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+"@(#) Copyright (c) 1985 Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)timed.c    2.4 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)timed.c    2.20 (Berkeley) 6/29/90";
+#endif /* not lint */

 
 #include "globals.h"
 #define TSPTYPES
 
 #include "globals.h"
 #define TSPTYPES


@@ -21,10 +34,11 @@ static char sccsid[] = "@(#)timed.c 2.4 (Berkeley) %G%";
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <setjmp.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <setjmp.h>

+#include "pathnames.h"

 
 int id;
 int trace;
 
 int id;
 int trace;

-int sock, sock_raw;
+int sock, sock_raw = -1;

 int status = 0;
 int backoff;
 int slvcount;                          /* no. of slaves controlled by master */
 int status = 0;
 int backoff;
 int slvcount;                          /* no. of slaves controlled by master */


@@ -32,9 +46,10 @@ int machup;
 u_short sequence;                      /* sequence number */
 long delay1;
 long delay2;
 u_short sequence;                      /* sequence number */
 long delay1;
 long delay2;

+long random();

 char hostname[MAXHOSTNAMELEN];
 struct host hp[NHOSTS];
 char hostname[MAXHOSTNAMELEN];
 struct host hp[NHOSTS];

-char tracefile[] = "/usr/adm/timed.log";
+char tracefile[] = _PATH_TIMEDLOG;

 FILE *fd;
 jmp_buf jmpenv;
 struct netinfo *nettab = NULL;
 FILE *fd;
 jmp_buf jmpenv;
 struct netinfo *nettab = NULL;


@@ -45,6 +60,13 @@ int nnets;           /* Number of networks I am connected to */
 struct netinfo *slavenet;
 struct netinfo *firstslavenet();
 int Mflag;
 struct netinfo *slavenet;
 struct netinfo *firstslavenet();
 int Mflag;

+int justquit = 0;
+
+struct nets {
+       char *name;
+       long net;
+       struct nets *next;
+} *nets = (struct nets *)0;

 
 /*
  * The timedaemons synchronize the clocks of hosts in a local area network.
 
 /*
  * The timedaemons synchronize the clocks of hosts in a local area network.


@@ -67,18 +89,14 @@ char **argv;
        int on;
        int ret;
        long seed;
        int on;
        int ret;
        long seed;

-       int nflag;
-       char *netname;
+       int nflag, iflag;

        struct timeval time;
        struct servent *srvp;
        struct timeval time;
        struct servent *srvp;

-       struct netent *getnetent();
-       struct netent *localnet;
-       struct tsp resp, conflict, *answer, *readmsg(), *acksend();

        long casual();
        char *date();
        int n;
        int flag;
        long casual();
        char *date();
        int n;
        int flag;

-       char buf[BUFSIZ];
+       char buf[BUFSIZ], *cp, *cplim;

        struct ifconf ifc;
        struct ifreq ifreq, *ifr;
        register struct netinfo *ntp;
        struct ifconf ifc;
        struct ifreq ifreq, *ifr;
        register struct netinfo *ntp;


@@ -86,7 +104,7 @@ char **argv;
        struct netinfo *savefromnet;
        struct sockaddr_in server;
        u_short port;
        struct netinfo *savefromnet;
        struct sockaddr_in server;
        u_short port;

-       int havemaster = 0;
+       uid_t getuid();

 
 #ifdef lint
        ntip = NULL;
 
 #ifdef lint
        ntip = NULL;


@@ -97,7 +115,8 @@ char **argv;
        backoff = 1;
        trace = OFF;
        nflag = OFF;
        backoff = 1;
        trace = OFF;
        nflag = OFF;

-       openlog("timed", LOG_ODELAY, LOG_DAEMON);
+       iflag = OFF;
+       openlog("timed", LOG_CONS|LOG_PID, LOG_DAEMON);

 
        if (getuid() != 0) {
                fprintf(stderr, "Timed: not superuser\n");
 
        if (getuid() != 0) {
                fprintf(stderr, "Timed: not superuser\n");


@@ -117,8 +136,24 @@ char **argv;
                                break;
                        case 'n':
                                argc--, argv++;
                                break;
                        case 'n':
                                argc--, argv++;

-                               nflag = ON;
-                               netname = *argv;
+                               if (iflag) {
+                                       fprintf(stderr,
+                                   "timed: -i and -n make no sense together\n");
+                               } else {
+                                       nflag = ON;
+                                       addnetname(*argv);
+                               }
+                               while (*(++(*argv)+1)) ;
+                               break;
+                       case 'i':
+                               argc--, argv++;
+                               if (nflag) {
+                                       fprintf(stderr,
+                                   "timed: -i and -n make no sense together\n");
+                               } else {
+                                       iflag = ON;
+                                       addnetname(*argv);
+                               }

                                while (*(++(*argv)+1)) ;
                                break;
                        default:
                                while (*(++(*argv)+1)) ;
                                break;
                        default:


@@ -130,20 +165,7 @@ char **argv;
        }
 
 #ifndef DEBUG
        }
 
 #ifndef DEBUG

-       if (fork())
-               exit(0);
-       { int s;
-         for (s = getdtablesize(); s >= 0; --s)
-               (void) close(s);
-         (void) open("/dev/null", 0);
-         (void) dup2(0, 1);
-         (void) dup2(0, 2);
-         s = open("/dev/tty", 2);
-         if (s >= 0) {
-               (void) ioctl(s, (int)TIOCNOTTY, (char *)0);
-               (void) close(s);
-         }
-       }
+       daemon(0, 0);

 #endif
 
        if (trace == ON) {
 #endif
 
        if (trace == ON) {


@@ -152,7 +174,6 @@ char **argv;
                fprintf(fd, "Tracing started on: %s\n\n", 
                                        date());
        }
                fprintf(fd, "Tracing started on: %s\n\n", 
                                        date());
        }

-       openlog("timed", LOG_ODELAY|LOG_CONS, LOG_DAEMON);

 
        srvp = getservbyname("timed", "udp");
        if (srvp == 0) {
 
        srvp = getservbyname("timed", "udp");
        if (srvp == 0) {


@@ -185,7 +206,7 @@ char **argv;
        seed = time.tv_sec + time.tv_usec;
        srandom(seed);
 
        seed = time.tv_sec + time.tv_usec;
        srandom(seed);
 

-       sequence = casual((long)1, (long)MAXSEQ);     /* initial seq number */
+       sequence = random();     /* initial seq number */

 
        /* rounds kernel variable time to multiple of 5 ms. */
        time.tv_sec = 0;
 
        /* rounds kernel variable time to multiple of 5 ms. */
        time.tv_sec = 0;


@@ -200,23 +221,33 @@ char **argv;
        }
        hp[0].name = hostname;
 
        }
        hp[0].name = hostname;
 

-       if (nflag) {
-               localnet = getnetbyname(netname);
-               if (localnet == NULL) {
-                       syslog(LOG_ERR, "getnetbyname: unknown net %s",
-                               netname);
-                       exit(1);
+       if (nflag || iflag) {
+               struct netent *getnetent();
+               struct netent *n;
+               struct nets *np;
+               for ( np = nets ; np ; np = np->next) {
+                       n = getnetbyname(np->name);
+                       if (n == NULL) {
+                               syslog(LOG_ERR, "getnetbyname: unknown net %s",
+                                       np->name);
+                               exit(1);
+                       }
+                       np->net = n->n_net;

                }
        }
        ifc.ifc_len = sizeof(buf);
        ifc.ifc_buf = buf;
                }
        }
        ifc.ifc_len = sizeof(buf);
        ifc.ifc_buf = buf;

-       if (ioctl(sock, (int)SIOCGIFCONF, (char *)&ifc) < 0) {
+       if (ioctl(sock, SIOCGIFCONF, (char *)&ifc) < 0) {

                syslog(LOG_ERR, "get interface configuration: %m");
                exit(1);
        }
                syslog(LOG_ERR, "get interface configuration: %m");
                exit(1);
        }

-       n = ifc.ifc_len/sizeof(struct ifreq);

        ntp = NULL;
        ntp = NULL;

-       for (ifr = ifc.ifc_req; n > 0; n--, ifr++) {
+#define max(a, b) (a > b ? a : b)
+#define size(p)        max((p).sa_len, sizeof(p))
+       cplim = buf + ifc.ifc_len; /*skip over if's with big ifr_addr's */
+       for (cp = buf; cp < cplim;
+                       cp += sizeof (ifr->ifr_name) + size(ifr->ifr_addr)) {
+               ifr = (struct ifreq *)cp;

                if (ifr->ifr_addr.sa_family != AF_INET)
                        continue;
                ifreq = *ifr;
                if (ifr->ifr_addr.sa_family != AF_INET)
                        continue;
                ifreq = *ifr;


@@ -224,7 +255,7 @@ char **argv;
                        ntp = (struct netinfo *)malloc(sizeof(struct netinfo));
                ntp->my_addr = 
                        ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr;
                        ntp = (struct netinfo *)malloc(sizeof(struct netinfo));
                ntp->my_addr = 
                        ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr;

-               if (ioctl(sock, (int)SIOCGIFFLAGS, 
+               if (ioctl(sock, SIOCGIFFLAGS, 

                                        (char *)&ifreq) < 0) {
                        syslog(LOG_ERR, "get interface flags: %m");
                        continue;
                                        (char *)&ifreq) < 0) {
                        syslog(LOG_ERR, "get interface flags: %m");
                        continue;


@@ -238,7 +269,7 @@ char **argv;
                        flag = 1;
                else
                        flag = 0;
                        flag = 1;
                else
                        flag = 0;

-               if (ioctl(sock, (int)SIOCGIFNETMASK, 
+               if (ioctl(sock, SIOCGIFNETMASK, 

                                        (char *)&ifreq) < 0) {
                        syslog(LOG_ERR, "get netmask: %m");
                        continue;
                                        (char *)&ifreq) < 0) {
                        syslog(LOG_ERR, "get netmask: %m");
                        continue;


@@ -246,14 +277,14 @@ char **argv;
                ntp->mask = ((struct sockaddr_in *)
                        &ifreq.ifr_addr)->sin_addr.s_addr;
                if (flag) {
                ntp->mask = ((struct sockaddr_in *)
                        &ifreq.ifr_addr)->sin_addr.s_addr;
                if (flag) {

-                       if (ioctl(sock, (int)SIOCGIFBRDADDR, 
+                       if (ioctl(sock, SIOCGIFBRDADDR, 

                                                (char *)&ifreq) < 0) {
                                syslog(LOG_ERR, "get broadaddr: %m");
                                continue;
                        }
                        ntp->dest_addr = *(struct sockaddr_in *)&ifreq.ifr_broadaddr;
                } else {
                                                (char *)&ifreq) < 0) {
                                syslog(LOG_ERR, "get broadaddr: %m");
                                continue;
                        }
                        ntp->dest_addr = *(struct sockaddr_in *)&ifreq.ifr_broadaddr;
                } else {

-                       if (ioctl(sock, (int)SIOCGIFDSTADDR, 
+                       if (ioctl(sock, SIOCGIFDSTADDR, 

                                                (char *)&ifreq) < 0) {
                                syslog(LOG_ERR, "get destaddr: %m");
                                continue;
                                                (char *)&ifreq) < 0) {
                                syslog(LOG_ERR, "get destaddr: %m");
                                continue;


@@ -261,8 +292,9 @@ char **argv;
                        ntp->dest_addr = *(struct sockaddr_in *)&ifreq.ifr_dstaddr;
                }
                ntp->dest_addr.sin_port = port;
                        ntp->dest_addr = *(struct sockaddr_in *)&ifreq.ifr_dstaddr;
                }
                ntp->dest_addr.sin_port = port;

-               if (nflag) {
+               if (nflag || iflag) {

                        u_long addr, mask;
                        u_long addr, mask;

+                       struct nets *n;

 
                        addr = ntohl(ntp->dest_addr.sin_addr.s_addr);
                        mask = ntohl(ntp->mask);
 
                        addr = ntohl(ntp->dest_addr.sin_addr.s_addr);
                        mask = ntohl(ntp->mask);


@@ -270,7 +302,10 @@ char **argv;
                                addr >>= 1;
                                mask >>= 1;
                        }
                                addr >>= 1;
                                mask >>= 1;
                        }

-                       if (addr != localnet->n_net)
+                       for (n = nets ; n ; n = n->next)
+                               if (addr == n->net)
+                                       break;
+                       if (nflag && !n || iflag && n)

                                continue;
                }
                ntp->net = ntp->mask & ntp->dest_addr.sin_addr.s_addr;
                                continue;
                }
                ntp->net = ntp->mask & ntp->dest_addr.sin_addr.s_addr;


@@ -303,13 +338,6 @@ char **argv;
        delay2 = casual((long)MINTOUT, (long)MAXTOUT);
 
        if (Mflag) {
        delay2 = casual((long)MINTOUT, (long)MAXTOUT);
 
        if (Mflag) {

-               /* open raw socket used to measure time differences */
-               sock_raw = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); 
-               if (sock_raw < 0)  {
-                       syslog(LOG_ERR, "opening raw socket: %m");
-                       exit (1);
-               }
-

                /*
                 * number (increased by 1) of slaves controlled by master: 
                 * used in master.c, candidate.c, networkdelta.c, and 
                /*
                 * number (increased by 1) of slaves controlled by master: 
                 * used in master.c, candidate.c, networkdelta.c, and 


@@ -348,6 +376,7 @@ char **argv;
                        else
                                makeslave(savefromnet);
                        setstatus();
                        else
                                makeslave(savefromnet);
                        setstatus();

+                       justquit = 1;

                        break;
                        
                default:
                        break;
                        
                default:


@@ -356,6 +385,23 @@ char **argv;
                        break;
                }
                        
                        break;
                }
                        

+               if (status & MASTER) {
+                       /* open raw socket used to measure time differences */
+                       if (sock_raw == -1) {
+                           sock_raw = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); 
+                           if (sock_raw < 0)  {
+                                   syslog(LOG_ERR, "opening raw socket: %m");
+                                   exit (1);
+                           }
+                       }
+               } else {
+                       /* sock_raw is not being used now */
+                       if (sock_raw != -1) {
+                           (void)close(sock_raw);
+                           sock_raw = -1;
+                       }
+               }
+

                if (status == MASTER) 
                        master();
                else 
                if (status == MASTER) 
                        master();
                else 


@@ -363,12 +409,11 @@ char **argv;
        } else {
                /* if Mflag is not set timedaemon is forced to act as a slave */
                status = SLAVE;
        } else {
                /* if Mflag is not set timedaemon is forced to act as a slave */
                status = SLAVE;

-               makeslave(firstslavenet());

                if (setjmp(jmpenv)) {
                        setstatus();
                        checkignorednets();
                if (setjmp(jmpenv)) {
                        setstatus();
                        checkignorednets();

-                       makeslave(firstslavenet());

                }
                }

+               makeslave(firstslavenet());

                for (ntp = nettab; ntp != NULL; ntp = ntp->next)
                        if (ntp->status == MASTER)
                                ntp->status = IGNORE;
                for (ntp = nettab; ntp != NULL; ntp = ntp->next)
                        if (ntp->status == MASTER)
                                ntp->status = IGNORE;


@@ -478,7 +523,7 @@ setstatus()
        if (trace)
                fprintf(fd, "Net status:\n");
        for (ntp = nettab; ntp != NULL; ntp = ntp->next) {
        if (trace)
                fprintf(fd, "Net status:\n");
        for (ntp = nettab; ntp != NULL; ntp = ntp->next) {

-               switch (ntp->status) {
+               switch ((int)ntp->status) {

                  case MASTER:
                        nmasternets++;
                        break;
                  case MASTER:
                        nmasternets++;
                        break;


@@ -491,7 +536,7 @@ setstatus()
                }
                if (trace) {
                        fprintf(fd, "\t%-16s", inet_ntoa(ntp->net));
                }
                if (trace) {
                        fprintf(fd, "\t%-16s", inet_ntoa(ntp->net));

-                       switch (ntp->status) {
+                       switch ((int)ntp->status) {

                          case MASTER:
                                fprintf(fd, "MASTER\n");
                                break;
                          case MASTER:
                                fprintf(fd, "MASTER\n");
                                break;


@@ -502,7 +547,7 @@ setstatus()
                                fprintf(fd, "IGNORE\n");
                                break;
                          default:
                                fprintf(fd, "IGNORE\n");
                                break;
                          default:

-                               fprintf(fd, "invalid state %d\n");
+                               fprintf(fd, "invalid state %d\n",(int)ntp->status);

                                break;
                        }
                }
                                break;
                        }
                }


@@ -538,7 +583,7 @@ firstslavenet()
        return ((struct netinfo *)0);
 }
 
        return ((struct netinfo *)0);
 }
 

-/* 
+/*

  * `casual' returns a random number in the range [inf, sup]
  */
 
  * `casual' returns a random number in the range [inf, sup]
  */
 


@@ -548,7 +593,6 @@ long inf;
 long sup;
 {
        float value;
 long sup;
 {
        float value;

-       long random();

 
        value = (float)(random() & 0x7fffffff) / 0x7fffffff;
        return(inf + (sup - inf) * value);
 
        value = (float)(random() & 0x7fffffff) / 0x7fffffff;
        return(inf + (sup - inf) * value);


@@ -557,11 +601,25 @@ long sup;
 char *
 date()
 {
 char *
 date()
 {

-       char    *ret;

        char    *ctime();
        struct  timeval tv;
 
        (void)gettimeofday(&tv, (struct timezone *)0);
        char    *ctime();
        struct  timeval tv;
 
        (void)gettimeofday(&tv, (struct timezone *)0);

-       ret = ctime(&tv.tv_sec);
-       return(ret);
+       return (ctime(&tv.tv_sec));
+}
+
+addnetname(name)
+       char *name;
+{
+       register struct nets **netlist = &nets;
+
+       while (*netlist)
+               netlist = &((*netlist)->next);
+       *netlist = (struct nets *)malloc(sizeof **netlist);
+       if (*netlist == (struct nets *)0) {
+               syslog(LOG_ERR, "malloc failed");
+               exit(1);
+       }
+       bzero((char *)*netlist, sizeof(**netlist));
+       (*netlist)->name = name;

 }
 }