Merge branch 'develop'

ChangeLog

@@ -1,8 +1,14 @@
+2017-01-11  David Schweikert  <david@schweikert.ch>
+  * Version 3.15
+  * (bugfix) Fix compiler errors on platforms other than Linux (related
+             to the new -M option, #109)
+  * Test suite fixes for macOS
+
 2017-01-10  David Schweikert  <david@schweikert.ch>
   * Version 3.14
   * (feature) Ignore network and broadcast for cidrs /31 and /32 (#102, Martin Topholm)
   * (feature) New option '-M' to set the "Don't Fragment" flag (#91, Don Bowman) 
-  * (feature) New option '-N' to output statistics for netdata (see: http://my-netdata.io/, #10, Costa Tsaousis)
+  * (feature) New option '-N' to output statistics for netdata (see: http://my-netdata.io/, #105, Costa Tsaousis)
   * (feature) New option '-o' to calculate total outage time (#90, @jgerbeck)
   * (bugfix) Exit code should be 2 when the hostname can't be resolved
             (fixes #98, reported by @green-fox)

ci/test-14-ping-internet-hosts.pl

@@ -43,7 +43,7 @@ $cmd->stderr_is_eq("");
 
 # fping6 -A -n
 SKIP: {
-    if(system("/sbin/ifconfig | grep inet6") != 0) {
+    if(system("/sbin/ifconfig | grep inet6.*Scope:Global") != 0) {
         skip 'No IPv6 on this host', 3;
     }
     my $cmd = Test::Command->new(cmd => "fping6 -n -A 2001:4860:4860::8888");

ci/test-issue-56.pl

@@ -1,8 +1,16 @@
 #!/usr/bin/perl -w
 
 # regression testing for github issue #56
+#
+use Test::Command;
+use Test::More;
 
-use Test::Command tests => 3;
+if( $^O eq 'darwin' ) {
+    plan skip_all => 'Test disabled on MacOS';
+    exit 0;
+}
+
+plan tests => 3;
 
 my $cmd1 = Test::Command->new(cmd => "fping -t100 -p100 -C3 255.255.255.255");
 $cmd1->exit_is_num(1);

configure.ac

@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)
 
-AC_INIT([fping],[3.14])
+AC_INIT([fping],[3.15])
 
 dnl make ipv4 and ipv6 options
 AC_ARG_ENABLE([ipv4],

doc/fping.pod

@@ -135,6 +135,10 @@ Set the "Don't Fragment" bit in the IP header (used to determine/test the MTU).
 
 Same as -d. 
 
+=item B<-N>
+
+Format output for netdata (-l -Q are required). See: http://my-netdata.io/
+
 =item B<-o>
 
 Calculate "outage time" based on the number of lost pings and the interval used (useful for network convergence tests).

src/fping.c

@@ -387,12 +387,17 @@ int main( int argc, char **argv )
         switch( c )
         {
         case 'M':
+#ifdef IP_MTU_DISCOVER
             {
-            int val = IP_PMTUDISC_DO;
-            if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, &val, sizeof(val))) {
-                perror("setsockopt IP_MTU_DISCOVER");
-            }
+                int val = IP_PMTUDISC_DO;
+                if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, &val, sizeof(val))) {
+                    perror("setsockopt IP_MTU_DISCOVER");
+                }
             }
+#else
+            fprintf(stderr, "-M option not supported on this platform\n");
+            exit(1);
+#endif
             break;
 
         case 't':