summaryrefslogtreecommitdiff
path: root/net/fping
diff options
context:
space:
mode:
Diffstat (limited to 'net/fping')
-rw-r--r--net/fping/patches/patch-aa29
-rw-r--r--net/fping/patches/patch-ab147
-rw-r--r--net/fping/patches/patch-ac54
3 files changed, 0 insertions, 230 deletions
diff --git a/net/fping/patches/patch-aa b/net/fping/patches/patch-aa
deleted file mode 100644
index 871e2039805..00000000000
--- a/net/fping/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/02/18 18:40:41 abs Exp $
-
---- Makefile.orig Mon Feb 18 18:37:42 2002
-+++ Makefile
-@@ -2,10 +2,10 @@
- PROG= fping
- OBJS= fping.o
- SRC= fping.c
--BIN= /usr/local/bin
--MAN= /usr/man/manl
-+BIN= $(PREFIX)/sbin
-+MAN= $(PREFIX)/man/man8
- MANSRC= fping.man
--MANDST= fping.l
-+MANDST= fping.8
-
- #
- # Interval is the minimum amount of time between sending a ping packet to
-@@ -43,8 +43,8 @@
- #
-
- install:
-- install -c -m 4555 -o root -s $(PROG) $(BIN)/$(PROG)
-- install -c -m 0444 -o root $(MANSRC) $(MAN)/$(MANDST)
-+ ${BSD_INSTALL_PROGRAM} $(PROG) $(BIN)/$(PROG)
-+ ${BSD_INSTALL_MAN} $(MANSRC) $(MAN)/$(MANDST)
-
- clean:
- rm -f a.out core *~ *.o $(PROG)
diff --git a/net/fping/patches/patch-ab b/net/fping/patches/patch-ab
deleted file mode 100644
index 3ed205ec0f0..00000000000
--- a/net/fping/patches/patch-ab
+++ /dev/null
@@ -1,147 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/02/18 18:40:42 abs Exp $
-
---- fping.c.orig Fri Feb 18 19:29:52 2022
-+++ fping.c
-@@ -153,7 +153,7 @@
- #include <errno.h>
- #include <time.h>
-
--#ifdef _POSIX_SOURCE
-+#if defined(_POSIX_SOURCE) || defined(__NetBSD__)
- #include <unistd.h>
- #endif
-
-@@ -185,7 +185,9 @@
-
- extern char *optarg;
- extern int optind,opterr;
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__linux__)
- extern char *sys_errlist[];
-+#endif
-
-
- #ifdef __cplusplus
-@@ -234,9 +236,9 @@
- int timeout = DEFAULT_TIMEOUT;
- int interval = DEFAULT_INTERVAL;
-
--long max_reply=0;
--long min_reply=10000;
--int total_replies=0;
-+long max_reply=0; /* usec */
-+long min_reply=10000; /* usec */
-+int total_replies=0; /* usec */
- double sum_replies=0;
-
- struct timeval timeout_timeval;
-@@ -385,6 +387,7 @@
- }
- if (!ping_file) errno_crash_and_burn("fopen");
- while(fgets(line,132,ping_file)) {
-+ line[132-1] = '\0';
- sscanf(line,"%s",host);
- if ((!*host) || (host[0]=='#')) /* magic to avoid comments */
- continue;
-@@ -411,8 +414,8 @@
- cursor=cursor->next;
- }
-
-- gettimeofday(&start_time,&tz);
- cursor=rrlist;
-+ gettimeofday(&start_time,&tz);
- while (num_waiting) { /* while pings are outstanding */
- if ( (timeval_diff(&current_time,&cursor->last_time)> timeout) ||
- cursor->num_packets_sent==0) {
-@@ -455,11 +458,11 @@
- min_reply=0; max_reply=0; total_replies=1; sum_replies=0;
- }
-
-- fprintf(stderr," %8d msec (min round trip time)\n",min_reply);
-- fprintf(stderr," %8d msec (avg round trip time)\n",(int)sum_replies/total_replies);
-- fprintf(stderr," %8d msec (max round trip time)\n",max_reply);
-+ fprintf(stderr," %8.3f msec (min round trip time)\n",min_reply/1000.0);
-+ fprintf(stderr," %8.3f msec (avg round trip time)\n",sum_replies/total_replies/1000.0);
-+ fprintf(stderr," %8.3f msec (max round trip time)\n",max_reply/1000.0);
- fprintf(stderr," %8.3f sec (elapsed real time)\n",
-- timeval_diff( &end_time,&start_time)/1000.0);
-+ timeval_diff( &end_time,&start_time)/1000000.0);
- fprintf(stderr,"\n");
-
- }
-@@ -493,8 +496,6 @@
- struct icmp *icp = (struct icmp *) buffer;
- int n,len;
-
-- gettimeofday(&h->last_time,&tz);
--
- icp->icmp_type = ICMP_ECHO;
- icp->icmp_code = 0;
- icp->icmp_cksum = 0;
-@@ -504,12 +505,15 @@
- #define SIZE_PACK_SENT (sizeof(h->num_packets_sent))
- #define SIZE_LAST_TIME (sizeof(h->last_time))
-
-- bcopy(&h->last_time,&buffer[SIZE_ICMP_HDR],SIZE_LAST_TIME);
- bcopy(&h->num_packets_sent,
- &buffer[SIZE_ICMP_HDR+SIZE_LAST_TIME], SIZE_PACK_SENT);
-
- len = SIZE_ICMP_HDR+SIZE_LAST_TIME+SIZE_PACK_SENT;
-
-+ /* set the time at the very last possible point */
-+ gettimeofday(&h->last_time,&tz);
-+ bcopy(&h->last_time,&buffer[SIZE_ICMP_HDR],SIZE_LAST_TIME);
-+
- icp->icmp_cksum = in_cksum( (u_short *)icp, len );
-
- n = sendto( s, buffer, len, 0, (struct sockaddr *)&h->saddr,
-@@ -578,10 +582,12 @@
- return 1; /* packet received, don't about it anymore */
- }
-
-+ /* get time of receipt as close to the real time as possible */
-+ gettimeofday(&current_time,&tz);
-+
- n=icp->icmp_seq;
- h=table[n];
-
-- gettimeofday(&current_time,&tz);
- bcopy(&icp->icmp_data[0],&sent_time,sizeof(sent_time));
- bcopy(&icp->icmp_data[SIZE_LAST_TIME],&the_index, sizeof(the_index));
- this_reply = timeval_diff(&current_time,&sent_time);
-@@ -594,7 +600,7 @@
- if (dns_flag) printf("%s",get_host_by_address(response_addr.sin_addr));
- else printf("%s",h->host);
- if (verbose_flag) printf(" is alive");
-- if (elapsed_flag) printf(" (%d msec)",this_reply);
-+ if (elapsed_flag) printf(" (%.3f msec)",this_reply/1000.0);
- printf("\n");
- }
- num_alive++;
-@@ -649,7 +655,7 @@
-
- u_long ipaddress = inet_addr(host);
-
-- if ( (ipaddress == -1) &&
-+ if ( (ipaddress == INADDR_NONE) &&
- ( ((host_ent=gethostbyname(host)) == 0) ||
- ((host_add = (struct in_addr *) *(host_ent->h_addr_list))==0))
- ) {
-@@ -669,7 +675,7 @@
- bzero((char*) &p->saddr, sizeof(p->saddr));
- p->saddr.sin_family = AF_INET;
-
-- if (ipaddress==-1) p->saddr.sin_addr = *host_add;
-+ if (ipaddress==INADDR_NONE) p->saddr.sin_addr = *host_add;
- else p->saddr.sin_addr.s_addr = ipaddress;
-
- if (!rrlist) {
-@@ -756,7 +762,7 @@
-
- temp =
- (((a->tv_sec*1000000)+ a->tv_usec) -
-- ((b->tv_sec*1000000)+ b->tv_usec))/1000;
-+ ((b->tv_sec*1000000)+ b->tv_usec));
-
- return (long) temp;
-
-
diff --git a/net/fping/patches/patch-ac b/net/fping/patches/patch-ac
deleted file mode 100644
index ce06962a6ae..00000000000
--- a/net/fping/patches/patch-ac
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/02/18 18:40:42 abs Exp $
-
---- fping.man.orig Mon Feb 18 18:37:42 2002
-+++ fping.man
-@@ -1,4 +1,4 @@
--.TH fping l
-+.TH fping 8
- .SH NAME
- fping \- send ICMP ECHO_REQUEST packets to network hosts
- .SH SYNOPSIS
-@@ -45,7 +45,7 @@
- .IP \fB-f\fR 5
- Read list of system from a file.
- .IP \fB-i\fIn\fR 5
--The minimum amount of time (in milliseconds) between sending a ping packet to any host (default is 25).
-+The minimum amount of time (in microseconds) between sending a ping packet to any host (default is 25).
- .IP \fB-q\fR 5
- Quiet. Don't show per host results, just set final exit status.
- .IP \fB-r\fIn\fR 5
-@@ -54,8 +54,8 @@
- .IP \fB-s\fR 5
- Dump final statistics.
- .IP \fB-t\fIn\fR 5
--Individual host timeout in milliseconds (default 2500). This is the
--minimum number of milliseconds between ping packets directed towards a given
-+Individual host timeout in microseconds (default 2500). This is the
-+minimum number of microseconds between ping packets directed towards a given
- host.
- .IP \fB-u\fR 5
- Show systems that are unreachable.
-@@ -70,12 +70,12 @@
- example none the less.
- .nf
-
--#!/usr/local/bin/perl
-+#!/usr/pkg/bin/perl
- require 'open2.pl';
-
- $MAILTO = "root";
-
--$pid = &open2("OUTPUT","INPUT","/usr/local/bin/fping -u");
-+$pid = &open2("OUTPUT","INPUT","/usr/pkg/sbin/fping -u");
-
- @check=("slapshot","foo","foobar");
-
-@@ -96,7 +96,7 @@
- that are currently reachable.
- .nf
-
--#!/usr/local/bin/perl
-+#!/usr/pkg/bin/perl
-
- $hosts_to_backup = `cat /etc/hosts.backup | fping -a`;
-
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 02:02:58 +0000