BSD 4_3_Net_2 release

[unix-history] / usr / src / sbin / XNSrouted / tools / query.c

diff --git a/usr/src/sbin/XNSrouted/tools/query.c b/usr/src/sbin/XNSrouted/tools/query.c
index 5d1292b..2e6374d 100644 (file)
--- a/usr/src/sbin/XNSrouted/tools/query.c
+++ b/usr/src/sbin/XNSrouted/tools/query.c
@@ -1,21 +1,37 @@
-/*
+/*-

  * Copyright (c) 1983, 1986 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983, 1986 The Regents of the University of California.
  * All rights reserved.
  *

- * This file includes significant work done at Cornell University by
- * Bill Nesheim.  That work included by permission.
+ * This code includes software contributed to Berkeley by
+ * Bill Nesheim at Cornell University.
+ *
+ * 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.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, 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'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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


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

-static char sccsid[] = "@(#)query.c    5.6 (Berkeley) 9/19/88";
+static char sccsid[] = "@(#)query.c    5.8 (Berkeley) 4/16/91";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -47,7 +63,7 @@ int   s;
 int    timedout, timeout();
 char   packet[MAXPACKETSIZE];
 extern int errno;
 int    timedout, timeout();
 char   packet[MAXPACKETSIZE];
 extern int errno;

-struct sockaddr_ns     myaddr = {AF_NS};
+struct sockaddr_ns     myaddr = {sizeof(myaddr), AF_NS};

 char *ns_ntoa();
 struct ns_addr ns_addr();
 main(argc, argv)
 char *ns_ntoa();
 struct ns_addr ns_addr();
 main(argc, argv)


@@ -102,7 +118,7 @@ char *argv[];
                count--;
        }
 }
                count--;
        }
 }

-static struct sockaddr_ns router = {AF_NS};
+static struct sockaddr_ns router = {sizeof(myaddr), AF_NS};

 static struct ns_addr zero_addr;
 static short allones[] = {-1, -1, -1};
 
 static struct ns_addr zero_addr;
 static short allones[] = {-1, -1, -1};
 


@@ -111,9 +127,13 @@ char **argv;
 {
        register struct rip *msg = (struct rip *)packet;
        char *host = *argv;
 {
        register struct rip *msg = (struct rip *)packet;
        char *host = *argv;

+       int flags = 0;

        struct ns_addr specific;
 
        struct ns_addr specific;
 

-       argv++; argc--;
+       if (bcmp(*argv, "-r", 3) == 0) {
+               flags = MSG_DONTROUTE; argv++; argc--;
+       }
+       host = *argv;

        router.sns_addr = ns_addr(host);
        router.sns_addr.x_port = htons(IDPPORT_RIF);
        if (ns_hosteq(zero_addr, router.sns_addr)) {
        router.sns_addr = ns_addr(host);
        router.sns_addr.x_port = htons(IDPPORT_RIF);
        if (ns_hosteq(zero_addr, router.sns_addr)) {


@@ -129,7 +149,7 @@ char **argv;
                specific.x_port = zero_addr.x_port;
                printf("Net asked for was %s\n", ns_ntoa(specific));
        }
                specific.x_port = zero_addr.x_port;
                printf("Net asked for was %s\n", ns_ntoa(specific));
        }

-       if (sendto(s, packet, sizeof (struct rip), 0,
+       if (sendto(s, packet, sizeof (struct rip), flags,

          &router, sizeof(router)) < 0)
                perror(host);
 }
          &router, sizeof(router)) < 0)
                perror(host);
 }