BSD 4_3_Net_2 release

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

diff --git a/usr/src/sbin/ping/ping.c b/usr/src/sbin/ping/ping.c
index e660dd0..bfa1447 100644 (file)
--- a/usr/src/sbin/ping/ping.c
+++ b/usr/src/sbin/ping/ping.c
@@ -5,19 +5,33 @@
  * This code is derived from software contributed to Berkeley by
  * Mike Muuss.
  *
  * This code is derived from software contributed to Berkeley by
  * Mike Muuss.
  *

- * 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


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

-static char sccsid[] = "@(#)ping.c     5.6 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)ping.c     5.9 (Berkeley) 5/12/91";

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


@@ -122,9 +136,8 @@ long tmin = LONG_MAX;               /* minimum round trip time */
 long tmax;                     /* maximum round trip time */
 u_long tsum;                   /* sum of all times, for doing average */
 
 long tmax;                     /* maximum round trip time */
 u_long tsum;                   /* sum of all times, for doing average */
 

-u_long inet_addr();
-char *inet_ntoa(), *pr_addr();
-int catcher(), finish();
+char *pr_addr();
+void catcher(), finish();

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


@@ -162,7 +175,7 @@ main(argc, argv)
                case 'f':
                        if (getuid()) {
                                (void)fprintf(stderr,
                case 'f':
                        if (getuid()) {
                                (void)fprintf(stderr,

-                                   "ping: you must be root to use the -f option.\n");
+                                   "ping: %s\n", strerror(EPERM));

                                exit(1);
                        }
                        options |= F_FLOOD;
                                exit(1);
                        }
                        options |= F_FLOOD;


@@ -365,6 +378,7 @@ main(argc, argv)
  * launched exactly at 1-second intervals).  This does not affect the
  * quality of the delay and loss statistics.
  */
  * launched exactly at 1-second intervals).  This does not affect the
  * quality of the delay and loss statistics.
  */

+void

 catcher()
 {
        int waittime;
 catcher()
 {
        int waittime;


@@ -426,7 +440,7 @@ pinger()
                (void)printf("ping: wrote %s %d chars, ret=%d\n",
                    hostname, cc, i);
        }
                (void)printf("ping: wrote %s %d chars, ret=%d\n",
                    hostname, cc, i);
        }

-       if (options & F_FLOOD)
+       if (!(options & F_QUIET) && options & F_FLOOD)

                (void)write(STDOUT_FILENO, &DOT, 1);
 }
 
                (void)write(STDOUT_FILENO, &DOT, 1);
 }
 


@@ -540,8 +554,7 @@ pr_pack(buf, cc, from)
        /* Display any IP options */
        cp = (u_char *)buf + sizeof(struct ip);
 
        /* Display any IP options */
        cp = (u_char *)buf + sizeof(struct ip);
 

-       /* ANSI C will force hlen to unsigned! */
-       for (; hlen > sizeof(struct ip); --hlen, ++cp)
+       for (; hlen > (int)sizeof(struct ip); --hlen, ++cp)

                switch (*cp) {
                case IPOPT_EOL:
                        hlen = 0;
                switch (*cp) {
                case IPOPT_EOL:
                        hlen = 0;


@@ -674,6 +687,7 @@ tvsub(out, in)
  * finish --
  *     Print out statistics, and give up.
  */
  * finish --
  *     Print out statistics, and give up.
  */

+void

 finish()
 {
        (void)signal(SIGINT, SIG_IGN);
 finish()
 {
        (void)signal(SIGINT, SIG_IGN);