BSD 4_3_Net_2 release

[unix-history] / usr / src / libexec / talkd / talkd.c

diff --git a/usr/src/libexec/talkd/talkd.c b/usr/src/libexec/talkd/talkd.c
index b1a3d6a..bc42729 100644 (file)
--- a/usr/src/libexec/talkd/talkd.c
+++ b/usr/src/libexec/talkd/talkd.c
@@ -1,6 +1,45 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)talkd.c    1.2 (Berkeley) %G%";
-#endif
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)talkd.c    5.8 (Berkeley) 2/26/91";
+#endif /* not lint */

 
 /*
  * The top level of the daemon, the format is heavily borrowed
 
 /*
  * The top level of the daemon, the format is heavily borrowed


@@ -8,20 +47,25 @@ static       char sccsid[] = "@(#)talkd.c    1.2 (Berkeley) %G%";
  * disconnect all descriptors and ttys, and then endless
  * loop on waiting for and processing requests
  */
  * disconnect all descriptors and ttys, and then endless
  * loop on waiting for and processing requests
  */

-#include <stdio.h>
-#include <errno.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <protocols/talkd.h>

 #include <signal.h>
 #include <signal.h>

-
-#include "ctl.h"
-
-struct sockaddr_in sin = { AF_INET };
+#include <syslog.h>
+#include <time.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <paths.h>

 
 CTL_MSG                request;
 CTL_RESPONSE   response;
 
 int    sockt;
 int    debug = 0;
 
 CTL_MSG                request;
 CTL_RESPONSE   response;
 
 int    sockt;
 int    debug = 0;

-int    timeout();
+void   timeout();

 long   lastmsgtime;
 
 char   hostname[32];
 long   lastmsgtime;
 
 char   hostname[32];


@@ -33,43 +77,51 @@ main(argc, argv)
        int argc;
        char *argv[];
 {
        int argc;
        char *argv[];
 {

-       struct sockaddr_in from;
-       int fromlen, cc;
+       register CTL_MSG *mp = &request;
+       int cc;

 
        if (getuid()) {
 
        if (getuid()) {

-               fprintf(stderr, "Talkd : not super user\n");
+               fprintf(stderr, "%s: getuid: not super-user", argv[0]);

                exit(1);
        }
                exit(1);
        }

-       gethostname(hostname, sizeof (hostname));
-       (void) chdir("/dev");
+       openlog("talkd", LOG_PID, LOG_DAEMON);
+       if (gethostname(hostname, sizeof (hostname) - 1) < 0) {
+               syslog(LOG_ERR, "gethostname: %m");
+               _exit(1);
+       }
+       if (chdir(_PATH_DEV) < 0) {
+               syslog(LOG_ERR, "chdir: %s: %m", _PATH_DEV);
+               _exit(1);
+       }
+       if (argc > 1 && strcmp(argv[1], "-d") == 0)
+               debug = 1;

        signal(SIGALRM, timeout);
        alarm(TIMEOUT);
        for (;;) {
                extern int errno;
 
        signal(SIGALRM, timeout);
        alarm(TIMEOUT);
        for (;;) {
                extern int errno;
 

-               fromlen = sizeof(from);
-               cc = recvfrom(0, (char *)&request, sizeof (request), 0,
-                   &from, &fromlen);
-               if (cc != sizeof(request)) {
+               cc = recv(0, (char *)mp, sizeof (*mp), 0);
+               if (cc != sizeof (*mp)) {

                        if (cc < 0 && errno != EINTR)
                        if (cc < 0 && errno != EINTR)

-                       perror("recvfrom");
+                               syslog(LOG_WARNING, "recv: %m");

                        continue;
                }
                lastmsgtime = time(0);
                        continue;
                }
                lastmsgtime = time(0);

-               process_request(&request, &response);
+               process_request(mp, &response);

                /* can block here, is this what I want? */
                /* can block here, is this what I want? */

-               cc = sendto(sockt, (char *) &response,
-                   sizeof (response), 0, &request.ctl_addr,
-                   sizeof (request.ctl_addr));
-               if (cc != sizeof(response))
-                       perror("sendto");
+               cc = sendto(sockt, (char *)&response,
+                   sizeof (response), 0, (struct sockaddr *)&mp->ctl_addr,
+                   sizeof (mp->ctl_addr));
+               if (cc != sizeof (response))
+                       syslog(LOG_WARNING, "sendto: %m");

        }
 }
 
        }
 }
 

+void

 timeout()
 {
 
        if (time(0) - lastmsgtime >= MAXIDLE)
 timeout()
 {
 
        if (time(0) - lastmsgtime >= MAXIDLE)

-               exit(0);
+               _exit(0);

        alarm(TIMEOUT);
 }
        alarm(TIMEOUT);
 }