traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #8852: Allow the socket module to build on OpenSolaris.

This commit is contained in:
Antoine Pitrou 2010-10-27 20:13:57 +00:00
parent 71f8cc9b4a
commit b156a46b26
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -184,6 +184,8 @@ Tests
Build
-----
- Issue #8852: Allow the socket module to build on OpenSolaris.
- Drop -OPT:Olimit compiler option.
- Issue #10094: Use versioned .so files on GNU/kfreeBSD and the GNU Hurd.

40
Modules/socketmodule.c
View File

@ -1139,7 +1139,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
}
#endif
#ifdef HAVE_NETPACKET_PACKET_H
#if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFNAME)
case AF_PACKET:
{
struct sockaddr_ll *a = (struct sockaddr_ll *)addr;
@ -1455,7 +1455,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
}
#endif
#ifdef HAVE_NETPACKET_PACKET_H
#if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFINDEX)
case AF_PACKET:
{
struct sockaddr_ll* addr;
@ -4569,16 +4569,32 @@ PyInit__socket(void)
PyModule_AddStringConstant(m, "BDADDR_LOCAL", "00:00:00:FF:FF:FF");
#endif
#ifdef HAVE_NETPACKET_PACKET_H
PyModule_AddIntConstant(m, "AF_PACKET", AF_PACKET);
PyModule_AddIntConstant(m, "PF_PACKET", PF_PACKET);
PyModule_AddIntConstant(m, "PACKET_HOST", PACKET_HOST);
PyModule_AddIntConstant(m, "PACKET_BROADCAST", PACKET_BROADCAST);
PyModule_AddIntConstant(m, "PACKET_MULTICAST", PACKET_MULTICAST);
PyModule_AddIntConstant(m, "PACKET_OTHERHOST", PACKET_OTHERHOST);
PyModule_AddIntConstant(m, "PACKET_OUTGOING", PACKET_OUTGOING);
PyModule_AddIntConstant(m, "PACKET_LOOPBACK", PACKET_LOOPBACK);
PyModule_AddIntConstant(m, "PACKET_FASTROUTE", PACKET_FASTROUTE);
#ifdef AF_PACKET
PyModule_AddIntMacro(m, AF_PACKET);
#endif
#ifdef PF_PACKET
PyModule_AddIntMacro(m, PF_PACKET);
#endif
#ifdef PACKET_HOST
PyModule_AddIntMacro(m, PACKET_HOST);
#endif
#ifdef PACKET_BROADCAST
PyModule_AddIntMacro(m, PACKET_BROADCAST);
#endif
#ifdef PACKET_MULTICAST
PyModule_AddIntMacro(m, PACKET_MULTICAST);
#endif
#ifdef PACKET_OTHERHOST
PyModule_AddIntMacro(m, PACKET_OTHERHOST);
#endif
#ifdef PACKET_OUTGOING
PyModule_AddIntMacro(m, PACKET_OUTGOING);
#endif
#ifdef PACKET_LOOPBACK
PyModule_AddIntMacro(m, PACKET_LOOPBACK);
#endif
#ifdef PACKET_FASTROUTE
PyModule_AddIntMacro(m, PACKET_FASTROUTE);
#endif
#ifdef HAVE_LINUX_TIPC_H