Hello community, here is the log from the commit of package liboping for openSUSE:Factory checked in at 2016-09-16 11:00:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liboping (Old) and /work/SRC/openSUSE:Factory/.liboping.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "liboping" Changes: -------- --- /work/SRC/openSUSE:Factory/liboping/liboping.changes 2015-04-27 12:59:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.liboping.new/liboping.changes 2016-09-16 11:00:50.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Jul 31 20:18:10 UTC 2016 - mar...@gmx.de + +- Update to version 1.9.0 + * liboping: The new "PING_OPT_MARK" option allows to mark packets, + which can be used for filtering and routing such packets on Linux. + * oping, noping: The new "-m" command line option allows to set a mark + on packets sent by the tool. + * oping, noping: The new "-O" command line option allows to write + measurements to an CSV file. + * oping, noping: The new "-w" command line option allows to specify + the timeout after which a packet/reply is considered "dropped". + +------------------------------------------------------------------- Old: ---- liboping-1.8.0.tar.bz2 New: ---- liboping-1.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liboping.spec ++++++ --- /var/tmp/diff_new_pack.UnfxBo/_old 2016-09-16 11:00:51.000000000 +0200 +++ /var/tmp/diff_new_pack.UnfxBo/_new 2016-09-16 11:00:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package liboping # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: liboping -Version: 1.8.0 +Version: 1.9.0 Release: 0 %define soname 0 Summary: Multiple Host Ping Library that supports ICMPv4 and ICMPv6 ++++++ liboping-1.8.0.tar.bz2 -> liboping-1.9.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/ChangeLog new/liboping-1.9.0/ChangeLog --- old/liboping-1.8.0/ChangeLog 2014-11-20 15:51:17.000000000 +0100 +++ new/liboping-1.9.0/ChangeLog 2016-06-27 08:40:29.000000000 +0200 @@ -1,3 +1,13 @@ +2016-06-27, Version 1.9.0: + * liboping: The new "PING_OPT_MARK" option allows to mark packets, + which can be used for filtering and routing such packets on Linux. + * oping, noping: The new "-m" command line option allows to set a mark + on packets sent by the tool. + * oping, noping: The new "-O" command line option allows to write + measurements to an CSV file. + * oping, noping: The new "-w" command line option allows to specify + the timeout after which a packet/reply is considered "dropped". + 2014-11-20, Version 1.8.0: * oping, noping: Average and standard deviation have been removed from the status output, which show median and 95th percentile instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/Makefile.in new/liboping-1.9.0/Makefile.in --- old/liboping-1.8.0/Makefile.in 2014-11-20 15:52:47.000000000 +0100 +++ new/liboping-1.9.0/Makefile.in 2016-06-27 08:46:18.000000000 +0200 @@ -80,8 +80,8 @@ subdir = . DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) COPYING TODO \ - compile config.guess config.sub install-sh missing ltmain.sh + $(top_srcdir)/configure $(am__configure_deps) COPYING compile \ + config.guess config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/README new/liboping-1.9.0/README --- old/liboping-1.8.0/README 2013-07-11 10:18:33.000000000 +0200 +++ new/liboping-1.9.0/README 2016-02-17 15:21:46.000000000 +0100 @@ -1,6 +1,6 @@ liboping – Library to ping IPv4 and IPv6 hosts in parallel ════════════════════════════════════════════════════════════ -http://verplant.org/liboping/ +http://noping.cc/ About ━━━━━ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/TODO new/liboping-1.9.0/TODO --- old/liboping-1.8.0/TODO 2014-11-17 14:42:06.000000000 +0100 +++ new/liboping-1.9.0/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -* Buffer the last 1000 (or so) replies, calculate percentile from that. -* Add to the Prettyping graph to the right, let it shift to the left. -* Redraw the entire line when pressing 'g'. - -12+12+1 = 25 -11+11+2 = 24 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/bindings/perl/Makefile.PL new/liboping-1.9.0/bindings/perl/Makefile.PL --- old/liboping-1.8.0/bindings/perl/Makefile.PL 2011-03-12 09:32:23.000000000 +0100 +++ new/liboping-1.9.0/bindings/perl/Makefile.PL 2016-02-17 15:21:46.000000000 +0100 @@ -123,7 +123,7 @@ PREREQ_PM => {}, ($] >= 5.005 ? (ABSTRACT_FROM => 'lib/Net/Oping.pm', - AUTHOR => 'Florian Forster <o...@verplant.org>') + AUTHOR => 'Florian Forster <f...@octo.it>') : ()), ($OPING_DEPEND ? (depend => $OPING_DEPEND) : ()), LIBS => [$OPING_LIBS], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/bindings/perl/Oping.xs new/liboping-1.9.0/bindings/perl/Oping.xs --- old/liboping-1.8.0/bindings/perl/Oping.xs 2011-03-12 09:32:23.000000000 +0100 +++ new/liboping-1.9.0/bindings/perl/Oping.xs 2016-02-17 15:21:46.000000000 +0100 @@ -19,7 +19,7 @@ * * Authors: * Olivier Fredj <ofredj at proxad.net> - * Florian octo Forster <octo at verplant.org> + * Florian octo Forster <ff at octo.it> */ #include "EXTERN.h" #include "perl.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/bindings/perl/README new/liboping-1.9.0/bindings/perl/README --- old/liboping-1.8.0/bindings/perl/README 2011-03-12 09:32:23.000000000 +0100 +++ new/liboping-1.9.0/bindings/perl/README 2016-02-17 15:21:46.000000000 +0100 @@ -28,13 +28,13 @@ DEPENDENCIES This module requires the "oping" library to be installed. The library is - available at <http://verplant.org/liboping/>. + available at <http://noping.cc/>. COPYRIGHT AND LICENSE Copyright (C) 2007 by Olivier Fredj <ofredj at proxad.net> - Copyright (C) 2008,2009 by Florian Forster <octo at verplant.org> + Copyright (C) 2008,2009 by Florian Forster <ff at octo.it> This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself, either Perl version 5.8.7 or, at your diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/bindings/perl/lib/Net/Oping.pm new/liboping-1.9.0/bindings/perl/lib/Net/Oping.pm --- old/liboping-1.8.0/bindings/perl/lib/Net/Oping.pm 2011-03-12 09:32:23.000000000 +0100 +++ new/liboping-1.9.0/bindings/perl/lib/Net/Oping.pm 2016-02-17 15:21:46.000000000 +0100 @@ -19,7 +19,7 @@ # # Authors: # Olivier Fredj <ofredj at proxad.net> -# Florian octo Forster <octo at verplant.org> +# Florian octo Forster <ff at octo.it> # package Net::Oping; @@ -41,11 +41,11 @@ =head1 DESCRIPTION This Perl module is a high-level interface to the -L<oping library|http://verplant.org/liboping/>. Its purpose it to send -C<ICMP ECHO_REQUEST> packets (also known as "ping") to a host and measure the -time that elapses until the reception of an C<ICMP ECHO_REPLY> packet (also -known as "pong"). If no such packet is received after a certain timeout the -host is considered to be unreachable. +L<oping library|http://noping.cc/>. Its purpose it to send C<ICMP ECHO_REQUEST> +packets (also known as "ping") to a host and measure the time that elapses +until the reception of an C<ICMP ECHO_REPLY> packet (also known as "pong"). If +no such packet is received after a certain timeout the host is considered to be +unreachable. The used I<oping> library supports "ping"ing multiple hosts in parallel and works with IPv4 and IPv6 transparently. Other advanced features that are @@ -432,7 +432,7 @@ L<liboping(3)> -The I<liboping> homepage may be found at L<http://verplant.org/liboping/>. +The I<liboping> homepage may be found at L<http://noping.cc/>. Information about its mailing list may be found at L<http://mailman.verplant.org/listinfo/liboping>. @@ -445,8 +445,7 @@ Copyright (C) 2007 by Olivier Fredj E<lt>ofredjE<nbsp>atE<nbsp>proxad.netE<gt> -Copyright (C) 2008,2009 by Florian Forster -E<lt>octoE<nbsp>atE<nbsp>verplant.orgE<gt> +Copyright (C) 2008,2009 by Florian Forster E<lt>ffE<nbsp>atE<nbsp>octo.itE<gt> This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself, either Perl version 5.8.7 or, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/configure new/liboping-1.9.0/configure --- old/liboping-1.8.0/configure 2014-11-20 15:52:44.000000000 +0100 +++ new/liboping-1.9.0/configure 2016-06-27 08:46:17.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for liboping 1.8.0. +# Generated by GNU Autoconf 2.69 for liboping 1.9.0. # # Report bugs to <libop...@verplant.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='liboping' PACKAGE_TARNAME='liboping' -PACKAGE_VERSION='1.8.0' -PACKAGE_STRING='liboping 1.8.0' +PACKAGE_VERSION='1.9.0' +PACKAGE_STRING='liboping 1.9.0' PACKAGE_BUGREPORT='libop...@verplant.org' PACKAGE_URL='http://noping.cc/' @@ -1335,7 +1335,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures liboping 1.8.0 to adapt to many kinds of systems. +\`configure' configures liboping 1.9.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1405,7 +1405,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of liboping 1.8.0:";; + short | recursive ) echo "Configuration of liboping 1.9.0:";; esac cat <<\_ACEOF @@ -1517,7 +1517,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -liboping configure 1.8.0 +liboping configure 1.9.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2040,7 +2040,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by liboping $as_me 1.8.0, which was +It was created by liboping $as_me 1.9.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2907,7 +2907,7 @@ # Define the identity of the package. PACKAGE='liboping' - VERSION='1.8.0' + VERSION='1.9.0' cat >>confdefs.h <<_ACEOF @@ -13328,7 +13328,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by liboping $as_me 1.8.0, which was +This file was extended by liboping $as_me 1.9.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13395,7 +13395,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -liboping config.status 1.8.0 +liboping config.status 1.9.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/configure.ac new/liboping-1.9.0/configure.ac --- old/liboping-1.8.0/configure.ac 2014-11-20 15:51:17.000000000 +0100 +++ new/liboping-1.9.0/configure.ac 2016-06-27 08:41:10.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ([2.65]) AC_INIT([liboping], - [1.8.0], + [1.9.0], [libop...@verplant.org], [], [http://noping.cc/]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/liboping.c new/liboping-1.9.0/src/liboping.c --- old/liboping-1.8.0/src/liboping.c 2014-09-28 11:21:20.000000000 +0200 +++ new/liboping-1.9.0/src/liboping.c 2016-06-27 08:45:50.000000000 +0200 @@ -1,6 +1,6 @@ /** * Object oriented C module to send ICMP and ICMPv6 `echo's. - * Copyright (C) 2006-2011 Florian octo Forster <ff at octo.it> + * Copyright (C) 2006-2016 Florian octo Forster <ff at octo.it> * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the @@ -142,6 +142,9 @@ char *device; + char set_mark; + int mark; + char errmsg[PING_ERRMSG_LEN]; pinghost_t *head; @@ -1322,6 +1325,19 @@ } /* case PING_OPT_DEVICE */ break; + case PING_OPT_MARK: + { +#ifdef SO_MARK + obj->mark = *(int*)(value); + obj->set_mark = 1; +#else /* SO_MARK */ + ping_set_errno (obj, ENOTSUP); + ret = -1; +#endif /* !SO_MARK */ + + } /* case PING_OPT_MARK */ + break; + default: ret = -2; } /* switch (option) */ @@ -1508,6 +1524,23 @@ } } #endif /* SO_BINDTODEVICE */ +#ifdef SO_MARK + if(obj->set_mark) + { + if(setsockopt(ph->fd, SOL_SOCKET, SO_MARK, &(obj->mark), sizeof(obj->mark)) != 0) + { +#if WITH_DEBUG + char errbuf[PING_ERRMSG_LEN]; + dprintf ("setsockopt (SO_MARK): %s\n", + sstrerror (errno, errbuf, sizeof (errbuf))); +#endif + ping_set_errno (obj, errno); + close (ph->fd); + ph->fd = -1; + continue; + } + } +#endif #ifdef SO_TIMESTAMP if (1) /* {{{ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/liboping.3 new/liboping-1.9.0/src/mans/liboping.3 --- old/liboping-1.8.0/src/mans/liboping.3 2011-09-07 02:44:57.000000000 +0200 +++ new/liboping-1.9.0/src/mans/liboping.3 2016-06-27 08:46:57.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "liboping 3" -.TH liboping 3 "2011-09-06" "1.6.2" "liboping" +.TH liboping 3 "2016-06-27" "1.9.0" "liboping" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -133,7 +142,7 @@ liboping \- Library to send ICMPv4/ICMPv6 echo packets to multiple hosts .SH "DESCRIPTION" .IX Header "DESCRIPTION" -This is an overview of liboping, a C library to send \s-1ICMP\s0 \s-1ECHO_REQUEST\s0 packets +This is an overview of liboping, a C library to send \s-1ICMP ECHO_REQUEST\s0 packets to remote hosts and measure the time it takes for replies to be received. This method, often simply called \*(L"ping\*(R", is a common way to measure network latency and/or host reachability. @@ -198,7 +207,7 @@ applicable. .SH "AUTHOR" .IX Header "AUTHOR" -liboping is written by Florian \*(L"octo\*(R" Forster <octo at verplant.org>. -Its homepage can be found at <http://verplant.org/liboping/>. +liboping is written by Florian \*(L"octo\*(R" Forster <ff at octo.it>. +Its homepage can be found at <http://noping.cc/>. .PP -Copyright (c) 2005\-2011 by Florian \*(L"octo\*(R" Forster. +Copyright (c) 2005\-2016 by Florian \*(L"octo\*(R" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/liboping.pod new/liboping-1.9.0/src/mans/liboping.pod --- old/liboping-1.8.0/src/mans/liboping.pod 2011-09-07 02:11:42.000000000 +0200 +++ new/liboping-1.9.0/src/mans/liboping.pod 2016-06-27 08:45:17.000000000 +0200 @@ -80,7 +80,7 @@ =head1 AUTHOR -liboping is written by Florian "octo" Forster E<lt>octo at verplant.orgE<gt>. -Its homepage can be found at L<http://verplant.org/liboping/>. +liboping is written by Florian "octo" Forster E<lt>ff at octo.itE<gt>. +Its homepage can be found at L<http://noping.cc/>. -Copyright (c) 2005-2011 by Florian "octo" Forster. +Copyright (c) 2005-2016 by Florian "octo" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/oping.8 new/liboping-1.9.0/src/mans/oping.8 --- old/liboping-1.8.0/src/mans/oping.8 2014-11-20 15:53:23.000000000 +0100 +++ new/liboping-1.9.0/src/mans/oping.8 2016-06-27 08:46:58.000000000 +0200 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "OPING 8" -.TH OPING 8 "2014-11-20" "1.8.0" "liboping" +.TH OPING 8 "2016-06-27" "1.9.0" "liboping" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -176,6 +176,11 @@ .IX Item "-i interval" Send one \s-1ICMP\s0 packet (per host) each \fIinterval\fR seconds. This can be a floating-point number to specify sub-second precision. +.IP "\fB\-w\fR \fItimeout\fR" 4 +.IX Item "-w timeout" +Specifies the time to wait for an \f(CW\*(C`ECHO REPLY\*(C'\fR packet before giving up, in +seconds. This can be a floating point number for sub-second precision. Defaults +to \fB1.0\fR seconds. .IP "\fB\-t\fR \fIttl\fR" 4 .IX Item "-t ttl" Set the \s-1IP\s0 Time to Live to \fIttl\fR. This must be a number between (and @@ -205,6 +210,11 @@ real user \s-1ID \s0(as returned by \fIgetuid\fR\|(2)) and the effective user \s-1ID \s0(as returned by \fIgeteuid\fR\|(2)) differ, the only argument allowed for this option is \&\*(L"\-\*(R" (i.e. standard input). +.IP "\fB\-O\fR \fIfilename\fR" 4 +.IX Item "-O filename" +Write measurements in \fIComma Separated Values\fR (\s-1CSV\s0) format to \fIfilename\fR. +This option writes three columns per row: wall clock time in (fractional) +seconds since epoch, hostname and the round trip time in milliseconds. .IP "\fB\-Q\fR \fIqos\fR" 4 .IX Item "-Q qos" Specify the \fIQuality of Service\fR (QoS) for outgoing packets. This is a @@ -280,6 +290,11 @@ \&\fIType of Service\fR (ToS) aliases were used to specify the bits of outgoing packets. .RE +.IP "\fB\-m\fR \fImark\fR" 4 +.IX Item "-m mark" +\&\fILinux only\fR Sets the \fImark\fR (an integer number) on outgoing packets. This +can be used by \fIiptables\fR\|(8) and other networking infrastructure for filtering +and routing. .IP "\fB\-u\fR|\fB\-U\fR" 4 .IX Item "-u|-U" \&\fInoping only\fR \fB\-u\fR forces \s-1UTF\-8\s0 output, \fB\-U\fR disables \s-1UTF\-8\s0 output. If @@ -315,7 +330,7 @@ .Vb 3 \& |\-\-\-\-\-\-\-\-\-\-[#####|##########]\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-| \& ^ ^ ^ ^ ^ -\& 2.75% 25% 50% 75% 97.5% +\& 2.5% 25% 50% 75% 97.5% .Ve .IP "\fBhistogram\fR" 4 .IX Item "histogram" @@ -363,10 +378,10 @@ printed in red. .SH "SEE ALSO" .IX Header "SEE ALSO" -\&\fIping\fR\|(8), <http://www.fping.com/>, \fIliboping\fR\|(3) +\&\fIping\fR\|(8), <http://fping.org/>, \fIliboping\fR\|(3) .SH "AUTHOR" .IX Header "AUTHOR" liboping is written by Florian \*(L"octo\*(R" Forster <ff at octo.it>. -Its homepage can be found at <http://verplant.org/liboping/>. +Its homepage can be found at <http://noping.cc/>. .PP -Copyright (c) 2005\-2011 by Florian \*(L"octo\*(R" Forster. +Copyright (c) 2005\-2016 by Florian \*(L"octo\*(R" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/oping.pod new/liboping-1.9.0/src/mans/oping.pod --- old/liboping-1.8.0/src/mans/oping.pod 2014-11-20 15:51:17.000000000 +0100 +++ new/liboping-1.9.0/src/mans/oping.pod 2016-06-27 08:45:17.000000000 +0200 @@ -31,7 +31,7 @@ =item B<-4> -Force the use of IPv4. +Force the use of IPv4. =item B<-6> @@ -46,6 +46,12 @@ Send one ICMP packet (per host) each I<interval> seconds. This can be a floating-point number to specify sub-second precision. +=item B<-w> I<timeout> + +Specifies the time to wait for an C<ECHO REPLY> packet before giving up, in +seconds. This can be a floating point number for sub-second precision. Defaults +to B<1.0> seconds. + =item B<-t> I<ttl> Set the IP Time to Live to I<ttl>. This must be a number between (and @@ -79,6 +85,12 @@ returned by L<geteuid(2)>) differ, the only argument allowed for this option is "-" (i.e. standard input). +=item B<-O> I<filename> + +Write measurements in I<Comma Separated Values> (CSV) format to I<filename>. +This option writes three columns per row: wall clock time in (fractional) +seconds since epoch, hostname and the round trip time in milliseconds. + =item B<-Q> I<qos> Specify the I<Quality of Service> (QoS) for outgoing packets. This is a @@ -166,6 +178,12 @@ I<Type of Service> (ToS) aliases were used to specify the bits of outgoing packets. +=item B<-m> I<mark> + +I<Linux only> Sets the I<mark> (an integer number) on outgoing packets. This +can be used by L<iptables(8)> and other networking infrastructure for filtering +and routing. + =item B<-u>|B<-U> I<noping only> B<-u> forces UTF-8 output, B<-U> disables UTF-8 output. If @@ -205,7 +223,7 @@ |----------[#####|##########]--------------------------------------------| ^ ^ ^ ^ ^ - 2.75% 25% 50% 75% 97.5% + 2.5% 25% 50% 75% 97.5% =item B<histogram> @@ -258,11 +276,11 @@ =head1 SEE ALSO -L<ping(8)>, L<http://www.fping.com/>, L<liboping(3)> +L<ping(8)>, L<http://fping.org/>, L<liboping(3)> =head1 AUTHOR liboping is written by Florian "octo" Forster E<lt>ff at octo.itE<gt>. -Its homepage can be found at L<http://verplant.org/liboping/>. +Its homepage can be found at L<http://noping.cc/>. -Copyright (c) 2005-2011 by Florian "octo" Forster. +Copyright (c) 2005-2016 by Florian "octo" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_construct.3 new/liboping-1.9.0/src/mans/ping_construct.3 --- old/liboping-1.8.0/src/mans/ping_construct.3 2011-09-07 02:44:57.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_construct.3 2016-06-27 08:46:57.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ping_construct 3" -.TH ping_construct 3 "2011-09-06" "1.6.2" "liboping" +.TH ping_construct 3 "2016-06-27" "1.9.0" "liboping" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -159,7 +168,7 @@ \&\fIliboping\fR\|(3) .SH "AUTHOR" .IX Header "AUTHOR" -liboping is written by Florian \*(L"octo\*(R" Forster <octo at verplant.org>. -Its homepage can be found at <http://verplant.org/liboping/>. +liboping is written by Florian \*(L"octo\*(R" Forster <ff at octo.it>. +Its homepage can be found at <http://noping.cc/>. .PP -Copyright (c) 2005\-2011 by Florian \*(L"octo\*(R" Forster. +Copyright (c) 2005\-2016 by Florian \*(L"octo\*(R" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_construct.pod new/liboping-1.9.0/src/mans/ping_construct.pod --- old/liboping-1.8.0/src/mans/ping_construct.pod 2011-09-07 02:11:42.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_construct.pod 2016-06-27 08:45:17.000000000 +0200 @@ -32,7 +32,7 @@ =head1 AUTHOR -liboping is written by Florian "octo" Forster E<lt>octo at verplant.orgE<gt>. -Its homepage can be found at L<http://verplant.org/liboping/>. +liboping is written by Florian "octo" Forster E<lt>ff at octo.itE<gt>. +Its homepage can be found at L<http://noping.cc/>. -Copyright (c) 2005-2011 by Florian "octo" Forster. +Copyright (c) 2005-2016 by Florian "octo" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_get_error.3 new/liboping-1.9.0/src/mans/ping_get_error.3 --- old/liboping-1.8.0/src/mans/ping_get_error.3 2011-09-07 02:44:58.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_get_error.3 2016-06-27 08:46:57.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ping_get_error 3" -.TH ping_get_error 3 "2011-09-06" "1.6.2" "liboping" +.TH ping_get_error 3 "2016-06-27" "1.9.0" "liboping" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -151,7 +160,7 @@ \&\fIliboping\fR\|(3) .SH "AUTHOR" .IX Header "AUTHOR" -liboping is written by Florian \*(L"octo\*(R" Forster <octo at verplant.org>. -Its homepage can be found at <http://verplant.org/liboping/>. +liboping is written by Florian \*(L"octo\*(R" Forster <ff at octo.it>. +Its homepage can be found at <http://noping.cc/>. .PP -Copyright (c) 2005\-2011 by Florian \*(L"octo\*(R" Forster. +Copyright (c) 2005\-2016 by Florian \*(L"octo\*(R" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_get_error.pod new/liboping-1.9.0/src/mans/ping_get_error.pod --- old/liboping-1.8.0/src/mans/ping_get_error.pod 2011-09-07 02:11:42.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_get_error.pod 2016-06-27 08:45:17.000000000 +0200 @@ -24,7 +24,7 @@ =head1 AUTHOR -liboping is written by Florian "octo" Forster E<lt>octo at verplant.orgE<gt>. -Its homepage can be found at L<http://verplant.org/liboping/>. +liboping is written by Florian "octo" Forster E<lt>ff at octo.itE<gt>. +Its homepage can be found at L<http://noping.cc/>. -Copyright (c) 2005-2011 by Florian "octo" Forster. +Copyright (c) 2005-2016 by Florian "octo" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_host_add.3 new/liboping-1.9.0/src/mans/ping_host_add.3 --- old/liboping-1.8.0/src/mans/ping_host_add.3 2011-09-07 02:44:58.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_host_add.3 2016-06-27 08:46:57.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ping_host_add 3" -.TH ping_host_add 3 "2011-09-06" "1.6.2" "liboping" +.TH ping_host_add 3 "2016-06-27" "1.9.0" "liboping" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -173,7 +182,7 @@ \&\fIliboping\fR\|(3) .SH "AUTHOR" .IX Header "AUTHOR" -liboping is written by Florian \*(L"octo\*(R" Forster <octo at verplant.org>. -Its homepage can be found at <http://verplant.org/liboping/>. +liboping is written by Florian \*(L"octo\*(R" Forster <ff at octo.it>. +Its homepage can be found at <http://noping.cc/>. .PP -Copyright (c) 2005\-2011 by Florian \*(L"octo\*(R" Forster. +Copyright (c) 2005\-2016 by Florian \*(L"octo\*(R" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_host_add.pod new/liboping-1.9.0/src/mans/ping_host_add.pod --- old/liboping-1.8.0/src/mans/ping_host_add.pod 2011-09-07 02:11:42.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_host_add.pod 2016-06-27 08:45:17.000000000 +0200 @@ -46,7 +46,7 @@ =head1 AUTHOR -liboping is written by Florian "octo" Forster E<lt>octo at verplant.orgE<gt>. -Its homepage can be found at L<http://verplant.org/liboping/>. +liboping is written by Florian "octo" Forster E<lt>ff at octo.itE<gt>. +Its homepage can be found at L<http://noping.cc/>. -Copyright (c) 2005-2011 by Florian "octo" Forster. +Copyright (c) 2005-2016 by Florian "octo" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_iterator_get.3 new/liboping-1.9.0/src/mans/ping_iterator_get.3 --- old/liboping-1.8.0/src/mans/ping_iterator_get.3 2011-09-07 02:44:58.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_iterator_get.3 2016-06-27 08:46:57.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ping_iterator_get 3" -.TH ping_iterator_get 3 "2011-09-06" "1.6.2" "liboping" +.TH ping_iterator_get 3 "2016-06-27" "1.9.0" "liboping" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -173,7 +182,7 @@ \&\fIliboping\fR\|(3) .SH "AUTHOR" .IX Header "AUTHOR" -liboping is written by Florian \*(L"octo\*(R" Forster <octo at verplant.org>. -Its homepage can be found at <http://verplant.org/liboping/>. +liboping is written by Florian \*(L"octo\*(R" Forster <ff at octo.it>. +Its homepage can be found at <http://noping.cc/>. .PP -Copyright (c) 2005\-2011 by Florian \*(L"octo\*(R" Forster. +Copyright (c) 2005\-2016 by Florian \*(L"octo\*(R" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_iterator_get.pod new/liboping-1.9.0/src/mans/ping_iterator_get.pod --- old/liboping-1.8.0/src/mans/ping_iterator_get.pod 2011-09-07 02:11:42.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_iterator_get.pod 2016-06-27 08:45:17.000000000 +0200 @@ -44,7 +44,7 @@ =head1 AUTHOR -liboping is written by Florian "octo" Forster E<lt>octo at verplant.orgE<gt>. -Its homepage can be found at L<http://verplant.org/liboping/>. +liboping is written by Florian "octo" Forster E<lt>ff at octo.itE<gt>. +Its homepage can be found at L<http://noping.cc/>. -Copyright (c) 2005-2011 by Florian "octo" Forster. +Copyright (c) 2005-2016 by Florian "octo" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_iterator_get_context.3 new/liboping-1.9.0/src/mans/ping_iterator_get_context.3 --- old/liboping-1.8.0/src/mans/ping_iterator_get_context.3 2011-09-07 02:44:58.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_iterator_get_context.3 2016-06-27 08:46:58.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ping_iterator_get_context 3" -.TH ping_iterator_get_context 3 "2011-09-06" "1.6.2" "liboping" +.TH ping_iterator_get_context 3 "2016-06-27" "1.9.0" "liboping" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -152,7 +161,7 @@ \&\fIping_iterator_get\fR\|(3) and ping_iterator_next. .PP The \fIcontext\fR argument of \fBping_iterator_set_context\fR is a pointer to -anything and may be \s-1NULL\s0. +anything and may be \s-1NULL.\s0 .SH "RETURN VALUE" .IX Header "RETURN VALUE" \&\fBping_iterator_get_context\fR returns the same pointer previously passed to @@ -166,7 +175,7 @@ \&\fIliboping\fR\|(3) .SH "AUTHOR" .IX Header "AUTHOR" -liboping is written by Florian \*(L"octo\*(R" Forster <octo at verplant.org>. -Its homepage can be found at <http://verplant.org/liboping/>. +liboping is written by Florian \*(L"octo\*(R" Forster <ff at octo.it>. +Its homepage can be found at <http://noping.cc/>. .PP -Copyright (c) 2005\-2011 by Florian \*(L"octo\*(R" Forster. +Copyright (c) 2005\-2016 by Florian \*(L"octo\*(R" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_iterator_get_context.pod new/liboping-1.9.0/src/mans/ping_iterator_get_context.pod --- old/liboping-1.8.0/src/mans/ping_iterator_get_context.pod 2011-09-07 02:11:42.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_iterator_get_context.pod 2016-06-27 08:45:17.000000000 +0200 @@ -39,7 +39,7 @@ =head1 AUTHOR -liboping is written by Florian "octo" Forster E<lt>octo at verplant.orgE<gt>. -Its homepage can be found at L<http://verplant.org/liboping/>. +liboping is written by Florian "octo" Forster E<lt>ff at octo.itE<gt>. +Its homepage can be found at L<http://noping.cc/>. -Copyright (c) 2005-2011 by Florian "octo" Forster. +Copyright (c) 2005-2016 by Florian "octo" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_iterator_get_info.3 new/liboping-1.9.0/src/mans/ping_iterator_get_info.3 --- old/liboping-1.8.0/src/mans/ping_iterator_get_info.3 2011-09-07 02:44:58.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_iterator_get_info.3 2016-06-27 08:46:58.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ping_iterator_get_info 3" -.TH ping_iterator_get_info 3 "2011-09-06" "1.6.2" "liboping" +.TH ping_iterator_get_info 3 "2016-06-27" "1.9.0" "liboping" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -167,7 +176,7 @@ buffer. .IP "\fB\s-1PING_INFO_ADDRESS\s0\fR" 4 .IX Item "PING_INFO_ADDRESS" -Return the address used in \s-1ASCII\s0 (i.e. human readable) format. The address is +Return the address used in \s-1ASCII \s0(i.e. human readable) format. The address is looked up every time you call this method. 40 bytes should be sufficient for the buffer (16 octets in hex format, seven colons and one null byte), but more won't hurt. @@ -236,7 +245,7 @@ \&\fIliboping\fR\|(3) .SH "AUTHOR" .IX Header "AUTHOR" -liboping is written by Florian \*(L"octo\*(R" Forster <octo at verplant.org>. -Its homepage can be found at <http://verplant.org/liboping/>. +liboping is written by Florian \*(L"octo\*(R" Forster <ff at octo.it>. +Its homepage can be found at <http://noping.cc/>. .PP -Copyright (c) 2005\-2011 by Florian \*(L"octo\*(R" Forster. +Copyright (c) 2005\-2016 by Florian \*(L"octo\*(R" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_iterator_get_info.pod new/liboping-1.9.0/src/mans/ping_iterator_get_info.pod --- old/liboping-1.8.0/src/mans/ping_iterator_get_info.pod 2011-09-07 02:11:42.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_iterator_get_info.pod 2016-06-27 08:45:17.000000000 +0200 @@ -129,7 +129,7 @@ =head1 AUTHOR -liboping is written by Florian "octo" Forster E<lt>octo at verplant.orgE<gt>. -Its homepage can be found at L<http://verplant.org/liboping/>. +liboping is written by Florian "octo" Forster E<lt>ff at octo.itE<gt>. +Its homepage can be found at L<http://noping.cc/>. -Copyright (c) 2005-2011 by Florian "octo" Forster. +Copyright (c) 2005-2016 by Florian "octo" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_send.3 new/liboping-1.9.0/src/mans/ping_send.3 --- old/liboping-1.8.0/src/mans/ping_send.3 2011-09-07 02:44:58.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_send.3 2016-06-27 08:46:57.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ping_send 3" -.TH ping_send 3 "2011-09-06" "1.6.2" "liboping" +.TH ping_send 3 "2016-06-27" "1.9.0" "liboping" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -163,7 +172,7 @@ \&\fIliboping\fR\|(3) .SH "AUTHOR" .IX Header "AUTHOR" -liboping is written by Florian \*(L"octo\*(R" Forster <octo at verplant.org>. -Its homepage can be found at <http://verplant.org/liboping/>. +liboping is written by Florian \*(L"octo\*(R" Forster <ff at octo.it>. +Its homepage can be found at <http://noping.cc/>. .PP -Copyright (c) 2005\-2011 by Florian \*(L"octo\*(R" Forster. +Copyright (c) 2005\-2016 by Florian \*(L"octo\*(R" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_send.pod new/liboping-1.9.0/src/mans/ping_send.pod --- old/liboping-1.8.0/src/mans/ping_send.pod 2011-09-07 02:11:42.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_send.pod 2016-06-27 08:45:17.000000000 +0200 @@ -36,7 +36,7 @@ =head1 AUTHOR -liboping is written by Florian "octo" Forster E<lt>octo at verplant.orgE<gt>. -Its homepage can be found at L<http://verplant.org/liboping/>. +liboping is written by Florian "octo" Forster E<lt>ff at octo.itE<gt>. +Its homepage can be found at L<http://noping.cc/>. -Copyright (c) 2005-2011 by Florian "octo" Forster. +Copyright (c) 2005-2016 by Florian "octo" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_setopt.3 new/liboping-1.9.0/src/mans/ping_setopt.3 --- old/liboping-1.8.0/src/mans/ping_setopt.3 2011-09-07 02:44:58.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_setopt.3 2016-06-27 08:46:57.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -38,6 +38,8 @@ . ds PI \(*p . ds L" `` . ds R" '' +. ds C` +. ds C' 'br\} .\" .\" Escape single quotes in literal strings from groff's Unicode transform. @@ -48,17 +50,24 @@ .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX .. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} .\} +.rr rF .\" .\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). .\" Fear. Run. Save yourself. No user-serviceable parts. @@ -124,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "ping_setopt 3" -.TH ping_setopt 3 "2011-09-06" "1.6.2" "liboping" +.TH ping_setopt 3 "2016-06-27" "1.9.0" "liboping" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -195,8 +204,13 @@ \&\f(CW\*(C`IP_TOS\*(C'\fR (IPv4) or \f(CW\*(C`IPV6_TCLASS\*(C'\fR (IPv6) option. It is the caller's responsibility to chose a valid bit combination. For details, read the \fIip\fR\|(7) and \fIipv6\fR\|(7) manual pages, as well as \fI\s-1RFC\s0\ 2474\fR. +.IP "\fB\s-1PING_OPT_MARK\s0\fR" 4 +.IX Item "PING_OPT_MARK" +Mark (as in netfilter) outgoing packets using the \s-1SO_MARK\s0 socket option. Takes +an int* pointer as a value. Setting this requires \s-1CAP_NET_ADMIN\s0 under Linux. +Fails with \f(CW\*(C`operation not supported\*(C'\fR on platforms which don't have \s-1SO_MARK.\s0 .PP -The \fIval\fR argument is a pointer to the new value. It must not be \s-1NULL\s0. It is +The \fIval\fR argument is a pointer to the new value. It must not be \s-1NULL.\s0 It is dereferenced depending on the value of the \fIopt\fR argument, see above. The memory pointed to by \fIval\fR is not changed. .SH "RETURN VALUE" @@ -208,7 +222,7 @@ \&\fIliboping\fR\|(3) .SH "AUTHOR" .IX Header "AUTHOR" -liboping is written by Florian \*(L"octo\*(R" Forster <octo at verplant.org>. -Its homepage can be found at <http://verplant.org/liboping/>. +liboping is written by Florian \*(L"octo\*(R" Forster <ff at octo.it>. +Its homepage can be found at <http://noping.cc/>. .PP -Copyright (c) 2005\-2011 by Florian \*(L"octo\*(R" Forster. +Copyright (c) 2005\-2016 by Florian \*(L"octo\*(R" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/mans/ping_setopt.pod new/liboping-1.9.0/src/mans/ping_setopt.pod --- old/liboping-1.8.0/src/mans/ping_setopt.pod 2011-09-07 02:11:42.000000000 +0200 +++ new/liboping-1.9.0/src/mans/ping_setopt.pod 2016-06-27 08:45:17.000000000 +0200 @@ -75,6 +75,12 @@ responsibility to chose a valid bit combination. For details, read the L<ip(7)> and L<ipv6(7)> manual pages, as well as I<RFCE<nbsp>2474>. +=item B<PING_OPT_MARK> + +Mark (as in netfilter) outgoing packets using the SO_MARK socket option. Takes +an int* pointer as a value. Setting this requires CAP_NET_ADMIN under Linux. +Fails with C<operation not supported> on platforms which don't have SO_MARK. + =back The I<val> argument is a pointer to the new value. It must not be NULL. It is @@ -92,7 +98,7 @@ =head1 AUTHOR -liboping is written by Florian "octo" Forster E<lt>octo at verplant.orgE<gt>. -Its homepage can be found at L<http://verplant.org/liboping/>. +liboping is written by Florian "octo" Forster E<lt>ff at octo.itE<gt>. +Its homepage can be found at L<http://noping.cc/>. -Copyright (c) 2005-2011 by Florian "octo" Forster. +Copyright (c) 2005-2016 by Florian "octo" Forster. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/oping.c new/liboping-1.9.0/src/oping.c --- old/liboping-1.8.0/src/oping.c 2014-11-20 15:51:17.000000000 +0100 +++ new/liboping-1.9.0/src/oping.c 2016-06-27 11:30:53.000000000 +0200 @@ -1,6 +1,6 @@ /** * Object oriented C module to send ICMP and ICMPv6 `echo's. - * Copyright (C) 2006-2014 Florian octo Forster <ff at octo.it> + * Copyright (C) 2006-2016 Florian octo Forster <ff at octo.it> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -192,9 +192,11 @@ } ping_context_t; static double opt_interval = 1.0; +static double opt_timeout = PING_DEF_TIMEOUT; static int opt_addrfamily = PING_DEF_AF; static char *opt_srcaddr = NULL; static char *opt_device = NULL; +static char *opt_mark = NULL; static char *opt_filename = NULL; static int opt_count = -1; static int opt_send_ttl = 64; @@ -206,8 +208,10 @@ static int opt_show_graph = 1; static int opt_utf8 = 0; #endif +static char *opt_outfile = NULL; -static int host_num = 0; +static int host_num = 0; +static FILE *outfile = NULL; #if USE_NCURSES static WINDOW *main_win = NULL; @@ -430,12 +434,15 @@ " -4|-6 force the use of IPv4 or IPv6\n" " -c count number of ICMP packets to send\n" " -i interval interval with which to send ICMP packets\n" + " -w timeout time to wait for replies, in seconds\n" " -t ttl time to live for each ICMP packet\n" " -Q qos Quality of Service (QoS) of outgoing packets\n" " Use \"-Q help\" for a list of valid options.\n" " -I srcaddr source address\n" " -D device outgoing interface name\n" - " -f filename filename to read hosts from\n" + " -m mark mark to set on outgoing packets\n" + " -f filename read hosts from <filename>\n" + " -O filename write RTT measurements to <filename>\n" #if USE_NCURSES " -u / -U force / disable UTF-8 output\n" " -g graph graph type to draw\n" @@ -444,8 +451,8 @@ " -Z percent Exit with non-zero exit status if more than this percentage of\n" " probes timed out. (default: never)\n" - "\noping "PACKAGE_VERSION", http://verplant.org/liboping/\n" - "by Florian octo Forster <o...@verplant.org>\n" + "\noping "PACKAGE_VERSION", http://noping.cc/\n" + "by Florian octo Forster <f...@octo.it>\n" "for contributions see `AUTHORS'\n", name); exit (status); @@ -645,7 +652,7 @@ while (1) { - optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:P:" + optchar = getopt (argc, argv, "46c:hi:I:t:Q:f:D:Z:O:P:m:w:" #if USE_NCURSES "uUg:" #endif @@ -698,6 +705,18 @@ } break; + case 'w': + { + char *endp = NULL; + double t = strtod (optarg, &endp); + if ((optarg[0] != 0) && (endp != NULL) && (*endp == 0)) + opt_timeout = t; + else + fprintf (stderr, "Ignoring invalid timeout: %s\n", + optarg); + } + break; + case 'I': { if (opt_srcaddr != NULL) @@ -710,6 +729,10 @@ opt_device = optarg; break; + case 'm': + opt_mark = optarg; + break; + case 't': { int new_send_ttl; @@ -726,6 +749,12 @@ set_opt_send_qos (optarg); break; + case 'O': + { + free (opt_outfile); + opt_outfile = strdup (optarg); + } + case 'P': { double new_percentile; @@ -1571,6 +1600,21 @@ #endif } + if (outfile != NULL) + { + struct timespec ts = { 0, 0 }; + + if (clock_gettime (CLOCK_REALTIME, &ts) == 0) + { + double t = ((double) ts.tv_sec) + (((double) ts.tv_nsec) / 1000000000.0); + + if ((sequence % 32) == 0) + fprintf (outfile, "#time,host,latency[ms]\n"); + + fprintf (outfile, "%.3f,\"%s\",%.2f\n", t, context->host, latency); + } + } + #if USE_NCURSES update_stats_from_context (context, iter); wrefresh (main_win); @@ -1664,7 +1708,7 @@ } #endif - setlocale(LC_ALL, ""); + setlocale(LC_ALL, ""); optind = read_options (argc, argv); #if !_POSIX_SAVED_IDS @@ -1715,6 +1759,12 @@ /* printf ("ts_int = %i.%09li\n", (int) ts_int.tv_sec, ts_int.tv_nsec); */ } + if (ping_setopt (ping, PING_OPT_TIMEOUT, (void*)(&opt_timeout)) != 0) + { + fprintf (stderr, "Setting timeout failed: %s\n", + ping_get_error (ping)); + } + if (opt_addrfamily != PING_DEF_AF) ping_setopt (ping, PING_OPT_AF, (void *) &opt_addrfamily); @@ -1736,6 +1786,24 @@ } } + if (opt_mark != NULL) + { + char *endp = NULL; + int mark = (int) strtol (opt_mark, &endp, /* base = */ 0); + if ((opt_mark[0] != 0) && (endp != NULL) && (*endp == 0)) + { + if (ping_setopt(ping, PING_OPT_MARK, (void*)(&mark)) != 0) + { + fprintf (stderr, "Setting mark failed: %s\n", + ping_get_error (ping)); + } + } + else + { + fprintf(stderr, "Ignoring invalid mark: %s\n", optarg); + } + } + if (opt_filename != NULL) { FILE *infile; @@ -1846,6 +1914,17 @@ saved_set_uid = (uid_t) -1; #endif + if (opt_outfile != NULL) + { + outfile = fopen (opt_outfile, "a"); + if (outfile == NULL) + { + fprintf (stderr, "opening \"%s\" failed: %s\n", + opt_outfile, strerror (errno)); + exit (EXIT_FAILURE); + } + } + ping_initialize_contexts (ping); if (i == 0) @@ -1932,6 +2011,12 @@ ping_destroy (ping); + if (outfile != NULL) + { + fclose (outfile); + outfile = NULL; + } + if (status == 0) exit (EXIT_SUCCESS); else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/liboping-1.8.0/src/oping.h new/liboping-1.9.0/src/oping.h --- old/liboping-1.8.0/src/oping.h 2014-11-20 15:51:17.000000000 +0100 +++ new/liboping-1.9.0/src/oping.h 2016-06-27 08:41:31.000000000 +0200 @@ -1,6 +1,6 @@ /** * Object oriented C module to send ICMP and ICMPv6 `echo's. - * Copyright (C) 2006-2011 Florian octo Forster <ff at octo.it> + * Copyright (C) 2006-2016 Florian octo Forster <ff at octo.it> * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by the @@ -33,7 +33,7 @@ extern "C" { #endif -#define OPING_VERSION 1008000 +#define OPING_VERSION 1009000 /* * Type definitions @@ -53,6 +53,7 @@ #define PING_OPT_SOURCE 0x10 #define PING_OPT_DEVICE 0x20 #define PING_OPT_QOS 0x40 +#define PING_OPT_MARK 0x80 #define PING_DEF_TIMEOUT 1.0 #define PING_DEF_TTL 255