fix unprivileged ping broken in v5.1 (fixes #248)

.dockerignore

@@ -1,30 +0,0 @@
-.*.swp
-*.tar.gz
-*~
-src/*.gcno
-src/*.gcda
-src/*.gcov
-src/tags
-.deps
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-missing
-src/*.o
-src/fping
-src/fping6
-stamp-h1
-doc/fping.8
-doc/fping6.8
-ci/build

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v1
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1

.github/workflows/test.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-18.04, ubuntu-20.04]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

.vscode/launch.json

@@ -1,35 +0,0 @@
-{
-  "configurations": [
-    {
-      "name": "Debug fping",
-      "type": "cppdbg",
-      "request": "launch",
-      "program": "${workspaceFolder}/src/fping",
-      "args": ["127.0.0.1"],
-      "stopAtEntry": false,
-      "cwd": "${workspaceFolder}",
-      "environment": [],
-      "externalConsole": false,
-      "MIMode": "gdb",
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        },
-        {
-          "description": "Set Disassembly Flavor to Intel",
-          "text": "-gdb-set disassembly-flavor intel",
-          "ignoreFailures": true
-        }
-      ],
-      "preLaunchTask": "build",
-      "postDebugTask": "autoclean",
-      "miDebuggerPath": "/usr/bin/gdb",
-      "logging": {
-        "engineLogging": false
-      }
-    }
-  ],
-  "version": "2.0.0"
-}

.vscode/tasks.json

@@ -1,45 +0,0 @@
-{
-  "tasks": [
-    {
-      "type": "shell",
-      "label": "autogen",
-      "command": "./autogen.sh",
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "problemMatcher": []
-    },
-    {
-      "type": "shell",
-      "label": "configure",
-      "command": "./configure",
-      "args": ["--enable-debug"],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "dependsOn": ["autogen"],
-      "problemMatcher": []
-    },
-    {
-      "type": "shell",
-      "label": "build",
-      "command": "make",
-      "args": ["CFLAGS=\"-g -O0\""],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "dependsOn": ["configure"],
-      "problemMatcher": ["$gcc"]
-    },
-    {
-      "type": "shell",
-      "label": "autoclean",
-      "command": "./autoclean.sh",
-      "problemMatcher": []
-    }
-  ],
-  "version": "2.0.0"
-}

CHANGELOG.md

@@ -1,43 +1,3 @@
-fping 5.2 (2024-04-21)
-======================
-
-## New features
-
-- New option -X / --fast-reachable to exit immediately once N hosts have been
-  found (#260, thanks @chriscray and @gsnw)
-
-- New option -k / -fwmark to set Linux fwmark mask (#289, thanks @tomangert and
-  @deepkv)
-
-## Bugfixes and other changes
-
-- Always output fatal error messages (#303, thanks @auerswal)
-- Fallback to SO\_TIMESTAMP if SO\_TIMESTAMPNS is not available (#279, thanks
-  @gsnw)
-- Fix "not enough sequence numbers available" error on BSD-like systems (#307,
-  thanks @cagney, @gsnw)
-- Fix running in unprivileged mode (#248, thanks @sfan5)
-- Fix build issue for NetBSD/alpha (#255, thanks @0-wiz-0)
-- Fix build issue for OpenBSD/alpha (#275, thanks @gsnw)
-- Fix build warning for long int usage (#258, thanks @gsnw)
-- Fix build error with musl libc (#263, thanks @kraj)
-- Fix to guard against division by zero (#293, thanks @auerswal)
-- Decouple -a/-u effects from -c (#298, thanks @auerswal)
-- Added contrib/Dockerfile (#224, thanks @darless)
-- Remove host from Netdata chart titles (#253, thanks @ilyam8)
-- Add additional tests (#292, #297, thanks @auerswal)
-- Update github action os images (#282, thanks @gsnw)
-- Fix Azure pipeline tests (#308, thanks @gsnw)
-- Various autoconf fixes (#286, #283, thanks @gsnw)
-- Extended configure script with --enable-debug and output cpu usage (#311,
-  thanks @gsnw)
-- Documentation: Update Netdata website link (#257, thanks @ilyam8)
-- Documentation: fix description of --file option (#268, thanks @MohGeek)
-- Documentation: improve exit status description (#294, thanks @auerswal)
-- Documentation: move description of -i MSEC (#298, thanks @auerswal)
-- Documentation: improve help output for options -c and -C (#302, #auerswal)
-
-
 fping 5.1 (2022-02-06)
 ======================
 

README.md

@@ -28,14 +28,13 @@ If you want to install fping from source, proceed as follows:
    (see: `./configure --help`)
 2. Run `make; make install`.
 3. Make fping either setuid, or, if under Linux:
-   `sudo setcap cap_net_raw,cap_net_admin+ep fping`
+   `sudo setcap cap_net_raw+ep fping`
 
 If you can't run fping as root or can't use the cap_net_raw capability, you can
 also run fping in unprivileged mode. This works on MacOS and also on Linux,
 provided that your GID is included in the range defined in
 `/proc/sys/net/ipv4/ping_group_range`. This is particularly useful for running
-fping in rootless / unprivileged containers. The --fwmark option needs root or
-cap_net_admin. setuid will not work for --fwmark.
+fping in rootless / unprivileged containers.
 
 ## Usage
 

azure-pipelines.yml

@@ -20,33 +20,7 @@ jobs:
   - script: |
      set -ex
      PATH=`pwd`/src:$PATH
-     prove $(ls ci/test-*.pl|grep -v internet-hosts|grep -v -E "test-13-unknown-host.pl|test-14-ping-internet-hosts.pl")
+     prove ci/test-{01..12}*.pl
+     prove ci/test-15*.pl
      ci/test-tarball.sh
     displayName: 'build_test'
-
-- job: macos_build
-  displayName: macOS Build
-
-  pool:
-    name: Azure Pipelines
-    vmImage: 'macos-latest'
-  workspace:
-    clean: all
-  steps:
-    - script: |
-       brew install autoconf automake lcov
-       ci/build-2-test-command.sh
-       ci/build-3-prepare-macos.sh
-      displayName: 'before_install'
-
-    - script: |
-       ci/build-4-compile.sh
-      displayName: install
-
-    - script: |
-       set -ex
-       PATH=`pwd`/src:$PATH
-       export SKIP_IPV6=1
-       prove $(ls ci/test-*.pl|grep -v internet-hosts|grep -v test-10-option-u-x.pl)
-       ci/run-lcov.sh
-      displayName: 'build_test'

ci/prepare-linux.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-sudo setcap cap_net_raw,cap_net_admin+ep src/fping
+sudo setcap cap_net_raw+ep src/fping
 
 if [[ ! $PATH =~ fping/src ]]; then
     PATH=/home/dws/checkouts/fping/src:$PATH

ci/test-01-basics.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-use Test::Command tests => 12;
+use Test::Command tests => 9;
 use Test::More;
 
 # ping 127.0.0.1
@@ -23,18 +23,6 @@ SKIP: {
     $cmd->stderr_is_eq("");
 }
 
-# ping ff02::1
-SKIP: {
-    #system("/sbin/ifconfig >&2");
-    if($ENV{SKIP_IPV6}) {
-        skip 'Skip IPv6 tests', 3;
-    }
-    my $cmd = Test::Command->new(cmd => "fping ff02::1");
-    $cmd->exit_is_num(0);
-    $cmd->stdout_is_eq("ff02::1 is alive\n");
-    $cmd->stderr_like(qr{ \[<- .*\]});
-}
-
 # ping 3 times 127.0.0.1
 {
     my $cmd = Test::Command->new(cmd => "fping -p 100 -C3 127.0.0.1");

ci/test-02-help.pl

@@ -1,11 +1,11 @@
 #!/usr/bin/perl -w
 
-use Test::Command tests => 12;
+use Test::Command tests => 9;
 
 my $I_HELP = "   -I, --iface=IFACE  bind to a particular interface\n";
 $I_HELP = '' if $^O eq 'darwin';
 
-# fping -h (special pre-parse code path)
+# fping -h
 my $cmd1 = Test::Command->new(cmd => "fping -h");
 $cmd1->exit_is_num(0);
 $cmd1->stdout_like(qr{Usage: fping \[options\] \[targets\.\.\.\]
@@ -16,17 +16,6 @@ Probing options:
 }s);
 $cmd1->stderr_is_eq("");
 
-# fping -4 -h (normal option parsing code path)
-my $cmd4 = Test::Command->new(cmd => "fping -4 -h");
-$cmd4->exit_is_num(0);
-$cmd4->stdout_like(qr{Usage: fping \[options\] \[targets\.\.\.\]
-
-Probing options:
-.*
-   -v, --version      show version
-}s);
-$cmd4->stderr_is_eq("");
-
 # fping -v
 my $cmd2 = Test::Command->new(cmd => "fping -v");
 $cmd2->exit_is_num(0);

ci/test-03-forbidden.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-use Test::Command tests => 36;
+use Test::Command tests => 24;
 
 # fping -i 0
 my $cmd1 = Test::Command->new(cmd => "fping -i 0 -T10 -g 127.0.0.1/29");
@@ -50,16 +50,9 @@ $cmd9->exit_is_num(1);
 $cmd9->stdout_is_eq("");
 $cmd9->stderr_is_eq("fping: backoff factor 0.9 not valid, must be between 1.0 and 5.0\n");
 
-# fping -B 5.1
+# fping -B 0.9
 my $cmd10 = Test::Command->new(cmd => "fping -B 5.1 127.0.0.1");
 $cmd10->exit_is_num(1);
 $cmd10->stdout_is_eq("");
 $cmd10->stderr_is_eq("fping: backoff factor 5.1 not valid, must be between 1.0 and 5.0\n");
 
-# non-negative only
-for my $arg (qw(i p Q t)) {
-    my $cmd = Test::Command->new(cmd => "fping -$arg -1");
-    $cmd->exit_is_num(1);
-    $cmd->stdout_is_eq("");
-    $cmd->stderr_like(qr{Usage:});
-}

ci/test-05-options-c-e.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-use Test::Command tests => 51;
+use Test::Command tests => 12;
 
 #  -c n       count of pings to send to each target (default 1)
 #  -C n       same as -c, report results in verbose format
@@ -22,46 +22,6 @@ $cmd->stderr_like(qr{localhost : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\
 });
 }
 
-# fping -c n -q
-{
-my $cmd = Test::Command->new(cmd => "fping -q -c 2 -p 100 localhost 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{localhost : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
-# fping -c n -a (-a is ignored)
-{
-my $cmd = Test::Command->new(cmd => "fping -a -c 2 -p 100 localhost 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_like(qr{localhost : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-127\.0\.0\.1 : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-localhost : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-127\.0\.0\.1 : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-});
-
-$cmd->stderr_like(qr{localhost : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
-# fping -c n -u (-u is ignored)
-{
-my $cmd = Test::Command->new(cmd => "fping -u -c 2 -p 100 localhost 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_like(qr{localhost : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-127\.0\.0\.1 : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-localhost : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-127\.0\.0\.1 : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-});
-
-$cmd->stderr_like(qr{localhost : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
 # fping -C n
 {
 my $cmd = Test::Command->new(cmd => "fping -4 -C 2 -p 100 localhost 127.0.0.1");
@@ -77,55 +37,6 @@ $cmd->stderr_like(qr{localhost : \d\.\d+ \d\.\d+
 });
 }
 
-# fping -C n -q
-{
-my $cmd = Test::Command->new(cmd => "fping -C 5 -q -p 100 localhost");
-$cmd->exit_is_num(0);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{localhost :( \d\.\d+){5}
-});
-}
-
-# fping -C n -a (-a is ignored)
-{
-my $cmd = Test::Command->new(cmd => "fping -a -C 2 -p 100 localhost 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_like(qr{localhost : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-127\.0\.0\.1 : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-localhost : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-127\.0\.0\.1 : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-});
-
-$cmd->stderr_like(qr{localhost : \d\.\d+ \d\.\d+
-127\.0\.0\.1 : \d\.\d+ \d\.\d+
-});
-}
-
-# fping -C n -u (-u is ignored)
-{
-my $cmd = Test::Command->new(cmd => "fping -u -C 2 -p 100 localhost 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_like(qr{localhost : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-127\.0\.0\.1 : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-localhost : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-127\.0\.0\.1 : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-});
-
-$cmd->stderr_like(qr{localhost : \d\.\d+ \d\.\d+
-127\.0\.0\.1 : \d\.\d+ \d\.\d+
-});
-}
-
-# fping -C n -i -q
-{
-my $cmd = Test::Command->new(cmd => "fping --quiet --interval=1 --vcount=20 --period=50 127.0.0.1 127.0.0.2");
-$cmd->exit_is_num(0);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{127\.0\.0\.1 :( \d\.\d+){20}
-127\.0\.0\.2 :( \d\.\d+){20}
-});
-}
-
 # fping -D
 {
 my $cmd = Test::Command->new(cmd => "fping -D -c 2 -p 100 127.0.0.1");
@@ -138,69 +49,6 @@ $cmd->stderr_like(qr{127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d
 });
 }
 
-# fping -D (timestamp not before 2001-09-09)
-{
-my $cmd = Test::Command->new(cmd => "fping -D -c 2 -p 100 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_like(qr{\[[1-9]\d{9,}\.\d+\] 127\.0\.0\.1 : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-\[[1-9]\d{9,}\.\d+\] 127\.0\.0\.1 : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-});
-$cmd->stderr_like(qr{127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
-# fping -D --timestamp-format=ctime
-{
-my $cmd = Test::Command->new(cmd => "fping -D --timestamp-format=ctime -c 2 -p 100 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_like(qr{\[\w+\s\w+\s+\d+\s[\d+:]+\s\d+\] 127\.0\.0\.1 : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-\[\w+\s\w+\s+\d+\s[\d+:]+\s\d+\] 127\.0\.0\.1 : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-});
-
-$cmd->stderr_like(qr{127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
-# fping -D --timestamp-format=iso
-{
-my $cmd = Test::Command->new(cmd => "fping -D --timestamp-format=iso -c 2 -p 100 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_like(qr{\[[\d+-]+T[\d+:]+\+\d+\] 127\.0\.0\.1 : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-\[[\d+-]+T[\d+:]+\+\d+\] 127\.0\.0\.1 : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-});
-
-$cmd->stderr_like(qr{127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
-# fping -D --timestamp-format=rfc3339
-{
-my $cmd = Test::Command->new(cmd => "fping -D --timestamp-format=rfc3339 -c 2 -p 100 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_like(qr{\[[\d+-]+\s[\d+:]+\] 127\.0\.0\.1 : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-\[[\d+-]+\s[\d+:]+\] 127\.0\.0\.1 : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-});
-
-$cmd->stderr_like(qr{127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
-# fping -D --timestamp-format
-{
-my $cmd = Test::Command->new(cmd => "fping -D --timestamp-format -c 2 -p 100 127.0.0.1");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{Usage:});
-}
-
-# fping -D --timestamp-format="%Y-%m-%d %H:%M:%S"
-{
-my $cmd = Test::Command->new(cmd => "fping -D --timestamp-format=\"%Y-%m-%d %H:%M:%S\" -c 2 -p 100 127.0.0.1");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{Usage:});
-}
-
 # fping -e
 {
 my $cmd = Test::Command->new(cmd => "fping -e 127.0.0.1");

ci/test-06-options-f-h.pl

@@ -1,7 +1,6 @@
 #!/usr/bin/perl -w
 
-use Test::Command tests => 75;
-use Test::More;
+use Test::Command tests => 24;
 use File::Temp;
 
 #  -f file    read list of targets from a file ( - means stdin) (only if no -g specified)
@@ -14,10 +13,6 @@ my $tmpfile = File::Temp->new();
 print $tmpfile "127.0.0.1\n127.0.0.2\n";
 close($tmpfile);
 
-my $tmpfile2 = File::Temp->new();
-print $tmpfile2 "# comment\n127.0.0.1\n\n127.0.0.2\n";
-close($tmpfile2);
-
 # fping without option (-> equivalent to 'fping -f -')
 {
 my $cmd = Test::Command->new(cmd => "cat ".$tmpfile->filename." | fping");
@@ -42,70 +37,6 @@ $cmd->stdout_is_eq("127.0.0.1 is alive\n127.0.0.2 is alive\n");
 $cmd->stderr_is_eq("");
 }
 
-# fping -f file (with comment and empty line)
-{
-my $cmd = Test::Command->new(cmd => "fping -f ".$tmpfile2->filename);
-$cmd->exit_is_num(0);
-$cmd->stdout_is_eq("127.0.0.1 is alive\n127.0.0.2 is alive\n");
-$cmd->stderr_is_eq("");
-}
-
-# fping -f non-existing-file (error)
-{
-my $cmd = Test::Command->new(cmd => "fping -f file-does-not-exist");
-$cmd->exit_is_num(4);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{: fopen :});
-}
-
-# fping -g (error: no argument)
-{
-my $cmd = Test::Command->new(cmd => "fping -g");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{^Usage: fping \[options\] \[targets\.\.\.\]});
-}
-
-# fping -g (error: single argument, but not in cidr format)
-{
-my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.1");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{^Usage: fping \[options\] \[targets\.\.\.\]});
-}
-
-# fping -g (error: CIDR network is not an IP address)
-{
-my $cmd = Test::Command->new(cmd => "fping -g xxx/32");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{can't parse address xxx});
-}
-
-# fping -g (error: start of range is not an IP address)
-{
-my $cmd = Test::Command->new(cmd => "fping -g xxx 127.0.0.1");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{can't parse address xxx});
-}
-
-# fping -g (error: end of range is not an IP address)
-{
-my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.1 yyy");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{can't parse address yyy});
-}
-
-# fping -g (error: too many arguments)
-{
-my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.1 127.0.0.2 127.0.0.3");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{^Usage: fping \[options\] \[targets\.\.\.\]});
-}
-
 # fping -g (range)
 {
 my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.1 127.0.0.5");
@@ -114,22 +45,6 @@ $cmd->stdout_is_eq("127.0.0.1 is alive\n127.0.0.2 is alive\n127.0.0.3 is alive\n
 $cmd->stderr_is_eq("");
 }
 
-# fping -g (empty range)
-{
-my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.2 127.0.0.1");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_is_eq("");
-}
-
-# fping -g (too large range)
-{
-my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.1 127.255.255.254");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_is_eq("fping: -g parameter generates too many addresses\n");
-}
-
 # fping -g (cidr)
 {
 my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.1/30");
@@ -138,7 +53,7 @@ $cmd->stdout_is_eq("127.0.0.1 is alive\n127.0.0.2 is alive\n");
 $cmd->stderr_is_eq("");
 }
 
-# fping -g (cidr - long prefixes: point-to-point)
+# fping -g (cidr - long prefixes)
 {
 my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.2/31");
 $cmd->exit_is_num(0);
@@ -146,14 +61,6 @@ $cmd->stdout_is_eq("127.0.0.2 is alive\n127.0.0.3 is alive\n");
 $cmd->stderr_is_eq("");
 }
 
-# fping -g (cidr - long prefixes: host)
-{
-my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.2/32");
-$cmd->exit_is_num(0);
-$cmd->stdout_is_eq("127.0.0.2 is alive\n");
-$cmd->stderr_is_eq("");
-}
-
 # fping -g (cidr - too long prefixes)
 {
 my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.2/33");
@@ -162,66 +69,6 @@ $cmd->stdout_is_eq("");
 $cmd->stderr_is_eq("fping: netmask must be between 1 and 32 (is: 33)\n");
 }
 
-# fping -g (cidr - too short prefixes)
-{
-my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.2/0");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_is_eq("fping: netmask must be between 1 and 32 (is: 0)\n");
-}
-
-# fping -g (cidr - too many addresses)
-{
-my $cmd = Test::Command->new(cmd => "fping -g 127.0.0.0/8");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_is_eq("fping: -g parameter generates too many addresses\n");
-}
-
-# fping -g (range - no IPv6 generator)
-SKIP: {
-    if($ENV{SKIP_IPV6}) {
-        skip 'Skip IPv6 tests', 3;
-    }
-    my $cmd = Test::Command->new(cmd => "fping -6 -g ::1 ::1");
-    $cmd->exit_is_num(1);
-    $cmd->stdout_is_eq("");
-    $cmd->stderr_is_eq("fping: -g works only with IPv4 addresses\n");
-}
-
-# fping -g (range - no IPv6 generator - start address IPv6)
-SKIP: {
-    if($ENV{SKIP_IPV6}) {
-        skip 'Skip IPv6 tests', 3;
-    }
-    my $cmd = Test::Command->new(cmd => "fping -6 -g ::1 127.0.0.1");
-    $cmd->exit_is_num(1);
-    $cmd->stdout_is_eq("");
-    $cmd->stderr_is_eq("fping: -g works only with IPv4 addresses\n");
-}
-
-# fping -g (range - no IPv6 generator - end address IPv6)
-SKIP: {
-    if($ENV{SKIP_IPV6}) {
-        skip 'Skip IPv6 tests', 3;
-    }
-    my $cmd = Test::Command->new(cmd => "fping -6 -g 127.0.0.1 ::1");
-    $cmd->exit_is_num(1);
-    $cmd->stdout_is_eq("");
-    $cmd->stderr_is_eq("fping: -g works only with IPv4 addresses\n");
-}
-
-# fping -g (CIDR - no IPv6 generator)
-SKIP: {
-    if($ENV{SKIP_IPV6}) {
-        skip 'Skip IPv6 tests', 3;
-    }
-    my $cmd = Test::Command->new(cmd => "fping -6 -g ::1/128");
-    $cmd->exit_is_num(1);
-    $cmd->stdout_is_eq("");
-    $cmd->stderr_is_eq("fping: -g works only with IPv4 addresses\n");
-}
-
 # fping -H
 {
 my $cmd = Test::Command->new(cmd => "fping -H 1 127.0.0.1");

ci/test-07-options-i-m.pl

@@ -1,11 +1,10 @@
 #!/usr/bin/perl -w
 
-use Test::Command tests => 15;
+use Test::Command tests => 9;
 use Test::More;
 
 #  -i n       interval between sending ping packets (in millisec) (default 25)
 #  -l         loop sending pings forever
-#  -k         set fwmark on ping packets
 #  -m         ping multiple interfaces on target host
 #  -M         don't fragment
 
@@ -25,17 +24,6 @@ $cmd->stdout_like(qr{127\.0\.0\.1 : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0
 });
 }
 
-# fping -k
-SKIP: {
-if($^O ne 'linux') {
-    skip '-k option is only supported on Linux', 3;
-}
-my $cmd = Test::Command->new(cmd => 'sudo env "PATH=$PATH" fping -k 256 127.0.0.1');
-$cmd->exit_is_num(0);
-$cmd->stdout_is_eq("127.0.0.1 is alive\n");
-$cmd->stderr_is_eq("");
-}
-
 # fping -l with SIGQUIT
 {
 my $cmd = Test::Command->new(cmd => '(sleep 2; pkill -QUIT fping; sleep 2; pkill fping)& fping -p 900 -l 127.0.0.1');
@@ -50,27 +38,6 @@ $cmd->stderr_like(qr{\[\d+:\d+:\d+\]
 });
 }
 
-# fping -l -Q
-SKIP: {
-if($^O eq 'darwin') {
-    skip 'On macOS, this test is unreliable', 2;
-}
-my $cmd = Test::Command->new(cmd => '(sleep 2; pkill fping)& fping -p 850 -l -Q 1 127.0.0.1');
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{\[\d\d:\d\d:\d\d\]
-127\.0\.0\.1 : xmt/rcv/%loss = \d/\d/\d%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-\[\d\d:\d\d:\d\d\]
-127\.0\.0\.1 : xmt/rcv/%loss = \d/\d/\d%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
-# fping -l -t
-{
-my $cmd = Test::Command->new(cmd => '(sleep 2; pkill fping)& fping -p 900 -t 1500 -l 127.0.0.1');
-$cmd->stdout_like(qr{127\.0\.0\.1 : \[0\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-127\.0\.0\.1 : \[1\], 64 bytes, \d\.\d+ ms \(\d\.\d+ avg, 0% loss\)
-});
-}
 
 # fping -M
 SKIP: {

ci/test-08-options-n-q.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-use Test::Command tests => 36;
+use Test::Command tests => 18;
 
 #  -n         show targets by name (-d is equivalent)
 #  -O n       set the type of service (tos) flag on the ICMP packets
@@ -68,81 +68,4 @@ $cmd->stderr_like(qr{\[\d+:\d+:\d+\]
 });
 }
 
-# fping -Q (longer test to show two time stamps and reset statistics)
-{
-my $cmd = Test::Command->new(cmd => "fping -Q 1 -p 550 -c 5 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{\[\d+:\d+:\d+\]
-127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-\[\d+:\d+:\d+\]
-127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-127\.0\.0\.1 : xmt/rcv/%loss = 5/5/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
-# fping -Q n ignores non-number characters after the number, except for keywords
-{
-my $cmd = Test::Command->new(cmd => "fping -Q 1whatever -p 550 -c 5 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{\[\d+:\d+:\d+\]
-127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-\[\d+:\d+:\d+\]
-127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-127\.0\.0\.1 : xmt/rcv/%loss = 5/5/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
-# fping -Q n ignores unknown keywords
-{
-my $cmd = Test::Command->new(cmd => "fping -Q 1,not_a_keyword -p 550 -c 5 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{\[\d+:\d+:\d+\]
-127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-\[\d+:\d+:\d+\]
-127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-127\.0\.0\.1 : xmt/rcv/%loss = 5/5/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
-# fping -Q n,cumulative
-{
-my $cmd = Test::Command->new(cmd => "fping -Q 1,cumulative -p 550 -c 5 127.0.0.1");
-$cmd->exit_is_num(0);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{\[\d+:\d+:\d+\]
-127\.0\.0\.1 : xmt/rcv/%loss = 2/2/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-\[\d+:\d+:\d+\]
-127\.0\.0\.1 : xmt/rcv/%loss = 4/4/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-127\.0\.0\.1 : xmt/rcv/%loss = 5/5/0%, min/avg/max = \d\.\d+/\d\.\d+/\d\.\d+
-});
-}
-
-# fping -Q -o
-{
-my $cmd = Test::Command->new(cmd => "fping -c4 -Q1 -p550 -o 8.8.8.7");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{\[\d+:\d+:\d+\]
-8\.8\.8\.7 : xmt/rcv/%loss = 1/0/100%, outage\(ms\) = 55\d
-\[\d+:\d+:\d+\]
-8\.8\.8\.7 : xmt/rcv/%loss = 2/0/100%, outage\(ms\) = 110\d
-8\.8\.8\.7 : xmt/rcv/%loss = 4/0/100%, outage\(ms\) = 220\d
-});
-}
-
-# fping -Q n,cumulative -o
-{
-my $cmd = Test::Command->new(cmd => "fping -c4 -Q1,cumulative -p550 -o 8.8.8.7");
-$cmd->exit_is_num(1);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{\[\d+:\d+:\d+\]
-8\.8\.8\.7 : xmt/rcv/%loss = 1/0/100%, outage\(ms\) = 55\d
-\[\d+:\d+:\d+\]
-8\.8\.8\.7 : xmt/rcv/%loss = 3/0/100%, outage\(ms\) = 165\d
-8\.8\.8\.7 : xmt/rcv/%loss = 4/0/100%, outage\(ms\) = 220\d
-});
-}
 

ci/test-09-option-r-t.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-use Test::Command tests => 27;
+use Test::Command tests => 21;
 use Test::More;
 
 #  -R         random bytes
@@ -84,14 +84,6 @@ $cmd->stdout_is_eq("127.0.0.1 is alive\n");
 $cmd->stderr_is_eq("");
 }
 
-# fping -S (wrong source address)
-{
-my $cmd = Test::Command->new(cmd => "fping -S 192.0.2.47 127.0.0.1");
-$cmd->exit_is_num(4);
-$cmd->stdout_is_eq("");
-$cmd->stderr_like(qr{fping: cannot bind source address : .+\n});
-}
-
 # fping -S
 SKIP: {
     if($ENV{SKIP_IPV6}) {
@@ -103,17 +95,6 @@ SKIP: {
     $cmd->stderr_is_eq("");
 }
 
-# fping -S (wrong IPv6 source address)
-SKIP: {
-    if($ENV{SKIP_IPV6}) {
-        skip 'Skip IPv6 tests', 3;
-    }
-    my $cmd = Test::Command->new(cmd => "fping -S 2001:db8::1 ::1");
-    $cmd->exit_is_num(4);
-    $cmd->stdout_is_eq("");
-    $cmd->stderr_like(qr{fping: cannot bind source address : .+\n});
-}
-
 # fping -S
 {
 my $cmd = Test::Command->new(cmd => "fping -S bla");

ci/test-10-option-u-x.pl

@@ -1,11 +1,9 @@
 #!/usr/bin/perl -w
 
-use Test::Command tests => 15;
+use Test::Command tests => 12;
 
 #  -u         show targets that are unreachable
 #  -v         show version
-#  -x         shows if >=N hosts are reachable or not
-#  -X         exits true immediately when N hosts are found
 
 # fping -u
 {
@@ -38,11 +36,3 @@ $cmd->exit_is_num(1);
 $cmd->stdout_is_eq("Not enough hosts reachable (required: 2, reachable: 1)\n");
 $cmd->stderr_is_eq("");
 }
-
-# fping -X
-{
-my $cmd = Test::Command->new(cmd => "fping -X 1 --generate 127.0.0.0/29");
-$cmd->exit_is_num(0);
-$cmd->stdout_is_eq("Enough hosts reachable (required: 1, reachable: 1)\n");
-$cmd->stderr_is_eq("");
-}

ci/test-12-option-type.pl

@@ -1,27 +1,10 @@
 #!/usr/bin/perl -w
 
-use Test::Command tests => 84;
-use Test::More;
+use Test::Command tests => 33;
 
-# some options require a numeric argument
-for my $arg (qw(b B c C H i O p Q r t x X)) {
-    for my $test_input (qw(xxx '')) {
-        my $cmd = Test::Command->new(cmd => "fping -$arg $test_input");
-        $cmd->exit_is_num(1);
-        $cmd->stdout_is_eq("");
-        $cmd->stderr_like(qr{Usage:});
-    }
-}
-
-# fping -k, only supported on Linux, requires a number
-SKIP: {
-    if($^O ne 'linux') {
-        skip '-k option is only supported on Linux', 6;
-    }
-    for my $test_input (qw(xxx '')) {
-        my $cmd = Test::Command->new(cmd => "fping -k $test_input 127.0.0.1");
-        $cmd->exit_is_num(1);
-        $cmd->stdout_is_eq("");
-        $cmd->stderr_like(qr{Usage:});
-    }
+for my $arg (qw(b B c C H i O p Q r t)) {
+    my $cmd = Test::Command->new(cmd => "fping -$arg xxx");
+    $cmd->exit_is_num(1);
+    $cmd->stdout_is_eq("");
+    $cmd->stderr_like(qr{Usage:});
 }

ci/test-15-netdata.pl

@@ -9,19 +9,19 @@ plan tests => 3;
 {
 my $cmd = Test::Command->new(cmd => "fping -c 2 -Q 1 -N 127.0.0.1");
 $cmd->exit_is_num(0);
-$cmd->stdout_like(qr{CHART fping\.127_0_0_1_packets '' 'FPing Packets' packets '127.0.0.1' fping\.packets line 110020 1
+$cmd->stdout_like(qr{CHART fping\.127_0_0_1_packets '' 'FPing Packets for host 127\.0\.0\.1' packets '127.0.0.1' fping\.packets line 110020 1
 DIMENSION xmt sent absolute 1 1
 DIMENSION rcv received absolute 1 1
 BEGIN fping\.127_0_0_1_packets
 SET xmt = 1
 SET rcv = 1
 END
-CHART fping\.127_0_0_1_quality '' 'FPing Quality' percentage '127.0.0.1' fping\.quality area 110010 1
+CHART fping\.127_0_0_1_quality '' 'FPing Quality for host 127\.0\.0\.1' percentage '127.0.0.1' fping\.quality area 110010 1
 DIMENSION returned '' absolute 1 1
 BEGIN fping\.127_0_0_1_quality
 SET returned = 100
 END
-CHART fping\.127_0_0_1_latency '' 'FPing Latency' ms '127.0.0.1' fping\.latency area 110000 1
+CHART fping\.127_0_0_1_latency '' 'FPing Latency for host 127\.0\.0\.1' ms '127.0.0.1' fping\.latency area 110000 1
 DIMENSION min minimum absolute 1 1000000
 DIMENSION max maximum absolute 1 1000000
 DIMENSION avg average absolute 1 1000000

configure.ac

@@ -3,25 +3,8 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)
 
-AC_INIT([fping],[5.2])
-
-m4_ifdef([AC_AUTOCONF_VERSION],[AC_USE_SYSTEM_EXTENSIONS], [AC_GNU_SOURCE])
-
-# Detect Operatingsystem
-AC_CANONICAL_TARGET
-only_clock_realtime=no
-
-case "${target}" in
-  *darwin*)
-    only_clock_realtime=yes
-    ;;
-  *freebsd*)
-    only_clock_realtime=yes
-    ;;
-  *openbsd*)
-    only_clock_realtime=yes
-    ;;
-esac
+AC_INIT([fping],[5.1])
+AC_GNU_SOURCE
 
 dnl --disable-ipv4
 AC_ARG_ENABLE([ipv4],
@@ -60,18 +43,13 @@ dnl Test if --enable-timestamp is explicitely enabled and make an error if this
 AS_IF([test "x$enable_timestamp" = "xyes" -a "x$have_so_timestamp" = "xno"], [
   AC_MSG_ERROR([--enable-timestamp not supported on this platform])
 ])
-AS_IF([test "x$only_clock_realtime" = "xyes"], [AC_DEFINE(ONLY_CLOCK_REALTIME, [1], [ONLY_CLOCK_REALTIME is defined])])
 
 AC_ARG_ENABLE([safe-limits],
   AS_HELP_STRING([--enable-safe-limits], [Restrict timing parameters (-i, -p) within "safe" limits]))
 AS_IF([test "x$enable_safe_limits" = "xyes"], [
    AC_DEFINE(FPING_SAFE_LIMITS, [1], [safe limits should be enforced])])
 
-AC_ARG_ENABLE([debug],
-  AS_HELP_STRING([--enable-debug], [enable debugging @<:@default=no@:>@]), [enable_debug=$enableval], [enable_debug=no])
-AS_IF([test "x$enable_debug" = "xyes"], [
-  AC_DEFINE([DEBUG], [1], [Define if debugging is enabled])])
-
+AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AM_MAINTAINER_MODE
 
@@ -81,7 +59,7 @@ dnl Checks for programs.
 
 AC_PROG_CC
 AM_PROG_CC_C_O
-m4_version_prereq([2.70],,[AC_PROG_CC_STDC])
+AC_PROG_CC_STDC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
@@ -100,9 +78,6 @@ if test $ac_cv_func_sigaction = yes; then
     AC_DEFINE([USE_SIGACTION],[1],[Define if sigaction is available.])
 fi
 
-AC_CHECK_FUNCS([strftime], [],
-  [AC_MSG_ERROR([strftime function is required but not found])])
-
 AH_TOP([
 #ifndef CONFIG_H
 #define CONFIG_H

contrib/Dockerfile

@@ -1,16 +0,0 @@
-FROM ubuntu:20.04
-
-# Base
-RUN apt-get update && apt-get install -y \
-  build-essential \
-  automake \
-  m4
-
-# Add source code
-COPY ./ /app
-
-# Compile
-WORKDIR /app
-RUN autoreconf --install
-RUN ./configure && make && make install
-ENTRYPOINT ["fping"]

contrib/fping.spec

@@ -54,8 +54,8 @@ rm -rf $RPM_BUILD_ROOT
 %post
 if [ -x /usr/sbin/setcap ]; then
     /bin/chmod 0755 /usr/sbin/fping*
-    /usr/sbin/setcap cap_net_raw,cap_net_admin+ep /usr/sbin/fping
-    /usr/sbin/setcap cap_net_raw,cap_net_admin+ep /usr/sbin/fping6
+    /usr/sbin/setcap cap_net_raw+ep /usr/sbin/fping
+    /usr/sbin/setcap cap_net_raw+ep /usr/sbin/fping6
 fi
 
 %changelog

doc/fping.pod

@@ -66,8 +66,7 @@ default is 1.5.
 Number of request packets to send to each target.  In this mode, a line is
 displayed for each received response (this can suppressed with B<-q> or B<-Q>).
 Also, statistics about responses for each target are displayed when all
-requests have been sent (or when interrupted).  This option overrides B<-a>
-or B<-u>.
+requests have been sent (or when interrupted).
 
 =item B<-C>, B<--vcount>=I<N>
 
@@ -78,8 +77,7 @@ designed for automated response-time statistics gathering. For example:
  somehost : 91.7 37.0 29.2 - 36.8
 
 shows the response time in milliseconds for each of the five requests, with the
-C<-> indicating that no response was received to the fourth request.  This
-option overrides B<-a> or B<-u>.
+C<-> indicating that no response was received to the fourth request.
 
 =item B<-d>, B<--rdns>
 
@@ -93,23 +91,16 @@ hostnames as target (NAME->IP->NAME).
 Add Unix timestamps in front of output lines generated with in looping or counting
 modes (B<-l>, B<-c>, or B<-C>).
 
-Subcommand: B<--timestamp-format>=I<ctime|iso|rfc3339>
-
-Allow to change the timestamp format of the B<-D> option to the following format types.
-
-I<ctime> = "%c" (Example: Mon Jun 10 07:50:00 2024)
-
-I<iso> = "%Y-%m-%dT%T%z" (Example: 2024-06-10T07:50:00+0200)
-
-I<rfc3339> = "%Y-%m-%d %H:%M:%S" (Example: 2024-06-10 07:50:00)
-
 =item B<-e>, B<--elapsed>
 
 Show elapsed (round-trip) time of packets.
 
 =item B<-f>, B<--file>
 
-Read list of targets from a file.
+Read list of targets from a file.  This option can only be used by the root
+user. Regular users should pipe in the file via stdin:
+
+ $ fping < targets_file
 
 =item B<-g>, B<--generate> I<addr/mask>
 
@@ -142,11 +133,6 @@ to any target (default is 10, minimum is 1).
 
 Set the interface (requires SO_BINDTODEVICE support).
 
-=item B<-k>, B<--fwmark>=I<FWMARK>
-
-Set FWMARK on ping packets for policy-based routing. Requires Linux kernel
-2.6.25<=, and root privileges or cap_net_admin.
-
 =item B<-l>, B<--loop>
 
 Loop sending packets to each target indefinitely. Can be interrupted with
@@ -168,7 +154,7 @@ to print hostnames in the output.
 
 =item B<-N>, B<--netdata>
 
-Format output for netdata (-l -Q are required). See: L<https://netdata.cloud/>
+Format output for netdata (-l -Q are required). See: L<http://my-netdata.io/>
 
 =item B<-o>, B<--outage>
 
@@ -190,11 +176,10 @@ an individual target. Default is 1000 and minimum is 10.
 Quiet. Don't show per-probe results, but only the final summary. Also don't
 show ICMP error messages.
 
-=item B<-Q>, B<--squiet>=I<SECS[,cumulative]>
+=item B<-Q>, B<--squiet>=I<SECS>
 
 Like B<-q>, but additionally show interval summary results every I<SECS>
-seconds. With I<cumulative>, show summary results since start instead of
-for the last interval, unless option B<-N> is used, too.
+seconds.
 
 =item B<-r>, B<--retry>=I<N>
 
@@ -247,11 +232,6 @@ Print B<fping> version information.
 Given a list of hosts, this mode checks if number of reachable hosts is >= N
 and exits true in that case.
 
-=item B<-X>, B<--fast-reachable>=I<N>
-
-Given a list of hosts, this mode immediately exits true once N alive hosts
-have been found.
-
 =back
 
 =head1 EXAMPLES
@@ -287,17 +267,12 @@ B<fping website: L<http://www.fping.org>>
 
 =head1 DIAGNOSTICS
 
-Exit status is 0 if all the hosts (or the number of hosts specified with B<-x>
-or B<-X>) are reachable, 1 if some (or too many with B<-x> or B<-X>) hosts
+Exit status is 0 if all the hosts are reachable, 1 if some hosts
 were unreachable, 2 if any IP addresses were not found, 3 for invalid command
 line arguments, and 4 for a system call failure.
 
 =head1 RESTRICTIONS
 
-The number of addresses that can be generated using the C<-g>, C<--generate>
-option is limited to 131070 (the number of host addresses in one 15-bit IPv4
-prefix).
-
 If fping was configured with C<--enable-safe-limits>, the following values are
 not allowed for non-root users:
 

src/.clang-format

@@ -1,3 +1,2 @@
 BasedOnStyle: WebKit
 BreakBeforeBraces: Stroustrup
-PointerAlignment: Right

src/fping.h

@@ -22,7 +22,7 @@ extern int trace_flag;
 void crash_and_burn( char *message );
 void errno_crash_and_burn( char *message );
 int in_cksum( unsigned short *p, int n );
-extern int nonzero_payload_flag;
+extern int random_data_flag;
 
 /* socket.c */
 int  open_ping_socket_ipv4(int *socktype);

src/optparse.c

@@ -238,14 +238,12 @@ optparse_long(struct optparse *options,
     /* Parse as long option. */
     options->errmsg[0] = '\0';
     options->optopt = 0;
-    options->optlongname = 0;
     options->optarg = 0;
     option += 2; /* skip "--" */
     options->optind++;
     for (int i = 0; !longopts_end(longopts, i); i++) {
         const char *name = longopts[i].longname;
         if (longopts_match(name, option)) {
-            options->optlongname = option;
             if (longindex)
                 *longindex = i;
             options->optopt = longopts[i].shortname;

src/optparse.h

@@ -48,7 +48,6 @@ struct optparse {
     int permute;
     int optind;
     int optopt;
-    char *optlongname;
     char *optarg;
     char errmsg[64];
     int subopt;

src/seqmap.c

@@ -41,7 +41,6 @@
 #include "options.h"
 #include "fping.h"
 
-#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -81,8 +80,8 @@ unsigned int seqmap_add(unsigned int host_nr, unsigned int ping_count, int64_t t
     /* check if expired (note that unused seqmap values will have fields set to
      * 0, so will be seen as expired */
     next_value = &seqmap_map[seqmap_next_id];
-    if (next_value->ping_ts != 0 && timestamp - next_value->ping_ts < SEQMAP_TIMEOUT_IN_NS) {
-        fprintf(stderr, "fping error: not enough sequence numbers available! (expire_timeout=%" PRId64 ", host_nr=%d, ping_count=%d, seqmap_next_id=%d)\n",
+    if (timestamp - next_value->ping_ts < SEQMAP_TIMEOUT_IN_NS) {
+        fprintf(stderr, "fping error: not enough sequence numbers available! (expire_timeout=%ld, host_nr=%d, ping_count=%d, seqmap_next_id=%d)\n",
             SEQMAP_TIMEOUT_IN_NS, host_nr, ping_count, seqmap_next_id);
         exit(4);
     }

src/socket4.c

@@ -133,7 +133,6 @@ int socket_sendto_ping_ipv4(int s, struct sockaddr* saddr, socklen_t saddr_len,
 {
     struct icmp* icp;
     int n;
-    size_t i;
 
     icp = (struct icmp*)ping_buffer_ipv4;
 
@@ -143,12 +142,9 @@ int socket_sendto_ping_ipv4(int s, struct sockaddr* saddr, socklen_t saddr_len,
     icp->icmp_seq = htons(icmp_seq_nr);
     icp->icmp_id = icmp_id_nr;
 
-    if (nonzero_payload_flag) {
-        // for (n = ((char*)&icp->icmp_data - (char*)icp); n < ping_pkt_size_ipv4; ++n) {
-        //     ping_buffer_ipv4[n] = random() & 0xFF;
-        // }
-        for(n = (char*) &icp->icmp_data - (char*)icp, i = 0xA; n < ping_pkt_size_ipv4; ++n, i += 1) {
-            ping_buffer_ipv4[n] = i & 0xFF;
+    if (random_data_flag) {
+        for (n = ((char*)&icp->icmp_data - (char*)icp); n < ping_pkt_size_ipv4; ++n) {
+            ping_buffer_ipv4[n] = random() & 0xFF;
         }
     }
 

src/socket6.c

@@ -51,15 +51,15 @@ int open_ping_socket_ipv6(int *socktype)
     struct protoent* proto;
     int s;
 
-    /* confirm that ICMP6 is available on this machine */
+    /* confirm that ICMP is available on this machine */
     if ((proto = getprotobyname("ipv6-icmp")) == NULL)
-        crash_and_burn("ipv6-icmp: unknown protocol");
+        crash_and_burn("icmp: unknown protocol");
 
-    /* create raw socket for ICMP6 calls (ping) */
+    /* create raw socket for ICMP calls (ping) */
     *socktype = SOCK_RAW;
     s = socket(AF_INET6, *socktype, proto->p_proto);
     if (s < 0) {
-        /* try non-privileged icmp6 (works on Mac OSX without privileges, for example) */
+        /* try non-privileged icmp (works on Mac OSX without privileges, for example) */
         *socktype = SOCK_DGRAM;
         s = socket(AF_INET6, *socktype, proto->p_proto);
         if (s < 0) {
@@ -104,7 +104,7 @@ void socket_set_src_addr_ipv6(int s, struct in6_addr* src_addr, int *ident)
     if (ident) {
         memset(&sa, 0, len);
         if (getsockname(s, (struct sockaddr *)&sa, &len) < 0)
-            errno_crash_and_burn("can't get ICMP6 socket identity");
+            errno_crash_and_burn("can't get ICMP socket identity");
 
         if (sa.sin6_port)
             *ident = sa.sin6_port;
@@ -115,7 +115,6 @@ int socket_sendto_ping_ipv6(int s, struct sockaddr* saddr, socklen_t saddr_len,
 {
     struct icmp6_hdr* icp;
     int n;
-    size_t i;
 
     icp = (struct icmp6_hdr*)ping_buffer_ipv6;
     icp->icmp6_type = ICMP6_ECHO_REQUEST;
@@ -123,9 +122,9 @@ int socket_sendto_ping_ipv6(int s, struct sockaddr* saddr, socklen_t saddr_len,
     icp->icmp6_seq = htons(icmp_seq_nr);
     icp->icmp6_id = icmp_id_nr;
 
-    if (nonzero_payload_flag) {
-        for (n = sizeof(struct icmp6_hdr), i = 0xA; n < ping_pkt_size_ipv6; ++n, i+=1) {
-            ping_buffer_ipv6[n] = i & 0xFF;
+    if (random_data_flag) {
+        for (n = sizeof(struct icmp6_hdr); n < ping_pkt_size_ipv6; ++n) {
+            ping_buffer_ipv6[n] = random() & 0xFF;
         }
     }