call to socket had one too many args, other small fixups.

SCCS-vsn: sbin/routed/main.c 5.2

diff --git a/usr/src/sbin/routed/main.c b/usr/src/sbin/routed/main.c
index 99273a1..89ed26f 100644 (file)
--- a/usr/src/sbin/routed/main.c
+++ b/usr/src/sbin/routed/main.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.2 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -43,7 +43,7 @@ main(argc, argv)
        u_char retry;
        
        argv0 = argv;
        u_char retry;
        
        argv0 = argv;

-       openlog("routed", LOG_PID, 0);
+       openlog("routed", LOG_PID | LOG_ODELAY, 0);

        sp = getservbyname("router", "udp");
        if (sp == NULL) {
                fprintf(stderr, "routed: router/udp: unknown service\n");
        sp = getservbyname("router", "udp");
        if (sp == NULL) {
                fprintf(stderr, "routed: router/udp: unknown service\n");


@@ -88,7 +88,7 @@ main(argc, argv)
                        exit(0);
                for (t = 0; t < 20; t++)
                        if (t != s)
                        exit(0);
                for (t = 0; t < 20; t++)
                        if (t != s)

-                               (void) close(cc);
+                               (void) close(t);

                (void) open("/", 0);
                (void) dup2(0, 1);
                (void) dup2(0, 2);
                (void) open("/", 0);
                (void) dup2(0, 1);
                (void) dup2(0, 2);


@@ -159,8 +159,7 @@ process(fd)
        }
        if (fromlen != sizeof (struct sockaddr_in))
                return;
        }
        if (fromlen != sizeof (struct sockaddr_in))
                return;

-#define        mask(s) (1<<((s)-1))
-       omask = sigblock(mask(SIGALRM));
+       omask = sigblock(sigmask(SIGALRM));

        rip_input(&from, cc);
        sigsetmask(omask);
 }
        rip_input(&from, cc);
        sigsetmask(omask);
 }


@@ -172,7 +171,7 @@ getsocket(domain, type, sin)
        int retry, s, on = 1;
 
        retry = 1;
        int retry, s, on = 1;
 
        retry = 1;

-       while ((s = socket(domain, type, 0, 0)) < 0 && retry) {
+       while ((s = socket(domain, type, 0)) < 0 && retry) {

                perror("socket");
                sleep(5 * retry);
                retry <<= 1;
                perror("socket");
                sleep(5 * retry);
                retry <<= 1;