Skip to content

Fix getprotobyname missing on Android preventing use #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Paliak wants to merge 6 commits into
base: develop
Choose a base branch
from
+34 −14
Open

Fix getprotobyname missing on Android preventing use #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d07f0c
FIX: getprotobyname missing on Android preventing use
Paliak May 17, 2026
85ee18b
Fix formatting in socket6.c
Paliak May 17, 2026
be8cc59
FIX: use existing OS detection for USE_GETPROTOBYNAME
Paliak May 31, 2026
0d09161
FIX: use value returned by getprotobyname when it is enabled
Paliak May 31, 2026
c2f67d0
Merge branch 'fix-getprotobyname-android' of https://github.com/Palia…
Paliak May 31, 2026
cb15cc5
MISC: remove extra new line
Paliak May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ m4_ifdef([AC_AUTOCONF_VERSION],[AC_USE_SYSTEM_EXTENSIONS], [AC_GNU_SOURCE])
# Detect Operatingsystem
AC_CANONICAL_TARGET
only_clock_realtime=no
use_getprotobyname=yes
Comment thread
Paliak marked this conversation as resolved.

case "${target}" in
*darwin*)
Expand All @@ -21,6 +22,9 @@ case "${target}" in
*openbsd*)
only_clock_realtime=yes
;;
*android*)
use_getprotobyname=no
;;
Comment thread
Paliak marked this conversation as resolved.
esac

dnl Detect IBM i PASE environment
Expand Down Expand Up @@ -104,6 +108,8 @@ AC_ARG_ENABLE([debug],
AS_IF([test "x$enable_debug" = "xyes"], [
AC_DEFINE([DEBUG], [1], [Define if debugging is enabled])])

AS_IF([test "x$use_getprotobyname" = "xyes"], [AC_DEFINE([USE_GETPROTOBYNAME], [1], [Enable use of getprotobyname])])
Comment thread
Paliak marked this conversation as resolved.

AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AM_MAINTAINER_MODE

Expand Down
21 changes: 14 additions & 7 deletions src/socket4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,27 @@ static int outgoing_src_addr_set_ipv4 = 0;

int open_ping_socket_ipv4(int *socktype)
{
struct protoent* proto;
int s;
int s = -1;
int p_proto = IPPROTO_ICMP;

/* confirm that ICMP is available on this machine */
if ((proto = getprotobyname("icmp")) == NULL)
crash_and_burn("icmp: unknown protocol");
#ifdef USE_GETPROTOBYNAME
Comment thread
Paliak marked this conversation as resolved.
{
/* confirm that ICMP is available on this machine */
struct protoent* proto = getprotobyname("icmp");
if (proto == NULL) {
crash_and_burn("icmp: unknown protocol");
}
p_proto = proto->p_proto;
}
#endif

/* create raw socket for ICMP calls (ping) */
*socktype = SOCK_RAW;
s = socket(AF_INET, *socktype, proto->p_proto);
s = socket(AF_INET, *socktype, p_proto);
if (s < 0) {
/* try non-privileged icmp (works on Mac OSX without privileges, for example) */
*socktype = SOCK_DGRAM;
s = socket(AF_INET, *socktype, proto->p_proto);
s = socket(AF_INET, *socktype, p_proto);
if (s < 0) {
return -1;
}
Expand Down
21 changes: 14 additions & 7 deletions src/socket6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,27 @@ static int outgoing_src_addr_set_ipv6 = 0;

int open_ping_socket_ipv6(int *socktype)
{
struct protoent* proto;
int s;
int s = -1;
int p_proto = IPPROTO_ICMPV6;

/* confirm that ICMP6 is available on this machine */
if ((proto = getprotobyname("ipv6-icmp")) == NULL)
crash_and_burn("ipv6-icmp: unknown protocol");
#ifdef USE_GETPROTOBYNAME
Comment thread
Paliak marked this conversation as resolved.
{
/* confirm that ICMP6 is available on this machine */
struct protoent* proto = getprotobyname("ipv6-icmp");
if (proto == NULL) {
crash_and_burn("ipv6-icmp: unknown protocol");
}
p_proto = proto->p_proto;
}
#endif

/* create raw socket for ICMP6 calls (ping) */
*socktype = SOCK_RAW;
s = socket(AF_INET6, *socktype, proto->p_proto);
s = socket(AF_INET6, *socktype, p_proto);
if (s < 0) {
/* try non-privileged icmp6 (works on Mac OSX without privileges, for example) */
*socktype = SOCK_DGRAM;
s = socket(AF_INET6, *socktype, proto->p_proto);
s = socket(AF_INET6, *socktype, p_proto);
if (s < 0) {
return -1;
}
Expand Down
Loading