cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update fping to 2.4b2_to4 (great numbering scheme!) from the

Browse Source 
smokeping MASTER_SITE.
This commit is contained in:
sthen 2010-11-24 15:14:45 +00:00
parent 540e981532
commit edce3cc433
4 changed files with 49 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
net/fping/Makefile
View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.27 2010/11/19 22:31:33 espie Exp $
# $OpenBSD: Makefile,v 1.28 2010/11/24 15:14:45 sthen Exp $
# $FreeBSD: ports/net/fping/Makefile,v 1.8 2000/03/22 00:26:51 obrien Exp $
COMMENT = quickly ping N hosts w/o flooding the network
DISTNAME = fping-2.4b2_to-ipv6
PKGNAME = ${DISTNAME:S/_to-ipv6//}
REVISION = 5
DISTNAME = fping-2.4b2_to4-ipv6
PKGNAME = ${DISTNAME:S/_to4-ipv6//}
REVISION = 6
CATEGORIES = net
HOMEPAGE = http://www.fping.com/
HOMEPAGE = http://fping.sf.net/
MAINTAINER = Stuart Henderson <sthen@openbsd.org>
@ -21,27 +21,31 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB = c
# upstream has no version number in filename
#MASTER_SITES = http://fping.sourceforge.net/download/
MASTER_SITES = http://spacehopper.org/mirrors/
MASTER_SITES = http://oss.oetiker.ch/smokeping/pub/
CONFIGURE_STYLE = gnu
SEPARATE_BUILD = simple
CONFIGURE_ARGS = --bindir=${PREFIX}/sbin
COPTS += -DHAVE_PROGNAME
USE_GROFF = Yes
pre-configure:
perl -pi -e 's,/usr/local/bin/fping,${LOCALBASE}/sbin/fping,g' \
${WRKSRC}/fping.8
post-build:
cd ${WRKSRC}; \
${CC} -DHAVE_CONFIG_H -I. ${CFLAGS} -c fping.c -DIPV6 -o fping6.o; \
${CC} ${CFLAGS} -o fping6 fping6.o
cd ${WRKBUILD}; \
${CC} -DHAVE_CONFIG_H -I. -I${WRKSRC} ${CFLAGS} -c \
-DIPV6 -o fping6.o ${WRKSRC}/fping.c; \
${CC} ${LDFLAGS} ${CFLAGS} -o fping6 fping6.o
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/fping ${PREFIX}/sbin
${INSTALL_PROGRAM} ${WRKBUILD}/fping6 ${PREFIX}/sbin
${INSTALL_MAN} ${WRKBUILD}/fping.8 ${PREFIX}/man/man8
${INSTALL_MAN} ${WRKSRC}/fping.8 ${PREFIX}/man/man8
ln ${PREFIX}/man/man8/fping.8 ${PREFIX}/man/man8/fping6.8
${INSTALL_MAN_DIR} ${PREFIX}/share/doc/fping
${INSTALL_MAN} ${WRKBUILD}/COPYING ${PREFIX}/share/doc/fping
${INSTALL_MAN} ${WRKBUILD}/README ${PREFIX}/share/doc/fping
${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/fping
${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/fping
.include <bsd.port.mk>

10
net/fping/distinfo
View File

@ -1,5 +1,5 @@
MD5 (fping-2.4b2_to-ipv6.tar.gz) = OtUWdlUUJJpA08W2yquBKg==
RMD160 (fping-2.4b2_to-ipv6.tar.gz) = z/EBpTuuycwjBj/yAE22mjUQxR8=
SHA1 (fping-2.4b2_to-ipv6.tar.gz) = 0xDG/pUfZGYNTApfK9HFN5weW94=
SHA256 (fping-2.4b2_to-ipv6.tar.gz) = d+GpCvT/9KX/xLcFQsb/RBMFWDV+fVSfmanv8jEI0XI=
SIZE (fping-2.4b2_to-ipv6.tar.gz) = 63333
MD5 (fping-2.4b2_to4-ipv6.tar.gz) = 56VaYiZJJMmnNzmHOwc3oA==
RMD160 (fping-2.4b2_to4-ipv6.tar.gz) = dv+o8/B9W/PHCsT4ntx6YzYwPR4=
SHA1 (fping-2.4b2_to4-ipv6.tar.gz) = qchGpvvrhoB4fmAsa6MFk6Vgc9M=
SHA256 (fping-2.4b2_to4-ipv6.tar.gz) = CxMI+nzJoIP76THwySftUrY0v4lavYaeyrgmQdbl9G8=
SIZE (fping-2.4b2_to4-ipv6.tar.gz) = 127986

27
net/fping/patches/patch-fping_8
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-fping_8,v 1.3 2008/10/28 23:49:58 sthen Exp $
--- fping.8.orig Mon Jan 21 02:05:48 2002
+++ fping.8 Tue Oct 28 01:37:46 2008
@@ -152,12 +152,12 @@ Sure the open2 usage is not needed in this example, bu
example none the less.
.nf
-#!/usr/local/bin/perl
+#!/usr/bin/perl
require 'open2.pl';
$MAILTO = "root";
-$pid = &open2("OUTPUT","INPUT","/usr/local/bin/fping -u");
+$pid = &open2("OUTPUT","INPUT","/usr/local/sbin/fping -u");
@check=("slapshot","foo","foobar");
@@ -178,7 +178,7 @@ Another good example is when you want to perform an ac
that are currently reachable.
.nf
-#!/usr/local/bin/perl
+#!/usr/bin/perl
$hosts_to_backup = `cat /etc/hosts.backup | fping -a`;

165
net/fping/patches/patch-fping_c
View File

@ -1,15 +1,7 @@
$OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
--- fping.c.orig Thu Jul 12 12:36:46 2007
+++ fping.c Thu Jul 12 12:36:50 2007
@@ -42,7 +42,6 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#define IPV6 1 /* This should be a compiler option, or even better be done from the Makefile... ;) */
#ifndef _NO_PROTO
#if !__STDC__ && !defined( __cplusplus ) && !defined( FUNCPROTO ) \
@@ -67,7 +66,7 @@ extern "C"
$OpenBSD: patch-fping_c,v 1.8 2010/11/24 15:14:45 sthen Exp $
--- fping.c.orig Thu Dec 31 15:57:28 2009
+++ fping.c Wed Nov 24 15:07:47 2010
@@ -67,7 +67,7 @@ extern "C"
/*** autoconf includes ***/
@ -18,7 +10,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
#include <stdio.h>
#include <errno.h>
#include <time.h>
@@ -88,7 +87,6 @@ extern "C"
@@ -88,7 +88,6 @@ extern "C"
#include <string.h>
#include <stddef.h>
@ -26,18 +18,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
#include <sys/time.h>
#include <sys/socket.h>
@@ -112,6 +110,10 @@ extern "C"
#include <arpa/inet.h>
#include <netdb.h>
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
+
/* RS6000 has sys/select.h */
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
@@ -123,10 +125,16 @@ extern "C"
@@ -118,10 +117,16 @@ extern "C"
/*** externals ***/
@ -54,7 +35,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
#ifdef __cplusplus
}
#endif /* __cplusplus */
@@ -246,13 +254,13 @@ typedef struct host_entry
@@ -245,13 +250,13 @@ typedef struct host_entry
struct timeval last_send_time; /* time of last packet sent */
int num_sent; /* number of ping packets sent */
int num_recv; /* number of pings received */
@ -72,32 +53,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
int total_time_i; /* sum of response times */
int *resp_times; /* individual response times */
#if defined( DEBUG ) || defined( _DEBUG )
@@ -283,6 +291,12 @@ u_int ping_pkt_size;
u_int count = 1;
u_int trials;
u_int report_interval = 0;
+int src_addr_present = 0;
+#ifndef IPV6
+struct in_addr src_addr;
+#else
+struct in6_addr src_addr;
+#endif
/* global stats */
long max_reply = 0;
@@ -408,6 +422,11 @@ int main( int argc, char **argv )
struct protoent *proto;
char *buf;
uid_t uid;
+#ifndef IPV6
+ struct sockaddr_in sa;
+#else
+ struct sockaddr_in6 sa;
+#endif
/* check if we are root */
if( geteuid() )
@@ -482,7 +501,11 @@ int main( int argc, char **argv )
@@ -524,7 +529,11 @@ int main( int argc, char **argv )
}/* IF */
@ -110,45 +66,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
ident = getpid() & 0xFFFF;
verbose_flag = 1;
@@ -491,7 +514,7 @@ int main( int argc, char **argv )
/* get command line options */
- while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:" ) ) != EOF )
+ while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:S:" ) ) != EOF )
{
switch( c )
{
@@ -502,9 +525,9 @@ int main( int argc, char **argv )
break;
case 'r':
- if( !( retry = ( u_int )atoi( optarg ) ) )
- usage();
+ retry = ( u_int )atoi( optarg );
+
break;
case 'i':
@@ -639,6 +662,16 @@ int main( int argc, char **argv )
generate_flag = 1;
break;
+ case 'S':
+#ifndef IPV6
+ if( ! inet_pton( AF_INET, optarg, &src_addr ) )
+#else
+ if( ! inet_pton( AF_INET6, optarg, &src_addr ) )
+#endif
+ usage();
+ src_addr_present = 1;
+ break;
+
default:
usage();
break;
@@ -808,8 +841,13 @@ int main( int argc, char **argv )
@@ -883,8 +892,13 @@ int main( int argc, char **argv )
else if( filename )
{
FILE *ping_file;
@ -162,47 +80,24 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
char *p;
if( strcmp( filename, "-" ) == 0 )
@@ -823,6 +861,7 @@ int main( int argc, char **argv )
@@ -898,6 +912,7 @@ int main( int argc, char **argv )
while( fgets( line, 132, ping_file ) )
while( fgets( line, sizeof(line), ping_file ) )
{
+ line[132-1] = '\0';
if( sscanf( line, "%s", host ) != 1 )
continue;
@@ -962,6 +1001,22 @@ int main( int argc, char **argv )
if( !num_hosts )
exit( 2 );
+ /* set the source address */
+
+ if( src_addr_present )
+ {
+ memset( &sa, 0, sizeof( sa ) );
+#ifndef IPV6
+ sa.sin_family = AF_INET;
+ sa.sin_addr = src_addr;
+#else
+ sa.sin6_family = AF_INET6;
+ sa.sin6_addr = src_addr;
+#endif
+ if ( bind( s, (struct sockaddr *)&sa, sizeof( sa ) ) < 0 )
+ errno_crash_and_burn( "cannot bind source address" );
+ }
+
/* allocate array to hold outstanding ping requests */
table = ( HOST_ENTRY** )malloc( sizeof( HOST_ENTRY* ) * num_hosts );
@@ -1503,7 +1558,6 @@ void send_ping( int s, HOST_ENTRY *h )
@@ -1594,7 +1609,6 @@ void send_ping( int s, HOST_ENTRY *h )
memset( buffer, 0, ping_pkt_size * sizeof( char ) );
icp = ( FPING_ICMPHDR* )buffer;
- gettimeofday( &h->last_send_time, &tz );
#ifndef IPV6
icp->icmp_type = ICMP_ECHO;
icp->icmp_code = 0;
@@ -1512,6 +1566,8 @@ void send_ping( int s, HOST_ENTRY *h )
icp->icmp_id = ident;
myseq = h->num_sent * num_hosts + h->i;
max_seq_sent = myseq > max_seq_sent ? myseq : max_seq_sent;
@@ -1606,6 +1620,8 @@ void send_ping( int s, HOST_ENTRY *h )
icp->icmp_id = htons(ident);
pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
+ /* set the time at the very last possible point */
@ -210,8 +105,8 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
pdp->ping_ts = h->last_send_time;
pdp->ping_count = h->num_sent;
@@ -1523,6 +1579,8 @@ void send_ping( int s, HOST_ENTRY *h )
icp->icmp6_id = ident;
@@ -1617,6 +1633,8 @@ void send_ping( int s, HOST_ENTRY *h )
icp->icmp6_id = htons(ident);
pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
+ /* set the time at the very last possible point */
@ -219,7 +114,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
pdp->ping_ts = h->last_send_time;
pdp->ping_count = h->num_sent;
@@ -1611,6 +1669,9 @@ int wait_for_reply( void )
@@ -1705,6 +1723,9 @@ int wait_for_reply( void )
result = recvfrom_wto( s, buffer, sizeof(buffer), &response_addr, select_time );
@ -229,7 +124,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
if( result < 0 )
return 0; /* timeout */
@@ -1625,7 +1686,7 @@ int wait_for_reply( void )
@@ -1719,7 +1740,7 @@ int wait_for_reply( void )
ip = ( struct ip* )buffer;
#ifndef IPV6
@ -238,7 +133,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
/* The alpha headers are decidedly broken.
* Using an ANSI compiler, it provides ip_vhl instead of ip_hl and
* ip_v. So, to get ip_hl, we mask off the bottom four bits.
@@ -1633,7 +1694,7 @@ int wait_for_reply( void )
@@ -1727,7 +1748,7 @@ int wait_for_reply( void )
hlen = ( ip->ip_vhl & 0x0F ) << 2;
#else
hlen = ip->ip_hl << 2;
@ -247,7 +142,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
if( result < hlen + ICMP_MINLEN )
#else
if( result < sizeof(FPING_ICMPHDR) )
@@ -1690,7 +1751,6 @@ int wait_for_reply( void )
@@ -1784,7 +1805,6 @@ int wait_for_reply( void )
h = table[n];
/* received ping is cool, so process it */
@ -255,7 +150,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
h->waiting = 0;
h->timeout = timeout;
h->num_recv++;
@@ -2570,7 +2630,7 @@ char * sprint_tm( int t )
@@ -2677,7 +2697,7 @@ char * sprint_tm( int t )
/* <= 0.99 ms */
if( t < 100 )
{
@ -264,7 +159,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
return( buf );
}/* IF */
@@ -2578,7 +2638,7 @@ char * sprint_tm( int t )
@@ -2685,7 +2705,7 @@ char * sprint_tm( int t )
/* 1.00 - 9.99 ms */
if( t < 1000 )
{
@ -273,7 +168,7 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
return( buf );
}/* IF */
@@ -2586,13 +2646,13 @@ char * sprint_tm( int t )
@@ -2693,13 +2713,13 @@ char * sprint_tm( int t )
/* 10.0 - 99.9 ms */
if( t < 10000 )
{
@ -289,11 +184,3 @@ $OpenBSD: patch-fping_c,v 1.7 2007/07/13 08:13:22 djm Exp $
return( buf );
} /* sprint_tm() */
@@ -2732,6 +2792,7 @@ void usage( void )
fprintf( stderr, " -Q n same as -q, but show summary every n seconds\n" );
fprintf( stderr, " -r n number of retries (default %d)\n", retry );
fprintf( stderr, " -s print final stats\n" );
+ fprintf( stderr, " -S addr set source address\n" );
fprintf( stderr, " -t n individual target initial timeout (in millisec) (default %d)\n", timeout / 100 );
fprintf( stderr, " -u show targets that are unreachable\n" );
fprintf( stderr, " -v show version\n" );