Release 2.76: use SOCK_DRGAM for ICMP under linux,

which requires no root. Owen DeLong GH #33
rurban · Dec 5, 2024 · 00c4de5 · 00c4de5
1 parent 0eef27a
commit 00c4de5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,9 @@
 CHANGES
 -------
+2.76  2024-12-05 13:12:08 rurban
+      Features
+      - use SOCK_DRGAM for ICMP under linux, which requires no root.
+        (Owen DeLong GH #33)
 2.75  2022-09-01 12:44:03 rurban
       Minor
       - Modernized the synopsis (PR #31)

diff --git a/lib/Net/Ping.pm b/lib/Net/Ping.pm
@@ -22,7 +22,7 @@ use Time::HiRes;
 @ISA = qw(Exporter);
 @EXPORT = qw(pingecho);
 @EXPORT_OK = qw(wakeonlan);
-$VERSION = "2.75";
+$VERSION = "2.76";
 
 # Globals
 
@@ -227,13 +227,18 @@ sub new
   }
   elsif ($self->{proto} eq "icmp")
   {
-    croak("icmp ping requires root privilege") if !_isroot();
+    croak("icmp ping requires root privilege") if !_isroot() && ($^O ne "linux");
     $self->{proto_num} = eval { (getprotobyname('icmp'))[2] } ||
       croak("Can't get icmp protocol by name");
     $self->{pid} = $$ & 0xffff;           # Save lower 16 bits of pid
     $self->{fh} = FileHandle->new();
-    socket($self->{fh}, PF_INET, SOCK_RAW, $self->{proto_num}) ||
-      croak("icmp socket error - $!");
+    if ($^O eq "linux") {
+        socket($self->{fh}, PF_INET, SOCK_DGRAM, $self->{proto_num}) ||
+            croak("icmp socket error - $!");
+    } else {
+        socket($self->{fh}, PF_INET, SOCK_RAW, $self->{proto_num}) ||
+            croak("icmp socket error - $!");
+    }
     $self->_setopts();
     if ($self->{'ttl'}) {
       setsockopt($self->{fh}, IPPROTO_IP, IP_TTL, pack("I*", $self->{'ttl'}))