Skip to content

Commit 1ba3fd5

Browse files
committed
Autotest for netpacket/packet.h, as it is not available on all Linux versions.
Depend AF_PACKET on HAVE_NETPACKET_PACKET_H. Fixes #449157
1 parent 05ac6de commit 1ba3fd5

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Modules/socketmodule.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Socket methods:
179179
#undef AF_UNIX
180180
#endif
181181

182-
#if defined(linux) && defined(AF_PACKET)
182+
#ifdef HAVE_NETPACKET_PACKET_H
183183
#include <sys/ioctl.h>
184184
#include <net/if.h>
185185
#include <netpacket/packet.h>
@@ -476,7 +476,7 @@ typedef struct {
476476
struct sockaddr_in6 in6;
477477
struct sockaddr_storage storage;
478478
#endif
479-
#if defined(linux) && defined(AF_PACKET)
479+
#ifdef HAVE_NETPACKET_PACKET_H
480480
struct sockaddr_ll ll;
481481
#endif
482482
} sock_addr;
@@ -715,7 +715,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen)
715715
}
716716
#endif
717717

718-
#if defined(linux) && defined(AF_PACKET)
718+
#ifdef HAVE_NETPACKET_PACKET_H
719719
case AF_PACKET:
720720
{
721721
struct sockaddr_ll *a = (struct sockaddr_ll *)addr;
@@ -828,7 +828,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
828828
}
829829
#endif
830830

831-
#if defined(linux) && defined(AF_PACKET)
831+
#ifdef HAVE_NETPACKET_PACKET_H
832832
case AF_PACKET:
833833
{
834834
struct sockaddr_ll* addr;
@@ -901,7 +901,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
901901
}
902902
#endif
903903

904-
#if defined(linux) && defined(AF_PACKET)
904+
#ifdef HAVE_NETPACKET_PACKET_H
905905
case AF_PACKET:
906906
{
907907
*len_ret = sizeof (struct sockaddr_ll);
@@ -2983,7 +2983,7 @@ init_socket(void)
29832983
#ifdef AF_ROSE
29842984
insint(d, "AF_ROSE", AF_ROSE); /* Amateur Radio X.25 PLP */
29852985
#endif
2986-
#if defined(linux) && defined(AF_PACKET)
2986+
#ifdef HAVE_NETPACKET_PACKET_H
29872987
insint(d, "AF_PACKET", AF_PACKET);
29882988
insint(d, "PF_PACKET", PF_PACKET);
29892989
insint(d, "PACKET_HOST", PACKET_HOST);

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ signal.h stdarg.h stddef.h stdlib.h thread.h unistd.h utime.h termios.h \
419419
sys/audioio.h sys/file.h sys/lock.h sys/modem.h db_185.h db.h \
420420
sys/param.h sys/poll.h sys/select.h sys/socket.h sys/time.h sys/times.h \
421421
sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
422-
ndbm.h db1/ndbm.h gdbm/ndbm.h sys/resource.h)
422+
ndbm.h db1/ndbm.h gdbm/ndbm.h sys/resource.h netpacket/packet.h)
423423
AC_HEADER_DIRENT
424424

425425
# checks for typedefs

0 commit comments

Comments
 (0)