BSD 4_3_Net_2 release

[unix-history] / usr / src / sbin / routed / main.c

diff --git a/usr/src/sbin/routed/main.c b/usr/src/sbin/routed/main.c
index 4a2a015..75ed82f 100644 (file)
--- a/usr/src/sbin/routed/main.c
+++ b/usr/src/sbin/routed/main.c
@@ -2,19 +2,33 @@
  * Copyright (c) 1983, 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983, 1988 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.
+ * 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


@@ -24,7 +38,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.21 (Berkeley) 6/29/90";
+static char sccsid[] = "@(#)main.c     5.23 (Berkeley) 7/1/91";

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


@@ -47,7 +61,7 @@ int   debug = 0;
 int    bufspace = 127*1024;    /* max. input buffer size to request */
 
 struct rip *msg = (struct rip *)packet;
 int    bufspace = 127*1024;    /* max. input buffer size to request */
 
 struct rip *msg = (struct rip *)packet;

-int    hup(), rtdeleteall(), sigtrace();
+void   hup(), rtdeleteall(), sigtrace(), timer();

 
 main(argc, argv)
        int argc;
 
 main(argc, argv)
        int argc;


@@ -147,7 +161,7 @@ main(argc, argv)
        else
                query->rip_nets[0].rip_dst.sa_family = AF_UNSPEC;
        query->rip_nets[0].rip_metric = htonl((u_long)HOPCNT_INFINITY);
        else
                query->rip_nets[0].rip_dst.sa_family = AF_UNSPEC;
        query->rip_nets[0].rip_metric = htonl((u_long)HOPCNT_INFINITY);

-       toall(sendmsg);
+       toall(sndmsg);

        signal(SIGALRM, timer);
        signal(SIGHUP, hup);
        signal(SIGTERM, hup);
        signal(SIGALRM, timer);
        signal(SIGHUP, hup);
        signal(SIGTERM, hup);


@@ -317,13 +331,13 @@ getsocket(domain, type, sin)
        if (traceactions)
                fprintf(ftrace, "recv buf %d\n", on);
 #endif
        if (traceactions)
                fprintf(ftrace, "recv buf %d\n", on);
 #endif

-       if (bind(sock, sin, sizeof (*sin), 0) < 0) {
+       if (bind(sock, (struct sockaddr *)sin, sizeof (*sin)) < 0) {

                perror("bind");
                syslog(LOG_ERR, "bind: %m");
                close(sock);
                return (-1);
        }
                perror("bind");
                syslog(LOG_ERR, "bind: %m");
                close(sock);
                return (-1);
        }

-       if (fcntl(sock, F_SETFL, FNDELAY) == -1)
-               syslog(LOG_ERR, "fcntl FNDELAY: %m\n");
+       if (fcntl(sock, F_SETFL, O_NONBLOCK) == -1)
+               syslog(LOG_ERR, "fcntl O_NONBLOCK: %m\n");

        return (sock);
 }
        return (sock);
 }