cpython-lru_cache-weakref: Modules/socketmodule.c annotate

annotate Modules/socketmodule.c @ 85327:5b5ef012cd4e

Issue #16809: Fixed some tkinter incompabilities with Tcl/Tk 8.6.

author	Serhiy Storchaka <storchaka@gmail.com>
date	Thu, 22 Aug 2013 17:53:06 +0300
parents	2a59428dbff5
children	0872257752c2

rev	line source
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1 /* Socket module */
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3 /*
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5 This module provides an interface to Berkeley socket IPC.
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	7 Limitations:
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	8
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	9 - Only AF_INET, AF_INET6 and AF_UNIX address families are supported in a
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	10 portable manner, though AF_PACKET, AF_NETLINK and AF_TIPC are supported
305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	11 under Linux.
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	12 - No read/write operations (use sendall/recv or makefile instead).
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	13 - Additional restrictions apply on some non-Unix platforms (compensated
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	14 for by socket.py).
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	15
2565 912813d573b4 fixed up comments describing interface Guido van Rossum <guido@python.org> parents: 2532 diff changeset	16 Module interface:
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	17
80933 50d19c2fac82 Issue #16717: get rid of socket.error, replace with OSError Andrew Svetlov <andrew.svetlov@gmail.com> parents: 80834 diff changeset	18 - socket.error: exception raised for socket specific errors, alias for OSError
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	19 - socket.gaierror: exception raised for getaddrinfo/getnameinfo errors,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	20 a subclass of socket.error
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	21 - socket.herror: exception raised for gethostby* errors,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	22 a subclass of socket.error
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	23 - socket.gethostbyname(hostname) --> host IP address (string: 'dd.dd.dd.dd')
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	24 - socket.gethostbyaddr(IP address) --> (hostname, [alias, ...], [IP addr, ...])
2565 912813d573b4 fixed up comments describing interface Guido van Rossum <guido@python.org> parents: 2532 diff changeset	25 - socket.gethostname() --> host name (string: 'spam' or 'spam.domain.com')
4783 feba6d58d204 Added the new getprotobyname() call to the module overview at the top. Guido van Rossum <guido@python.org> parents: 4782 diff changeset	26 - socket.getprotobyname(protocolname) --> protocol number
32429 d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	27 - socket.getservbyname(servicename[, protocolname]) --> port number
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	28 - socket.getservbyport(portnumber[, protocolname]) --> service name
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	29 - socket.socket([family[, type [, proto, fileno]]]) --> new socket object
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	30 (fileno specifies a pre-existing socket file descriptor)
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	31 - socket.socketpair([family[, type [, proto]]]) --> (socket, socket)
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	32 - socket.ntohs(16 bit value) --> new int object
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	33 - socket.ntohl(32 bit value) --> new int object
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	34 - socket.htons(16 bit value) --> new int object
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	35 - socket.htonl(32 bit value) --> new int object
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	36 - socket.getaddrinfo(host, port [, family, socktype, proto, flags])
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	37 --> List of (family, socktype, proto, canonname, sockaddr)
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	38 - socket.getnameinfo(sockaddr, flags) --> (host, port)
2565 912813d573b4 fixed up comments describing interface Guido van Rossum <guido@python.org> parents: 2532 diff changeset	39 - socket.AF_INET, socket.SOCK_STREAM, etc.: constants from <socket.h>
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	40 - socket.has_ipv6: boolean value indicating if IPv6 is supported
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	41 - socket.inet_aton(IP address) -> 32-bit packed IP representation
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	42 - socket.inet_ntoa(packed IP) -> IP address string
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	43 - socket.getdefaulttimeout() -> None \| float
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	44 - socket.setdefaulttimeout(None \| float)
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	45 - socket.if_nameindex() -> list of tuples (if_index, if_name)
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	46 - socket.if_nametoindex(name) -> corresponding interface index
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	47 - socket.if_indextoname(index) -> corresponding interface name
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	48 - an Internet socket address is a pair (hostname, port)
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	49 where hostname can be anything recognized by gethostbyname()
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	50 (including the dd.dd.dd.dd notation) and port is in host byte order
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	51 - where a hostname is returned, the dd.dd.dd.dd notation is used
2565 912813d573b4 fixed up comments describing interface Guido van Rossum <guido@python.org> parents: 2532 diff changeset	52 - a UNIX domain socket address is a string specifying the pathname
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	53 - an AF_PACKET socket address is a tuple containing a string
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	54 specifying the ethernet interface and an integer specifying
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	55 the Ethernet protocol number to be received. For example:
16427 c8ef864ba861 fix a couple last-minute bugs in the raw socket support Jeremy Hylton <jeremy@alum.mit.edu> parents: 16410 diff changeset	56 ("eth0",0x1234). Optional 3rd,4th,5th elements in the tuple
32611 8b3288f607e1 [Patch #947352 from Jason Andryuk] Add support for AF_PACKET hardware addresses Andrew M. Kuchling <amk@amk.ca> parents: 32578 diff changeset	57 specify packet-type and ha-type/addr.
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	58 - an AF_TIPC socket address is expressed as
305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	59 (addr_type, v1, v2, v3 [, scope]); where addr_type can be one of:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	60 TIPC_ADDR_NAMESEQ, TIPC_ADDR_NAME, and TIPC_ADDR_ID;
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	61 and scope can be one of:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	62 TIPC_ZONE_SCOPE, TIPC_CLUSTER_SCOPE, and TIPC_NODE_SCOPE.
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	63 The meaning of v1, v2 and v3 depends on the value of addr_type:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	64 if addr_type is TIPC_ADDR_NAME:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	65 v1 is the server type
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	66 v2 is the port identifier
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	67 v3 is ignored
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	68 if addr_type is TIPC_ADDR_NAMESEQ:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	69 v1 is the server type
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	70 v2 is the lower port number
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	71 v3 is the upper port number
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	72 if addr_type is TIPC_ADDR_ID:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	73 v1 is the node
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	74 v2 is the ref
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	75 v3 is ignored
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	76
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	77
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	78 Local naming conventions:
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	79
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	80 - names starting with sock_ are socket object methods
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	81 - names starting with socket_ are module-level functions
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	82 - names starting with PySocket are exported through socketmodule.h
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	83
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	84 */
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	85
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	86 #ifdef __APPLE__
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	87 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	88 * inet_aton is not available on OSX 10.3, yet we want to use a binary
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	89 * that was build on 10.4 or later to work on that release, weak linking
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	90 * comes to the rescue.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	91 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	92 # pragma weak inet_aton
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	93 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	94
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	95 #include "Python.h"
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	96 #include "structmember.h"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	97
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	98 /* Socket object documentation */
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	99 PyDoc_STRVAR(sock_doc,
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	100 "socket([family[, type[, proto]]]) -> socket object\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	101 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	102 Open a socket of the given type. The family argument specifies the\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	103 address family; it defaults to AF_INET. The type argument specifies\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	104 whether this is a stream (SOCK_STREAM, this is the default)\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	105 or datagram (SOCK_DGRAM) socket. The protocol argument defaults to 0,\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	106 specifying the default protocol. Keyword arguments are accepted.\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	107 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	108 A socket object represents one endpoint of a network connection.\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	109 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	110 Methods of socket objects (keyword arguments not allowed):\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	111 \n\
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	112 _accept() -- accept connection, returning new socket fd and client address\n\
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	113 bind(addr) -- bind the socket to a local address\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	114 close() -- close the socket\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	115 connect(addr) -- connect the socket to a remote address\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	116 connect_ex(addr) -- connect, return an error code instead of an exception\n\
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	117 _dup() -- return a new socket fd duplicated from fileno()\n\
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	118 fileno() -- return underlying file descriptor\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	119 getpeername() -- return remote address [*]\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	120 getsockname() -- return local address\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	121 getsockopt(level, optname[, buflen]) -- get socket options\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	122 gettimeout() -- return timeout or None\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	123 listen(n) -- start listening for incoming connections\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	124 recv(buflen[, flags]) -- receive data\n\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	125 recv_into(buffer[, nbytes[, flags]]) -- receive data (into a buffer)\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	126 recvfrom(buflen[, flags]) -- receive data and sender\'s address\n\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	127 recvfrom_into(buffer[, nbytes, [, flags])\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	128 -- receive data and sender\'s address (into a buffer)\n\
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	129 sendall(data[, flags]) -- send all data\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	130 send(data[, flags]) -- send data, may not send all of it\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	131 sendto(data[, flags], addr) -- send data to a given address\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	132 setblocking(0 \| 1) -- set or clear the blocking I/O flag\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	133 setsockopt(level, optname, value) -- set socket options\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	134 settimeout(None \| float) -- set or clear the timeout\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	135 shutdown(how) -- shut down traffic in one or both directions\n\
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	136 if_nameindex() -- return all network interface indices and names\n\
70640 20d9926f5db5 Further documentation updates to be consistent with doc standards and comments Gregory P. Smith <greg@krypto.org> parents: 70226 diff changeset	137 if_nametoindex(name) -- return the corresponding interface index\n\
20d9926f5db5 Further documentation updates to be consistent with doc standards and comments Gregory P. Smith <greg@krypto.org> parents: 70226 diff changeset	138 if_indextoname(index) -- return the corresponding interface name\n\
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	139 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	140 [*] not available on all platforms!");
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	141
30722 651fc8d98d99 Fix a bunch of typos in documentation, docstrings and comments. Walter Dörwald <walter@livinglogic.de> parents: 30683 diff changeset	142 /* XXX This is a terrible mess of platform-dependent preprocessor hacks.
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	143 I hope some day someone can clean this up please... */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	144
11288 adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	145 /* Hacks for gethostbyname_r(). On some non-Linux platforms, the configure
adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	146 script doesn't get this right, so we hardcode some platform checks below.
adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	147 On the other hand, not all Linux versions agree, so there the settings
adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	148 computed by the configure script are needed! */
adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	149
adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	150 #ifndef linux
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	151 # undef HAVE_GETHOSTBYNAME_R_3_ARG
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	152 # undef HAVE_GETHOSTBYNAME_R_5_ARG
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	153 # undef HAVE_GETHOSTBYNAME_R_6_ARG
11288 adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	154 #endif
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	155
72045 b4b84e87dc6b Close #12826: fix socketmodule.c for OpenBSD, include sys/uio.h Victor Stinner <vstinner@wyplay.com> parents: 72030 diff changeset	156 #if defined(__OpenBSD__)
b4b84e87dc6b Close #12826: fix socketmodule.c for OpenBSD, include sys/uio.h Victor Stinner <vstinner@wyplay.com> parents: 72030 diff changeset	157 # include <sys/uio.h>
b4b84e87dc6b Close #12826: fix socketmodule.c for OpenBSD, include sys/uio.h Victor Stinner <vstinner@wyplay.com> parents: 72030 diff changeset	158 #endif
b4b84e87dc6b Close #12826: fix socketmodule.c for OpenBSD, include sys/uio.h Victor Stinner <vstinner@wyplay.com> parents: 72030 diff changeset	159
10579 1ed1eb5bc6ec Put back __osf__ support for gethostbyname_r(); the real bug was that Guido van Rossum <guido@python.org> parents: 10561 diff changeset	160 #ifndef WITH_THREAD
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	161 # undef HAVE_GETHOSTBYNAME_R
10579 1ed1eb5bc6ec Put back __osf__ support for gethostbyname_r(); the real bug was that Guido van Rossum <guido@python.org> parents: 10561 diff changeset	162 #endif
1ed1eb5bc6ec Put back __osf__ support for gethostbyname_r(); the real bug was that Guido van Rossum <guido@python.org> parents: 10561 diff changeset	163
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	164 #ifdef HAVE_GETHOSTBYNAME_R
68457 15b090c9442a Issue #11495: OSF support is eliminated. It was deprecated in Python 3.2 Jesus Cea <jcea@jcea.es> parents: 68258 diff changeset	165 # if defined(_AIX)
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	166 # define HAVE_GETHOSTBYNAME_R_3_ARG
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	167 # elif defined(__sun) \|\| defined(__sgi)
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	168 # define HAVE_GETHOSTBYNAME_R_5_ARG
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	169 # elif defined(linux)
11288 adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	170 /* Rely on the configure script */
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	171 # else
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	172 # undef HAVE_GETHOSTBYNAME_R
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	173 # endif
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	174 #endif
dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	175
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	176 #if !defined(HAVE_GETHOSTBYNAME_R) && defined(WITH_THREAD) && \
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	177 !defined(MS_WINDOWS)
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	178 # define USE_GETHOSTBYNAME_LOCK
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	179 #endif
9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	180
35635 27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	181 /* To use __FreeBSD_version */
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	182 #ifdef HAVE_SYS_PARAM_H
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	183 #include <sys/param.h>
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	184 #endif
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	185 /* On systems on which getaddrinfo() is believed to not be thread-safe,
29036 ccf7e138a126 Addition to [731644]: also use the lock when using the getaddrinfo Just van Rossum <just@letterror.com> parents: 29035 diff changeset	186 (this includes the getaddrinfo emulation) protect access with a lock. */
35635 27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	187 #if defined(WITH_THREAD) && (defined(__APPLE__) \|\| \
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	188 (defined(__FreeBSD__) && __FreeBSD_version+0 < 503000) \|\| \
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	189 defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| \
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	190 defined(__VMS) \|\| !defined(HAVE_GETADDRINFO))
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	191 #define USE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	192 #endif
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	193
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	194 #ifdef USE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	195 #define ACQUIRE_GETADDRINFO_LOCK PyThread_acquire_lock(netdb_lock, 1);
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	196 #define RELEASE_GETADDRINFO_LOCK PyThread_release_lock(netdb_lock);
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	197 #else
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	198 #define ACQUIRE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	199 #define RELEASE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	200 #endif
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	201
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	202 #if defined(USE_GETHOSTBYNAME_LOCK) \|\| defined(USE_GETADDRINFO_LOCK)
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	203 # include "pythread.h"
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	204 #endif
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	205
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	206 #if defined(PYCC_VACPP)
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	207 # include <types.h>
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	208 # include <io.h>
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	209 # include <sys/ioctl.h>
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	210 # include <utils.h>
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	211 # include <ctype.h>
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	212 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	213
26551 0c995cd07026 Don't include <ioctl.h> unless on __VMS. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	214 #if defined(__VMS)
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	215 # include <ioctl.h>
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	216 #endif
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	217
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	218 #ifdef __APPLE__
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	219 # include <sys/ioctl.h>
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	220 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	221
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	222
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	223 #if defined(__sgi) && _COMPILER_VERSION>700 && !_SGIAPI
25327 337fcc24985b Patch #608999: Fix portability problems with MIPSPro 7.x Martin v. Löwis <martin@v.loewis.de> parents: 25105 diff changeset	224 /* make sure that the reentrant (gethostbyaddr_r etc)
337fcc24985b Patch #608999: Fix portability problems with MIPSPro 7.x Martin v. Löwis <martin@v.loewis.de> parents: 25105 diff changeset	225 functions are declared correctly if compiling with
337fcc24985b Patch #608999: Fix portability problems with MIPSPro 7.x Martin v. Löwis <martin@v.loewis.de> parents: 25105 diff changeset	226 MIPSPro 7.x in ANSI C mode (default) */
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	227
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	228 /* XXX Using _SGIAPI is the wrong thing,
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	229 but I don't know what the right thing is. */
33478 1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	230 #undef _SGIAPI /* to avoid warning */
25327 337fcc24985b Patch #608999: Fix portability problems with MIPSPro 7.x Martin v. Löwis <martin@v.loewis.de> parents: 25105 diff changeset	231 #define _SGIAPI 1
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	232
33478 1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	233 #undef _XOPEN_SOURCE
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	234 #include <sys/socket.h>
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	235 #include <sys/types.h>
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	236 #include <netinet/in.h>
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	237 #ifdef _SS_ALIGNSIZE
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	238 #define HAVE_GETADDRINFO 1
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	239 #define HAVE_GETNAMEINFO 1
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	240 #endif
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	241
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	242 #define HAVE_INET_PTON
08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	243 #include <netdb.h>
25327 337fcc24985b Patch #608999: Fix portability problems with MIPSPro 7.x Martin v. Löwis <martin@v.loewis.de> parents: 25105 diff changeset	244 #endif
337fcc24985b Patch #608999: Fix portability problems with MIPSPro 7.x Martin v. Löwis <martin@v.loewis.de> parents: 25105 diff changeset	245
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	246 /* Irix 6.5 fails to define this variable at all. This is needed
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	247 for both GCC and SGI's compiler. I'd say that the SGI headers
36610 0671f3c462d5 Bug #854823: socketmodule now builds on Sun platforms even when Georg Brandl <georg@python.org> parents: 36476 diff changeset	248 are just busted. Same thing for Solaris. */
0671f3c462d5 Bug #854823: socketmodule now builds on Sun platforms even when Georg Brandl <georg@python.org> parents: 36476 diff changeset	249 #if (defined(__sgi) \|\| defined(sun)) && !defined(INET_ADDRSTRLEN)
30646 a6fb6822814a made the SGI INET_ADDRSTRLEN define apply for any compiler on Irix. Both the Anthony Baxter <anthonybaxter@gmail.com> parents: 30630 diff changeset	250 #define INET_ADDRSTRLEN 16
a6fb6822814a made the SGI INET_ADDRSTRLEN define apply for any compiler on Irix. Both the Anthony Baxter <anthonybaxter@gmail.com> parents: 30630 diff changeset	251 #endif
a6fb6822814a made the SGI INET_ADDRSTRLEN define apply for any compiler on Irix. Both the Anthony Baxter <anthonybaxter@gmail.com> parents: 30630 diff changeset	252
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	253 /* Generic includes */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	254 #ifdef HAVE_SYS_TYPES_H
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	255 #include <sys/types.h>
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	256 #endif
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	257
70151 b6aafb20e5f5 issue #1746656: Fix for OS X. configure and #include changes so that the socket Gregory P. Smith <greg@krypto.org> parents: 70136 diff changeset	258 #ifdef HAVE_SYS_SOCKET_H
b6aafb20e5f5 issue #1746656: Fix for OS X. configure and #include changes so that the socket Gregory P. Smith <greg@krypto.org> parents: 70136 diff changeset	259 #include <sys/socket.h>
b6aafb20e5f5 issue #1746656: Fix for OS X. configure and #include changes so that the socket Gregory P. Smith <greg@krypto.org> parents: 70136 diff changeset	260 #endif
b6aafb20e5f5 issue #1746656: Fix for OS X. configure and #include changes so that the socket Gregory P. Smith <greg@krypto.org> parents: 70136 diff changeset	261
b6aafb20e5f5 issue #1746656: Fix for OS X. configure and #include changes so that the socket Gregory P. Smith <greg@krypto.org> parents: 70136 diff changeset	262 #ifdef HAVE_NET_IF_H
b6aafb20e5f5 issue #1746656: Fix for OS X. configure and #include changes so that the socket Gregory P. Smith <greg@krypto.org> parents: 70136 diff changeset	263 #include <net/if.h>
b6aafb20e5f5 issue #1746656: Fix for OS X. configure and #include changes so that the socket Gregory P. Smith <greg@krypto.org> parents: 70136 diff changeset	264 #endif
b6aafb20e5f5 issue #1746656: Fix for OS X. configure and #include changes so that the socket Gregory P. Smith <greg@krypto.org> parents: 70136 diff changeset	265
21961 ea23e6e49290 Also fix the comment. Marc-André Lemburg <mal@egenix.com> parents: 21960 diff changeset	266 /* Generic socket object definitions and includes */
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	267 #define PySocket_BUILDING_SOCKET
21960 7a917ad8f442 Fix the name of the header file. Marc-André Lemburg <mal@egenix.com> parents: 21959 diff changeset	268 #include "socketmodule.h"
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	269
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	270 /* Addressing includes */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	271
3738 ce74bba8a6a6 Slightly different Windows ifdefs Guido van Rossum <guido@python.org> parents: 3702 diff changeset	272 #ifndef MS_WINDOWS
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	273
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	274 /* Non-MS WINDOWS includes */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	275 # include <netdb.h>
72030 9fc5231c36e0 Attempt to address Windows buildbot failures Nick Coghlan <ncoghlan@gmail.com> parents: 72029 diff changeset	276 # include <unistd.h>
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	277
11288 adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	278 /* Headers needed for inet_ntoa() and inet_addr() */
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	279 # include <arpa/inet.h>
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	280
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	281 # include <fcntl.h>
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	282
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20648 diff changeset	283 #else
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	284
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	285 /* MS_WINDOWS includes */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	286 # ifdef HAVE_FCNTL_H
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	287 # include <fcntl.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	288 # endif
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	289
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	290 #endif
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	291
31504 2abc52c3d4c2 remove support for missing ANSI C header files (limits.h, stddef.h, etc). Skip Montanaro <skip@pobox.com> parents: 31443 diff changeset	292 #include <stddef.h>
18263 41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	293
41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	294 #ifndef offsetof
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	295 # define offsetof(type, member) ((size_t)(&((type *)0)->member))
18263 41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	296 #endif
41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	297
25994 bb813346b227 Use O_NONBLOCK rather than O_NDELAY, so we get POSIX non-blocking I/O. Neal Norwitz <nnorwitz@gmail.com> parents: 25327 diff changeset	298 #ifndef O_NONBLOCK
bb813346b227 Use O_NONBLOCK rather than O_NDELAY, so we get POSIX non-blocking I/O. Neal Norwitz <nnorwitz@gmail.com> parents: 25327 diff changeset	299 # define O_NONBLOCK O_NDELAY
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	300 #endif
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	301
33427 8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	302 /* include Python's addrinfo.h unless it causes trouble */
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	303 #if defined(__sgi) && _COMPILER_VERSION>700 && defined(_SS_ALIGNSIZE)
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	304 /* Do not include addinfo.h on some newer IRIX versions.
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	305 * _SS_ALIGNSIZE is defined in sys/socket.h by 6.5.21,
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	306 * for example, but not by 6.5.10.
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	307 */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	308 #elif defined(_MSC_VER) && _MSC_VER>1201
33427 8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	309 /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	310 * EAI_* constants are defined in (the already included) ws2tcpip.h.
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	311 */
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	312 #else
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	313 # include "addrinfo.h"
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	314 #endif
33066 cda0455bd0a0 Bug #1001857: socketmodule does not build under cygwin Jason Tishler <jason@tishler.net> parents: 33063 diff changeset	315
18262 6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	316 #ifndef HAVE_INET_PTON
43926 2de7d00fbf19 The patch from weck does a better job than my original idea. Thanks! Christian Heimes <christian@cheimes.de> parents: 43881 diff changeset	317 #if !defined(NTDDI_VERSION) \|\| (NTDDI_VERSION < NTDDI_LONGHORN)
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	318 int inet_pton(int af, const char src, void dst);
18790 7cd22bf56d7b Silence warnings in MSVC++: hide unused variables, add constness back to Martin v. Löwis <martin@v.loewis.de> parents: 18753 diff changeset	319 const char inet_ntop(int af, const void src, char *dst, socklen_t size);
18262 6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	320 #endif
43874 6b012f01a889 Fix for VS 2008 Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	321 #endif
18262 6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	322
18954 fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	323 #ifdef __APPLE__
fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	324 /* On OS X, getaddrinfo returns no error indication of lookup
fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	325 failure, so we must use the emulation instead of the libinfo
fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	326 implementation. Unfortunately, performing an autoconf test
fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	327 for this bug would require DNS access for the machine performing
fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	328 the configuration, which is not acceptable. Therefore, we
fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	329 determine the bug just by checking for __APPLE__. If this bug
fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	330 gets ever fixed, perhaps checking for sys/version.h would be
fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	331 appropriate, which is 10/0 on the system with the bug. */
24078 702a5900df7d Mac OS X Jaguar (developer preview) seems to have a working getaddrinfo(). Jack Jansen <jack.jansen@cwi.nl> parents: 23832 diff changeset	332 #ifndef HAVE_GETNAMEINFO
702a5900df7d Mac OS X Jaguar (developer preview) seems to have a working getaddrinfo(). Jack Jansen <jack.jansen@cwi.nl> parents: 23832 diff changeset	333 /* This bug seems to be fixed in Jaguar. Ths easiest way I could
702a5900df7d Mac OS X Jaguar (developer preview) seems to have a working getaddrinfo(). Jack Jansen <jack.jansen@cwi.nl> parents: 23832 diff changeset	334 Find to check for Jaguar is that it has getnameinfo(), which
702a5900df7d Mac OS X Jaguar (developer preview) seems to have a working getaddrinfo(). Jack Jansen <jack.jansen@cwi.nl> parents: 23832 diff changeset	335 older releases don't have */
18954 fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	336 #undef HAVE_GETADDRINFO
fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	337 #endif
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	338
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	339 #ifdef HAVE_INET_ATON
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	340 #define USE_INET_ATON_WEAKLINK
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	341 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	342
24078 702a5900df7d Mac OS X Jaguar (developer preview) seems to have a working getaddrinfo(). Jack Jansen <jack.jansen@cwi.nl> parents: 23832 diff changeset	343 #endif
18954 fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	344
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	345 /* I know this is a bad practice, but it is the easiest... */
18954 fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	346 #if !defined(HAVE_GETADDRINFO)
28913 b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	347 /* avoid clashes with the C library definition of the symbol. */
b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	348 #define getaddrinfo fake_getaddrinfo
b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	349 #define gai_strerror fake_gai_strerror
b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	350 #define freeaddrinfo fake_freeaddrinfo
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	351 #include "getaddrinfo.c"
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	352 #endif
18954 fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	353 #if !defined(HAVE_GETNAMEINFO)
28913 b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	354 #define getnameinfo fake_getnameinfo
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	355 #include "getnameinfo.c"
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	356 #endif
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	357
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	358 #ifdef MS_WINDOWS
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	359 /* On Windows a socket is really a handle not an fd */
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	360 static SOCKET
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	361 dup_socket(SOCKET handle)
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	362 {
64393 633166d4fc12 Merged revisions 84450 via svnmerge from Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64121 diff changeset	363 WSAPROTOCOL_INFO info;
633166d4fc12 Merged revisions 84450 via svnmerge from Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64121 diff changeset	364
633166d4fc12 Merged revisions 84450 via svnmerge from Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64121 diff changeset	365 if (WSADuplicateSocket(handle, GetCurrentProcessId(), &info))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	366 return INVALID_SOCKET;
64393 633166d4fc12 Merged revisions 84450 via svnmerge from Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64121 diff changeset	367
633166d4fc12 Merged revisions 84450 via svnmerge from Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64121 diff changeset	368 return WSASocket(FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO,
76035 5be4d8fc9c44 Issue #14300: Under Windows, sockets created using socket.dup() now allow overlapped I/O. Antoine Pitrou <solipsis@pitrou.net> parents: 76011 diff changeset	369 FROM_PROTOCOL_INFO, &info, 0, WSA_FLAG_OVERLAPPED);
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	370 }
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	371 #define SOCKETCLOSE closesocket
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	372 #else
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	373 /* On Unix we can use dup to duplicate the file descriptor of a socket*/
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	374 #define dup_socket(fd) dup(fd)
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	375 #endif
a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	376
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	377 #ifdef MS_WIN32
76011 e46013f92013 Fix warning when compiling socketmodule.c with VS2010 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75469 diff changeset	378 #undef EAFNOSUPPORT
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	379 #define EAFNOSUPPORT WSAEAFNOSUPPORT
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	380 #define snprintf _snprintf
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	381 #endif
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	382
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	383 #ifndef SOCKETCLOSE
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	384 #define SOCKETCLOSE close
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	385 #endif
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	386
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	387 #if (defined(HAVE_BLUETOOTH_H) \|\| defined(HAVE_BLUETOOTH_BLUETOOTH_H)) && !defined(__NetBSD__) && !defined(__DragonFly__)
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	388 #define USE_BLUETOOTH 1
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	389 #if defined(__FreeBSD__)
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	390 #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	391 #define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	392 #define BTPROTO_HCI BLUETOOTH_PROTO_HCI
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	393 #define SOL_HCI SOL_HCI_RAW
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	394 #define HCI_FILTER SO_HCI_RAW_FILTER
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	395 #define sockaddr_l2 sockaddr_l2cap
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	396 #define sockaddr_rc sockaddr_rfcomm
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	397 #define hci_dev hci_node
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	398 #define _BT_L2_MEMB(sa, memb) ((sa)->l2cap_##memb)
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	399 #define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	400 #define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	401 #elif defined(__NetBSD__) \|\| defined(__DragonFly__)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	402 #define sockaddr_l2 sockaddr_bt
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	403 #define sockaddr_rc sockaddr_bt
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	404 #define sockaddr_hci sockaddr_bt
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	405 #define sockaddr_sco sockaddr_bt
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	406 #define SOL_HCI BTPROTO_HCI
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	407 #define HCI_DATA_DIR SO_HCI_DIRECTION
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	408 #define _BT_L2_MEMB(sa, memb) ((sa)->bt_##memb)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	409 #define _BT_RC_MEMB(sa, memb) ((sa)->bt_##memb)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	410 #define _BT_HCI_MEMB(sa, memb) ((sa)->bt_##memb)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	411 #define _BT_SCO_MEMB(sa, memb) ((sa)->bt_##memb)
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	412 #else
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	413 #define _BT_L2_MEMB(sa, memb) ((sa)->l2_##memb)
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	414 #define _BT_RC_MEMB(sa, memb) ((sa)->rc_##memb)
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	415 #define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	416 #define _BT_SCO_MEMB(sa, memb) ((sa)->sco_##memb)
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	417 #endif
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	418 #endif
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	419
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	420 #ifdef __VMS
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	421 /* TCP/IP Services for VMS uses a maximum send/recv buffer length */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	422 #define SEGMENT_SIZE (32 * 1024 -1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	423 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	424
74142 683a1b1ff15d Issue #8623: Fix some strict-aliasing warnings. Patch by David Watson. Charles-François Natali <neologix@free.fr> parents: 74012 diff changeset	425 /* Convert "sock_addr_t " to "struct sockaddr ". */
683a1b1ff15d Issue #8623: Fix some strict-aliasing warnings. Patch by David Watson. Charles-François Natali <neologix@free.fr> parents: 74012 diff changeset	426 #define SAS2SA(x) (&((x)->sa))
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	427
28953 09422c301826 Patch #724588: Check whether the address of hstrerror and inet_pton can Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	428 /*
09422c301826 Patch #724588: Check whether the address of hstrerror and inet_pton can Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	429 * Constants for getnameinfo()
09422c301826 Patch #724588: Check whether the address of hstrerror and inet_pton can Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	430 */
09422c301826 Patch #724588: Check whether the address of hstrerror and inet_pton can Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	431 #if !defined(NI_MAXHOST)
09422c301826 Patch #724588: Check whether the address of hstrerror and inet_pton can Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	432 #define NI_MAXHOST 1025
09422c301826 Patch #724588: Check whether the address of hstrerror and inet_pton can Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	433 #endif
09422c301826 Patch #724588: Check whether the address of hstrerror and inet_pton can Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	434 #if !defined(NI_MAXSERV)
09422c301826 Patch #724588: Check whether the address of hstrerror and inet_pton can Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	435 #define NI_MAXSERV 32
09422c301826 Patch #724588: Check whether the address of hstrerror and inet_pton can Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	436 #endif
09422c301826 Patch #724588: Check whether the address of hstrerror and inet_pton can Martin v. Löwis <martin@v.loewis.de> parents: 28949 diff changeset	437
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	438 #ifndef INVALID_SOCKET /* MS defines this */
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	439 #define INVALID_SOCKET (-1)
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	440 #endif
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	441
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	442 /* XXX There's a problem here: static functions are not supposed to have
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	443 a Py prefix (or use CapitalizedWords). Later... */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	444
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	445 /* Global variable holding the exception type for errors detected
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	446 by this module (but not argument type or memory errors, etc.). */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	447 static PyObject *socket_herror;
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	448 static PyObject *socket_gaierror;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	449 static PyObject *socket_timeout;
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	450
21970 b1a871dc5196 Moved the declaration of PySocketSock_Type from socketmodule.h to Tim Peters <tim.peters@gmail.com> parents: 21964 diff changeset	451 /* A forward reference to the socket type object.
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	452 The sock_type variable contains pointers to various functions,
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	453 some of which call new_sockobject(), which uses sock_type, so
21970 b1a871dc5196 Moved the declaration of PySocketSock_Type from socketmodule.h to Tim Peters <tim.peters@gmail.com> parents: 21964 diff changeset	454 there has to be a circular reference. */
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24078 diff changeset	455 static PyTypeObject sock_type;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	456
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	457 #if defined(HAVE_POLL_H)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	458 #include <poll.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	459 #elif defined(HAVE_SYS_POLL_H)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	460 #include <sys/poll.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	461 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	462
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	463 /* Largest value to try to store in a socklen_t (used when handling
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	464 ancillary data). POSIX requires socklen_t to hold at least
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	465 (2**31)-1 and recommends against storing larger values, but
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	466 socklen_t was originally int in the BSD interface, so to be on the
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	467 safe side we use the smaller of (2*31)-1 and INT_MAX. /
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	468 #if INT_MAX > 0x7fffffff
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	469 #define SOCKLEN_T_LIMIT 0x7fffffff
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	470 #else
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	471 #define SOCKLEN_T_LIMIT INT_MAX
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	472 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	473
72115 852ca32eb18d Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is Charles-François Natali <neologix@free.fr> parents: 71864 diff changeset	474 #ifdef HAVE_POLL
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	475 /* Instead of select(), we'll use poll() since poll() works on any fd. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	476 #define IS_SELECTABLE(s) 1
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	477 /* Can we call select() with this socket without a buffer overrun? */
36476 c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	478 #else
72115 852ca32eb18d Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is Charles-François Natali <neologix@free.fr> parents: 71864 diff changeset	479 /* If there's no timeout left, we don't have to call select, so it's a safe,
852ca32eb18d Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is Charles-François Natali <neologix@free.fr> parents: 71864 diff changeset	480 * little white lie. */
852ca32eb18d Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is Charles-François Natali <neologix@free.fr> parents: 71864 diff changeset	481 #define IS_SELECTABLE(s) (_PyIsSelectable_fd((s)->sock_fd) \|\| (s)->sock_timeout <= 0.0)
36476 c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	482 #endif
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	483
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	484 static PyObject*
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	485 select_error(void)
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	486 {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	487 PyErr_SetString(PyExc_OSError, "unable to select on socket");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	488 return NULL;
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	489 }
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	490
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	491 #ifdef MS_WINDOWS
64991 6c1f10e07455 Fix compilation under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 64988 diff changeset	492 #ifndef WSAEAGAIN
6c1f10e07455 Fix compilation under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 64988 diff changeset	493 #define WSAEAGAIN WSAEWOULDBLOCK
6c1f10e07455 Fix compilation under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 64988 diff changeset	494 #endif
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	495 #define CHECK_ERRNO(expected) \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	496 (WSAGetLastError() == WSA ## expected)
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	497 #else
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	498 #define CHECK_ERRNO(expected) \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	499 (errno == expected)
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	500 #endif
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	501
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	502 /* Convenience function to raise an error according to errno
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	503 and return a NULL pointer from a function. */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	504
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	505 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	506 set_error(void)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	507 {
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	508 #ifdef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	509 int err_no = WSAGetLastError();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	510 /* PyErr_SetExcFromWindowsErr() invokes FormatMessage() which
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	511 recognizes the error codes used by both GetLastError() and
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	512 WSAGetLastError */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	513 if (err_no)
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	514 return PyErr_SetExcFromWindowsErr(PyExc_OSError, err_no);
1915 80818c106e3e * Modules/xxmodule.c: integrated with xxobject.c by Jack Guido van Rossum <guido@python.org> parents: 1867 diff changeset	515 #endif
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	516
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	517 return PyErr_SetFromErrno(PyExc_OSError);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	518 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	519
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	520
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	521 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	522 set_herror(int h_error)
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	523 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	524 PyObject *v;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	525
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	526 #ifdef HAVE_HSTRERROR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	527 v = Py_BuildValue("(is)", h_error, (char *)hstrerror(h_error));
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	528 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	529 v = Py_BuildValue("(is)", h_error, "host not found");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	530 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	531 if (v != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	532 PyErr_SetObject(socket_herror, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	533 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	534 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	535
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	536 return NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	537 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	538
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	539
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	540 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	541 set_gaierror(int error)
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	542 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	543 PyObject *v;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	544
22096 9e5ff6747437 Patch #520062: Support IPv6 with VC.NET. Martin v. Löwis <martin@v.loewis.de> parents: 21970 diff changeset	545 #ifdef EAI_SYSTEM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	546 /* EAI_SYSTEM is not available on Windows XP. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	547 if (error == EAI_SYSTEM)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	548 return set_error();
22096 9e5ff6747437 Patch #520062: Support IPv6 with VC.NET. Martin v. Löwis <martin@v.loewis.de> parents: 21970 diff changeset	549 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	550
19278 1afc3116c602 Fix portability problems with glibc 2.0, as reported in #449157. Martin v. Löwis <martin@v.loewis.de> parents: 19197 diff changeset	551 #ifdef HAVE_GAI_STRERROR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	552 v = Py_BuildValue("(is)", error, gai_strerror(error));
19278 1afc3116c602 Fix portability problems with glibc 2.0, as reported in #449157. Martin v. Löwis <martin@v.loewis.de> parents: 19197 diff changeset	553 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	554 v = Py_BuildValue("(is)", error, "getaddrinfo failed");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	555 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	556 if (v != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	557 PyErr_SetObject(socket_gaierror, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	558 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	559 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	560
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	561 return NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	562 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	563
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	564 #ifdef __VMS
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	565 /* Function to send in segments */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	566 static int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	567 sendsegmented(int sock_fd, char *buf, int len, int flags)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	568 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	569 int n = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	570 int remaining = len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	571
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	572 while (remaining > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	573 unsigned int segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	574
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	575 segment = (remaining >= SEGMENT_SIZE ? SEGMENT_SIZE : remaining);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	576 n = send(sock_fd, buf, segment, flags);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	577 if (n < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	578 return n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	579 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	580 remaining -= segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	581 buf += segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	582 } /* end while */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	583
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	584 return len;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	585 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	586 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	587
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	588 /* Function to perform the setting of socket blocking mode
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	589 internally. block = (1 \| 0). */
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	590 static int
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	591 internal_setblocking(PySocketSockObject *s, int block)
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	592 {
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	593 #ifndef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	594 int delay_flag;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	595 #endif
65314 12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	596 #ifdef SOCK_NONBLOCK
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	597 if (block)
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	598 s->sock_type &= (~SOCK_NONBLOCK);
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	599 else
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	600 s->sock_type \|= SOCK_NONBLOCK;
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	601 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	602
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	603 Py_BEGIN_ALLOW_THREADS
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	604 #ifndef MS_WINDOWS
79475 dea15868963f #16135: Removal of OS/2 support (Modules/) Jesus Cea <jcea@jcea.es>* parents: 78932 diff changeset	605 #if defined(__VMS)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	606 block = !block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	607 ioctl(s->sock_fd, FIONBIO, (unsigned int *)&block);
79475 dea15868963f #16135: Removal of OS/2 support (Modules/) Jesus Cea <jcea@jcea.es>* parents: 78932 diff changeset	608 #else /* !__VMS */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	609 delay_flag = fcntl(s->sock_fd, F_GETFL, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	610 if (block)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	611 delay_flag &= (~O_NONBLOCK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	612 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	613 delay_flag \|= O_NONBLOCK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	614 fcntl(s->sock_fd, F_SETFL, delay_flag);
79475 dea15868963f #16135: Removal of OS/2 support (Modules/) Jesus Cea <jcea@jcea.es>* parents: 78932 diff changeset	615 #endif /* !__VMS */
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	616 #else /* MS_WINDOWS */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	617 block = !block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	618 ioctlsocket(s->sock_fd, FIONBIO, (u_long*)&block);
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	619 #endif /* MS_WINDOWS */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	620 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	621
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	622 /* Since these don't return anything */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	623 return 1;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	624 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	625
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	626 /* Do a select()/poll() on the socket, if necessary (sock_timeout > 0).
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	627 The argument writing indicates the direction.
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	628 This does not raise an exception; we'll let our caller do that
0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	629 after they've reacquired the interpreter lock.
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	630 Returns 1 on timeout, -1 on error, 0 otherwise. */
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	631 static int
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	632 internal_select_ex(PySocketSockObject *s, int writing, double interval)
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	633 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	634 int n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	635
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	636 /* Nothing to do unless we're in timeout mode (not non-blocking) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	637 if (s->sock_timeout <= 0.0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	638 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	639
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	640 /* Guard against closed socket */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	641 if (s->sock_fd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	642 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	643
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	644 /* Handling this condition here simplifies the select loops */
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	645 if (interval < 0.0)
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	646 return 1;
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	647
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	648 /* Prefer poll, if available, since you can poll() any fd
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	649 * which can't be done with select(). */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	650 #ifdef HAVE_POLL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	651 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	652 struct pollfd pollfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	653 int timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	654
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	655 pollfd.fd = s->sock_fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	656 pollfd.events = writing ? POLLOUT : POLLIN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	657
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	658 /* s->sock_timeout is in seconds, timeout in ms */
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	659 timeout = (int)(interval * 1000 + 0.5);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	660 n = poll(&pollfd, 1, timeout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	661 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	662 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	663 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	664 /* Construct the arguments to select */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	665 fd_set fds;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	666 struct timeval tv;
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	667 tv.tv_sec = (int)interval;
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	668 tv.tv_usec = (int)((interval - tv.tv_sec) * 1e6);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	669 FD_ZERO(&fds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	670 FD_SET(s->sock_fd, &fds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	671
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	672 /* See if the socket is ready */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	673 if (writing)
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	674 n = select(Py_SAFE_DOWNCAST(s->sock_fd+1, SOCKET_T, int),
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	675 NULL, &fds, NULL, &tv);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	676 else
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	677 n = select(Py_SAFE_DOWNCAST(s->sock_fd+1, SOCKET_T, int),
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	678 &fds, NULL, NULL, &tv);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	679 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	680 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	681
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	682 if (n < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	683 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	684 if (n == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	685 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	686 return 0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	687 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	688
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	689 static int
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	690 internal_select(PySocketSockObject *s, int writing)
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	691 {
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	692 return internal_select_ex(s, writing, s->sock_timeout);
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	693 }
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	694
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	695 /*
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	696 Two macros for automatic retry of select() in case of false positives
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	697 (for example, select() could indicate a socket is ready for reading
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	698 but the data then discarded by the OS because of a wrong checksum).
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	699 Here is an example of use:
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	700
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	701 BEGIN_SELECT_LOOP(s)
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	702 Py_BEGIN_ALLOW_THREADS
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	703 timeout = internal_select_ex(s, 0, interval);
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	704 if (!timeout)
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	705 outlen = recv(s->sock_fd, cbuf, len, flags);
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	706 Py_END_ALLOW_THREADS
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	707 if (timeout == 1) {
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	708 PyErr_SetString(socket_timeout, "timed out");
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	709 return -1;
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	710 }
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	711 END_SELECT_LOOP(s)
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	712 */
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	713
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	714 #define BEGIN_SELECT_LOOP(s) \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	715 { \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	716 _PyTime_timeval now, deadline = {0, 0}; \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	717 double interval = s->sock_timeout; \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	718 int has_timeout = s->sock_timeout > 0.0; \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	719 if (has_timeout) { \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	720 _PyTime_gettimeofday(&now); \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	721 deadline = now; \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	722 _PyTime_ADD_SECONDS(deadline, s->sock_timeout); \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	723 } \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	724 while (1) { \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	725 errno = 0; \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	726
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	727 #define END_SELECT_LOOP(s) \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	728 if (!has_timeout \|\| \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	729 (!CHECK_ERRNO(EWOULDBLOCK) && !CHECK_ERRNO(EAGAIN))) \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	730 break; \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	731 _PyTime_gettimeofday(&now); \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	732 interval = _PyTime_INTERVAL(now, deadline); \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	733 } \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	734 } \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	735
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	736 /* Initialize a new socket object. */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	737
24305 428cbbf05639 A Python float is a C double; redeclare defaulttimeout as such; stops Tim Peters <tim.peters@gmail.com> parents: 24303 diff changeset	738 static double defaulttimeout = -1.0; /* Default timeout for new sockets */
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	739
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	740 static void
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	741 init_sockobject(PySocketSockObject *s,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	742 SOCKET_T fd, int family, int type, int proto)
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	743 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	744 s->sock_fd = fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	745 s->sock_family = family;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	746 s->sock_type = type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	747 s->sock_proto = proto;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	748
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	749 s->errorhandler = &set_error;
65314 12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	750 #ifdef SOCK_NONBLOCK
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	751 if (type & SOCK_NONBLOCK)
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	752 s->sock_timeout = 0.0;
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	753 else
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	754 #endif
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	755 {
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	756 s->sock_timeout = defaulttimeout;
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	757 if (defaulttimeout >= 0.0)
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	758 internal_setblocking(s, 0);
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	759 }
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	760
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	761 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	762
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	763
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	764 /* Create a new socket object.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	765 This just creates the object and initializes it.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	766 If the creation fails, return NULL and set an exception (implicit
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	767 in NEWOBJ()). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	768
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	769 static PySocketSockObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	770 new_sockobject(SOCKET_T fd, int family, int type, int proto)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	771 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	772 PySocketSockObject *s;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	773 s = (PySocketSockObject *)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	774 PyType_GenericNew(&sock_type, NULL, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	775 if (s != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	776 init_sockobject(s, fd, family, type, proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	777 return s;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	778 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	779
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	780
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	781 /* Lock to allow python interpreter to continue, but only allow one
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	782 thread to be in gethostbyname or getaddrinfo */
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	783 #if defined(USE_GETHOSTBYNAME_LOCK) \|\| defined(USE_GETADDRINFO_LOCK)
78569 6ec9e646ffc7 Modules/socketmodule.c: netdb_lock: define static. Matthias Klose <doko@ubuntu.com> parents: 77612 diff changeset	784 static PyThread_type_lock netdb_lock;
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	785 #endif
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	786
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	787
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	788 /* Convert a string specifying a host name or one of a few symbolic
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	789 names to a numeric IP address. This usually calls gethostbyname()
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	790 to do the work; the names "" and "<broadcast>" are special.
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	791 Return the length (IPv4 should be 4 bytes), or negative if
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	792 an error occurred; then an exception is raised. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	793
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	794 static int
24411 8e266d0acd10 Pass length of result structure into setipaddr. Fixes bug #565747. Martin v. Löwis <martin@v.loewis.de> parents: 24380 diff changeset	795 setipaddr(char name, struct sockaddr addr_ret, size_t addr_ret_size, int af)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	796 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	797 struct addrinfo hints, *res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	798 int error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	799 int d1, d2, d3, d4;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	800 char ch;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	801
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	802 memset((void ) addr_ret, '\0', sizeof(addr_ret));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	803 if (name[0] == '\0') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	804 int siz;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	805 memset(&hints, 0, sizeof(hints));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	806 hints.ai_family = af;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	807 hints.ai_socktype = SOCK_DGRAM; /dummy/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	808 hints.ai_flags = AI_PASSIVE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	809 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	810 ACQUIRE_GETADDRINFO_LOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	811 error = getaddrinfo(NULL, "0", &hints, &res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	812 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	813 /* We assume that those thread-unsafe getaddrinfo() versions
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	814 are safe regarding their return value, ie. that a
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	815 subsequent call to getaddrinfo() does not destroy the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	816 outcome of the first call. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	817 RELEASE_GETADDRINFO_LOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	818 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	819 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	820 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	821 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	822 switch (res->ai_family) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	823 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	824 siz = 4;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	825 break;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	826 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	827 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	828 siz = 16;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	829 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	830 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	831 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	832 freeaddrinfo(res);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	833 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	834 "unsupported address family");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	835 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	836 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	837 if (res->ai_next) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	838 freeaddrinfo(res);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	839 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	840 "wildcard resolved to multiple address");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	841 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	842 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	843 if (res->ai_addrlen < addr_ret_size)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	844 addr_ret_size = res->ai_addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	845 memcpy(addr_ret, res->ai_addr, addr_ret_size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	846 freeaddrinfo(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	847 return siz;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	848 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	849 if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	850 struct sockaddr_in *sin;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	851 if (af != AF_INET && af != AF_UNSPEC) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	852 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	853 "address family mismatched");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	854 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	855 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	856 sin = (struct sockaddr_in *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	857 memset((void ) sin, '\0', sizeof(sin));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	858 sin->sin_family = AF_INET;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	859 #ifdef HAVE_SOCKADDR_SA_LEN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	860 sin->sin_len = sizeof(*sin);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	861 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	862 sin->sin_addr.s_addr = INADDR_BROADCAST;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	863 return sizeof(sin->sin_addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	864 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	865 if (sscanf(name, "%d.%d.%d.%d%c", &d1, &d2, &d3, &d4, &ch) == 4 &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	866 0 <= d1 && d1 <= 255 && 0 <= d2 && d2 <= 255 &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	867 0 <= d3 && d3 <= 255 && 0 <= d4 && d4 <= 255) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	868 struct sockaddr_in *sin;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	869 sin = (struct sockaddr_in *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	870 sin->sin_addr.s_addr = htonl(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	871 ((long) d1 << 24) \| ((long) d2 << 16) \|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	872 ((long) d3 << 8) \| ((long) d4 << 0));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	873 sin->sin_family = AF_INET;
28925 a769e079bb12 Patch 731209: Restore socketmodule's behaviour with dotted quad addresses Anthony Baxter <anthonybaxter@gmail.com> parents: 28913 diff changeset	874 #ifdef HAVE_SOCKADDR_SA_LEN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	875 sin->sin_len = sizeof(*sin);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	876 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	877 return 4;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	878 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	879 memset(&hints, 0, sizeof(hints));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	880 hints.ai_family = af;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	881 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	882 ACQUIRE_GETADDRINFO_LOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	883 error = getaddrinfo(name, NULL, &hints, &res);
20661 f7009167dd67 After discussion with itojun, it was clarified that Tru64 is in error, Martin v. Löwis <martin@v.loewis.de> parents: 20654 diff changeset	884 #if defined(__digital__) && defined(__unix__)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	885 if (error == EAI_NONAME && af == AF_UNSPEC) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	886 /* On Tru64 V5.1, numeric-to-addr conversion fails
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	887 if no address family is given. Assume IPv4 for now.*/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	888 hints.ai_family = AF_INET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	889 error = getaddrinfo(name, NULL, &hints, &res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	890 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	891 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	892 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	893 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	894 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	895 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	896 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	897 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	898 if (res->ai_addrlen < addr_ret_size)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	899 addr_ret_size = res->ai_addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	900 memcpy((char *) addr_ret, res->ai_addr, addr_ret_size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	901 freeaddrinfo(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	902 switch (addr_ret->sa_family) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	903 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	904 return 4;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	905 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	906 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	907 return 16;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	908 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	909 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	910 PyErr_SetString(PyExc_OSError, "unknown address family");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	911 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	912 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	913 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	914
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	915
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	916 /* Create a string object representing an IP address.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	917 This is always a string of the form 'dd.dd.dd.dd' (with variable
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	918 size numbers). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	919
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	920 static PyObject *
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	921 makeipaddr(struct sockaddr *addr, int addrlen)
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	922 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	923 char buf[NI_MAXHOST];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	924 int error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	925
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	926 error = getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	927 NI_NUMERICHOST);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	928 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	929 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	930 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	931 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	932 return PyUnicode_FromString(buf);
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	933 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	934
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	935
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	936 #ifdef USE_BLUETOOTH
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	937 /* Convert a string representation of a Bluetooth address into a numeric
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	938 address. Returns the length (6), or raises an exception and returns -1 if
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	939 an error occurred. */
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	940
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	941 static int
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	942 setbdaddr(char name, bdaddr_t bdaddr)
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	943 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	944 unsigned int b0, b1, b2, b3, b4, b5;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	945 char ch;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	946 int n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	947
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	948 n = sscanf(name, "%X:%X:%X:%X:%X:%X%c",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	949 &b5, &b4, &b3, &b2, &b1, &b0, &ch);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	950 if (n == 6 && (b0 \| b1 \| b2 \| b3 \| b4 \| b5) < 256) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	951 bdaddr->b[0] = b0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	952 bdaddr->b[1] = b1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	953 bdaddr->b[2] = b2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	954 bdaddr->b[3] = b3;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	955 bdaddr->b[4] = b4;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	956 bdaddr->b[5] = b5;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	957 return 6;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	958 } else {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	959 PyErr_SetString(PyExc_OSError, "bad bluetooth address");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	960 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	961 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	962 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	963
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	964 /* Create a string representation of the Bluetooth address. This is always a
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	965 string of the form 'XX:XX:XX:XX:XX:XX' where XX is a two digit hexadecimal
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	966 value (zero padded if necessary). */
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	967
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	968 static PyObject *
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	969 makebdaddr(bdaddr_t *bdaddr)
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	970 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	971 char buf[(6 * 2) + 5 + 1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	972
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	973 sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	974 bdaddr->b[5], bdaddr->b[4], bdaddr->b[3],
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	975 bdaddr->b[2], bdaddr->b[1], bdaddr->b[0]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	976 return PyUnicode_FromString(buf);
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	977 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	978 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	979
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	980
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	981 /* Create an object representing the given socket address,
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	982 suitable for passing it back to bind(), connect() etc.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	983 The family field of the sockaddr structure is inspected
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	984 to determine what kind of address it really is. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	985
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	986 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	987 static PyObject *
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	988 makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	989 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	990 if (addrlen == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	991 /* No address -- may be recvfrom() from known socket */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	992 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	993 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	994 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	995
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	996 switch (addr->sa_family) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	997
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	998 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	999 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1000 struct sockaddr_in *a;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1001 PyObject addrobj = makeipaddr(addr, sizeof(a));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1002 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1003 if (addrobj) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1004 a = (struct sockaddr_in *)addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1005 ret = Py_BuildValue("Oi", addrobj, ntohs(a->sin_port));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1006 Py_DECREF(addrobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1007 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1008 return ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1009 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1010
31867 51aaceeaabe1 OS/2's TCP/IP stack supports AF_UNIX sockets, with the limitation that Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 31790 diff changeset	1011 #if defined(AF_UNIX)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1012 case AF_UNIX:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1013 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1014 struct sockaddr_un a = (struct sockaddr_un ) addr;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1015 #ifdef linux
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1016 if (a->sun_path[0] == 0) { /* Linux abstract namespace */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1017 addrlen -= offsetof(struct sockaddr_un, sun_path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1018 return PyBytes_FromStringAndSize(a->sun_path, addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1019 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1020 else
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1021 #endif /* linux */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1022 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1023 /* regular NULL-terminated string */
73998 1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1024 return PyUnicode_DecodeFSDefault(a->sun_path);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1025 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1026 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1027 #endif /* AF_UNIX */
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1028
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1029 #if defined(AF_NETLINK)
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1030 case AF_NETLINK:
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1031 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1032 struct sockaddr_nl a = (struct sockaddr_nl ) addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1033 return Py_BuildValue("II", a->nl_pid, a->nl_groups);
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1034 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1035 #endif /* AF_NETLINK */
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1036
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1037 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1038 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1039 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1040 struct sockaddr_in6 *a;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1041 PyObject addrobj = makeipaddr(addr, sizeof(a));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1042 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1043 if (addrobj) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1044 a = (struct sockaddr_in6 *)addr;
74233 cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	1045 ret = Py_BuildValue("OiII",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1046 addrobj,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1047 ntohs(a->sin6_port),
74233 cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	1048 ntohl(a->sin6_flowinfo),
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1049 a->sin6_scope_id);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1050 Py_DECREF(addrobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1051 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1052 return ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1053 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1054 #endif
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1055
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1056 #ifdef USE_BLUETOOTH
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1057 case AF_BLUETOOTH:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1058 switch (proto) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1059
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1060 case BTPROTO_L2CAP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1061 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1062 struct sockaddr_l2 a = (struct sockaddr_l2 ) addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1063 PyObject *addrobj = makebdaddr(&_BT_L2_MEMB(a, bdaddr));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1064 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1065 if (addrobj) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1066 ret = Py_BuildValue("Oi",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1067 addrobj,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1068 _BT_L2_MEMB(a, psm));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1069 Py_DECREF(addrobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1070 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1071 return ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1072 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1073
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1074 case BTPROTO_RFCOMM:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1075 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1076 struct sockaddr_rc a = (struct sockaddr_rc ) addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1077 PyObject *addrobj = makebdaddr(&_BT_RC_MEMB(a, bdaddr));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1078 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1079 if (addrobj) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1080 ret = Py_BuildValue("Oi",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1081 addrobj,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1082 _BT_RC_MEMB(a, channel));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1083 Py_DECREF(addrobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1084 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1085 return ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1086 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1087
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1088 case BTPROTO_HCI:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1089 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1090 struct sockaddr_hci a = (struct sockaddr_hci ) addr;
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1091 #if defined(__NetBSD__) \|\| defined(__DragonFly__)
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1092 return makebdaddr(&_BT_HCI_MEMB(a, bdaddr));
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1093 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1094 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1095 ret = Py_BuildValue("i", _BT_HCI_MEMB(a, dev));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1096 return ret;
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1097 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1098 }
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1099
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1100 #if !defined(__FreeBSD__)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1101 case BTPROTO_SCO:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1102 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1103 struct sockaddr_sco a = (struct sockaddr_sco ) addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1104 return makebdaddr(&_BT_SCO_MEMB(a, bdaddr));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1105 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1106 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1107
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1108 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1109 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1110 "Unknown Bluetooth protocol");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1111 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1112 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1113 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1114
65668 add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	1115 #if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFNAME)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1116 case AF_PACKET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1117 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1118 struct sockaddr_ll a = (struct sockaddr_ll )addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1119 char *ifname = "";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1120 struct ifreq ifr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1121 /* need to look up interface name give index */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1122 if (a->sll_ifindex) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1123 ifr.ifr_ifindex = a->sll_ifindex;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1124 if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1125 ifname = ifr.ifr_name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1126 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1127 return Py_BuildValue("shbhy#",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1128 ifname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1129 ntohs(a->sll_protocol),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1130 a->sll_pkttype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1131 a->sll_hatype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1132 a->sll_addr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1133 a->sll_halen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1134 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1135 #endif
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1136
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	1137 #ifdef HAVE_LINUX_TIPC_H
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1138 case AF_TIPC:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1139 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1140 struct sockaddr_tipc a = (struct sockaddr_tipc ) addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1141 if (a->addrtype == TIPC_ADDR_NAMESEQ) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1142 return Py_BuildValue("IIIII",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1143 a->addrtype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1144 a->addr.nameseq.type,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1145 a->addr.nameseq.lower,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1146 a->addr.nameseq.upper,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1147 a->scope);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1148 } else if (a->addrtype == TIPC_ADDR_NAME) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1149 return Py_BuildValue("IIIII",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1150 a->addrtype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1151 a->addr.name.name.type,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1152 a->addr.name.name.instance,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1153 a->addr.name.name.instance,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1154 a->scope);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1155 } else if (a->addrtype == TIPC_ADDR_ID) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1156 return Py_BuildValue("IIIII",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1157 a->addrtype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1158 a->addr.id.node,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1159 a->addr.id.ref,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1160 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1161 a->scope);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1162 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1163 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1164 "Invalid address type");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1165 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1166 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1167 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1168 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1169
72807 d4ce850b06b7 Issue #10141: fix socketmodule compilation on Linux systems with <linux/can.h> Charles-François Natali <neologix@free.fr> parents: 72758 diff changeset	1170 #ifdef AF_CAN
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1171 case AF_CAN:
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1172 {
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1173 struct sockaddr_can a = (struct sockaddr_can )addr;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1174 char *ifname = "";
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1175 struct ifreq ifr;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1176 /* need to look up interface name given index */
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1177 if (a->can_ifindex) {
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1178 ifr.ifr_ifindex = a->can_ifindex;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1179 if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1180 ifname = ifr.ifr_name;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1181 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1182
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1183 return Py_BuildValue("O&h", PyUnicode_DecodeFSDefault,
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1184 ifname,
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1185 a->can_family);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1186 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1187 #endif
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1188
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1189 #ifdef PF_SYSTEM
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1190 case PF_SYSTEM:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1191 switch(proto) {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1192 #ifdef SYSPROTO_CONTROL
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1193 case SYSPROTO_CONTROL:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1194 {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1195 struct sockaddr_ctl a = (struct sockaddr_ctl )addr;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1196 return Py_BuildValue("(II)", a->sc_id, a->sc_unit);
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1197 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1198 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1199 default:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1200 PyErr_SetString(PyExc_ValueError,
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1201 "Invalid address type");
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1202 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1203 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1204 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1205
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1206 /* More cases here... */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1207
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1208 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1209 /* If we don't know the address family, don't raise an
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1210 exception -- return it as an (int, bytes) tuple. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1211 return Py_BuildValue("iy#",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1212 addr->sa_family,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1213 addr->sa_data,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1214 sizeof(addr->sa_data));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1215
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1216 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1217 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1218
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1219
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1220 /* Parse a socket address argument according to the socket object's
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1221 address family. Return 1 if the address was in the proper format,
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1222 0 of not. The address is returned through addr_ret, its length
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1223 through len_ret. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1224
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1225 static int
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1226 getsockaddrarg(PySocketSockObject s, PyObject args,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1227 struct sockaddr addr_ret, int len_ret)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1228 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1229 switch (s->sock_family) {
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1230
31867 51aaceeaabe1 OS/2's TCP/IP stack supports AF_UNIX sockets, with the limitation that Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 31790 diff changeset	1231 #if defined(AF_UNIX)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1232 case AF_UNIX:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1233 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1234 struct sockaddr_un* addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1235 char *path;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1236 int len;
73998 1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1237 int retval = 0;
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1238
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1239 /* PEP 383. Not using PyUnicode_FSConverter since we need to
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1240 allow embedded nulls on Linux. */
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1241 if (PyUnicode_Check(args)) {
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1242 if ((args = PyUnicode_EncodeFSDefault(args)) == NULL)
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1243 return 0;
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1244 }
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1245 else
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1246 Py_INCREF(args);
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1247 if (!PyArg_Parse(args, "y#", &path, &len))
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1248 goto unix_out;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1249
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1250 addr = (struct sockaddr_un*)addr_ret;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1251 #ifdef linux
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1252 if (len > 0 && path[0] == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1253 /* Linux abstract namespace extension */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1254 if (len > sizeof addr->sun_path) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1255 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1256 "AF_UNIX path too long");
73998 1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1257 goto unix_out;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1258 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1259 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1260 else
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	1261 #endif /* linux */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1262 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1263 /* regular NULL-terminated string */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1264 if (len >= sizeof addr->sun_path) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1265 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1266 "AF_UNIX path too long");
73998 1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1267 goto unix_out;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1268 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1269 addr->sun_path[len] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1270 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1271 addr->sun_family = s->sock_family;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1272 memcpy(addr->sun_path, path, len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1273 *len_ret = len + offsetof(struct sockaddr_un, sun_path);
73998 1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1274 retval = 1;
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1275 unix_out:
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1276 Py_DECREF(args);
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1277 return retval;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1278 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1279 #endif /* AF_UNIX */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1280
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1281 #if defined(AF_NETLINK)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1282 case AF_NETLINK:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1283 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1284 struct sockaddr_nl* addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1285 int pid, groups;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1286 addr = (struct sockaddr_nl *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1287 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1288 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1289 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1290 "getsockaddrarg: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1291 "AF_NETLINK address must be tuple, not %.500s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1292 Py_TYPE(args)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1293 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1294 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1295 if (!PyArg_ParseTuple(args, "II:getsockaddrarg", &pid, &groups))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1296 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1297 addr->nl_family = AF_NETLINK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1298 addr->nl_pid = pid;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1299 addr->nl_groups = groups;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1300 len_ret = sizeof(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1301 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1302 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1303 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1304
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1305 #ifdef AF_RDS
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1306 case AF_RDS:
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1307 /* RDS sockets use sockaddr_in: fall-through */
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1308 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1309
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1310 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1311 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1312 struct sockaddr_in* addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1313 char *host;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1314 int port, result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1315 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1316 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1317 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1318 "getsockaddrarg: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1319 "AF_INET address must be tuple, not %.500s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1320 Py_TYPE(args)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1321 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1322 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1323 if (!PyArg_ParseTuple(args, "eti:getsockaddrarg",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1324 "idna", &host, &port))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1325 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1326 addr=(struct sockaddr_in*)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1327 result = setipaddr(host, (struct sockaddr *)addr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1328 sizeof(*addr), AF_INET);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1329 PyMem_Free(host);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1330 if (result < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1331 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1332 if (port < 0 \|\| port > 0xffff) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1333 PyErr_SetString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1334 PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1335 "getsockaddrarg: port must be 0-65535.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1336 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1337 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1338 addr->sin_family = AF_INET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1339 addr->sin_port = htons((short)port);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1340 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1341 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1342 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1343
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1344 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1345 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1346 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1347 struct sockaddr_in6* addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1348 char *host;
74233 cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	1349 int port, result;
cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	1350 unsigned int flowinfo, scope_id;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1351 flowinfo = scope_id = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1352 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1353 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1354 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1355 "getsockaddrarg: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1356 "AF_INET6 address must be tuple, not %.500s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1357 Py_TYPE(args)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1358 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1359 }
74233 cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	1360 if (!PyArg_ParseTuple(args, "eti\|II",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1361 "idna", &host, &port, &flowinfo,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1362 &scope_id)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1363 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1364 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1365 addr = (struct sockaddr_in6*)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1366 result = setipaddr(host, (struct sockaddr *)addr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1367 sizeof(*addr), AF_INET6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1368 PyMem_Free(host);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1369 if (result < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1370 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1371 if (port < 0 \|\| port > 0xffff) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1372 PyErr_SetString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1373 PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1374 "getsockaddrarg: port must be 0-65535.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1375 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1376 }
77612 55849442d7a9 Remove useless test (flowinfo is unsigned). Charles-François Natali <neologix@free.fr> parents: 74233 diff changeset	1377 if (flowinfo > 0xfffff) {
74233 cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	1378 PyErr_SetString(
cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	1379 PyExc_OverflowError,
cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	1380 "getsockaddrarg: flowinfo must be 0-1048575.");
cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	1381 return 0;
cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	1382 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1383 addr->sin6_family = s->sock_family;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1384 addr->sin6_port = htons((short)port);
74233 cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	1385 addr->sin6_flowinfo = htonl(flowinfo);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1386 addr->sin6_scope_id = scope_id;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1387 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1388 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1389 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1390 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1391
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1392 #ifdef USE_BLUETOOTH
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1393 case AF_BLUETOOTH:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1394 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1395 switch (s->sock_proto) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1396 case BTPROTO_L2CAP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1397 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1398 struct sockaddr_l2 *addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1399 char *straddr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1400
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1401 addr = (struct sockaddr_l2 *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1402 memset(addr, 0, sizeof(struct sockaddr_l2));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1403 _BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1404 if (!PyArg_ParseTuple(args, "si", &straddr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1405 &_BT_L2_MEMB(addr, psm))) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1406 PyErr_SetString(PyExc_OSError, "getsockaddrarg: "
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1407 "wrong format");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1408 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1409 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1410 if (setbdaddr(straddr, &_BT_L2_MEMB(addr, bdaddr)) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1411 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1412
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1413 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1414 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1415 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1416 case BTPROTO_RFCOMM:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1417 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1418 struct sockaddr_rc *addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1419 char *straddr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1420
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1421 addr = (struct sockaddr_rc *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1422 _BT_RC_MEMB(addr, family) = AF_BLUETOOTH;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1423 if (!PyArg_ParseTuple(args, "si", &straddr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1424 &_BT_RC_MEMB(addr, channel))) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1425 PyErr_SetString(PyExc_OSError, "getsockaddrarg: "
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1426 "wrong format");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1427 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1428 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1429 if (setbdaddr(straddr, &_BT_RC_MEMB(addr, bdaddr)) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1430 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1431
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1432 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1433 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1434 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1435 case BTPROTO_HCI:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1436 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1437 struct sockaddr_hci addr = (struct sockaddr_hci )addr_ret;
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1438 #if defined(__NetBSD__) \|\| defined(__DragonFly__)
66799 50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66663 diff changeset	1439 char *straddr = PyBytes_AS_STRING(args);
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66663 diff changeset	1440
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66663 diff changeset	1441 _BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1442 if (straddr == NULL) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1443 PyErr_SetString(PyExc_OSError, "getsockaddrarg: "
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1444 "wrong format");
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1445 return 0;
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1446 }
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1447 if (setbdaddr(straddr, &_BT_HCI_MEMB(addr, bdaddr)) < 0)
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1448 return 0;
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1449 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1450 _BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1451 if (!PyArg_ParseTuple(args, "i", &_BT_HCI_MEMB(addr, dev))) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1452 PyErr_SetString(PyExc_OSError, "getsockaddrarg: "
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1453 "wrong format");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1454 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1455 }
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1456 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1457 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1458 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1459 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1460 #if !defined(__FreeBSD__)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1461 case BTPROTO_SCO:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1462 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1463 struct sockaddr_sco *addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1464 char *straddr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1465
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1466 addr = (struct sockaddr_sco *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1467 _BT_SCO_MEMB(addr, family) = AF_BLUETOOTH;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1468 if (!PyBytes_Check(args)) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1469 PyErr_SetString(PyExc_OSError, "getsockaddrarg: "
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1470 "wrong format");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1471 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1472 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1473 straddr = PyBytes_AS_STRING(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1474 if (setbdaddr(straddr, &_BT_SCO_MEMB(addr, bdaddr)) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1475 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1476
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1477 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1478 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1479 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1480 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1481 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1482 PyErr_SetString(PyExc_OSError, "getsockaddrarg: unknown Bluetooth protocol");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1483 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1484 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1485 }
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1486 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1487
65668 add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	1488 #if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFINDEX)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1489 case AF_PACKET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1490 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1491 struct sockaddr_ll* addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1492 struct ifreq ifr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1493 char *interfaceName;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1494 int protoNumber;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1495 int hatype = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1496 int pkttype = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1497 char *haddr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1498 unsigned int halen = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1499
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1500 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1501 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1502 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1503 "getsockaddrarg: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1504 "AF_PACKET address must be tuple, not %.500s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1505 Py_TYPE(args)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1506 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1507 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1508 if (!PyArg_ParseTuple(args, "si\|iiy#", &interfaceName,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1509 &protoNumber, &pkttype, &hatype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1510 &haddr, &halen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1511 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1512 strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1513 ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1514 if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1515 s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1516 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1517 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1518 if (halen > 8) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1519 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1520 "Hardware address must be 8 bytes or less");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1521 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1522 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1523 if (protoNumber < 0 \|\| protoNumber > 0xffff) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1524 PyErr_SetString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1525 PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1526 "getsockaddrarg: protoNumber must be 0-65535.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1527 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1528 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1529 addr = (struct sockaddr_ll*)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1530 addr->sll_family = AF_PACKET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1531 addr->sll_protocol = htons((short)protoNumber);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1532 addr->sll_ifindex = ifr.ifr_ifindex;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1533 addr->sll_pkttype = pkttype;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1534 addr->sll_hatype = hatype;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1535 if (halen != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1536 memcpy(&addr->sll_addr, haddr, halen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1537 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1538 addr->sll_halen = halen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1539 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1540 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1541 }
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1542 #endif
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1543
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	1544 #ifdef HAVE_LINUX_TIPC_H
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1545 case AF_TIPC:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1546 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1547 unsigned int atype, v1, v2, v3;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1548 unsigned int scope = TIPC_CLUSTER_SCOPE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1549 struct sockaddr_tipc *addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1550
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1551 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1552 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1553 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1554 "getsockaddrarg: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1555 "AF_TIPC address must be tuple, not %.500s",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1556 Py_TYPE(args)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1557 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1558 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1559
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1560 if (!PyArg_ParseTuple(args,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1561 "IIII\|I;Invalid TIPC address format",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1562 &atype, &v1, &v2, &v3, &scope))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1563 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1564
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1565 addr = (struct sockaddr_tipc *) addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1566 memset(addr, 0, sizeof(struct sockaddr_tipc));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1567
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1568 addr->family = AF_TIPC;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1569 addr->scope = scope;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1570 addr->addrtype = atype;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1571
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1572 if (atype == TIPC_ADDR_NAMESEQ) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1573 addr->addr.nameseq.type = v1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1574 addr->addr.nameseq.lower = v2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1575 addr->addr.nameseq.upper = v3;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1576 } else if (atype == TIPC_ADDR_NAME) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1577 addr->addr.name.name.type = v1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1578 addr->addr.name.name.instance = v2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1579 } else if (atype == TIPC_ADDR_ID) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1580 addr->addr.id.node = v1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1581 addr->addr.id.ref = v2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1582 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1583 /* Shouldn't happen */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1584 PyErr_SetString(PyExc_TypeError, "Invalid address type");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1585 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1586 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1587
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1588 len_ret = sizeof(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1589
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1590 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1591 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1592 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1593
72807 d4ce850b06b7 Issue #10141: fix socketmodule compilation on Linux systems with <linux/can.h> Charles-François Natali <neologix@free.fr> parents: 72758 diff changeset	1594 #ifdef AF_CAN
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1595 case AF_CAN:
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1596 switch (s->sock_proto) {
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1597 case CAN_RAW:
82024 f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	1598 /* fall-through */
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	1599 case CAN_BCM:
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1600 {
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1601 struct sockaddr_can *addr;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1602 PyObject *interfaceName;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1603 struct ifreq ifr;
83794 e2e104ba42ff C89 declaration compliance Benjamin Peterson <benjamin@python.org> parents: 82621 diff changeset	1604 Py_ssize_t len;
e2e104ba42ff C89 declaration compliance Benjamin Peterson <benjamin@python.org> parents: 82621 diff changeset	1605
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1606 addr = (struct sockaddr_can *)addr_ret;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1607
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1608 if (!PyArg_ParseTuple(args, "O&", PyUnicode_FSConverter,
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1609 &interfaceName))
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1610 return 0;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1611
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1612 len = PyBytes_GET_SIZE(interfaceName);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1613
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1614 if (len == 0) {
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1615 ifr.ifr_ifindex = 0;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1616 } else if (len < sizeof(ifr.ifr_name)) {
78932 80909b23ca1e Make sure that really no more than sizeof(ifr.ifr_name) chars are strcpy-ed to ifr.ifr_name and that the string is always NUL terminated. New code shouldn't use strcpy(), too. CID 719692 Christian Heimes <christian@cheimes.de> parents: 78570 diff changeset	1617 strncpy(ifr.ifr_name, PyBytes_AS_STRING(interfaceName), sizeof(ifr.ifr_name));
80909b23ca1e Make sure that really no more than sizeof(ifr.ifr_name) chars are strcpy-ed to ifr.ifr_name and that the string is always NUL terminated. New code shouldn't use strcpy(), too. CID 719692 Christian Heimes <christian@cheimes.de> parents: 78570 diff changeset	1618 ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1619 if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1620 s->errorhandler();
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1621 Py_DECREF(interfaceName);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1622 return 0;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1623 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1624 } else {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1625 PyErr_SetString(PyExc_OSError,
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1626 "AF_CAN interface name too long");
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1627 Py_DECREF(interfaceName);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1628 return 0;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1629 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1630
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1631 addr->can_family = AF_CAN;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1632 addr->can_ifindex = ifr.ifr_ifindex;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1633
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1634 len_ret = sizeof(addr);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1635 Py_DECREF(interfaceName);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1636 return 1;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1637 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1638 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1639 PyErr_SetString(PyExc_OSError,
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1640 "getsockaddrarg: unsupported CAN protocol");
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1641 return 0;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1642 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1643 #endif
84019 ffdee6b36305 Close #18109: os.uname() now decodes fields from the locale encoding, and Victor Stinner <victor.stinner@gmail.com> parents: 83907 diff changeset	1644
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1645 #ifdef PF_SYSTEM
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1646 case PF_SYSTEM:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1647 switch (s->sock_proto) {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1648 #ifdef SYSPROTO_CONTROL
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1649 case SYSPROTO_CONTROL:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1650 {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1651 struct sockaddr_ctl *addr;
84019 ffdee6b36305 Close #18109: os.uname() now decodes fields from the locale encoding, and Victor Stinner <victor.stinner@gmail.com> parents: 83907 diff changeset	1652
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1653 addr = (struct sockaddr_ctl *)addr_ret;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1654 addr->sc_family = AF_SYSTEM;
84019 ffdee6b36305 Close #18109: os.uname() now decodes fields from the locale encoding, and Victor Stinner <victor.stinner@gmail.com> parents: 83907 diff changeset	1655 addr->ss_sysaddr = AF_SYS_CONTROL;
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1656
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1657 if (PyUnicode_Check(args)) {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1658 struct ctl_info info;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1659 PyObject *ctl_name;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1660
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1661 if (!PyArg_Parse(args, "O&",
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1662 PyUnicode_FSConverter, &ctl_name)) {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1663 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1664 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1665
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1666 if (PyBytes_GET_SIZE(ctl_name) > sizeof(info.ctl_name)) {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1667 PyErr_SetString(PyExc_ValueError,
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1668 "provided string is too long");
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1669 Py_DECREF(ctl_name);
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1670 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1671 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1672 strncpy(info.ctl_name, PyBytes_AS_STRING(ctl_name),
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1673 sizeof(info.ctl_name));
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1674 Py_DECREF(ctl_name);
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1675
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1676 if (ioctl(s->sock_fd, CTLIOCGINFO, &info)) {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1677 PyErr_SetString(PyExc_OSError,
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1678 "cannot find kernel control with provided name");
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1679 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1680 }
84019 ffdee6b36305 Close #18109: os.uname() now decodes fields from the locale encoding, and Victor Stinner <victor.stinner@gmail.com> parents: 83907 diff changeset	1681
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1682 addr->sc_id = info.ctl_id;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1683 addr->sc_unit = 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1684 } else if (!PyArg_ParseTuple(args, "II",
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1685 &(addr->sc_id), &(addr->sc_unit))) {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1686 PyErr_SetString(PyExc_TypeError, "getsockaddrarg: "
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1687 "expected str or tuple of two ints");
84019 ffdee6b36305 Close #18109: os.uname() now decodes fields from the locale encoding, and Victor Stinner <victor.stinner@gmail.com> parents: 83907 diff changeset	1688
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1689 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1690 }
84019 ffdee6b36305 Close #18109: os.uname() now decodes fields from the locale encoding, and Victor Stinner <victor.stinner@gmail.com> parents: 83907 diff changeset	1691
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1692 len_ret = sizeof(addr);
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1693 return 1;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1694 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1695 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1696 default:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1697 PyErr_SetString(PyExc_OSError,
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1698 "getsockaddrarg: unsupported PF_SYSTEM protocol");
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1699 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1700 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1701 #endif
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1702
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1703 /* More cases here... */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1704
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1705 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1706 PyErr_SetString(PyExc_OSError, "getsockaddrarg: bad family");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1707 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1708
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1709 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1710 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1711
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1712
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1713 /* Get the address length according to the socket object's address family.
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1714 Return 1 if the family is known, 0 otherwise. The length is returned
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1715 through len_ret. */
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1716
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1717 static int
13554 906efc1da247 Errare humanum est. Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13538 diff changeset	1718 getsockaddrlen(PySocketSockObject s, socklen_t len_ret)
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1719 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1720 switch (s->sock_family) {
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1721
31867 51aaceeaabe1 OS/2's TCP/IP stack supports AF_UNIX sockets, with the limitation that Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 31790 diff changeset	1722 #if defined(AF_UNIX)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1723 case AF_UNIX:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1724 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1725 *len_ret = sizeof (struct sockaddr_un);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1726 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1727 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1728 #endif /* AF_UNIX */
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1729 #if defined(AF_NETLINK)
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1730 case AF_NETLINK:
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1731 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1732 *len_ret = sizeof (struct sockaddr_nl);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1733 return 1;
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1734 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1735 #endif
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1736
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1737 #ifdef AF_RDS
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1738 case AF_RDS:
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1739 /* RDS sockets use sockaddr_in: fall-through */
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1740 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1741
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1742 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1743 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1744 *len_ret = sizeof (struct sockaddr_in);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1745 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1746 }
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1747
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1748 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1749 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1750 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1751 *len_ret = sizeof (struct sockaddr_in6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1752 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1753 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1754 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1755
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1756 #ifdef USE_BLUETOOTH
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1757 case AF_BLUETOOTH:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1758 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1759 switch(s->sock_proto)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1760 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1761
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1762 case BTPROTO_L2CAP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1763 *len_ret = sizeof (struct sockaddr_l2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1764 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1765 case BTPROTO_RFCOMM:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1766 *len_ret = sizeof (struct sockaddr_rc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1767 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1768 case BTPROTO_HCI:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1769 *len_ret = sizeof (struct sockaddr_hci);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1770 return 1;
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1771 #if !defined(__FreeBSD__)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1772 case BTPROTO_SCO:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1773 *len_ret = sizeof (struct sockaddr_sco);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1774 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1775 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1776 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1777 PyErr_SetString(PyExc_OSError, "getsockaddrlen: "
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1778 "unknown BT protocol");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1779 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1780
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1781 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1782 }
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1783 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1784
19151 cd44254360b6 Autotest for netpacket/packet.h, as it is not available on all Linux versions. Martin v. Löwis <martin@v.loewis.de> parents: 18997 diff changeset	1785 #ifdef HAVE_NETPACKET_PACKET_H
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1786 case AF_PACKET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1787 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1788 *len_ret = sizeof (struct sockaddr_ll);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1789 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1790 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1791 #endif
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1792
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	1793 #ifdef HAVE_LINUX_TIPC_H
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1794 case AF_TIPC:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1795 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1796 *len_ret = sizeof (struct sockaddr_tipc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1797 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1798 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1799 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1800
72807 d4ce850b06b7 Issue #10141: fix socketmodule compilation on Linux systems with <linux/can.h> Charles-François Natali <neologix@free.fr> parents: 72758 diff changeset	1801 #ifdef AF_CAN
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1802 case AF_CAN:
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1803 {
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1804 *len_ret = sizeof (struct sockaddr_can);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1805 return 1;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1806 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1807 #endif
84019 ffdee6b36305 Close #18109: os.uname() now decodes fields from the locale encoding, and Victor Stinner <victor.stinner@gmail.com> parents: 83907 diff changeset	1808
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1809 #ifdef PF_SYSTEM
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1810 case PF_SYSTEM:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1811 switch(s->sock_proto) {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1812 #ifdef SYSPROTO_CONTROL
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1813 case SYSPROTO_CONTROL:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1814 *len_ret = sizeof (struct sockaddr_ctl);
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1815 return 1;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1816 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1817 default:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1818 PyErr_SetString(PyExc_OSError, "getsockaddrlen: "
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1819 "unknown PF_SYSTEM protocol");
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1820 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1821 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1822 #endif
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1823
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1824 /* More cases here... */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1825
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1826 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1827 PyErr_SetString(PyExc_OSError, "getsockaddrlen: bad family");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1828 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1829
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1830 }
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1831 }
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1832
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1833
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1834 /* Support functions for the sendmsg() and recvmsg[_into]() methods.
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1835 Currently, these methods are only compiled if the RFC 2292/3542
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1836 CMSG_LEN() macro is available. Older systems seem to have used
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1837 sizeof(struct cmsghdr) + (length) where CMSG_LEN() is used now, so
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1838 it may be possible to define CMSG_LEN() that way if it's not
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1839 provided. Some architectures might need extra padding after the
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1840 cmsghdr, however, and CMSG_LEN() would have to take account of
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1841 this. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1842 #ifdef CMSG_LEN
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1843 /* If length is in range, set *result to CMSG_LEN(length) and return
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1844 true; otherwise, return false. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1845 static int
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1846 get_CMSG_LEN(size_t length, size_t *result)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1847 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1848 size_t tmp;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1849
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1850 if (length > (SOCKLEN_T_LIMIT - CMSG_LEN(0)))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1851 return 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1852 tmp = CMSG_LEN(length);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1853 if (tmp > SOCKLEN_T_LIMIT \|\| tmp < length)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1854 return 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1855 *result = tmp;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1856 return 1;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1857 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1858
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1859 #ifdef CMSG_SPACE
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1860 /* If length is in range, set *result to CMSG_SPACE(length) and return
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1861 true; otherwise, return false. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1862 static int
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1863 get_CMSG_SPACE(size_t length, size_t *result)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1864 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1865 size_t tmp;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1866
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1867 /* Use CMSG_SPACE(1) here in order to take account of the padding
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1868 necessary before and after the data. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1869 if (length > (SOCKLEN_T_LIMIT - CMSG_SPACE(1)))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1870 return 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1871 tmp = CMSG_SPACE(length);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1872 if (tmp > SOCKLEN_T_LIMIT \|\| tmp < length)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1873 return 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1874 *result = tmp;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1875 return 1;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1876 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1877 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1878
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1879 /* Return true iff msg->msg_controllen is valid, cmsgh is a valid
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1880 pointer in msg->msg_control with at least "space" bytes after it,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1881 and its cmsg_len member inside the buffer. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1882 static int
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1883 cmsg_min_space(struct msghdr msg, struct cmsghdr cmsgh, size_t space)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1884 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1885 size_t cmsg_offset;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1886 static const size_t cmsg_len_end = (offsetof(struct cmsghdr, cmsg_len) +
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1887 sizeof(cmsgh->cmsg_len));
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1888
72117 3ed2d087e70d Issue #12837: POSIX.1-2008 allows socklen_t to be a signed integer: re-enable Charles-François Natali <neologix@free.fr> parents: 72116 diff changeset	1889 /* Note that POSIX allows msg_controllen to be of signed type. */
3ed2d087e70d Issue #12837: POSIX.1-2008 allows socklen_t to be a signed integer: re-enable Charles-François Natali <neologix@free.fr> parents: 72116 diff changeset	1890 if (cmsgh == NULL \|\| msg->msg_control == NULL \|\| msg->msg_controllen < 0)
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1891 return 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1892 if (space < cmsg_len_end)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1893 space = cmsg_len_end;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1894 cmsg_offset = (char )cmsgh - (char )msg->msg_control;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1895 return (cmsg_offset <= (size_t)-1 - space &&
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1896 cmsg_offset + space <= msg->msg_controllen);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1897 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1898
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1899 /* If pointer CMSG_DATA(cmsgh) is in buffer msg->msg_control, set
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1900 *space to number of bytes following it in the buffer and return
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1901 true; otherwise, return false. Assumes cmsgh, msg->msg_control and
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1902 msg->msg_controllen are valid. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1903 static int
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1904 get_cmsg_data_space(struct msghdr msg, struct cmsghdr cmsgh, size_t *space)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1905 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1906 size_t data_offset;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1907 char *data_ptr;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1908
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1909 if ((data_ptr = (char *)CMSG_DATA(cmsgh)) == NULL)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1910 return 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1911 data_offset = data_ptr - (char *)msg->msg_control;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1912 if (data_offset > msg->msg_controllen)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1913 return 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1914 *space = msg->msg_controllen - data_offset;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1915 return 1;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1916 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1917
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1918 /* If cmsgh is invalid or not contained in the buffer pointed to by
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1919 msg->msg_control, return -1. If cmsgh is valid and its associated
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1920 data is entirely contained in the buffer, set *data_len to the
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1921 length of the associated data and return 0. If only part of the
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1922 associated data is contained in the buffer but cmsgh is otherwise
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1923 valid, set *data_len to the length contained in the buffer and
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1924 return 1. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1925 static int
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1926 get_cmsg_data_len(struct msghdr msg, struct cmsghdr cmsgh, size_t *data_len)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1927 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1928 size_t space, cmsg_data_len;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1929
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1930 if (!cmsg_min_space(msg, cmsgh, CMSG_LEN(0)) \|\|
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1931 cmsgh->cmsg_len < CMSG_LEN(0))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1932 return -1;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1933 cmsg_data_len = cmsgh->cmsg_len - CMSG_LEN(0);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1934 if (!get_cmsg_data_space(msg, cmsgh, &space))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1935 return -1;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1936 if (space >= cmsg_data_len) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1937 *data_len = cmsg_data_len;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1938 return 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1939 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1940 *data_len = space;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1941 return 1;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1942 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1943 #endif /* CMSG_LEN */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1944
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1945
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	1946 /* s._accept() -> (fd, address) */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1947
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1948 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	1949 sock_accept(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1950 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1951 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1952 SOCKET_T newfd = INVALID_SOCKET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1953 socklen_t addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1954 PyObject *sock = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1955 PyObject *addr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1956 PyObject *res = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1957 int timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1958 if (!getsockaddrlen(s, &addrlen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1959 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1960 memset(&addrbuf, 0, addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1961
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1962 if (!IS_SELECTABLE(s))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1963 return select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1964
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	1965 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1966 Py_BEGIN_ALLOW_THREADS
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	1967 timeout = internal_select_ex(s, 0, interval);
65314 12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	1968 if (!timeout) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1969 newfd = accept(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
65314 12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	1970 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1971 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1972
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1973 if (timeout == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1974 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1975 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1976 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	1977 END_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1978
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1979 if (newfd == INVALID_SOCKET)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1980 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1981
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1982 sock = PyLong_FromSocket_t(newfd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1983 if (sock == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1984 SOCKETCLOSE(newfd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1985 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1986 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1987
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1988 addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1989 addrlen, s->sock_proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1990 if (addr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1991 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1992
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1993 res = PyTuple_Pack(2, sock, addr);
4871 a7159ba0e45d Check of return values and proper error handling. Barry Warsaw <barry@python.org> parents: 4783 diff changeset	1994
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1995 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1996 Py_XDECREF(sock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1997 Py_XDECREF(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1998 return res;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1999 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2000
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2001 PyDoc_STRVAR(accept_doc,
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	2002 "_accept() -> (integer, address info)\n\
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2003 \n\
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	2004 Wait for an incoming connection. Return a new socket file descriptor\n\
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	2005 representing the connection, and the address of the client.\n\
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	2006 For IP sockets, the address info is a pair (hostaddr, port).");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2007
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2008 /* s.setblocking(flag) method. Argument:
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2009 False -- non-blocking mode; same as settimeout(0)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2010 True -- blocking mode; same as settimeout(None)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2011 */
1867 758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	2012
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2013 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2014 sock_setblocking(PySocketSockObject s, PyObject arg)
1867 758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	2015 {
81587 974ace29ee2d Issue #15989: Fix several occurrences of integer overflow Serhiy Storchaka <storchaka@gmail.com> parents: 78569 diff changeset	2016 long block;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2017
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2018 block = PyLong_AsLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2019 if (block == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2020 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2021
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2022 s->sock_timeout = block ? -1.0 : 0.0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2023 internal_setblocking(s, block);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2024
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2025 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2026 return Py_None;
1867 758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	2027 }
758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	2028
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2029 PyDoc_STRVAR(setblocking_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2030 "setblocking(flag)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2031 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2032 Set the socket to blocking (flag is true) or non-blocking (false).\n\
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2033 setblocking(True) is equivalent to settimeout(None);\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2034 setblocking(False) is equivalent to settimeout(0.0).");
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2035
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2036 /* s.settimeout(timeout) method. Argument:
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2037 None -- no timeout, blocking mode; same as setblocking(True)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2038 0.0 -- non-blocking mode; same as setblocking(False)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2039 > 0 -- timeout mode; operations time out after timeout seconds
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2040 < 0 -- illegal; raises an exception
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2041 */
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2042 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2043 sock_settimeout(PySocketSockObject s, PyObject arg)
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2044 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2045 double timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2046
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2047 if (arg == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2048 timeout = -1.0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2049 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2050 timeout = PyFloat_AsDouble(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2051 if (timeout < 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2052 if (!PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2053 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2054 "Timeout value out of range");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2055 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2056 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2057 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2058
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2059 s->sock_timeout = timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2060 internal_setblocking(s, timeout < 0.0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2061
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2062 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2063 return Py_None;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2064 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2065
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2066 PyDoc_STRVAR(settimeout_doc,
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2067 "settimeout(timeout)\n\
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2068 \n\
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2069 Set a timeout on socket operations. 'timeout' can be a float,\n\
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2070 giving in seconds, or None. Setting a timeout of None disables\n\
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2071 the timeout feature and is equivalent to setblocking(1).\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2072 Setting a timeout of zero is the same as setblocking(0).");
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2073
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2074 /* s.gettimeout() method.
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2075 Returns the timeout associated with a socket. */
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2076 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2077 sock_gettimeout(PySocketSockObject *s)
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2078 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2079 if (s->sock_timeout < 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2080 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2081 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2082 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2083 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2084 return PyFloat_FromDouble(s->sock_timeout);
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2085 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2086
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2087 PyDoc_STRVAR(gettimeout_doc,
24676 980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	2088 "gettimeout() -> timeout\n\
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2089 \n\
71864 ab3432a81c26 #12725: fix working. Patch by Ben Hayden. Ezio Melotti <ezio.melotti@gmail.com> parents: 70012 diff changeset	2090 Returns the timeout in seconds (float) associated with socket \n\
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2091 operations. A timeout of None indicates that timeouts on socket \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2092 operations are disabled.");
1867 758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	2093
1039 6aa0ee14ac2e Made struct a standard built-in module; added string args to {set,get}sockopt; Guido van Rossum <guido@python.org> parents: 926 diff changeset	2094 /* s.setsockopt() method.
6aa0ee14ac2e Made struct a standard built-in module; added string args to {set,get}sockopt; Guido van Rossum <guido@python.org> parents: 926 diff changeset	2095 With an integer third argument, sets an integer option.
6aa0ee14ac2e Made struct a standard built-in module; added string args to {set,get}sockopt; Guido van Rossum <guido@python.org> parents: 926 diff changeset	2096 With a string third argument, sets an option from a buffer;
6aa0ee14ac2e Made struct a standard built-in module; added string args to {set,get}sockopt; Guido van Rossum <guido@python.org> parents: 926 diff changeset	2097 use optional built-in module 'struct' to encode the string. */
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2098
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2099 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2100 sock_setsockopt(PySocketSockObject s, PyObject args)
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2101 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2102 int level;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2103 int optname;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2104 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2105 char *buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2106 int buflen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2107 int flag;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2108
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2109 if (PyArg_ParseTuple(args, "iii:setsockopt",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2110 &level, &optname, &flag)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2111 buf = (char *) &flag;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2112 buflen = sizeof flag;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2113 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2114 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2115 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2116 if (!PyArg_ParseTuple(args, "iiy#:setsockopt",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2117 &level, &optname, &buf, &buflen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2118 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2119 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2120 res = setsockopt(s->sock_fd, level, optname, (void *)buf, buflen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2121 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2122 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2123 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2124 return Py_None;
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2125 }
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2126
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2127 PyDoc_STRVAR(setsockopt_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2128 "setsockopt(level, option, value)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2129 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2130 Set a socket option. See the Unix manual for level and option.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2131 The value argument can either be an integer or a string.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2132
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2133
1039 6aa0ee14ac2e Made struct a standard built-in module; added string args to {set,get}sockopt; Guido van Rossum <guido@python.org> parents: 926 diff changeset	2134 /* s.getsockopt() method.
6aa0ee14ac2e Made struct a standard built-in module; added string args to {set,get}sockopt; Guido van Rossum <guido@python.org> parents: 926 diff changeset	2135 With two arguments, retrieves an integer option.
6aa0ee14ac2e Made struct a standard built-in module; added string args to {set,get}sockopt; Guido van Rossum <guido@python.org> parents: 926 diff changeset	2136 With a third integer argument, retrieves a string buffer of that size;
6aa0ee14ac2e Made struct a standard built-in module; added string args to {set,get}sockopt; Guido van Rossum <guido@python.org> parents: 926 diff changeset	2137 use optional built-in module 'struct' to decode the string. */
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2138
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2139 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2140 sock_getsockopt(PySocketSockObject s, PyObject args)
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2141 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2142 int level;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2143 int optname;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2144 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2145 PyObject *buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2146 socklen_t buflen = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2147
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2148 if (!PyArg_ParseTuple(args, "ii\|i:getsockopt",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2149 &level, &optname, &buflen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2150 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2151
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2152 if (buflen == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2153 int flag = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2154 socklen_t flagsize = sizeof flag;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2155 res = getsockopt(s->sock_fd, level, optname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2156 (void *)&flag, &flagsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2157 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2158 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2159 return PyLong_FromLong(flag);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2160 }
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	2161 #ifdef __VMS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2162 /* socklen_t is unsigned so no negative test is needed,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2163 test buflen == 0 is previously done */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2164 if (buflen > 1024) {
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	2165 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2166 if (buflen <= 0 \|\| buflen > 1024) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2167 #endif
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	2168 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2169 "getsockopt buflen out of range");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2170 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2171 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2172 buf = PyBytes_FromStringAndSize((char *)NULL, buflen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2173 if (buf == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2174 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2175 res = getsockopt(s->sock_fd, level, optname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2176 (void *)PyBytes_AS_STRING(buf), &buflen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2177 if (res < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2178 Py_DECREF(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2179 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2180 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2181 _PyBytes_Resize(&buf, buflen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2182 return buf;
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2183 }
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2184
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2185 PyDoc_STRVAR(getsockopt_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2186 "getsockopt(level, option[, buffersize]) -> value\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2187 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2188 Get a socket option. See the Unix manual for level and option.\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2189 If a nonzero buffersize argument is given, the return value is a\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2190 string of that length; otherwise it is an integer.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2191
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2192
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	2193 /* s.bind(sockaddr) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2194
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2195 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2196 sock_bind(PySocketSockObject s, PyObject addro)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2197 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2198 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2199 int addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2200 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2201
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2202 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2203 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2204 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2205 res = bind(s->sock_fd, SAS2SA(&addrbuf), addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2206 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2207 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2208 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2209 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2210 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2211 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2212
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2213 PyDoc_STRVAR(bind_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2214 "bind(address)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2215 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2216 Bind the socket to a local address. For IP sockets, the address is a\n\
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	2217 pair (host, port); the host must refer to the local host. For raw packet\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2218 sockets the address is a tuple (ifname, proto [,pkttype [,hatype]])");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2219
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2220
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2221 /* s.close() method.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2222 Set the file descriptor to -1 so operations tried subsequently
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2223 will surely fail. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2224
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2225 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2226 sock_close(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2227 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2228 SOCKET_T fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2229
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2230 if ((fd = s->sock_fd) != -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2231 s->sock_fd = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2232 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2233 (void) SOCKETCLOSE(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2234 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2235 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2236 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2237 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2238 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2239
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2240 PyDoc_STRVAR(close_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2241 "close()\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2242 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2243 Close the socket. It cannot be used after this call.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2244
63856 3f8cef837f07 Issue #8524: Add a forget() method to socket objects, so as to put the Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	2245 static PyObject *
63890 60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	2246 sock_detach(PySocketSockObject *s)
63856 3f8cef837f07 Issue #8524: Add a forget() method to socket objects, so as to put the Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	2247 {
63890 60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	2248 SOCKET_T fd = s->sock_fd;
63856 3f8cef837f07 Issue #8524: Add a forget() method to socket objects, so as to put the Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	2249 s->sock_fd = -1;
63890 60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	2250 return PyLong_FromSocket_t(fd);
63856 3f8cef837f07 Issue #8524: Add a forget() method to socket objects, so as to put the Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	2251 }
3f8cef837f07 Issue #8524: Add a forget() method to socket objects, so as to put the Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	2252
63890 60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	2253 PyDoc_STRVAR(detach_doc,
60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	2254 "detach()\n\
63856 3f8cef837f07 Issue #8524: Add a forget() method to socket objects, so as to put the Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	2255 \n\
3f8cef837f07 Issue #8524: Add a forget() method to socket objects, so as to put the Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	2256 Close the socket object without closing the underlying file descriptor.\
3f8cef837f07 Issue #8524: Add a forget() method to socket objects, so as to put the Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	2257 The object cannot be used after this call, but the file descriptor\
63890 60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	2258 can be reused for other purposes. The file descriptor is returned.");
63856 3f8cef837f07 Issue #8524: Add a forget() method to socket objects, so as to put the Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	2259
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2260 static int
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2261 internal_connect(PySocketSockObject s, struct sockaddr addr, int addrlen,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2262 int *timeoutp)
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2263 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2264 int res, timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2265
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2266 timeout = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2267 res = connect(s->sock_fd, addr, addrlen);
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2268
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2269 #ifdef MS_WINDOWS
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2270
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2271 if (s->sock_timeout > 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2272 if (res < 0 && WSAGetLastError() == WSAEWOULDBLOCK &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2273 IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2274 /* This is a mess. Best solution: trust select */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2275 fd_set fds;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2276 fd_set fds_exc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2277 struct timeval tv;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2278 tv.tv_sec = (int)s->sock_timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2279 tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2280 FD_ZERO(&fds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2281 FD_SET(s->sock_fd, &fds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2282 FD_ZERO(&fds_exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2283 FD_SET(s->sock_fd, &fds_exc);
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2284 res = select(Py_SAFE_DOWNCAST(s->sock_fd+1, SOCKET_T, int),
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2285 NULL, &fds, &fds_exc, &tv);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2286 if (res == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2287 res = WSAEWOULDBLOCK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2288 timeout = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2289 } else if (res > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2290 if (FD_ISSET(s->sock_fd, &fds))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2291 /* The socket is in the writable set - this
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2292 means connected */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2293 res = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2294 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2295 /* As per MS docs, we need to call getsockopt()
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2296 to get the underlying error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2297 int res_size = sizeof res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2298 /* It must be in the exception set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2299 assert(FD_ISSET(s->sock_fd, &fds_exc));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2300 if (0 == getsockopt(s->sock_fd, SOL_SOCKET, SO_ERROR,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2301 (char *)&res, &res_size))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2302 /* getsockopt also clears WSAGetLastError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2303 so reset it back. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2304 WSASetLastError(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2305 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2306 res = WSAGetLastError();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2307 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2308 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2309 /* else if (res < 0) an error occurred */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2310 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2311 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2312
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2313 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2314 res = WSAGetLastError();
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2315
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2316 #else
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2317
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2318 if (s->sock_timeout > 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2319 if (res < 0 && errno == EINPROGRESS && IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2320 timeout = internal_select(s, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2321 if (timeout == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2322 /* Bug #1019808: in case of an EINPROGRESS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2323 use getsockopt(SO_ERROR) to get the real
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2324 error. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2325 socklen_t res_size = sizeof res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2326 (void)getsockopt(s->sock_fd, SOL_SOCKET,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2327 SO_ERROR, &res, &res_size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2328 if (res == EISCONN)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2329 res = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2330 errno = res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2331 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2332 else if (timeout == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2333 res = errno; /* had error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2334 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2335 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2336 res = EWOULDBLOCK; /* timed out */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2337 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2338 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2339
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2340 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2341 res = errno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2342
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2343 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2344 *timeoutp = timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2345
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2346 return res;
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2347 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2348
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	2349 /* s.connect(sockaddr) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2350
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2351 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2352 sock_connect(PySocketSockObject s, PyObject addro)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2353 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2354 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2355 int addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2356 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2357 int timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2358
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2359 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2360 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2361
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2362 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2363 res = internal_connect(s, SAS2SA(&addrbuf), addrlen, &timeout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2364 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2365
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2366 if (timeout == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2367 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2368 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2369 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2370 if (res != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2371 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2372 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2373 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2374 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2375
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2376 PyDoc_STRVAR(connect_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2377 "connect(address)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2378 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2379 Connect the socket to a remote address. For IP sockets, the address\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2380 is a pair (host, port).");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2381
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2382
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	2383 /* s.connect_ex(sockaddr) method */
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2384
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2385 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2386 sock_connect_ex(PySocketSockObject s, PyObject addro)
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2387 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2388 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2389 int addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2390 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2391 int timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2392
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2393 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2394 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2395
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2396 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2397 res = internal_connect(s, SAS2SA(&addrbuf), addrlen, &timeout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2398 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2399
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2400 /* Signals are not errors (though they may raise exceptions). Adapted
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2401 from PyErr_SetFromErrnoWithFilenameObject(). */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2402 #ifdef EINTR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2403 if (res == EINTR && PyErr_CheckSignals())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2404 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2405 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2406
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2407 return PyLong_FromLong((long) res);
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2408 }
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2409
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2410 PyDoc_STRVAR(connect_ex_doc,
24676 980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	2411 "connect_ex(address) -> errno\n\
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2412 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2413 This is like connect(address), but returns an error code (the errno value)\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2414 instead of raising an exception when an error occurs.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2415
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2416
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: 900 diff changeset	2417 /* s.fileno() method */
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: 900 diff changeset	2418
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2419 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2420 sock_fileno(PySocketSockObject *s)
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: 900 diff changeset	2421 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2422 return PyLong_FromSocket_t(s->sock_fd);
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: 900 diff changeset	2423 }
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: 900 diff changeset	2424
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2425 PyDoc_STRVAR(fileno_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2426 "fileno() -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2427 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2428 Return the integer file descriptor of the socket.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2429
902 a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: 900 diff changeset	2430
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2431 /* s.getsockname() method */
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2432
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2433 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2434 sock_getsockname(PySocketSockObject *s)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2435 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2436 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2437 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2438 socklen_t addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2439
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2440 if (!getsockaddrlen(s, &addrlen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2441 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2442 memset(&addrbuf, 0, addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2443 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2444 res = getsockname(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2445 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2446 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2447 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2448 return makesockaddr(s->sock_fd, SAS2SA(&addrbuf), addrlen,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2449 s->sock_proto);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2450 }
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2451
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2452 PyDoc_STRVAR(getsockname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2453 "getsockname() -> address info\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2454 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2455 Return the address of the local endpoint. For IP sockets, the address\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2456 info is a pair (hostaddr, port).");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2457
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2458
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2459 #ifdef HAVE_GETPEERNAME /* Cray APP doesn't have this :-( */
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2460 /* s.getpeername() method */
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2461
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2462 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2463 sock_getpeername(PySocketSockObject *s)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2464 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2465 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2466 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2467 socklen_t addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2468
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2469 if (!getsockaddrlen(s, &addrlen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2470 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2471 memset(&addrbuf, 0, addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2472 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2473 res = getpeername(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2474 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2475 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2476 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2477 return makesockaddr(s->sock_fd, SAS2SA(&addrbuf), addrlen,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2478 s->sock_proto);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2479 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2480
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2481 PyDoc_STRVAR(getpeername_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2482 "getpeername() -> address info\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2483 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2484 Return the address of the remote endpoint. For IP sockets, the address\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2485 info is a pair (hostaddr, port).");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2486
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2487 #endif /* HAVE_GETPEERNAME */
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2488
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2489
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2490 /* s.listen(n) method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2491
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2492 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2493 sock_listen(PySocketSockObject s, PyObject arg)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2494 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2495 int backlog;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2496 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2497
81587 974ace29ee2d Issue #15989: Fix several occurrences of integer overflow Serhiy Storchaka <storchaka@gmail.com> parents: 78569 diff changeset	2498 backlog = _PyLong_AsInt(arg);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2499 if (backlog == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2500 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2501 Py_BEGIN_ALLOW_THREADS
70012 713006ecee0c Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in Antoine Pitrou <solipsis@pitrou.net> parents: 68660 diff changeset	2502 /* To avoid problems on systems that don't allow a negative backlog
713006ecee0c Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in Antoine Pitrou <solipsis@pitrou.net> parents: 68660 diff changeset	2503 * (which doesn't make sense anyway) we force a minimum value of 0. */
713006ecee0c Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in Antoine Pitrou <solipsis@pitrou.net> parents: 68660 diff changeset	2504 if (backlog < 0)
713006ecee0c Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in Antoine Pitrou <solipsis@pitrou.net> parents: 68660 diff changeset	2505 backlog = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2506 res = listen(s->sock_fd, backlog);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2507 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2508 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2509 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2510 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2511 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2512 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2513
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2514 PyDoc_STRVAR(listen_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2515 "listen(backlog)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2516 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2517 Enable a server to accept connections. The backlog argument must be at\n\
70012 713006ecee0c Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in Antoine Pitrou <solipsis@pitrou.net> parents: 68660 diff changeset	2518 least 0 (if it is lower, it is set to 0); it specifies the number of\n\
713006ecee0c Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in Antoine Pitrou <solipsis@pitrou.net> parents: 68660 diff changeset	2519 unaccepted connections that the system will allow before refusing new\n\
713006ecee0c Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in Antoine Pitrou <solipsis@pitrou.net> parents: 68660 diff changeset	2520 connections.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2521
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2522
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2523 /*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2524 * This is the guts of the recv() and recv_into() methods, which reads into a
40582 67287ca4e1e8 Merged revisions 53005-53303 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	2525 * char buffer. If you have any inc/dec ref to do to the objects that contain
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2526 * the buffer, do it in the caller. This function returns the number of bytes
68585 bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 65668 diff changeset	2527 * successfully read. If there was an error, it returns -1. Note that it is
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2528 * also possible that we return a number of bytes smaller than the request
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2529 * bytes.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2530 */
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2531
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2532 static Py_ssize_t
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2533 sock_recv_guts(PySocketSockObject s, char cbuf, Py_ssize_t len, int flags)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2534 {
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2535 Py_ssize_t outlen = -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2536 int timeout;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2537 #ifdef __VMS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2538 int remaining;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2539 char *read_buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2540 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2541
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2542 if (!IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2543 select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2544 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2545 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2546 if (len == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2547 /* If 0 bytes were requested, do nothing. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2548 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2549 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2550
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2551 #ifndef __VMS
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2552 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2553 Py_BEGIN_ALLOW_THREADS
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2554 timeout = internal_select_ex(s, 0, interval);
84328 c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	2555 if (!timeout) {
84331 dfc020b4b123 If MS_WIN64 is defined, MS_WINDOWS is also defined: #ifdef can be simplified. Victor Stinner <victor.stinner@gmail.com> parents: 84328 diff changeset	2556 #ifdef MS_WINDOWS
84328 c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	2557 if (len > INT_MAX)
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	2558 len = INT_MAX;
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	2559 outlen = recv(s->sock_fd, cbuf, (int)len, flags);
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	2560 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2561 outlen = recv(s->sock_fd, cbuf, len, flags);
84328 c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	2562 #endif
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	2563 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2564 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2565
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2566 if (timeout == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2567 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2568 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2569 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2570 END_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2571 if (outlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2572 /* Note: the call to errorhandler() ALWAYS indirectly returned
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2573 NULL, so ignore its return value */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2574 s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2575 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2576 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2577 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2578 read_buf = cbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2579 remaining = len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2580 while (remaining != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2581 unsigned int segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2582 int nread = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2583
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2584 segment = remaining /SEGMENT_SIZE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2585 if (segment != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2586 segment = SEGMENT_SIZE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2587 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2588 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2589 segment = remaining;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2590 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2591
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2592 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2593 Py_BEGIN_ALLOW_THREADS
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2594 timeout = internal_select_ex(s, 0, interval);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2595 if (!timeout)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2596 nread = recv(s->sock_fd, read_buf, segment, flags);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2597 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2598 if (timeout == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2599 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2600 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2601 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2602 END_SELECT_LOOP(s)
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2603
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2604 if (nread < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2605 s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2606 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2607 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2608 if (nread != remaining) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2609 read_buf += nread;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2610 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2611 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2612
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2613 remaining -= segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2614 read_buf += segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2615 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2616 outlen = read_buf - cbuf;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2617 #endif /* !__VMS */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2618
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2619 return outlen;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2620 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2621
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	2622
1293 ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1271 diff changeset	2623 /* s.recv(nbytes [,flags]) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2624
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2625 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2626 sock_recv(PySocketSockObject s, PyObject args)
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2627 {
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2628 Py_ssize_t recvlen, outlen;
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2629 int flags = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2630 PyObject *buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2631
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2632 if (!PyArg_ParseTuple(args, "n\|i:recv", &recvlen, &flags))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2633 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2634
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2635 if (recvlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2636 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2637 "negative buffersize in recv");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2638 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2639 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2640
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2641 /* Allocate a new string. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2642 buf = PyBytes_FromStringAndSize((char *) 0, recvlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2643 if (buf == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2644 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2645
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2646 /* Call the guts */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2647 outlen = sock_recv_guts(s, PyBytes_AS_STRING(buf), recvlen, flags);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2648 if (outlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2649 /* An error occurred, release the string and return an
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2650 error. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2651 Py_DECREF(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2652 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2653 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2654 if (outlen != recvlen) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2655 /* We did not read as many bytes as we anticipated, resize the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2656 string if possible and be successful. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2657 _PyBytes_Resize(&buf, outlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2658 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2659
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2660 return buf;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2661 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2662
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2663 PyDoc_STRVAR(recv_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2664 "recv(buffersize[, flags]) -> data\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2665 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2666 Receive up to buffersize bytes from the socket. For the optional flags\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2667 argument, see the Unix manual. When no data is available, block until\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2668 at least one byte is available or until the remote end is closed. When\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2669 the remote end is closed and all data is read, return the empty string.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2670
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2671
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2672 /* s.recv_into(buffer, [nbytes [,flags]]) method */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2673
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2674 static PyObject*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2675 sock_recv_into(PySocketSockObject s, PyObject args, PyObject *kwds)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2676 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2677 static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2678
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2679 int flags = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2680 Py_buffer pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2681 char *buf;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2682 Py_ssize_t buflen, readlen, recvlen = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2683
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2684 /* Get the buffer's memory */
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2685 if (!PyArg_ParseTupleAndKeywords(args, kwds, "w*\|ni:recv_into", kwlist,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2686 &pbuf, &recvlen, &flags))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2687 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2688 buf = pbuf.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2689 buflen = pbuf.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2690
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2691 if (recvlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2692 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2693 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2694 "negative buffersize in recv_into");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2695 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2696 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2697 if (recvlen == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2698 /* If nbytes was not specified, use the buffer's length */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2699 recvlen = buflen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2700 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2701
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2702 /* Check if the buffer is large enough */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2703 if (buflen < recvlen) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2704 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2705 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2706 "buffer too small for requested bytes");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2707 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2708 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2709
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2710 /* Call the guts */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2711 readlen = sock_recv_guts(s, buf, recvlen, flags);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2712 if (readlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2713 /* Return an error. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2714 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2715 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2716 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2717
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2718 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2719 /* Return the number of bytes read. Note that we do not do anything
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2720 special here in the case that readlen < recvlen. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2721 return PyLong_FromSsize_t(readlen);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2722 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2723
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2724 PyDoc_STRVAR(recv_into_doc,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2725 "recv_into(buffer, [nbytes[, flags]]) -> nbytes_read\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2726 \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2727 A version of recv() that stores its data into a buffer rather than creating \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2728 a new string. Receive up to buffersize bytes from the socket. If buffersize \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2729 is not specified (or 0), receive up to the size available in the given buffer.\n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2730 \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2731 See recv() for documentation about the flags.");
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2732
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2733
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2734 /*
44349 4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	2735 * This is the guts of the recvfrom() and recvfrom_into() methods, which reads
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	2736 * into a char buffer. If you have any inc/def ref to do to the objects that
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	2737 * contain the buffer, do it in the caller. This function returns the number
68585 bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 65668 diff changeset	2738 * of bytes successfully read. If there was an error, it returns -1. Note
44349 4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	2739 * that it is also possible that we return a number of bytes smaller than the
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	2740 * request bytes.
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2741 *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2742 * 'addr' is a return value for the address object. Note that you must decref
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2743 * it yourself.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2744 */
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2745 static Py_ssize_t
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2746 sock_recvfrom_guts(PySocketSockObject s, char cbuf, Py_ssize_t len, int flags,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2747 PyObject** addr)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2748 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2749 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2750 int timeout;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2751 Py_ssize_t n = -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2752 socklen_t addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2753
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2754 *addr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2755
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2756 if (!getsockaddrlen(s, &addrlen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2757 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2758
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2759 if (!IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2760 select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2761 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2762 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2763
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2764 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2765 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2766 memset(&addrbuf, 0, addrlen);
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2767 timeout = internal_select_ex(s, 0, interval);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2768 if (!timeout) {
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	2769 #ifndef MS_WINDOWS
84328 c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	2770 if (len > INT_MAX)
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	2771 len = INT_MAX;
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	2772 n = recvfrom(s->sock_fd, cbuf, (int)len, flags,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2773 (void *) &addrbuf, &addrlen);
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	2774 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2775 n = recvfrom(s->sock_fd, cbuf, len, flags,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2776 SAS2SA(&addrbuf), &addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2777 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2778 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2779 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2780
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2781 if (timeout == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2782 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2783 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2784 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2785 END_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2786 if (n < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2787 s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2788 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2789 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2790
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2791 if (!(*addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2792 addrlen, s->sock_proto)))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2793 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2794
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2795 return n;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2796 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2797
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2798 /* s.recvfrom(nbytes [,flags]) method */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2799
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2800 static PyObject *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2801 sock_recvfrom(PySocketSockObject s, PyObject args)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2802 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2803 PyObject *buf = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2804 PyObject *addr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2805 PyObject *ret = NULL;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2806 int flags = 0;
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2807 Py_ssize_t recvlen, outlen;
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2808
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2809 if (!PyArg_ParseTuple(args, "n\|i:recvfrom", &recvlen, &flags))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2810 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2811
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2812 if (recvlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2813 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2814 "negative buffersize in recvfrom");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2815 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2816 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2817
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2818 buf = PyBytes_FromStringAndSize((char *) 0, recvlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2819 if (buf == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2820 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2821
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2822 outlen = sock_recvfrom_guts(s, PyBytes_AS_STRING(buf),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2823 recvlen, flags, &addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2824 if (outlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2825 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2826 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2827
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2828 if (outlen != recvlen) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2829 /* We did not read as many bytes as we anticipated, resize the
68585 bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 65668 diff changeset	2830 string if possible and be successful. */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2831 if (_PyBytes_Resize(&buf, outlen) < 0)
68585 bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 65668 diff changeset	2832 /* Oopsy, not so successful after all. */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2833 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2834 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2835
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2836 ret = PyTuple_Pack(2, buf, addr);
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2837
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2838 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2839 Py_XDECREF(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2840 Py_XDECREF(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2841 return ret;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2842 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2843
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2844 PyDoc_STRVAR(recvfrom_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2845 "recvfrom(buffersize[, flags]) -> (data, address info)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2846 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2847 Like recv(buffersize, flags) but also return the sender's address info.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2848
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2849
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2850 /* s.recvfrom_into(buffer[, nbytes [,flags]]) method */
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2851
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2852 static PyObject *
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2853 sock_recvfrom_into(PySocketSockObject s, PyObject args, PyObject* kwds)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2854 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2855 static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2856
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2857 int flags = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2858 Py_buffer pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2859 char *buf;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2860 Py_ssize_t readlen, buflen, recvlen = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2861
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2862 PyObject *addr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2863
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2864 if (!PyArg_ParseTupleAndKeywords(args, kwds, "w*\|ni:recvfrom_into",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2865 kwlist, &pbuf,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2866 &recvlen, &flags))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2867 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2868 buf = pbuf.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2869 buflen = pbuf.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2870 assert(buf != 0 && buflen > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2871
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2872 if (recvlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2873 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2874 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2875 "negative buffersize in recvfrom_into");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2876 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2877 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2878 if (recvlen == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2879 /* If nbytes was not specified, use the buffer's length */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2880 recvlen = buflen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2881 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2882
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2883 readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2884 if (readlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2885 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2886 /* Return an error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2887 Py_XDECREF(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2888 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2889 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2890
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2891 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2892 /* Return the number of bytes read and the address. Note that we do
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2893 not do anything special here in the case that readlen < recvlen. */
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2894 return Py_BuildValue("nN", readlen, addr);
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2895 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2896
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2897 PyDoc_STRVAR(recvfrom_into_doc,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2898 "recvfrom_into(buffer[, nbytes[, flags]]) -> (nbytes, address info)\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2899 \n\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2900 Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info.");
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2901
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2902
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2903 /* The sendmsg() and recvmsg[_into]() methods require a working
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2904 CMSG_LEN(). See the comment near get_CMSG_LEN(). */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2905 #ifdef CMSG_LEN
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2906 /*
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2907 * Call recvmsg() with the supplied iovec structures, flags, and
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2908 * ancillary data buffer size (controllen). Returns the tuple return
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2909 * value for recvmsg() or recvmsg_into(), with the first item provided
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2910 * by the supplied makeval() function. makeval() will be called with
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2911 * the length read and makeval_data as arguments, and must return a
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2912 * new reference (which will be decrefed if there is a subsequent
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2913 * error). On error, closes any file descriptors received via
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2914 * SCM_RIGHTS.
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2915 */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2916 static PyObject *
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2917 sock_recvmsg_guts(PySocketSockObject s, struct iovec iov, int iovlen,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2918 int flags, Py_ssize_t controllen,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2919 PyObject (makeval)(ssize_t, void ), void makeval_data)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2920 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2921 ssize_t bytes_received = -1;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2922 int timeout;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2923 sock_addr_t addrbuf;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2924 socklen_t addrbuflen;
72062 c53db7dc4b8f sock_sendmsg/sock_recvmsg: Use {0} to 0-initialize aggregate types with Charles-François Natali <neologix@free.fr> parents: 72061 diff changeset	2925 struct msghdr msg = {0};
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2926 PyObject cmsg_list = NULL, retval = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2927 void *controlbuf = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2928 struct cmsghdr *cmsgh;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2929 size_t cmsgdatalen = 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2930 int cmsg_status;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2931
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2932 /* XXX: POSIX says that msg_name and msg_namelen "shall be
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2933 ignored" when the socket is connected (Linux fills them in
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2934 anyway for AF_UNIX sockets at least). Normally msg_namelen
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2935 seems to be set to 0 if there's no address, but try to
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2936 initialize msg_name to something that won't be mistaken for a
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2937 real address if that doesn't happen. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2938 if (!getsockaddrlen(s, &addrbuflen))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2939 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2940 memset(&addrbuf, 0, addrbuflen);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2941 SAS2SA(&addrbuf)->sa_family = AF_UNSPEC;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2942
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2943 if (controllen < 0 \|\| controllen > SOCKLEN_T_LIMIT) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2944 PyErr_SetString(PyExc_ValueError,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2945 "invalid ancillary data buffer length");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2946 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2947 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2948 if (controllen > 0 && (controlbuf = PyMem_Malloc(controllen)) == NULL)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2949 return PyErr_NoMemory();
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2950
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2951 /* Make the system call. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2952 if (!IS_SELECTABLE(s)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2953 select_error();
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2954 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2955 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2956
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2957 BEGIN_SELECT_LOOP(s)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2958 Py_BEGIN_ALLOW_THREADS;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2959 msg.msg_name = SAS2SA(&addrbuf);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2960 msg.msg_namelen = addrbuflen;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2961 msg.msg_iov = iov;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2962 msg.msg_iovlen = iovlen;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2963 msg.msg_control = controlbuf;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2964 msg.msg_controllen = controllen;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2965 timeout = internal_select_ex(s, 0, interval);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2966 if (!timeout)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2967 bytes_received = recvmsg(s->sock_fd, &msg, flags);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2968 Py_END_ALLOW_THREADS;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2969 if (timeout == 1) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2970 PyErr_SetString(socket_timeout, "timed out");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2971 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2972 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2973 END_SELECT_LOOP(s)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2974
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2975 if (bytes_received < 0) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2976 s->errorhandler();
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2977 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2978 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2979
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2980 /* Make list of (level, type, data) tuples from control messages. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2981 if ((cmsg_list = PyList_New(0)) == NULL)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2982 goto err_closefds;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2983 /* Check for empty ancillary data as old CMSG_FIRSTHDR()
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2984 implementations didn't do so. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2985 for (cmsgh = ((msg.msg_controllen > 0) ? CMSG_FIRSTHDR(&msg) : NULL);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2986 cmsgh != NULL; cmsgh = CMSG_NXTHDR(&msg, cmsgh)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2987 PyObject bytes, tuple;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2988 int tmp;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2989
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2990 cmsg_status = get_cmsg_data_len(&msg, cmsgh, &cmsgdatalen);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2991 if (cmsg_status != 0) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2992 if (PyErr_WarnEx(PyExc_RuntimeWarning,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2993 "received malformed or improperly-truncated "
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2994 "ancillary data", 1) == -1)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2995 goto err_closefds;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2996 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2997 if (cmsg_status < 0)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2998 break;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2999 if (cmsgdatalen > PY_SSIZE_T_MAX) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	3000 PyErr_SetString(PyExc_OSError, "control message too long");
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3001 goto err_closefds;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3002 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3003
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3004 bytes = PyBytes_FromStringAndSize((char *)CMSG_DATA(cmsgh),
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3005 cmsgdatalen);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3006 tuple = Py_BuildValue("iiN", (int)cmsgh->cmsg_level,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3007 (int)cmsgh->cmsg_type, bytes);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3008 if (tuple == NULL)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3009 goto err_closefds;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3010 tmp = PyList_Append(cmsg_list, tuple);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3011 Py_DECREF(tuple);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3012 if (tmp != 0)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3013 goto err_closefds;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3014
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3015 if (cmsg_status != 0)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3016 break;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3017 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3018
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3019 retval = Py_BuildValue("NOiN",
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3020 (*makeval)(bytes_received, makeval_data),
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3021 cmsg_list,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3022 (int)msg.msg_flags,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3023 makesockaddr(s->sock_fd, SAS2SA(&addrbuf),
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3024 ((msg.msg_namelen > addrbuflen) ?
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3025 addrbuflen : msg.msg_namelen),
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3026 s->sock_proto));
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3027 if (retval == NULL)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3028 goto err_closefds;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3029
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3030 finally:
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3031 Py_XDECREF(cmsg_list);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3032 PyMem_Free(controlbuf);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3033 return retval;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3034
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3035 err_closefds:
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3036 #ifdef SCM_RIGHTS
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3037 /* Close all descriptors coming from SCM_RIGHTS, so they don't leak. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3038 for (cmsgh = ((msg.msg_controllen > 0) ? CMSG_FIRSTHDR(&msg) : NULL);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3039 cmsgh != NULL; cmsgh = CMSG_NXTHDR(&msg, cmsgh)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3040 cmsg_status = get_cmsg_data_len(&msg, cmsgh, &cmsgdatalen);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3041 if (cmsg_status < 0)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3042 break;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3043 if (cmsgh->cmsg_level == SOL_SOCKET &&
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3044 cmsgh->cmsg_type == SCM_RIGHTS) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3045 size_t numfds;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3046 int *fdp;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3047
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3048 numfds = cmsgdatalen / sizeof(int);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3049 fdp = (int *)CMSG_DATA(cmsgh);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3050 while (numfds-- > 0)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3051 close(*fdp++);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3052 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3053 if (cmsg_status != 0)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3054 break;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3055 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3056 #endif /* SCM_RIGHTS */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3057 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3058 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3059
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3060
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3061 static PyObject *
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3062 makeval_recvmsg(ssize_t received, void *data)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3063 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3064 PyObject **buf = data;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3065
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3066 if (received < PyBytes_GET_SIZE(*buf))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3067 _PyBytes_Resize(buf, received);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3068 Py_XINCREF(*buf);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3069 return *buf;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3070 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3071
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3072 /* s.recvmsg(bufsize[, ancbufsize[, flags]]) method */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3073
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3074 static PyObject *
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3075 sock_recvmsg(PySocketSockObject s, PyObject args)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3076 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3077 Py_ssize_t bufsize, ancbufsize = 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3078 int flags = 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3079 struct iovec iov;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3080 PyObject buf = NULL, retval = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3081
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3082 if (!PyArg_ParseTuple(args, "n\|ni:recvmsg", &bufsize, &ancbufsize, &flags))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3083 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3084
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3085 if (bufsize < 0) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3086 PyErr_SetString(PyExc_ValueError, "negative buffer size in recvmsg()");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3087 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3088 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3089 if ((buf = PyBytes_FromStringAndSize(NULL, bufsize)) == NULL)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3090 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3091 iov.iov_base = PyBytes_AS_STRING(buf);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3092 iov.iov_len = bufsize;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3093
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3094 /* Note that we're passing a pointer to our pointer to the bytes
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3095 object here (&buf); makeval_recvmsg() may incref the object, or
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3096 deallocate it and set our pointer to NULL. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3097 retval = sock_recvmsg_guts(s, &iov, 1, flags, ancbufsize,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3098 &makeval_recvmsg, &buf);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3099 Py_XDECREF(buf);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3100 return retval;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3101 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3102
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3103 PyDoc_STRVAR(recvmsg_doc,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3104 "recvmsg(bufsize[, ancbufsize[, flags]]) -> (data, ancdata, msg_flags, address)\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3105 \n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3106 Receive normal data (up to bufsize bytes) and ancillary data from the\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3107 socket. The ancbufsize argument sets the size in bytes of the\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3108 internal buffer used to receive the ancillary data; it defaults to 0,\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3109 meaning that no ancillary data will be received. Appropriate buffer\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3110 sizes for ancillary data can be calculated using CMSG_SPACE() or\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3111 CMSG_LEN(), and items which do not fit into the buffer might be\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3112 truncated or discarded. The flags argument defaults to 0 and has the\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3113 same meaning as for recv().\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3114 \n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3115 The return value is a 4-tuple: (data, ancdata, msg_flags, address).\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3116 The data item is a bytes object holding the non-ancillary data\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3117 received. The ancdata item is a list of zero or more tuples\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3118 (cmsg_level, cmsg_type, cmsg_data) representing the ancillary data\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3119 (control messages) received: cmsg_level and cmsg_type are integers\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3120 specifying the protocol level and protocol-specific type respectively,\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3121 and cmsg_data is a bytes object holding the associated data. The\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3122 msg_flags item is the bitwise OR of various flags indicating\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3123 conditions on the received message; see your system documentation for\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3124 details. If the receiving socket is unconnected, address is the\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3125 address of the sending socket, if available; otherwise, its value is\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3126 unspecified.\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3127 \n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3128 If recvmsg() raises an exception after the system call returns, it\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3129 will first attempt to close any file descriptors received via the\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3130 SCM_RIGHTS mechanism.");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3131
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3132
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3133 static PyObject *
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3134 makeval_recvmsg_into(ssize_t received, void *data)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3135 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3136 return PyLong_FromSsize_t(received);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3137 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3138
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3139 /* s.recvmsg_into(buffers[, ancbufsize[, flags]]) method */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3140
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3141 static PyObject *
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3142 sock_recvmsg_into(PySocketSockObject s, PyObject args)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3143 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3144 Py_ssize_t ancbufsize = 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3145 int flags = 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3146 struct iovec *iovs = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3147 Py_ssize_t i, nitems, nbufs = 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3148 Py_buffer *bufs = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3149 PyObject buffers_arg, fast, *retval = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3150
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3151 if (!PyArg_ParseTuple(args, "O\|ni:recvmsg_into",
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3152 &buffers_arg, &ancbufsize, &flags))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3153 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3154
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3155 if ((fast = PySequence_Fast(buffers_arg,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3156 "recvmsg_into() argument 1 must be an "
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3157 "iterable")) == NULL)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3158 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3159 nitems = PySequence_Fast_GET_SIZE(fast);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3160 if (nitems > INT_MAX) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	3161 PyErr_SetString(PyExc_OSError, "recvmsg_into() argument 1 is too long");
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3162 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3163 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3164
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3165 /* Fill in an iovec for each item, and save the Py_buffer
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3166 structs to release afterwards. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3167 if (nitems > 0 && ((iovs = PyMem_New(struct iovec, nitems)) == NULL \|\|
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3168 (bufs = PyMem_New(Py_buffer, nitems)) == NULL)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3169 PyErr_NoMemory();
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3170 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3171 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3172 for (; nbufs < nitems; nbufs++) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3173 if (!PyArg_Parse(PySequence_Fast_GET_ITEM(fast, nbufs),
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3174 "w*;recvmsg_into() argument 1 must be an iterable "
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3175 "of single-segment read-write buffers",
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3176 &bufs[nbufs]))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3177 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3178 iovs[nbufs].iov_base = bufs[nbufs].buf;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3179 iovs[nbufs].iov_len = bufs[nbufs].len;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3180 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3181
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3182 retval = sock_recvmsg_guts(s, iovs, nitems, flags, ancbufsize,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3183 &makeval_recvmsg_into, NULL);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3184 finally:
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3185 for (i = 0; i < nbufs; i++)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3186 PyBuffer_Release(&bufs[i]);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3187 PyMem_Free(bufs);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3188 PyMem_Free(iovs);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3189 Py_DECREF(fast);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3190 return retval;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3191 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3192
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3193 PyDoc_STRVAR(recvmsg_into_doc,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3194 "recvmsg_into(buffers[, ancbufsize[, flags]]) -> (nbytes, ancdata, msg_flags, address)\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3195 \n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3196 Receive normal data and ancillary data from the socket, scattering the\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3197 non-ancillary data into a series of buffers. The buffers argument\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3198 must be an iterable of objects that export writable buffers\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3199 (e.g. bytearray objects); these will be filled with successive chunks\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3200 of the non-ancillary data until it has all been written or there are\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3201 no more buffers. The ancbufsize argument sets the size in bytes of\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3202 the internal buffer used to receive the ancillary data; it defaults to\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3203 0, meaning that no ancillary data will be received. Appropriate\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3204 buffer sizes for ancillary data can be calculated using CMSG_SPACE()\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3205 or CMSG_LEN(), and items which do not fit into the buffer might be\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3206 truncated or discarded. The flags argument defaults to 0 and has the\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3207 same meaning as for recv().\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3208 \n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3209 The return value is a 4-tuple: (nbytes, ancdata, msg_flags, address).\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3210 The nbytes item is the total number of bytes of non-ancillary data\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3211 written into the buffers. The ancdata item is a list of zero or more\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3212 tuples (cmsg_level, cmsg_type, cmsg_data) representing the ancillary\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3213 data (control messages) received: cmsg_level and cmsg_type are\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3214 integers specifying the protocol level and protocol-specific type\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3215 respectively, and cmsg_data is a bytes object holding the associated\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3216 data. The msg_flags item is the bitwise OR of various flags\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3217 indicating conditions on the received message; see your system\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3218 documentation for details. If the receiving socket is unconnected,\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3219 address is the address of the sending socket, if available; otherwise,\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3220 its value is unspecified.\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3221 \n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3222 If recvmsg_into() raises an exception after the system call returns,\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3223 it will first attempt to close any file descriptors received via the\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3224 SCM_RIGHTS mechanism.");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3225 #endif /* CMSG_LEN */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3226
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3227
1293 ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1271 diff changeset	3228 /* s.send(data [,flags]) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3229
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3230 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3231 sock_send(PySocketSockObject s, PyObject args)
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3232 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3233 char *buf;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	3234 Py_ssize_t len, n = -1;
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	3235 int flags = 0, timeout;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3236 Py_buffer pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3237
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3238 if (!PyArg_ParseTuple(args, "y*\|i:send", &pbuf, &flags))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3239 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3240
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3241 if (!IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3242 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3243 return select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3244 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3245 buf = pbuf.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3246 len = pbuf.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3247
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3248 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3249 Py_BEGIN_ALLOW_THREADS
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3250 timeout = internal_select_ex(s, 1, interval);
84328 c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3251 if (!timeout) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3252 #ifdef __VMS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3253 n = sendsegmented(s->sock_fd, buf, len, flags);
84331 dfc020b4b123 If MS_WIN64 is defined, MS_WINDOWS is also defined: #ifdef can be simplified. Victor Stinner <victor.stinner@gmail.com> parents: 84328 diff changeset	3254 #elif defined(MS_WINDOWS)
84328 c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3255 if (len > INT_MAX)
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3256 len = INT_MAX;
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3257 n = send(s->sock_fd, buf, (int)len, flags);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3258 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3259 n = send(s->sock_fd, buf, len, flags);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3260 #endif
84328 c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3261 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3262 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3263 if (timeout == 1) {
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3264 PyBuffer_Release(&pbuf);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3265 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3266 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3267 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3268 END_SELECT_LOOP(s)
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3269
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3270 PyBuffer_Release(&pbuf);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3271 if (n < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3272 return s->errorhandler();
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	3273 return PyLong_FromSsize_t(n);
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3274 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3275
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3276 PyDoc_STRVAR(send_doc,
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3277 "send(data[, flags]) -> count\n\
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3278 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3279 Send a data string to the socket. For the optional flags\n\
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3280 argument, see the Unix manual. Return the number of bytes\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3281 sent; this may be less than len(data) if the network is busy.");
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3282
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3283
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3284 /* s.sendall(data [,flags]) method */
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3285
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3286 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3287 sock_sendall(PySocketSockObject s, PyObject args)
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3288 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3289 char *buf;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	3290 Py_ssize_t len, n = -1;
64961 5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3291 int flags = 0, timeout, saved_errno;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3292 Py_buffer pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3293
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3294 if (!PyArg_ParseTuple(args, "y*\|i:sendall", &pbuf, &flags))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3295 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3296 buf = pbuf.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3297 len = pbuf.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3298
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3299 if (!IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3300 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3301 return select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3302 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3303
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3304 do {
64961 5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3305 Py_BEGIN_ALLOW_THREADS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3306 timeout = internal_select(s, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3307 n = -1;
64961 5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3308 if (!timeout) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3309 #ifdef __VMS
64961 5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3310 n = sendsegmented(s->sock_fd, buf, len, flags);
84331 dfc020b4b123 If MS_WIN64 is defined, MS_WINDOWS is also defined: #ifdef can be simplified. Victor Stinner <victor.stinner@gmail.com> parents: 84328 diff changeset	3311 #elif defined(MS_WINDOWS)
84328 c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3312 if (len > INT_MAX)
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3313 len = INT_MAX;
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3314 n = send(s->sock_fd, buf, (int)len, flags);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3315 #else
64961 5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3316 n = send(s->sock_fd, buf, len, flags);
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3317 #endif
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3318 }
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3319 Py_END_ALLOW_THREADS
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3320 if (timeout == 1) {
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3321 PyBuffer_Release(&pbuf);
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3322 PyErr_SetString(socket_timeout, "timed out");
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3323 return NULL;
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3324 }
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3325 /* PyErr_CheckSignals() might change errno */
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3326 saved_errno = errno;
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3327 /* We must run our signal handlers before looping again.
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3328 send() can return a successful partial write when it is
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3329 interrupted, so we can't restrict ourselves to EINTR. */
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3330 if (PyErr_CheckSignals()) {
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3331 PyBuffer_Release(&pbuf);
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3332 return NULL;
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3333 }
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3334 if (n < 0) {
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3335 /* If interrupted, try again */
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3336 if (saved_errno == EINTR)
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3337 continue;
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3338 else
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3339 break;
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3340 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3341 buf += n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3342 len -= n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3343 } while (len > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3344 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3345
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3346 if (n < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3347 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3348
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3349 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3350 return Py_None;
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3351 }
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3352
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3353 PyDoc_STRVAR(sendall_doc,
20679 e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3354 "sendall(data[, flags])\n\
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3355 \n\
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3356 Send a data string to the socket. For the optional flags\n\
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3357 argument, see the Unix manual. This calls send() repeatedly\n\
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3358 until all data is sent. If an error occurs, it's impossible\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3359 to tell how much data has been sent.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3360
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3361
1293 ac3c80abbf43 * classobject.c: in instance_getattr, don't make a method out of a Guido van Rossum <guido@python.org> parents: 1271 diff changeset	3362 /* s.sendto(data, [flags,] sockaddr) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3363
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3364 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3365 sock_sendto(PySocketSockObject s, PyObject args)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3366 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3367 Py_buffer pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3368 PyObject *addro;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3369 char *buf;
68659 c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3370 Py_ssize_t len, arglen;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3371 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3372 int addrlen, n = -1, flags, timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3373
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3374 flags = 0;
68659 c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3375 arglen = PyTuple_Size(args);
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3376 switch (arglen) {
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3377 case 2:
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3378 PyArg_ParseTuple(args, "y*O:sendto", &pbuf, &addro);
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3379 break;
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3380 case 3:
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3381 PyArg_ParseTuple(args, "y*iO:sendto",
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3382 &pbuf, &flags, &addro);
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3383 break;
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3384 default:
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3385 PyErr_Format(PyExc_TypeError,
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3386 "sendto() takes 2 or 3 arguments (%d given)",
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3387 arglen);
70399 9d33770071b2 socket.sendto(): exit directly after setting the error Victor Stinner <victor.stinner@haypocalc.com> parents: 70226 diff changeset	3388 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3389 }
68659 c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3390 if (PyErr_Occurred())
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3391 return NULL;
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3392
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3393 buf = pbuf.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3394 len = pbuf.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3395
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3396 if (!IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3397 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3398 return select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3399 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3400
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3401 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3402 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3403 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3404 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3405
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3406 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3407 Py_BEGIN_ALLOW_THREADS
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3408 timeout = internal_select_ex(s, 1, interval);
84328 c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3409 if (!timeout) {
84331 dfc020b4b123 If MS_WIN64 is defined, MS_WINDOWS is also defined: #ifdef can be simplified. Victor Stinner <victor.stinner@gmail.com> parents: 84328 diff changeset	3410 #ifdef MS_WINDOWS
84328 c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3411 if (len > INT_MAX)
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3412 len = INT_MAX;
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3413 n = sendto(s->sock_fd, buf, (int)len, flags,
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3414 SAS2SA(&addrbuf), addrlen);
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3415 #else
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3416 n = sendto(s->sock_fd, buf, len, flags,
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3417 SAS2SA(&addrbuf), addrlen);
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3418 #endif
c1a400501db6 Issue #9566: recv(), recvfrom(), send(), sendall() and sendto() methods Victor Stinner <victor.stinner@gmail.com> parents: 84210 diff changeset	3419 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3420 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3421
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3422 if (timeout == 1) {
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3423 PyBuffer_Release(&pbuf);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3424 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3425 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3426 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3427 END_SELECT_LOOP(s)
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3428 PyBuffer_Release(&pbuf);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3429 if (n < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3430 return s->errorhandler();
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	3431 return PyLong_FromSsize_t(n);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3432 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3433
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3434 PyDoc_STRVAR(sendto_doc,
24676 980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	3435 "sendto(data[, flags], address) -> count\n\
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3436 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3437 Like send(data, flags) but allows specifying the destination address.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3438 For IP sockets, the address is a pair (hostaddr, port).");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3439
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3440
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3441 /* The sendmsg() and recvmsg[_into]() methods require a working
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3442 CMSG_LEN(). See the comment near get_CMSG_LEN(). */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3443 #ifdef CMSG_LEN
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3444 /* s.sendmsg(buffers[, ancdata[, flags[, address]]]) method */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3445
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3446 static PyObject *
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3447 sock_sendmsg(PySocketSockObject s, PyObject args)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3448 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3449 Py_ssize_t i, ndataparts, ndatabufs = 0, ncmsgs, ncmsgbufs = 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3450 Py_buffer *databufs = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3451 struct iovec *iovs = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3452 sock_addr_t addrbuf;
72062 c53db7dc4b8f sock_sendmsg/sock_recvmsg: Use {0} to 0-initialize aggregate types with Charles-François Natali <neologix@free.fr> parents: 72061 diff changeset	3453 struct msghdr msg = {0};
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3454 struct cmsginfo {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3455 int level;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3456 int type;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3457 Py_buffer data;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3458 } *cmsgs = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3459 void *controlbuf = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3460 size_t controllen, controllen_last;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3461 ssize_t bytes_sent = -1;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3462 int addrlen, timeout, flags = 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3463 PyObject data_arg, cmsg_arg = NULL, addr_arg = NULL, data_fast = NULL,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3464 cmsg_fast = NULL, retval = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3465
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3466 if (!PyArg_ParseTuple(args, "O\|OiO:sendmsg",
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3467 &data_arg, &cmsg_arg, &flags, &addr_arg))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3468 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3469
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3470 /* Parse destination address. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3471 if (addr_arg != NULL && addr_arg != Py_None) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3472 if (!getsockaddrarg(s, addr_arg, SAS2SA(&addrbuf), &addrlen))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3473 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3474 msg.msg_name = &addrbuf;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3475 msg.msg_namelen = addrlen;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3476 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3477
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3478 /* Fill in an iovec for each message part, and save the Py_buffer
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3479 structs to release afterwards. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3480 if ((data_fast = PySequence_Fast(data_arg,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3481 "sendmsg() argument 1 must be an "
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3482 "iterable")) == NULL)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3483 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3484 ndataparts = PySequence_Fast_GET_SIZE(data_fast);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3485 if (ndataparts > INT_MAX) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	3486 PyErr_SetString(PyExc_OSError, "sendmsg() argument 1 is too long");
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3487 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3488 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3489 msg.msg_iovlen = ndataparts;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3490 if (ndataparts > 0 &&
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3491 ((msg.msg_iov = iovs = PyMem_New(struct iovec, ndataparts)) == NULL \|\|
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3492 (databufs = PyMem_New(Py_buffer, ndataparts)) == NULL)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3493 PyErr_NoMemory();
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3494 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3495 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3496 for (; ndatabufs < ndataparts; ndatabufs++) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3497 if (!PyArg_Parse(PySequence_Fast_GET_ITEM(data_fast, ndatabufs),
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3498 "y*;sendmsg() argument 1 must be an iterable of "
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3499 "buffer-compatible objects",
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3500 &databufs[ndatabufs]))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3501 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3502 iovs[ndatabufs].iov_base = databufs[ndatabufs].buf;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3503 iovs[ndatabufs].iov_len = databufs[ndatabufs].len;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3504 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3505
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3506 if (cmsg_arg == NULL)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3507 ncmsgs = 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3508 else {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3509 if ((cmsg_fast = PySequence_Fast(cmsg_arg,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3510 "sendmsg() argument 2 must be an "
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3511 "iterable")) == NULL)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3512 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3513 ncmsgs = PySequence_Fast_GET_SIZE(cmsg_fast);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3514 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3515
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3516 #ifndef CMSG_SPACE
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3517 if (ncmsgs > 1) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	3518 PyErr_SetString(PyExc_OSError,
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3519 "sending multiple control messages is not supported "
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3520 "on this system");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3521 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3522 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3523 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3524 /* Save level, type and Py_buffer for each control message,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3525 and calculate total size. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3526 if (ncmsgs > 0 && (cmsgs = PyMem_New(struct cmsginfo, ncmsgs)) == NULL) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3527 PyErr_NoMemory();
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3528 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3529 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3530 controllen = controllen_last = 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3531 while (ncmsgbufs < ncmsgs) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3532 size_t bufsize, space;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3533
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3534 if (!PyArg_Parse(PySequence_Fast_GET_ITEM(cmsg_fast, ncmsgbufs),
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3535 "(iiy*):[sendmsg() ancillary data items]",
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3536 &cmsgs[ncmsgbufs].level,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3537 &cmsgs[ncmsgbufs].type,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3538 &cmsgs[ncmsgbufs].data))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3539 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3540 bufsize = cmsgs[ncmsgbufs++].data.len;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3541
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3542 #ifdef CMSG_SPACE
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3543 if (!get_CMSG_SPACE(bufsize, &space)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3544 #else
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3545 if (!get_CMSG_LEN(bufsize, &space)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3546 #endif
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	3547 PyErr_SetString(PyExc_OSError, "ancillary data item too large");
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3548 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3549 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3550 controllen += space;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3551 if (controllen > SOCKLEN_T_LIMIT \|\| controllen < controllen_last) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	3552 PyErr_SetString(PyExc_OSError, "too much ancillary data");
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3553 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3554 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3555 controllen_last = controllen;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3556 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3557
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3558 /* Construct ancillary data block from control message info. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3559 if (ncmsgbufs > 0) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3560 struct cmsghdr *cmsgh = NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3561
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3562 if ((msg.msg_control = controlbuf =
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3563 PyMem_Malloc(controllen)) == NULL) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3564 PyErr_NoMemory();
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3565 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3566 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3567 msg.msg_controllen = controllen;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3568
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3569 /* Need to zero out the buffer as a workaround for glibc's
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3570 CMSG_NXTHDR() implementation. After getting the pointer to
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3571 the next header, it checks its (uninitialized) cmsg_len
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3572 member to see if the "message" fits in the buffer, and
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3573 returns NULL if it doesn't. Zero-filling the buffer
82621 e9ada209b67f Issue #17047: remove doubled words added in 3.3 Terry Jan Reedy <tjreedy@udel.edu> parents: 82111 diff changeset	3574 ensures that this doesn't happen. */
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3575 memset(controlbuf, 0, controllen);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3576
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3577 for (i = 0; i < ncmsgbufs; i++) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3578 size_t msg_len, data_len = cmsgs[i].data.len;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3579 int enough_space = 0;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3580
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3581 cmsgh = (i == 0) ? CMSG_FIRSTHDR(&msg) : CMSG_NXTHDR(&msg, cmsgh);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3582 if (cmsgh == NULL) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3583 PyErr_Format(PyExc_RuntimeError,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3584 "unexpected NULL result from %s()",
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3585 (i == 0) ? "CMSG_FIRSTHDR" : "CMSG_NXTHDR");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3586 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3587 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3588 if (!get_CMSG_LEN(data_len, &msg_len)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3589 PyErr_SetString(PyExc_RuntimeError,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3590 "item size out of range for CMSG_LEN()");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3591 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3592 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3593 if (cmsg_min_space(&msg, cmsgh, msg_len)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3594 size_t space;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3595
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3596 cmsgh->cmsg_len = msg_len;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3597 if (get_cmsg_data_space(&msg, cmsgh, &space))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3598 enough_space = (space >= data_len);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3599 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3600 if (!enough_space) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3601 PyErr_SetString(PyExc_RuntimeError,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3602 "ancillary data does not fit in calculated "
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3603 "space");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3604 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3605 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3606 cmsgh->cmsg_level = cmsgs[i].level;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3607 cmsgh->cmsg_type = cmsgs[i].type;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3608 memcpy(CMSG_DATA(cmsgh), cmsgs[i].data.buf, data_len);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3609 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3610 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3611
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3612 /* Make the system call. */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3613 if (!IS_SELECTABLE(s)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3614 select_error();
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3615 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3616 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3617
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3618 BEGIN_SELECT_LOOP(s)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3619 Py_BEGIN_ALLOW_THREADS;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3620 timeout = internal_select_ex(s, 1, interval);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3621 if (!timeout)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3622 bytes_sent = sendmsg(s->sock_fd, &msg, flags);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3623 Py_END_ALLOW_THREADS;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3624 if (timeout == 1) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3625 PyErr_SetString(socket_timeout, "timed out");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3626 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3627 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3628 END_SELECT_LOOP(s)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3629
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3630 if (bytes_sent < 0) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3631 s->errorhandler();
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3632 goto finally;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3633 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3634 retval = PyLong_FromSsize_t(bytes_sent);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3635
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3636 finally:
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3637 PyMem_Free(controlbuf);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3638 for (i = 0; i < ncmsgbufs; i++)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3639 PyBuffer_Release(&cmsgs[i].data);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3640 PyMem_Free(cmsgs);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3641 Py_XDECREF(cmsg_fast);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3642 for (i = 0; i < ndatabufs; i++)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3643 PyBuffer_Release(&databufs[i]);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3644 PyMem_Free(databufs);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3645 PyMem_Free(iovs);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3646 Py_XDECREF(data_fast);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3647 return retval;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3648 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3649
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3650 PyDoc_STRVAR(sendmsg_doc,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3651 "sendmsg(buffers[, ancdata[, flags[, address]]]) -> count\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3652 \n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3653 Send normal and ancillary data to the socket, gathering the\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3654 non-ancillary data from a series of buffers and concatenating it into\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3655 a single message. The buffers argument specifies the non-ancillary\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3656 data as an iterable of buffer-compatible objects (e.g. bytes objects).\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3657 The ancdata argument specifies the ancillary data (control messages)\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3658 as an iterable of zero or more tuples (cmsg_level, cmsg_type,\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3659 cmsg_data), where cmsg_level and cmsg_type are integers specifying the\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3660 protocol level and protocol-specific type respectively, and cmsg_data\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3661 is a buffer-compatible object holding the associated data. The flags\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3662 argument defaults to 0 and has the same meaning as for send(). If\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3663 address is supplied and not None, it sets a destination address for\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3664 the message. The return value is the number of bytes of non-ancillary\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3665 data sent.");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3666 #endif /* CMSG_LEN */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3667
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3668
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3669 /* s.shutdown(how) method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3670
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3671 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3672 sock_shutdown(PySocketSockObject s, PyObject arg)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3673 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3674 int how;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3675 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3676
81587 974ace29ee2d Issue #15989: Fix several occurrences of integer overflow Serhiy Storchaka <storchaka@gmail.com> parents: 78569 diff changeset	3677 how = _PyLong_AsInt(arg);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3678 if (how == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3679 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3680 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3681 res = shutdown(s->sock_fd, how);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3682 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3683 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3684 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3685 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3686 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3687 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3688
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3689 PyDoc_STRVAR(shutdown_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3690 "shutdown(flag)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3691 \n\
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	3692 Shut down the reading side of the socket (flag == SHUT_RD), the writing side\n\
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	3693 of the socket (flag == SHUT_WR), or both ends (flag == SHUT_RDWR).");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3694
47667 b1f4ea4eb555 Merged revisions 64214 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47663 diff changeset	3695 #if defined(MS_WINDOWS) && defined(SIO_RCVALL)
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3696 static PyObject*
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3697 sock_ioctl(PySocketSockObject s, PyObject arg)
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3698 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3699 unsigned long cmd = SIO_RCVALL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3700 PyObject *argO;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3701 DWORD recv;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3702
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3703 if (!PyArg_ParseTuple(arg, "kO:ioctl", &cmd, &argO))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3704 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3705
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3706 switch (cmd) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3707 case SIO_RCVALL: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3708 unsigned int option = RCVALL_ON;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3709 if (!PyArg_ParseTuple(arg, "kI:ioctl", &cmd, &option))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3710 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3711 if (WSAIoctl(s->sock_fd, cmd, &option, sizeof(option),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3712 NULL, 0, &recv, NULL, NULL) == SOCKET_ERROR) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3713 return set_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3714 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3715 return PyLong_FromUnsignedLong(recv); }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3716 case SIO_KEEPALIVE_VALS: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3717 struct tcp_keepalive ka;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3718 if (!PyArg_ParseTuple(arg, "k(kkk):ioctl", &cmd,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3719 &ka.onoff, &ka.keepalivetime, &ka.keepaliveinterval))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3720 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3721 if (WSAIoctl(s->sock_fd, cmd, &ka, sizeof(ka),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3722 NULL, 0, &recv, NULL, NULL) == SOCKET_ERROR) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3723 return set_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3724 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3725 return PyLong_FromUnsignedLong(recv); }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3726 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3727 PyErr_Format(PyExc_ValueError, "invalid ioctl command %d", cmd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3728 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3729 }
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3730 }
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3731 PyDoc_STRVAR(sock_ioctl_doc,
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3732 "ioctl(cmd, option) -> long\n\
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3733 \n\
56252 debb245ebb40 http://bugs.python.org/issue6971 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 53824 diff changeset	3734 Control the socket with WSAIoctl syscall. Currently supported 'cmd' values are\n\
debb245ebb40 http://bugs.python.org/issue6971 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 53824 diff changeset	3735 SIO_RCVALL: 'option' must be one of the socket.RCVALL_* constants.\n\
debb245ebb40 http://bugs.python.org/issue6971 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 53824 diff changeset	3736 SIO_KEEPALIVE_VALS: 'option' is a tuple of (onoff, timeout, interval).");
76150 51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3737 #endif
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3738
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3739 #if defined(MS_WINDOWS)
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3740 static PyObject*
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3741 sock_share(PySocketSockObject s, PyObject arg)
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3742 {
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3743 WSAPROTOCOL_INFO info;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3744 DWORD processId;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3745 int result;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3746
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3747 if (!PyArg_ParseTuple(arg, "I", &processId))
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3748 return NULL;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3749
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3750 Py_BEGIN_ALLOW_THREADS
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3751 result = WSADuplicateSocket(s->sock_fd, processId, &info);
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3752 Py_END_ALLOW_THREADS
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3753 if (result == SOCKET_ERROR)
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3754 return set_error();
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3755 return PyBytes_FromStringAndSize((const char*)&info, sizeof(info));
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3756 }
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3757 PyDoc_STRVAR(sock_share_doc,
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3758 "share(process_id) -> bytes\n\
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3759 \n\
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3760 Share the socket with another process. The target process id\n\
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3761 must be provided and the resulting bytes object passed to the target\n\
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3762 process. There the shared socket can be instantiated by calling\n\
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3763 socket.fromshare().");
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3764
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3765
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3766 #endif
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3767
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3768 /* List of methods for socket objects */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3769
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3770 static PyMethodDef sock_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3771 {"_accept", (PyCFunction)sock_accept, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3772 accept_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3773 {"bind", (PyCFunction)sock_bind, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3774 bind_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3775 {"close", (PyCFunction)sock_close, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3776 close_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3777 {"connect", (PyCFunction)sock_connect, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3778 connect_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3779 {"connect_ex", (PyCFunction)sock_connect_ex, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3780 connect_ex_doc},
63890 60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	3781 {"detach", (PyCFunction)sock_detach, METH_NOARGS,
60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	3782 detach_doc},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3783 {"fileno", (PyCFunction)sock_fileno, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3784 fileno_doc},
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3785 #ifdef HAVE_GETPEERNAME
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3786 {"getpeername", (PyCFunction)sock_getpeername,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3787 METH_NOARGS, getpeername_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3788 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3789 {"getsockname", (PyCFunction)sock_getsockname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3790 METH_NOARGS, getsockname_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3791 {"getsockopt", (PyCFunction)sock_getsockopt, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3792 getsockopt_doc},
47667 b1f4ea4eb555 Merged revisions 64214 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47663 diff changeset	3793 #if defined(MS_WINDOWS) && defined(SIO_RCVALL)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3794 {"ioctl", (PyCFunction)sock_ioctl, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3795 sock_ioctl_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3796 #endif
76150 51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3797 #if defined(MS_WINDOWS)
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3798 {"share", (PyCFunction)sock_share, METH_VARARGS,
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3799 sock_share_doc},
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3800 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3801 {"listen", (PyCFunction)sock_listen, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3802 listen_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3803 {"recv", (PyCFunction)sock_recv, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3804 recv_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3805 {"recv_into", (PyCFunction)sock_recv_into, METH_VARARGS \| METH_KEYWORDS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3806 recv_into_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3807 {"recvfrom", (PyCFunction)sock_recvfrom, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3808 recvfrom_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3809 {"recvfrom_into", (PyCFunction)sock_recvfrom_into, METH_VARARGS \| METH_KEYWORDS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3810 recvfrom_into_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3811 {"send", (PyCFunction)sock_send, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3812 send_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3813 {"sendall", (PyCFunction)sock_sendall, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3814 sendall_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3815 {"sendto", (PyCFunction)sock_sendto, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3816 sendto_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3817 {"setblocking", (PyCFunction)sock_setblocking, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3818 setblocking_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3819 {"settimeout", (PyCFunction)sock_settimeout, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3820 settimeout_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3821 {"gettimeout", (PyCFunction)sock_gettimeout, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3822 gettimeout_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3823 {"setsockopt", (PyCFunction)sock_setsockopt, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3824 setsockopt_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3825 {"shutdown", (PyCFunction)sock_shutdown, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3826 shutdown_doc},
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3827 #ifdef CMSG_LEN
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3828 {"recvmsg", (PyCFunction)sock_recvmsg, METH_VARARGS,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3829 recvmsg_doc},
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3830 {"recvmsg_into", (PyCFunction)sock_recvmsg_into, METH_VARARGS,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3831 recvmsg_into_doc,},
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3832 {"sendmsg", (PyCFunction)sock_sendmsg, METH_VARARGS,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3833 sendmsg_doc},
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3834 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3835 {NULL, NULL} /* sentinel */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3836 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3837
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	3838 /* SockObject members */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	3839 static PyMemberDef sock_memberlist[] = {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	3840 {"family", T_INT, offsetof(PySocketSockObject, sock_family), READONLY, "the socket family"},
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	3841 {"type", T_INT, offsetof(PySocketSockObject, sock_type), READONLY, "the socket type"},
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	3842 {"proto", T_INT, offsetof(PySocketSockObject, sock_proto), READONLY, "the socket protocol"},
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	3843 {"timeout", T_DOUBLE, offsetof(PySocketSockObject, sock_timeout), READONLY, "the socket timeout"},
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	3844 {0},
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	3845 };
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3846
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3847 /* Deallocate a socket object in response to the last Py_DECREF().
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3848 First close the file description. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3849
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3850 static void
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3851 sock_dealloc(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3852 {
65707 cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3853 if (s->sock_fd != -1) {
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3854 PyObject exc, val, *tb;
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3855 Py_ssize_t old_refcount = Py_REFCNT(s);
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3856 ++Py_REFCNT(s);
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3857 PyErr_Fetch(&exc, &val, &tb);
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3858 if (PyErr_WarnFormat(PyExc_ResourceWarning, 1,
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3859 "unclosed %R", s))
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3860 /* Spurious errors can appear at shutdown */
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3861 if (PyErr_ExceptionMatches(PyExc_Warning))
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3862 PyErr_WriteUnraisable((PyObject *) s);
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3863 PyErr_Restore(exc, val, tb);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3864 (void) SOCKETCLOSE(s->sock_fd);
65707 cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3865 Py_REFCNT(s) = old_refcount;
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3866 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3867 Py_TYPE(s)->tp_free((PyObject *)s);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3868 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3869
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3870
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3871 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3872 sock_repr(PySocketSockObject *s)
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3873 {
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	3874 #if SIZEOF_SOCKET_T > SIZEOF_LONG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3875 if (s->sock_fd > LONG_MAX) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3876 /* this can occur on Win64, and actually there is a special
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3877 ugly printf formatter for decimal pointer length integer
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3878 printing, only bother if necessary*/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3879 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3880 "no printf formatter to display "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3881 "the socket descriptor in decimal");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3882 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3883 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3884 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3885 return PyUnicode_FromFormat(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3886 "<socket object, fd=%ld, family=%d, type=%d, proto=%d>",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3887 (long)s->sock_fd, s->sock_family,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3888 s->sock_type,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3889 s->sock_proto);
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3890 }
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3891
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3892
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3893 /* Create a new, uninitialized socket object. */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3894
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3895 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3896 sock_new(PyTypeObject type, PyObject args, PyObject *kwds)
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3897 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3898 PyObject *new;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3899
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3900 new = type->tp_alloc(type, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3901 if (new != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3902 ((PySocketSockObject *)new)->sock_fd = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3903 ((PySocketSockObject *)new)->sock_timeout = -1.0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3904 ((PySocketSockObject *)new)->errorhandler = &set_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3905 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3906 return new;
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3907 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3908
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3909
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3910 /* Initialize a new socket object. */
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3911
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3912 /ARGSUSED/
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3913 static int
23807 cc65b5bcfc38 work around name clash with OS/2 TCPIP routine sock_init() Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 23736 diff changeset	3914 sock_initobj(PyObject self, PyObject args, PyObject *kwds)
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3915 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3916 PySocketSockObject s = (PySocketSockObject )self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3917 PyObject *fdobj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3918 SOCKET_T fd = INVALID_SOCKET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3919 int family = AF_INET, type = SOCK_STREAM, proto = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3920 static char *keywords[] = {"family", "type", "proto", "fileno", 0};
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3921
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3922 if (!PyArg_ParseTupleAndKeywords(args, kwds,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3923 "\|iiiO:socket", keywords,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3924 &family, &type, &proto, &fdobj))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3925 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3926
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3927 if (fdobj != NULL && fdobj != Py_None) {
76150 51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3928 #ifdef MS_WINDOWS
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3929 /* recreate a socket that was duplicated */
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3930 if (PyBytes_Check(fdobj)) {
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3931 WSAPROTOCOL_INFO info;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3932 if (PyBytes_GET_SIZE(fdobj) != sizeof(info)) {
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3933 PyErr_Format(PyExc_ValueError,
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3934 "socket descriptor string has wrong size, "
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3935 "should be %zu bytes.", sizeof(info));
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3936 return -1;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3937 }
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3938 memcpy(&info, PyBytes_AS_STRING(fdobj), sizeof(info));
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3939 Py_BEGIN_ALLOW_THREADS
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3940 fd = WSASocket(FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO,
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3941 FROM_PROTOCOL_INFO, &info, 0, WSA_FLAG_OVERLAPPED);
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3942 Py_END_ALLOW_THREADS
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3943 if (fd == INVALID_SOCKET) {
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3944 set_error();
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3945 return -1;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3946 }
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3947 family = info.iAddressFamily;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3948 type = info.iSocketType;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3949 proto = info.iProtocol;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3950 }
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3951 else
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3952 #endif
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3953 {
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3954 fd = PyLong_AsSocket_t(fdobj);
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3955 if (fd == (SOCKET_T)(-1) && PyErr_Occurred())
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3956 return -1;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3957 if (fd == INVALID_SOCKET) {
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3958 PyErr_SetString(PyExc_ValueError,
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3959 "can't use invalid socket value");
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3960 return -1;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3961 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3962 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3963 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3964 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3965 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3966 fd = socket(family, type, proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3967 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3968
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3969 if (fd == INVALID_SOCKET) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3970 set_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3971 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3972 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3973 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3974 init_sockobject(s, fd, family, type, proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3975
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3976 return 0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3977
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3978 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3979
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3980
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	3981 /* Type object for socket objects. */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3982
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3983 static PyTypeObject sock_type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3984 PyVarObject_HEAD_INIT(0, 0) /* Must fill in type value later */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3985 "_socket.socket", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3986 sizeof(PySocketSockObject), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3987 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3988 (destructor)sock_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3989 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3990 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3991 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3992 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3993 (reprfunc)sock_repr, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3994 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3995 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3996 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3997 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3998 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3999 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4000 PyObject_GenericGetAttr, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4001 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4002 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4003 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4004 sock_doc, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4005 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4006 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4007 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4008 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4009 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4010 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4011 sock_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4012 sock_memberlist, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4013 0, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4014 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4015 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4016 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4017 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4018 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4019 sock_initobj, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4020 PyType_GenericAlloc, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4021 sock_new, /* tp_new */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4022 PyObject_Del, /* tp_free */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4023 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4024
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4025
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	4026 /* Python interface to gethostname(). */
a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	4027
a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	4028 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	4029 static PyObject *
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	4030 socket_gethostname(PyObject self, PyObject unused)
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	4031 {
65721 a4fd3dc74299 Issue #9377: Use Unicode API for gethostname on Windows. Martin v. Löwis <martin@v.loewis.de> parents: 65707 diff changeset	4032 #ifdef MS_WINDOWS
a4fd3dc74299 Issue #9377: Use Unicode API for gethostname on Windows. Martin v. Löwis <martin@v.loewis.de> parents: 65707 diff changeset	4033 /* Don't use winsock's gethostname, as this returns the ANSI
a4fd3dc74299 Issue #9377: Use Unicode API for gethostname on Windows. Martin v. Löwis <martin@v.loewis.de> parents: 65707 diff changeset	4034 version of the hostname, whereas we need a Unicode string.
a4fd3dc74299 Issue #9377: Use Unicode API for gethostname on Windows. Martin v. Löwis <martin@v.loewis.de> parents: 65707 diff changeset	4035 Otherwise, gethostname apparently also returns the DNS name. */
65981 49b0d423023e Fixed socket_gethostname() on windows. Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 65727 diff changeset	4036 wchar_t buf[MAX_COMPUTERNAME_LENGTH + 1];
72510 b534b56379cb Use the new Py_ARRAY_LENGTH macro Victor Stinner <victor.stinner@haypocalc.com> parents: 72117 diff changeset	4037 DWORD size = Py_ARRAY_LENGTH(buf);
73594 488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4038 wchar_t *name;
65981 49b0d423023e Fixed socket_gethostname() on windows. Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 65727 diff changeset	4039 PyObject *result;
73594 488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4040
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4041 if (GetComputerNameExW(ComputerNamePhysicalDnsHostname, buf, &size))
73683 d48b4a1c511a Use the new Unicode API Victor Stinner <victor.stinner@haypocalc.com> parents: 73594 diff changeset	4042 return PyUnicode_FromWideChar(buf, size);
73594 488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4043
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4044 if (GetLastError() != ERROR_MORE_DATA)
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4045 return PyErr_SetFromWindowsErr(0);
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4046
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4047 if (size == 0)
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4048 return PyUnicode_New(0, 0);
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4049
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4050 /* MSDN says ERROR_MORE_DATA may occur because DNS allows longer
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4051 names */
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4052 name = PyMem_Malloc(size * sizeof(wchar_t));
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4053 if (!name)
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4054 return NULL;
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4055 if (!GetComputerNameExW(ComputerNamePhysicalDnsHostname,
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4056 name,
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4057 &size))
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4058 {
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4059 PyMem_Free(name);
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4060 return PyErr_SetFromWindowsErr(0);
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4061 }
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4062
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4063 result = PyUnicode_FromWideChar(name, size);
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4064 PyMem_Free(name);
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4065 return result;
65721 a4fd3dc74299 Issue #9377: Use Unicode API for gethostname on Windows. Martin v. Löwis <martin@v.loewis.de> parents: 65707 diff changeset	4066 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4067 char buf[1024];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4068 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4069 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4070 res = gethostname(buf, (int) sizeof buf - 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4071 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4072 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4073 return set_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4074 buf[sizeof buf - 1] = '\0';
84019 ffdee6b36305 Close #18109: os.uname() now decodes fields from the locale encoding, and Victor Stinner <victor.stinner@gmail.com> parents: 83907 diff changeset	4075 return PyUnicode_DecodeFSDefault(buf);
65721 a4fd3dc74299 Issue #9377: Use Unicode API for gethostname on Windows. Martin v. Löwis <martin@v.loewis.de> parents: 65707 diff changeset	4076 #endif
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	4077 }
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	4078
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4079 PyDoc_STRVAR(gethostname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4080 "gethostname() -> string\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4081 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4082 Return the current host name.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4083
68194 a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4084 #ifdef HAVE_SETHOSTNAME
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4085 PyDoc_STRVAR(sethostname_doc,
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4086 "sethostname(name)\n\n\
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4087 Sets the hostname to name.");
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4088
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4089 static PyObject *
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4090 socket_sethostname(PyObject self, PyObject args)
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4091 {
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4092 PyObject *hnobj;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4093 Py_buffer buf;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4094 int res, flag = 0;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4095
84209 9f8efcd78d0d Issue #18259: Declare sethostname in socketmodule.c for AIX Christian Heimes <christian@cheimes.de> parents: 84075 diff changeset	4096 #ifdef _AIX
9f8efcd78d0d Issue #18259: Declare sethostname in socketmodule.c for AIX Christian Heimes <christian@cheimes.de> parents: 84075 diff changeset	4097 /* issue #18259, not declared in any useful header file */
9f8efcd78d0d Issue #18259: Declare sethostname in socketmodule.c for AIX Christian Heimes <christian@cheimes.de> parents: 84075 diff changeset	4098 extern int sethostname(const char *, size_t);
9f8efcd78d0d Issue #18259: Declare sethostname in socketmodule.c for AIX Christian Heimes <christian@cheimes.de> parents: 84075 diff changeset	4099 #endif
9f8efcd78d0d Issue #18259: Declare sethostname in socketmodule.c for AIX Christian Heimes <christian@cheimes.de> parents: 84075 diff changeset	4100
68194 a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4101 if (!PyArg_ParseTuple(args, "S:sethostname", &hnobj)) {
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4102 PyErr_Clear();
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4103 if (!PyArg_ParseTuple(args, "O&:sethostname",
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4104 PyUnicode_FSConverter, &hnobj))
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4105 return NULL;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4106 flag = 1;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4107 }
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4108 res = PyObject_GetBuffer(hnobj, &buf, PyBUF_SIMPLE);
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4109 if (!res) {
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4110 res = sethostname(buf.buf, buf.len);
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4111 PyBuffer_Release(&buf);
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4112 }
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4113 if (flag)
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4114 Py_DECREF(hnobj);
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4115 if (res)
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4116 return set_error();
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4117 Py_RETURN_NONE;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4118 }
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4119 #endif
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	4120
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4121 /* Python interface to gethostbyname(name). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4122
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4123 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	4124 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4125 socket_gethostbyname(PyObject self, PyObject args)
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4126 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4127 char *name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4128 sock_addr_t addrbuf;
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4129 PyObject *ret = NULL;
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4130
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4131 if (!PyArg_ParseTuple(args, "et:gethostbyname", "idna", &name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4132 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4133 if (setipaddr(name, SAS2SA(&addrbuf), sizeof(addrbuf), AF_INET) < 0)
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4134 goto finally;
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4135 ret = makeipaddr(SAS2SA(&addrbuf), sizeof(struct sockaddr_in));
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4136 finally:
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4137 PyMem_Free(name);
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4138 return ret;
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4139 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4140
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4141 PyDoc_STRVAR(gethostbyname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4142 "gethostbyname(host) -> address\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4143 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4144 Return the IP address (a string of the form '255.255.255.255') for a host.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4145
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4146
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4147 /* Convenience function common to gethostbyname_ex and gethostbyaddr */
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4148
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4149 static PyObject *
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4150 gethost_common(struct hostent h, struct sockaddr addr, int alen, int af)
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4151 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4152 char **pch;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4153 PyObject rtn_tuple = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4154 PyObject name_list = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4155 PyObject addr_list = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4156 PyObject *tmp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4157
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4158 if (h == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4159 /* Let's get real error message to return */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4160 set_herror(h_errno);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4161 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4162 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4163
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4164 if (h->h_addrtype != af) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4165 /* Let's get real error message to return */
74007 51412b4b81ae Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8 Victor Stinner <victor.stinner@haypocalc.com> parents: 73998 diff changeset	4166 errno = EAFNOSUPPORT;
51412b4b81ae Issue #13560: os.strerror() now uses the current locale encoding instead of UTF-8 Victor Stinner <victor.stinner@haypocalc.com> parents: 73998 diff changeset	4167 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4168 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4169 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4170
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4171 switch (af) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4172
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4173 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4174 if (alen < sizeof(struct sockaddr_in))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4175 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4176 break;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	4177
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	4178 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4179 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4180 if (alen < sizeof(struct sockaddr_in6))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4181 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4182 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4183 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4184
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4185 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4186
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4187 if ((name_list = PyList_New(0)) == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4188 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4189
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4190 if ((addr_list = PyList_New(0)) == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4191 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4192
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4193 /* SF #1511317: h_aliases can be NULL */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4194 if (h->h_aliases) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4195 for (pch = h->h_aliases; *pch != NULL; pch++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4196 int status;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4197 tmp = PyUnicode_FromString(*pch);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4198 if (tmp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4199 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4200
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4201 status = PyList_Append(name_list, tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4202 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4203
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4204 if (status)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4205 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4206 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4207 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4208
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4209 for (pch = h->h_addr_list; *pch != NULL; pch++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4210 int status;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4211
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4212 switch (af) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4213
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4214 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4215 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4216 struct sockaddr_in sin;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4217 memset(&sin, 0, sizeof(sin));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4218 sin.sin_family = af;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4219 #ifdef HAVE_SOCKADDR_SA_LEN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4220 sin.sin_len = sizeof(sin);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4221 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4222 memcpy(&sin.sin_addr, *pch, sizeof(sin.sin_addr));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4223 tmp = makeipaddr((struct sockaddr *)&sin, sizeof(sin));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4224
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4225 if (pch == h->h_addr_list && alen >= sizeof(sin))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4226 memcpy((char *) addr, &sin, sizeof(sin));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4227 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4228 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	4229
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	4230 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4231 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4232 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4233 struct sockaddr_in6 sin6;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4234 memset(&sin6, 0, sizeof(sin6));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4235 sin6.sin6_family = af;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4236 #ifdef HAVE_SOCKADDR_SA_LEN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4237 sin6.sin6_len = sizeof(sin6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4238 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4239 memcpy(&sin6.sin6_addr, *pch, sizeof(sin6.sin6_addr));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4240 tmp = makeipaddr((struct sockaddr *)&sin6,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4241 sizeof(sin6));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4242
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4243 if (pch == h->h_addr_list && alen >= sizeof(sin6))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4244 memcpy((char *) addr, &sin6, sizeof(sin6));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4245 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4246 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4247 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4248
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4249 default: /* can't happen */
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4250 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4251 "unsupported address family");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4252 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4253 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4254
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4255 if (tmp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4256 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4257
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4258 status = PyList_Append(addr_list, tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4259 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4260
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4261 if (status)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4262 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4263 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4264
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4265 rtn_tuple = Py_BuildValue("sOO", h->h_name, name_list, addr_list);
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	4266
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4267 err:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4268 Py_XDECREF(name_list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4269 Py_XDECREF(addr_list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4270 return rtn_tuple;
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4271 }
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4272
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4273
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4274 /* Python interface to gethostbyname_ex(name). */
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4275
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4276 /ARGSUSED/
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4277 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4278 socket_gethostbyname_ex(PyObject self, PyObject args)
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4279 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4280 char *name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4281 struct hostent *h;
74142 683a1b1ff15d Issue #8623: Fix some strict-aliasing warnings. Patch by David Watson. Charles-François Natali <neologix@free.fr> parents: 74012 diff changeset	4282 sock_addr_t addr;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4283 struct sockaddr *sa;
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4284 PyObject *ret = NULL;
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4285 #ifdef HAVE_GETHOSTBYNAME_R
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4286 struct hostent hp_allocated;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4287 #ifdef HAVE_GETHOSTBYNAME_R_3_ARG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4288 struct hostent_data data;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4289 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4290 char buf[16384];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4291 int buf_len = (sizeof buf) - 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4292 int errnop;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4293 #endif
75469 2f10c1ad4b21 Issue #10951: Fix warnings in the socket module. Ross Lagerwall <rosslagerwall@gmail.com> parents: 74741 diff changeset	4294 #ifdef HAVE_GETHOSTBYNAME_R_3_ARG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4295 int result;
10401 f81db738abd9 Patch by Rob Riggs for Linux -- glibc2 has a different argument Guido van Rossum <guido@python.org> parents: 9679 diff changeset	4296 #endif
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4297 #endif /* HAVE_GETHOSTBYNAME_R */
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4298
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4299 if (!PyArg_ParseTuple(args, "et:gethostbyname_ex", "idna", &name))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4300 return NULL;
74142 683a1b1ff15d Issue #8623: Fix some strict-aliasing warnings. Patch by David Watson. Charles-François Natali <neologix@free.fr> parents: 74012 diff changeset	4301 if (setipaddr(name, SAS2SA(&addr), sizeof(addr), AF_INET) < 0)
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4302 goto finally;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4303 Py_BEGIN_ALLOW_THREADS
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4304 #ifdef HAVE_GETHOSTBYNAME_R
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4305 #if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
75469 2f10c1ad4b21 Issue #10951: Fix warnings in the socket module. Ross Lagerwall <rosslagerwall@gmail.com> parents: 74741 diff changeset	4306 gethostbyname_r(name, &hp_allocated, buf, buf_len,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4307 &h, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4308 #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4309 h = gethostbyname_r(name, &hp_allocated, buf, buf_len, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4310 #else /* HAVE_GETHOSTBYNAME_R_3_ARG */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4311 memset((void *) &data, '\0', sizeof(data));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4312 result = gethostbyname_r(name, &hp_allocated, &data);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4313 h = (result != 0) ? NULL : &hp_allocated;
10401 f81db738abd9 Patch by Rob Riggs for Linux -- glibc2 has a different argument Guido van Rossum <guido@python.org> parents: 9679 diff changeset	4314 #endif
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4315 #else /* not HAVE_GETHOSTBYNAME_R */
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	4316 #ifdef USE_GETHOSTBYNAME_LOCK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4317 PyThread_acquire_lock(netdb_lock, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4318 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4319 h = gethostbyname(name);
10441 9ba5dffccb1b Jonathan Giddy writes: Guido van Rossum <guido@python.org> parents: 10401 diff changeset	4320 #endif /* HAVE_GETHOSTBYNAME_R */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4321 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4322 /* Some C libraries would require addr.__ss_family instead of
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4323 addr.ss_family.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4324 Therefore, we cast the sockaddr_storage into sockaddr to
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4325 access sa_family. */
74142 683a1b1ff15d Issue #8623: Fix some strict-aliasing warnings. Patch by David Watson. Charles-François Natali <neologix@free.fr> parents: 74012 diff changeset	4326 sa = SAS2SA(&addr);
683a1b1ff15d Issue #8623: Fix some strict-aliasing warnings. Patch by David Watson. Charles-François Natali <neologix@free.fr> parents: 74012 diff changeset	4327 ret = gethost_common(h, SAS2SA(&addr), sizeof(addr),
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4328 sa->sa_family);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	4329 #ifdef USE_GETHOSTBYNAME_LOCK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4330 PyThread_release_lock(netdb_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4331 #endif
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4332 finally:
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4333 PyMem_Free(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4334 return ret;
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4335 }
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4336
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4337 PyDoc_STRVAR(ghbn_ex_doc,
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4338 "gethostbyname_ex(host) -> (name, aliaslist, addresslist)\n\
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4339 \n\
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4340 Return the true host name, a list of aliases, and a list of IP addresses,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4341 for a host. The host argument is a string giving a host name or IP number.");
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4342
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4343
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4344 /* Python interface to gethostbyaddr(IP). */
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4345
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4346 /ARGSUSED/
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4347 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4348 socket_gethostbyaddr(PyObject self, PyObject args)
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4349 {
74142 683a1b1ff15d Issue #8623: Fix some strict-aliasing warnings. Patch by David Watson. Charles-François Natali <neologix@free.fr> parents: 74012 diff changeset	4350 sock_addr_t addr;
683a1b1ff15d Issue #8623: Fix some strict-aliasing warnings. Patch by David Watson. Charles-François Natali <neologix@free.fr> parents: 74012 diff changeset	4351 struct sockaddr *sa = SAS2SA(&addr);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4352 char *ip_num;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4353 struct hostent *h;
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4354 PyObject *ret = NULL;
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	4355 #ifdef HAVE_GETHOSTBYNAME_R
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4356 struct hostent hp_allocated;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4357 #ifdef HAVE_GETHOSTBYNAME_R_3_ARG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4358 struct hostent_data data;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4359 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4360 /* glibcs up to 2.10 assume that the buf argument to
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4361 gethostbyaddr_r is 8-byte aligned, which at least llvm-gcc
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4362 does not ensure. The attribute below instructs the compiler
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4363 to maintain this alignment. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4364 char buf[16384] Py_ALIGNED(8);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4365 int buf_len = (sizeof buf) - 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4366 int errnop;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4367 #endif
75469 2f10c1ad4b21 Issue #10951: Fix warnings in the socket module. Ross Lagerwall <rosslagerwall@gmail.com> parents: 74741 diff changeset	4368 #ifdef HAVE_GETHOSTBYNAME_R_3_ARG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4369 int result;
10401 f81db738abd9 Patch by Rob Riggs for Linux -- glibc2 has a different argument Guido van Rossum <guido@python.org> parents: 9679 diff changeset	4370 #endif
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	4371 #endif /* HAVE_GETHOSTBYNAME_R */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4372 char *ap;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4373 int al;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4374 int af;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4375
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4376 if (!PyArg_ParseTuple(args, "et:gethostbyaddr", "idna", &ip_num))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4377 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4378 af = AF_UNSPEC;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4379 if (setipaddr(ip_num, sa, sizeof(addr), af) < 0)
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4380 goto finally;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4381 af = sa->sa_family;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4382 ap = NULL;
68102 e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 66799 diff changeset	4383 /* al = 0; */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4384 switch (af) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4385 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4386 ap = (char )&((struct sockaddr_in )sa)->sin_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4387 al = sizeof(((struct sockaddr_in *)sa)->sin_addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4388 break;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	4389 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4390 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4391 ap = (char )&((struct sockaddr_in6 )sa)->sin6_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4392 al = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4393 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4394 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4395 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4396 PyErr_SetString(PyExc_OSError, "unsupported address family");
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4397 goto finally;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4398 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4399 Py_BEGIN_ALLOW_THREADS
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	4400 #ifdef HAVE_GETHOSTBYNAME_R
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4401 #if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
75469 2f10c1ad4b21 Issue #10951: Fix warnings in the socket module. Ross Lagerwall <rosslagerwall@gmail.com> parents: 74741 diff changeset	4402 gethostbyaddr_r(ap, al, af,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4403 &hp_allocated, buf, buf_len,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4404 &h, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4405 #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4406 h = gethostbyaddr_r(ap, al, af,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4407 &hp_allocated, buf, buf_len, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4408 #else /* HAVE_GETHOSTBYNAME_R_3_ARG */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4409 memset((void *) &data, '\0', sizeof(data));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4410 result = gethostbyaddr_r(ap, al, af, &hp_allocated, &data);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4411 h = (result != 0) ? NULL : &hp_allocated;
10401 f81db738abd9 Patch by Rob Riggs for Linux -- glibc2 has a different argument Guido van Rossum <guido@python.org> parents: 9679 diff changeset	4412 #endif
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	4413 #else /* not HAVE_GETHOSTBYNAME_R */
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	4414 #ifdef USE_GETHOSTBYNAME_LOCK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4415 PyThread_acquire_lock(netdb_lock, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4416 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4417 h = gethostbyaddr(ap, al, af);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	4418 #endif /* HAVE_GETHOSTBYNAME_R */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4419 Py_END_ALLOW_THREADS
74142 683a1b1ff15d Issue #8623: Fix some strict-aliasing warnings. Patch by David Watson. Charles-François Natali <neologix@free.fr> parents: 74012 diff changeset	4420 ret = gethost_common(h, SAS2SA(&addr), sizeof(addr), af);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	4421 #ifdef USE_GETHOSTBYNAME_LOCK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4422 PyThread_release_lock(netdb_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4423 #endif
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4424 finally:
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4425 PyMem_Free(ip_num);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4426 return ret;
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4427 }
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4428
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4429 PyDoc_STRVAR(gethostbyaddr_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4430 "gethostbyaddr(host) -> (name, aliaslist, addresslist)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4431 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4432 Return the true host name, a list of aliases, and a list of IP addresses,\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4433 for a host. The host argument is a string giving a host name or IP number.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4434
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4435
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4436 /* Python interface to getservbyname(name).
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4437 This only returns the port number, since the other info is already
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4438 known or not useful (like the list of aliases). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4439
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4440 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	4441 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4442 socket_getservbyname(PyObject self, PyObject args)
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4443 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4444 char name, proto=NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4445 struct servent *sp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4446 if (!PyArg_ParseTuple(args, "s\|s:getservbyname", &name, &proto))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4447 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4448 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4449 sp = getservbyname(name, proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4450 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4451 if (sp == NULL) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4452 PyErr_SetString(PyExc_OSError, "service/proto not found");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4453 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4454 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4455 return PyLong_FromLong((long) ntohs(sp->s_port));
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4456 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4457
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4458 PyDoc_STRVAR(getservbyname_doc,
32429 d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4459 "getservbyname(servicename[, protocolname]) -> integer\n\
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4460 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4461 Return a port number from a service name and protocol name.\n\
32429 d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4462 The optional protocol name, if given, should be 'tcp' or 'udp',\n\
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4463 otherwise any protocol will match.");
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4464
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4465
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4466 /* Python interface to getservbyport(port).
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4467 This only returns the service name, since the other info is already
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4468 known or not useful (like the list of aliases). */
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4469
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4470 /ARGSUSED/
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4471 static PyObject *
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4472 socket_getservbyport(PyObject self, PyObject args)
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4473 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4474 int port;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4475 char *proto=NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4476 struct servent *sp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4477 if (!PyArg_ParseTuple(args, "i\|s:getservbyport", &port, &proto))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4478 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4479 if (port < 0 \|\| port > 0xffff) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4480 PyErr_SetString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4481 PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4482 "getservbyport: port must be 0-65535.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4483 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4484 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4485 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4486 sp = getservbyport(htons((short)port), proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4487 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4488 if (sp == NULL) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4489 PyErr_SetString(PyExc_OSError, "port/proto not found");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4490 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4491 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4492 return PyUnicode_FromString(sp->s_name);
32429 d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4493 }
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4494
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4495 PyDoc_STRVAR(getservbyport_doc,
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4496 "getservbyport(port[, protocolname]) -> string\n\
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4497 \n\
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4498 Return the service name from a port number and protocol name.\n\
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4499 The optional protocol name, if given, should be 'tcp' or 'udp',\n\
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4500 otherwise any protocol will match.");
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4501
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4502 /* Python interface to getprotobyname(name).
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4503 This only returns the protocol number, since the other info is
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4504 already known or not useful (like the list of aliases). */
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4505
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4506 /ARGSUSED/
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4507 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4508 socket_getprotobyname(PyObject self, PyObject args)
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4509 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4510 char *name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4511 struct protoent *sp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4512 if (!PyArg_ParseTuple(args, "s:getprotobyname", &name))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4513 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4514 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4515 sp = getprotobyname(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4516 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4517 if (sp == NULL) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4518 PyErr_SetString(PyExc_OSError, "protocol not found");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4519 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4520 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4521 return PyLong_FromLong((long) sp->p_proto);
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4522 }
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4523
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4524 PyDoc_STRVAR(getprotobyname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4525 "getprotobyname(name) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4526 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4527 Return the protocol number for the named protocol. (Rarely used.)");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4528
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4529
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4530 #ifndef NO_DUP
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4531 /* dup() function for socket fds */
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4532
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4533 static PyObject *
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4534 socket_dup(PyObject self, PyObject fdobj)
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4535 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4536 SOCKET_T fd, newfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4537 PyObject *newfdobj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4538
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4539
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4540 fd = PyLong_AsSocket_t(fdobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4541 if (fd == (SOCKET_T)(-1) && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4542 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4543
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4544 newfd = dup_socket(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4545 if (newfd == INVALID_SOCKET)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4546 return set_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4547
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4548 newfdobj = PyLong_FromSocket_t(newfd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4549 if (newfdobj == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4550 SOCKETCLOSE(newfd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4551 return newfdobj;
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4552 }
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4553
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4554 PyDoc_STRVAR(dup_doc,
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4555 "dup(integer) -> integer\n\
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4556 \n\
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4557 Duplicate an integer socket file descriptor. This is like os.dup(), but for\n\
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4558 sockets; on some platforms os.dup() won't work for socket file descriptors.");
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4559 #endif
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4560
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4561
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4562 #ifdef HAVE_SOCKETPAIR
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4563 /* Create a pair of sockets using the socketpair() function.
33239 fb9869044bba Updated the socketpair() docstring and documentation to explain that the Dave Cole <djc@object-craft.com.au> parents: 33238 diff changeset	4564 Arguments as for socket() except the default family is AF_UNIX if
33280 826ad896a7a5 Patch #1015012. Improve markup and punctuation in libsocket.tex Dave Cole <djc@object-craft.com.au> parents: 33260 diff changeset	4565 defined on the platform; otherwise, the default is AF_INET. */
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4566
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4567 /ARGSUSED/
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4568 static PyObject *
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4569 socket_socketpair(PyObject self, PyObject args)
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4570 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4571 PySocketSockObject s0 = NULL, s1 = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4572 SOCKET_T sv[2];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4573 int family, type = SOCK_STREAM, proto = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4574 PyObject *res = NULL;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4575
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4576 #if defined(AF_UNIX)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4577 family = AF_UNIX;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4578 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4579 family = AF_INET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4580 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4581 if (!PyArg_ParseTuple(args, "\|iii:socketpair",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4582 &family, &type, &proto))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4583 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4584 /* Create a pair of socket fds */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4585 if (socketpair(family, type, proto, sv) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4586 return set_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4587 s0 = new_sockobject(sv[0], family, type, proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4588 if (s0 == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4589 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4590 s1 = new_sockobject(sv[1], family, type, proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4591 if (s1 == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4592 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4593 res = PyTuple_Pack(2, s0, s1);
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4594
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4595 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4596 if (res == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4597 if (s0 == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4598 SOCKETCLOSE(sv[0]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4599 if (s1 == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4600 SOCKETCLOSE(sv[1]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4601 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4602 Py_XDECREF(s0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4603 Py_XDECREF(s1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4604 return res;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4605 }
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4606
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4607 PyDoc_STRVAR(socketpair_doc,
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4608 "socketpair([family[, type[, proto]]]) -> (socket object, socket object)\n\
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4609 \n\
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4610 Create a pair of socket objects from the sockets returned by the platform\n\
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4611 socketpair() function.\n\
33239 fb9869044bba Updated the socketpair() docstring and documentation to explain that the Dave Cole <djc@object-craft.com.au> parents: 33238 diff changeset	4612 The arguments are the same as for socket() except the default family is\n\
33280 826ad896a7a5 Patch #1015012. Improve markup and punctuation in libsocket.tex Dave Cole <djc@object-craft.com.au> parents: 33260 diff changeset	4613 AF_UNIX if defined on the platform; otherwise, the default is AF_INET.");
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4614
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4615 #endif /* HAVE_SOCKETPAIR */
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4616
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4617
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4618 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4619 socket_ntohs(PyObject self, PyObject args)
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4620 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4621 int x1, x2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4622
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4623 if (!PyArg_ParseTuple(args, "i:ntohs", &x1)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4624 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4625 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4626 if (x1 < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4627 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4628 "can't convert negative number to unsigned long");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4629 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4630 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4631 x2 = (unsigned int)ntohs((unsigned short)x1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4632 return PyLong_FromLong(x2);
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4633 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4634
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4635 PyDoc_STRVAR(ntohs_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4636 "ntohs(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4637 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4638 Convert a 16-bit integer from network to host byte order.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4639
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4640
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4641 static PyObject *
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	4642 socket_ntohl(PyObject self, PyObject arg)
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4643 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4644 unsigned long x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4645
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4646 if (PyLong_Check(arg)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4647 x = PyLong_AsUnsignedLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4648 if (x == (unsigned long) -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4649 return NULL;
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	4650 #if SIZEOF_LONG > 4
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4651 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4652 unsigned long y;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4653 /* only want the trailing 32 bits */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4654 y = x & 0xFFFFFFFFUL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4655 if (y ^ x)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4656 return PyErr_Format(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4657 "long int larger than 32 bits");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4658 x = y;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4659 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4660 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4661 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4662 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4663 return PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4664 "expected int/long, %s found",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4665 Py_TYPE(arg)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4666 return PyLong_FromUnsignedLong(ntohl(x));
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4667 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4668
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4669 PyDoc_STRVAR(ntohl_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4670 "ntohl(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4671 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4672 Convert a 32-bit integer from network to host byte order.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4673
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4674
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4675 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4676 socket_htons(PyObject self, PyObject args)
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4677 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4678 int x1, x2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4679
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4680 if (!PyArg_ParseTuple(args, "i:htons", &x1)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4681 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4682 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4683 if (x1 < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4684 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4685 "can't convert negative number to unsigned long");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4686 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4687 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4688 x2 = (unsigned int)htons((unsigned short)x1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4689 return PyLong_FromLong(x2);
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4690 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4691
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4692 PyDoc_STRVAR(htons_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4693 "htons(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4694 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4695 Convert a 16-bit integer from host to network byte order.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4696
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4697
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4698 static PyObject *
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	4699 socket_htonl(PyObject self, PyObject arg)
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4700 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4701 unsigned long x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4702
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4703 if (PyLong_Check(arg)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4704 x = PyLong_AsUnsignedLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4705 if (x == (unsigned long) -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4706 return NULL;
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	4707 #if SIZEOF_LONG > 4
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4708 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4709 unsigned long y;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4710 /* only want the trailing 32 bits */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4711 y = x & 0xFFFFFFFFUL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4712 if (y ^ x)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4713 return PyErr_Format(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4714 "long int larger than 32 bits");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4715 x = y;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4716 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4717 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4718 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4719 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4720 return PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4721 "expected int/long, %s found",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4722 Py_TYPE(arg)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4723 return PyLong_FromUnsignedLong(htonl((unsigned long)x));
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4724 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4725
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4726 PyDoc_STRVAR(htonl_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4727 "htonl(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4728 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4729 Convert a 32-bit integer from host to network byte order.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4730
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4731 /* socket.inet_aton() and socket.inet_ntoa() functions. */
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4732
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4733 PyDoc_STRVAR(inet_aton_doc,
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	4734 "inet_aton(string) -> bytes giving packed 32-bit IP representation\n\
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4735 \n\
11219 2d7331f4dfe3 Port inet_ntoa and inet_aton to Windows: Guido van Rossum <guido@python.org> parents: 11217 diff changeset	4736 Convert an IP address in string format (123.45.67.89) to the 32-bit packed\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4737 binary format used in low-level network functions.");
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4738
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4739 static PyObject*
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4740 socket_inet_aton(PyObject self, PyObject args)
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4741 {
11268 3fe8d13328c8 It appears that inet_aton() doesn't really exist except in libresolv; Guido van Rossum <guido@python.org> parents: 11219 diff changeset	4742 #ifndef INADDR_NONE
3fe8d13328c8 It appears that inet_aton() doesn't really exist except in libresolv; Guido van Rossum <guido@python.org> parents: 11219 diff changeset	4743 #define INADDR_NONE (-1)
3fe8d13328c8 It appears that inet_aton() doesn't really exist except in libresolv; Guido van Rossum <guido@python.org> parents: 11219 diff changeset	4744 #endif
27858 9453d8cdd01e Ummm, try to get it right this time Neal Norwitz <nnorwitz@gmail.com> parents: 27857 diff changeset	4745 #ifdef HAVE_INET_ATON
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4746 struct in_addr buf;
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4747 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4748
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4749 #if !defined(HAVE_INET_ATON) \|\| defined(USE_INET_ATON_WEAKLINK)
51579 648e07dd0825 Merged revisions 69364-69365,69409-69410,69413,69417,69435,69442,69447,69495,69519-69521 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51384 diff changeset	4750 #if (SIZEOF_INT != 4)
648e07dd0825 Merged revisions 69364-69365,69409-69410,69413,69417,69435,69442,69447,69495,69519-69521 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51384 diff changeset	4751 #error "Not sure if in_addr_t exists and int is not 32-bits."
648e07dd0825 Merged revisions 69364-69365,69409-69410,69413,69417,69435,69442,69447,69495,69519-69521 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51384 diff changeset	4752 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4753 /* Have to use inet_addr() instead */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4754 unsigned int packed_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4755 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4756 char *ip_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4757
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4758 if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4759 return NULL;
27861 f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	4760
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	4761
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	4762 #ifdef HAVE_INET_ATON
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4763
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4764 #ifdef USE_INET_ATON_WEAKLINK
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4765 if (inet_aton != NULL) {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4766 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4767 if (inet_aton(ip_addr, &buf))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4768 return PyBytes_FromStringAndSize((char *)(&buf),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4769 sizeof(buf));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4770
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4771 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4772 "illegal IP address string passed to inet_aton");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4773 return NULL;
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	4774
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4775 #ifdef USE_INET_ATON_WEAKLINK
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4776 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4777 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4778
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4779 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4780
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4781 #if !defined(HAVE_INET_ATON) \|\| defined(USE_INET_ATON_WEAKLINK)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4782
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4783 /* special-case this address as inet_addr might return INADDR_NONE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4784 * for this */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4785 if (strcmp(ip_addr, "255.255.255.255") == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4786 packed_addr = 0xFFFFFFFF;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4787 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4788
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4789 packed_addr = inet_addr(ip_addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4790
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4791 if (packed_addr == INADDR_NONE) { /* invalid address */
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4792 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4793 "illegal IP address string passed to inet_aton");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4794 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4795 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4796 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4797 return PyBytes_FromStringAndSize((char *) &packed_addr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4798 sizeof(packed_addr));
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4799
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4800 #ifdef USE_INET_ATON_WEAKLINK
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4801 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4802 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4803
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	4804 #endif
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4805 }
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4806
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4807 PyDoc_STRVAR(inet_ntoa_doc,
11937 ef98ee6aeb42 Fixed inet_ntoa() docstring. Fred Drake <fdrake@acm.org> parents: 11882 diff changeset	4808 "inet_ntoa(packed_ip) -> ip_address_string\n\
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4809 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4810 Convert an IP address from 32-bit packed binary format to string format");
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4811
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4812 static PyObject*
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4813 socket_inet_ntoa(PyObject self, PyObject args)
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4814 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4815 char *packed_str;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4816 int addr_len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4817 struct in_addr packed_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4818
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4819 if (!PyArg_ParseTuple(args, "y#:inet_ntoa", &packed_str, &addr_len)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4820 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4821 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4822
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4823 if (addr_len != sizeof(packed_addr)) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4824 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4825 "packed IP wrong length for inet_ntoa");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4826 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4827 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4828
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4829 memcpy(&packed_addr, packed_str, addr_len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4830
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4831 return PyUnicode_FromString(inet_ntoa(packed_addr));
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4832 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4833
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4834 #ifdef HAVE_INET_PTON
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4835
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4836 PyDoc_STRVAR(inet_pton_doc,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4837 "inet_pton(af, ip) -> packed IP address string\n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4838 \n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4839 Convert an IP address from string format to a packed string suitable\n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4840 for use with low-level network functions.");
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4841
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4842 static PyObject *
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4843 socket_inet_pton(PyObject self, PyObject args)
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4844 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4845 int af;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4846 char* ip;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4847 int retval;
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	4848 #ifdef ENABLE_IPV6
84022 41a2cbe23349 Reuse Py_MIN and Py_MAX macros: remove duplicate MIN/MAX macros Victor Stinner <victor.stinner@gmail.com> parents: 84020 diff changeset	4849 char packed[Py_MAX(sizeof(struct in_addr), sizeof(struct in6_addr))];
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	4850 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4851 char packed[sizeof(struct in_addr)];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4852 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4853 if (!PyArg_ParseTuple(args, "is:inet_pton", &af, &ip)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4854 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4855 }
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4856
32183 a799b0d1c568 Patch #924294: Do not check for AF_INET6 if it is not defined. Martin v. Löwis <martin@v.loewis.de> parents: 32149 diff changeset	4857 #if !defined(ENABLE_IPV6) && defined(AF_INET6)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4858 if(af == AF_INET6) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4859 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4860 "can't use AF_INET6, IPv6 is disabled");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4861 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4862 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4863 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4864
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4865 retval = inet_pton(af, ip, packed);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4866 if (retval < 0) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4867 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4868 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4869 } else if (retval == 0) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4870 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4871 "illegal IP address string passed to inet_pton");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4872 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4873 } else if (af == AF_INET) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4874 return PyBytes_FromStringAndSize(packed,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4875 sizeof(struct in_addr));
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	4876 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4877 } else if (af == AF_INET6) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4878 return PyBytes_FromStringAndSize(packed,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4879 sizeof(struct in6_addr));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4880 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4881 } else {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4882 PyErr_SetString(PyExc_OSError, "unknown address family");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4883 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4884 }
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4885 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4886
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4887 PyDoc_STRVAR(inet_ntop_doc,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4888 "inet_ntop(af, packed_ip) -> string formatted IP address\n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4889 \n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4890 Convert a packed IP address of the given family to string format.");
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4891
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4892 static PyObject *
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4893 socket_inet_ntop(PyObject self, PyObject args)
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4894 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4895 int af;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4896 char* packed;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4897 int len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4898 const char* retval;
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	4899 #ifdef ENABLE_IPV6
84022 41a2cbe23349 Reuse Py_MIN and Py_MAX macros: remove duplicate MIN/MAX macros Victor Stinner <victor.stinner@gmail.com> parents: 84020 diff changeset	4900 char ip[Py_MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN) + 1];
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	4901 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4902 char ip[INET_ADDRSTRLEN + 1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4903 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4904
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4905 /* Guarantee NUL-termination for PyUnicode_FromString() below */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4906 memset((void *) &ip[0], '\0', sizeof(ip));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4907
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4908 if (!PyArg_ParseTuple(args, "iy#:inet_ntop", &af, &packed, &len)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4909 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4910 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4911
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4912 if (af == AF_INET) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4913 if (len != sizeof(struct in_addr)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4914 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4915 "invalid length of packed IP address string");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4916 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4917 }
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	4918 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4919 } else if (af == AF_INET6) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4920 if (len != sizeof(struct in6_addr)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4921 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4922 "invalid length of packed IP address string");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4923 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4924 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4925 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4926 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4927 PyErr_Format(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4928 "unknown address family %d", af);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4929 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4930 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4931
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4932 retval = inet_ntop(af, packed, ip, sizeof(ip));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4933 if (!retval) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4934 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4935 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4936 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4937 return PyUnicode_FromString(retval);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4938 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4939
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4940 /* NOTREACHED */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4941 PyErr_SetString(PyExc_RuntimeError, "invalid handling of inet_ntop");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4942 return NULL;
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4943 }
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4944
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4945 #endif /* HAVE_INET_PTON */
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4946
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4947 /* Python interface to getaddrinfo(host, port). */
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4948
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4949 /ARGSUSED/
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4950 static PyObject *
64113 ca2a859e9bf6 fix issue #8866: parameters passed to socket.getaddrinfo can now be specified as single keyword arguments. Giampaolo Rodolà <g.rodola@gmail.com> parents: 63890 diff changeset	4951 socket_getaddrinfo(PyObject self, PyObject args, PyObject* kwargs)
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4952 {
70399 9d33770071b2 socket.sendto(): exit directly after setting the error Victor Stinner <victor.stinner@haypocalc.com> parents: 70226 diff changeset	4953 static char* kwnames[] = {"host", "port", "family", "type", "proto",
64113 ca2a859e9bf6 fix issue #8866: parameters passed to socket.getaddrinfo can now be specified as single keyword arguments. Giampaolo Rodolà <g.rodola@gmail.com> parents: 63890 diff changeset	4954 "flags", 0};
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4955 struct addrinfo hints, *res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4956 struct addrinfo *res0 = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4957 PyObject *hobj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4958 PyObject pobj = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4959 char pbuf[30];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4960 char hptr, pptr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4961 int family, socktype, protocol, flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4962 int error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4963 PyObject all = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4964 PyObject *idna = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4965
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4966 family = socktype = protocol = flags = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4967 family = AF_UNSPEC;
70399 9d33770071b2 socket.sendto(): exit directly after setting the error Victor Stinner <victor.stinner@haypocalc.com> parents: 70226 diff changeset	4968 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO\|iiii:getaddrinfo",
64113 ca2a859e9bf6 fix issue #8866: parameters passed to socket.getaddrinfo can now be specified as single keyword arguments. Giampaolo Rodolà <g.rodola@gmail.com> parents: 63890 diff changeset	4969 kwnames, &hobj, &pobj, &family, &socktype,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4970 &protocol, &flags)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4971 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4972 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4973 if (hobj == Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4974 hptr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4975 } else if (PyUnicode_Check(hobj)) {
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72879 diff changeset	4976 _Py_IDENTIFIER(encode);
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72807 diff changeset	4977
5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72807 diff changeset	4978 idna = _PyObject_CallMethodId(hobj, &PyId_encode, "s", "idna");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4979 if (!idna)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4980 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4981 assert(PyBytes_Check(idna));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4982 hptr = PyBytes_AS_STRING(idna);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4983 } else if (PyBytes_Check(hobj)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4984 hptr = PyBytes_AsString(hobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4985 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4986 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4987 "getaddrinfo() argument 1 must be string or None");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4988 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4989 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4990 if (PyLong_CheckExact(pobj)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4991 long value = PyLong_AsLong(pobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4992 if (value == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4993 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4994 PyOS_snprintf(pbuf, sizeof(pbuf), "%ld", value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4995 pptr = pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4996 } else if (PyUnicode_Check(pobj)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4997 pptr = _PyUnicode_AsString(pobj);
66799 50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66663 diff changeset	4998 if (pptr == NULL)
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66663 diff changeset	4999 goto err;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5000 } else if (PyBytes_Check(pobj)) {
66799 50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66663 diff changeset	5001 pptr = PyBytes_AS_STRING(pobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5002 } else if (pobj == Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5003 pptr = (char *)NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5004 } else {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5005 PyErr_SetString(PyExc_OSError, "Int or String expected");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5006 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5007 }
84075 ef103e7e7af2 Ensure that the fix for #17269 also works on OSX 10.4 Ronald Oussoren <ronaldoussoren@mac.com> parents: 84019 diff changeset	5008 #if defined(__APPLE__) && defined(AI_NUMERICSERV)
83907 3c4a5dc29417 Issue #17269: Workaround for a platform bug in getaddrinfo on OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 83794 diff changeset	5009 if ((flags & AI_NUMERICSERV) && (pptr == NULL \|\| (pptr[0] == '0' && pptr[1] == 0))) {
3c4a5dc29417 Issue #17269: Workaround for a platform bug in getaddrinfo on OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 83794 diff changeset	5010 /* On OSX upto at least OSX 10.8 getaddrinfo crashes
3c4a5dc29417 Issue #17269: Workaround for a platform bug in getaddrinfo on OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 83794 diff changeset	5011 * if AI_NUMERICSERV is set and the servname is NULL or "0".
3c4a5dc29417 Issue #17269: Workaround for a platform bug in getaddrinfo on OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 83794 diff changeset	5012 * This workaround avoids a segfault in libsystem.
3c4a5dc29417 Issue #17269: Workaround for a platform bug in getaddrinfo on OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 83794 diff changeset	5013 */
3c4a5dc29417 Issue #17269: Workaround for a platform bug in getaddrinfo on OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 83794 diff changeset	5014 pptr = "00";
3c4a5dc29417 Issue #17269: Workaround for a platform bug in getaddrinfo on OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 83794 diff changeset	5015 }
3c4a5dc29417 Issue #17269: Workaround for a platform bug in getaddrinfo on OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 83794 diff changeset	5016 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5017 memset(&hints, 0, sizeof(hints));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5018 hints.ai_family = family;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5019 hints.ai_socktype = socktype;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5020 hints.ai_protocol = protocol;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5021 hints.ai_flags = flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5022 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5023 ACQUIRE_GETADDRINFO_LOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5024 error = getaddrinfo(hptr, pptr, &hints, &res0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5025 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5026 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5027 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5028 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5029 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5030 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5031
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5032 if ((all = PyList_New(0)) == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5033 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5034 for (res = res0; res; res = res->ai_next) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5035 PyObject *single;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5036 PyObject *addr =
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5037 makesockaddr(-1, res->ai_addr, res->ai_addrlen, protocol);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5038 if (addr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5039 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5040 single = Py_BuildValue("iiisO", res->ai_family,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5041 res->ai_socktype, res->ai_protocol,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5042 res->ai_canonname ? res->ai_canonname : "",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5043 addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5044 Py_DECREF(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5045 if (single == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5046 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5047
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5048 if (PyList_Append(all, single))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5049 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5050 Py_XDECREF(single);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5051 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5052 Py_XDECREF(idna);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5053 if (res0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5054 freeaddrinfo(res0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5055 return all;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5056 err:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5057 Py_XDECREF(all);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5058 Py_XDECREF(idna);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5059 if (res0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5060 freeaddrinfo(res0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5061 return (PyObject *)NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5062 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5063
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	5064 PyDoc_STRVAR(getaddrinfo_doc,
24676 980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	5065 "getaddrinfo(host, port [, family, socktype, proto, flags])\n\
980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	5066 -> list of (family, socktype, proto, canonname, sockaddr)\n\
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5067 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	5068 Resolve host and port into addrinfo struct.");
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5069
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5070 /* Python interface to getnameinfo(sa, flags). */
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5071
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5072 /ARGSUSED/
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5073 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5074 socket_getnameinfo(PyObject self, PyObject args)
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5075 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5076 PyObject sa = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5077 int flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5078 char *hostp;
74233 cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	5079 int port;
cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	5080 unsigned int flowinfo, scope_id;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5081 char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5082 struct addrinfo hints, *res = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5083 int error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5084 PyObject ret = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5085
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5086 flags = flowinfo = scope_id = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5087 if (!PyArg_ParseTuple(args, "Oi:getnameinfo", &sa, &flags))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5088 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5089 if (!PyTuple_Check(sa)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5090 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5091 "getnameinfo() argument 1 must be a tuple");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5092 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5093 }
74233 cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	5094 if (!PyArg_ParseTuple(sa, "si\|II",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5095 &hostp, &port, &flowinfo, &scope_id))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5096 return NULL;
77612 55849442d7a9 Remove useless test (flowinfo is unsigned). Charles-François Natali <neologix@free.fr> parents: 74233 diff changeset	5097 if (flowinfo > 0xfffff) {
74233 cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	5098 PyErr_SetString(PyExc_OverflowError,
cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	5099 "getsockaddrarg: flowinfo must be 0-1048575.");
cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	5100 return NULL;
cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	5101 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5102 PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5103 memset(&hints, 0, sizeof(hints));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5104 hints.ai_family = AF_UNSPEC;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5105 hints.ai_socktype = SOCK_DGRAM; /* make numeric port happy */
64277 2ccd043aad5c Issue #1027206: getnameinfo is now restricted to numeric addresses as input. Martin v. Löwis <martin@v.loewis.de> parents: 64230 diff changeset	5106 hints.ai_flags = AI_NUMERICHOST; /* don't do any name resolution */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5107 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5108 ACQUIRE_GETADDRINFO_LOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5109 error = getaddrinfo(hostp, pbuf, &hints, &res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5110 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5111 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5112 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5113 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5114 goto fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5115 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5116 if (res->ai_next) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5117 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5118 "sockaddr resolved to multiple addresses");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5119 goto fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5120 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5121 switch (res->ai_family) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5122 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5123 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5124 if (PyTuple_GET_SIZE(sa) != 2) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5125 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5126 "IPv4 sockaddr must be 2 tuple");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5127 goto fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5128 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5129 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5130 }
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	5131 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5132 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5133 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5134 struct sockaddr_in6 *sin6;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5135 sin6 = (struct sockaddr_in6 *)res->ai_addr;
74233 cc346a672091 Issue #9975: socket: Fix incorrect use of flowinfo and scope_id. Patch by Charles-François Natali <neologix@free.fr> parents: 72115 diff changeset	5136 sin6->sin6_flowinfo = htonl(flowinfo);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5137 sin6->sin6_scope_id = scope_id;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5138 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5139 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5140 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5141 }
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	5142 error = getnameinfo(res->ai_addr, (socklen_t) res->ai_addrlen,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5143 hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), flags);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5144 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5145 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5146 goto fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5147 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5148 ret = Py_BuildValue("ss", hbuf, pbuf);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5149
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5150 fail:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5151 if (res)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5152 freeaddrinfo(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5153 return ret;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5154 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5155
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	5156 PyDoc_STRVAR(getnameinfo_doc,
24676 980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	5157 "getnameinfo(sockaddr, flags) --> (host, port)\n\
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5158 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	5159 Get host and port for a sockaddr.");
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5160
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5161
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5162 /* Python API to getting and setting the default timeout value. */
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5163
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5164 static PyObject *
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5165 socket_getdefaulttimeout(PyObject *self)
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5166 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5167 if (defaulttimeout < 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5168 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5169 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5170 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5171 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5172 return PyFloat_FromDouble(defaulttimeout);
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5173 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5174
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5175 PyDoc_STRVAR(getdefaulttimeout_doc,
24676 980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	5176 "getdefaulttimeout() -> timeout\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5177 \n\
71864 ab3432a81c26 #12725: fix working. Patch by Ben Hayden. Ezio Melotti <ezio.melotti@gmail.com> parents: 70012 diff changeset	5178 Returns the default timeout in seconds (float) for new socket objects.\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5179 A value of None indicates that new socket objects have no timeout.\n\
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5180 When the socket module is first imported, the default is None.");
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5181
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5182 static PyObject *
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5183 socket_setdefaulttimeout(PyObject self, PyObject arg)
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5184 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5185 double timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5186
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5187 if (arg == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5188 timeout = -1.0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5189 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5190 timeout = PyFloat_AsDouble(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5191 if (timeout < 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5192 if (!PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5193 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5194 "Timeout value out of range");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5195 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5196 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5197 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5198
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5199 defaulttimeout = timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5200
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5201 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5202 return Py_None;
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5203 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5204
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5205 PyDoc_STRVAR(setdefaulttimeout_doc,
24676 980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	5206 "setdefaulttimeout(timeout)\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5207 \n\
71864 ab3432a81c26 #12725: fix working. Patch by Ben Hayden. Ezio Melotti <ezio.melotti@gmail.com> parents: 70012 diff changeset	5208 Set the default timeout in seconds (float) for new socket objects.\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5209 A value of None indicates that new socket objects have no timeout.\n\
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5210 When the socket module is first imported, the default is None.");
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5211
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5212 #ifdef HAVE_IF_NAMEINDEX
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5213 /* Python API for getting interface indices and names */
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5214
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5215 static PyObject *
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5216 socket_if_nameindex(PyObject self, PyObject arg)
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5217 {
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5218 PyObject *list;
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5219 int i;
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5220 struct if_nameindex *ni;
70399 9d33770071b2 socket.sendto(): exit directly after setting the error Victor Stinner <victor.stinner@haypocalc.com> parents: 70226 diff changeset	5221
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5222 ni = if_nameindex();
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5223 if (ni == NULL) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5224 PyErr_SetFromErrno(PyExc_OSError);
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5225 return NULL;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5226 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5227
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5228 list = PyList_New(0);
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5229 if (list == NULL) {
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5230 if_freenameindex(ni);
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5231 return NULL;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5232 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5233
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5234 for (i = 0; ni[i].if_index != 0 && i < INT_MAX; i++) {
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5235 PyObject *ni_tuple = Py_BuildValue("IO&",
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5236 ni[i].if_index, PyUnicode_DecodeFSDefault, ni[i].if_name);
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5237
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5238 if (ni_tuple == NULL \|\| PyList_Append(list, ni_tuple) == -1) {
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5239 Py_XDECREF(ni_tuple);
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5240 Py_DECREF(list);
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5241 if_freenameindex(ni);
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5242 return NULL;
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5243 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5244 Py_DECREF(ni_tuple);
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5245 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5246
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5247 if_freenameindex(ni);
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5248 return list;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5249 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5250
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5251 PyDoc_STRVAR(if_nameindex_doc,
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5252 "if_nameindex()\n\
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5253 \n\
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5254 Returns a list of network interface information (index, name) tuples.");
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5255
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5256 static PyObject *
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5257 socket_if_nametoindex(PyObject self, PyObject args)
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5258 {
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5259 PyObject *oname;
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5260 unsigned long index;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5261
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5262 if (!PyArg_ParseTuple(args, "O&:if_nametoindex",
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5263 PyUnicode_FSConverter, &oname))
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5264 return NULL;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5265
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5266 index = if_nametoindex(PyBytes_AS_STRING(oname));
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5267 Py_DECREF(oname);
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5268 if (index == 0) {
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5269 /* if_nametoindex() doesn't set errno */
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5270 PyErr_SetString(PyExc_OSError, "no interface with this name");
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5271 return NULL;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5272 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5273
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5274 return PyLong_FromUnsignedLong(index);
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5275 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5276
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5277 PyDoc_STRVAR(if_nametoindex_doc,
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5278 "if_nametoindex(if_name)\n\
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5279 \n\
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5280 Returns the interface index corresponding to the interface name if_name.");
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5281
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5282 static PyObject *
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5283 socket_if_indextoname(PyObject self, PyObject arg)
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5284 {
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5285 unsigned long index;
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5286 char name[IF_NAMESIZE + 1];
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5287
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5288 index = PyLong_AsUnsignedLong(arg);
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5289 if (index == (unsigned long) -1)
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5290 return NULL;
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5291
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5292 if (if_indextoname(index, name) == NULL) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5293 PyErr_SetFromErrno(PyExc_OSError);
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5294 return NULL;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5295 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5296
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5297 return PyUnicode_DecodeFSDefault(name);
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5298 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5299
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5300 PyDoc_STRVAR(if_indextoname_doc,
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5301 "if_indextoname(if_index)\n\
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5302 \n\
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5303 Returns the interface name corresponding to the interface index if_index.");
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5304
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5305 #endif /* HAVE_IF_NAMEINDEX */
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5306
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5307
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5308 #ifdef CMSG_LEN
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5309 /* Python interface to CMSG_LEN(length). */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5310
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5311 static PyObject *
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5312 socket_CMSG_LEN(PyObject self, PyObject args)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5313 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5314 Py_ssize_t length;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5315 size_t result;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5316
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5317 if (!PyArg_ParseTuple(args, "n:CMSG_LEN", &length))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5318 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5319 if (length < 0 \|\| !get_CMSG_LEN(length, &result)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5320 PyErr_Format(PyExc_OverflowError, "CMSG_LEN() argument out of range");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5321 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5322 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5323 return PyLong_FromSize_t(result);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5324 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5325
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5326 PyDoc_STRVAR(CMSG_LEN_doc,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5327 "CMSG_LEN(length) -> control message length\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5328 \n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5329 Return the total length, without trailing padding, of an ancillary\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5330 data item with associated data of the given length. This value can\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5331 often be used as the buffer size for recvmsg() to receive a single\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5332 item of ancillary data, but RFC 3542 requires portable applications to\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5333 use CMSG_SPACE() and thus include space for padding, even when the\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5334 item will be the last in the buffer. Raises OverflowError if length\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5335 is outside the permissible range of values.");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5336
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5337
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5338 #ifdef CMSG_SPACE
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5339 /* Python interface to CMSG_SPACE(length). */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5340
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5341 static PyObject *
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5342 socket_CMSG_SPACE(PyObject self, PyObject args)
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5343 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5344 Py_ssize_t length;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5345 size_t result;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5346
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5347 if (!PyArg_ParseTuple(args, "n:CMSG_SPACE", &length))
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5348 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5349 if (length < 0 \|\| !get_CMSG_SPACE(length, &result)) {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5350 PyErr_SetString(PyExc_OverflowError,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5351 "CMSG_SPACE() argument out of range");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5352 return NULL;
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5353 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5354 return PyLong_FromSize_t(result);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5355 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5356
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5357 PyDoc_STRVAR(CMSG_SPACE_doc,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5358 "CMSG_SPACE(length) -> buffer size\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5359 \n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5360 Return the buffer size needed for recvmsg() to receive an ancillary\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5361 data item with associated data of the given length, along with any\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5362 trailing padding. The buffer space needed to receive multiple items\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5363 is the sum of the CMSG_SPACE() values for their associated data\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5364 lengths. Raises OverflowError if length is outside the permissible\n\
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5365 range of values.");
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5366 #endif /* CMSG_SPACE */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5367 #endif /* CMSG_LEN */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5368
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5369
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	5370 /* List of functions exported by this module. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	5371
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5372 static PyMethodDef socket_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5373 {"gethostbyname", socket_gethostbyname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5374 METH_VARARGS, gethostbyname_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5375 {"gethostbyname_ex", socket_gethostbyname_ex,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5376 METH_VARARGS, ghbn_ex_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5377 {"gethostbyaddr", socket_gethostbyaddr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5378 METH_VARARGS, gethostbyaddr_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5379 {"gethostname", socket_gethostname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5380 METH_NOARGS, gethostname_doc},
68194 a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	5381 #ifdef HAVE_SETHOSTNAME
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	5382 {"sethostname", socket_sethostname,
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	5383 METH_VARARGS, sethostname_doc},
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	5384 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5385 {"getservbyname", socket_getservbyname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5386 METH_VARARGS, getservbyname_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5387 {"getservbyport", socket_getservbyport,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5388 METH_VARARGS, getservbyport_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5389 {"getprotobyname", socket_getprotobyname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5390 METH_VARARGS, getprotobyname_doc},
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	5391 #ifndef NO_DUP
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5392 {"dup", socket_dup,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5393 METH_O, dup_doc},
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	5394 #endif
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	5395 #ifdef HAVE_SOCKETPAIR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5396 {"socketpair", socket_socketpair,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5397 METH_VARARGS, socketpair_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5398 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5399 {"ntohs", socket_ntohs,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5400 METH_VARARGS, ntohs_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5401 {"ntohl", socket_ntohl,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5402 METH_O, ntohl_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5403 {"htons", socket_htons,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5404 METH_VARARGS, htons_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5405 {"htonl", socket_htonl,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5406 METH_O, htonl_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5407 {"inet_aton", socket_inet_aton,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5408 METH_VARARGS, inet_aton_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5409 {"inet_ntoa", socket_inet_ntoa,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5410 METH_VARARGS, inet_ntoa_doc},
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	5411 #ifdef HAVE_INET_PTON
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5412 {"inet_pton", socket_inet_pton,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5413 METH_VARARGS, inet_pton_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5414 {"inet_ntop", socket_inet_ntop,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5415 METH_VARARGS, inet_ntop_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5416 #endif
64113 ca2a859e9bf6 fix issue #8866: parameters passed to socket.getaddrinfo can now be specified as single keyword arguments. Giampaolo Rodolà <g.rodola@gmail.com> parents: 63890 diff changeset	5417 {"getaddrinfo", (PyCFunction)socket_getaddrinfo,
ca2a859e9bf6 fix issue #8866: parameters passed to socket.getaddrinfo can now be specified as single keyword arguments. Giampaolo Rodolà <g.rodola@gmail.com> parents: 63890 diff changeset	5418 METH_VARARGS \| METH_KEYWORDS, getaddrinfo_doc},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5419 {"getnameinfo", socket_getnameinfo,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5420 METH_VARARGS, getnameinfo_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5421 {"getdefaulttimeout", (PyCFunction)socket_getdefaulttimeout,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5422 METH_NOARGS, getdefaulttimeout_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5423 {"setdefaulttimeout", socket_setdefaulttimeout,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5424 METH_O, setdefaulttimeout_doc},
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5425 #ifdef HAVE_IF_NAMEINDEX
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5426 {"if_nameindex", socket_if_nameindex,
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5427 METH_NOARGS, if_nameindex_doc},
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5428 {"if_nametoindex", socket_if_nametoindex,
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5429 METH_VARARGS, if_nametoindex_doc},
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5430 {"if_indextoname", socket_if_indextoname,
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5431 METH_O, if_indextoname_doc},
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5432 #endif
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5433 #ifdef CMSG_LEN
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5434 {"CMSG_LEN", socket_CMSG_LEN,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5435 METH_VARARGS, CMSG_LEN_doc},
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5436 #ifdef CMSG_SPACE
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5437 {"CMSG_SPACE", socket_CMSG_SPACE,
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5438 METH_VARARGS, CMSG_SPACE_doc},
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5439 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5440 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5441 {NULL, NULL} /* Sentinel */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5442 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5443
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	5444
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	5445 #ifdef MS_WINDOWS
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5446 #define OS_INIT_DEFINED
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5447
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5448 /* Additional initialization and cleanup for Windows */
3700 931086cb8529 More rational support for Windows (tested on Roj's NT 3.5 machine only). Guido van Rossum <guido@python.org> parents: 3673 diff changeset	5449
931086cb8529 More rational support for Windows (tested on Roj's NT 3.5 machine only). Guido van Rossum <guido@python.org> parents: 3673 diff changeset	5450 static void
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5451 os_cleanup(void)
3700 931086cb8529 More rational support for Windows (tested on Roj's NT 3.5 machine only). Guido van Rossum <guido@python.org> parents: 3673 diff changeset	5452 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5453 WSACleanup();
3700 931086cb8529 More rational support for Windows (tested on Roj's NT 3.5 machine only). Guido van Rossum <guido@python.org> parents: 3673 diff changeset	5454 }
931086cb8529 More rational support for Windows (tested on Roj's NT 3.5 machine only). Guido van Rossum <guido@python.org> parents: 3673 diff changeset	5455
931086cb8529 More rational support for Windows (tested on Roj's NT 3.5 machine only). Guido van Rossum <guido@python.org> parents: 3673 diff changeset	5456 static int
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5457 os_init(void)
3700 931086cb8529 More rational support for Windows (tested on Roj's NT 3.5 machine only). Guido van Rossum <guido@python.org> parents: 3673 diff changeset	5458 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5459 WSADATA WSAData;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5460 int ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5461 ret = WSAStartup(0x0101, &WSAData);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5462 switch (ret) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5463 case 0: /* No error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5464 Py_AtExit(os_cleanup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5465 return 1; /* Success */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5466 case WSASYSNOTREADY:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5467 PyErr_SetString(PyExc_ImportError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5468 "WSAStartup failed: network not ready");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5469 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5470 case WSAVERNOTSUPPORTED:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5471 case WSAEINVAL:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5472 PyErr_SetString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5473 PyExc_ImportError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5474 "WSAStartup failed: requested version not supported");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5475 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5476 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5477 PyErr_Format(PyExc_ImportError, "WSAStartup failed: error code %d", ret);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5478 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5479 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5480 return 0; /* Failure */
3700 931086cb8529 More rational support for Windows (tested on Roj's NT 3.5 machine only). Guido van Rossum <guido@python.org> parents: 3673 diff changeset	5481 }
931086cb8529 More rational support for Windows (tested on Roj's NT 3.5 machine only). Guido van Rossum <guido@python.org> parents: 3673 diff changeset	5482
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	5483 #endif /* MS_WINDOWS */
3700 931086cb8529 More rational support for Windows (tested on Roj's NT 3.5 machine only). Guido van Rossum <guido@python.org> parents: 3673 diff changeset	5484
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5485
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5486
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5487 #ifndef OS_INIT_DEFINED
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5488 static int
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5489 os_init(void)
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5490 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5491 return 1; /* Success */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5492 }
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5493 #endif
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5494
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5495
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	5496 /* C API table - always add new things to the end for binary
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	5497 compatibility. */
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	5498 static
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	5499 PySocketModule_APIObject PySocketModuleAPI =
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	5500 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5501 &sock_type,
66663 3d9a86b8cc98 Issue #10272: The ssl module now raises socket.timeout instead of a generic Antoine Pitrou <solipsis@pitrou.net> parents: 65981 diff changeset	5502 NULL,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5503 NULL
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	5504 };
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	5505
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5506
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5507 /* Initialize the _socket module.
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5508
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5509 This module is actually called "_socket", and there's a wrapper
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	5510 "socket.py" which implements some additional functionality.
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	5511 The import of "_socket" may fail with an ImportError exception if
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	5512 os-specific initialization fails. On Windows, this does WINSOCK
68585 bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 65668 diff changeset	5513 initialization. When WINSOCK is initialized successfully, a call to
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	5514 WSACleanup() is scheduled to be made at exit time.
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5515 */
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5516
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	5517 PyDoc_STRVAR(socket_doc,
24676 980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	5518 "Implementation module for socket operations.\n\
980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	5519 \n\
980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	5520 See the socket module for documentation.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	5521
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	5522 static struct PyModuleDef socketmodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5523 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5524 PySocket_MODULE_NAME,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5525 socket_doc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5526 -1,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5527 socket_methods,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5528 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5529 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5530 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5531 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	5532 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	5533
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24411 diff changeset	5534 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	5535 PyInit__socket(void)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5536 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5537 PyObject m, has_ipv6;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5538
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5539 if (!os_init())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5540 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5541
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5542 Py_TYPE(&sock_type) = &PyType_Type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5543 m = PyModule_Create(&socketmodule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5544 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5545 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5546
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5547 Py_INCREF(PyExc_OSError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5548 PySocketModuleAPI.error = PyExc_OSError;
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5549 Py_INCREF(PyExc_OSError);
41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5550 PyModule_AddObject(m, "error", PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5551 socket_herror = PyErr_NewException("socket.herror",
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5552 PyExc_OSError, NULL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5553 if (socket_herror == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5554 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5555 Py_INCREF(socket_herror);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5556 PyModule_AddObject(m, "herror", socket_herror);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5557 socket_gaierror = PyErr_NewException("socket.gaierror", PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5558 NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5559 if (socket_gaierror == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5560 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5561 Py_INCREF(socket_gaierror);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5562 PyModule_AddObject(m, "gaierror", socket_gaierror);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5563 socket_timeout = PyErr_NewException("socket.timeout",
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5564 PyExc_OSError, NULL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5565 if (socket_timeout == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5566 return NULL;
66663 3d9a86b8cc98 Issue #10272: The ssl module now raises socket.timeout instead of a generic Antoine Pitrou <solipsis@pitrou.net> parents: 65981 diff changeset	5567 PySocketModuleAPI.timeout_error = socket_timeout;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5568 Py_INCREF(socket_timeout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5569 PyModule_AddObject(m, "timeout", socket_timeout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5570 Py_INCREF((PyObject *)&sock_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5571 if (PyModule_AddObject(m, "SocketType",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5572 (PyObject *)&sock_type) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5573 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5574 Py_INCREF((PyObject *)&sock_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5575 if (PyModule_AddObject(m, "socket",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5576 (PyObject *)&sock_type) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5577 return NULL;
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5578
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	5579 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5580 has_ipv6 = Py_True;
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	5581 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5582 has_ipv6 = Py_False;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5583 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5584 Py_INCREF(has_ipv6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5585 PyModule_AddObject(m, "has_ipv6", has_ipv6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5586
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5587 /* Export C API */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5588 if (PyModule_AddObject(m, PySocket_CAPI_NAME,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5589 PyCapsule_New(&PySocketModuleAPI, PySocket_CAPSULE_NAME, NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5590 ) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5591 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5592
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5593 /* Address families (we only support AF_INET and AF_UNIX) */
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5594 #ifdef AF_UNSPEC
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5595 PyModule_AddIntMacro(m, AF_UNSPEC);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5596 #endif
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5597 PyModule_AddIntMacro(m, AF_INET);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5598 #ifdef AF_INET6
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5599 PyModule_AddIntMacro(m, AF_INET6);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5600 #endif /* AF_INET6 */
31867 51aaceeaabe1 OS/2's TCP/IP stack supports AF_UNIX sockets, with the limitation that Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 31790 diff changeset	5601 #if defined(AF_UNIX)
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5602 PyModule_AddIntMacro(m, AF_UNIX);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	5603 #endif /* AF_UNIX */
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5604 #ifdef AF_AX25
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5605 /* Amateur Radio AX.25 */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5606 PyModule_AddIntMacro(m, AF_AX25);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5607 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5608 #ifdef AF_IPX
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5609 PyModule_AddIntMacro(m, AF_IPX); /* Novell IPX */
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5610 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5611 #ifdef AF_APPLETALK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5612 /* Appletalk DDP */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5613 PyModule_AddIntMacro(m, AF_APPLETALK);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5614 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5615 #ifdef AF_NETROM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5616 /* Amateur radio NetROM */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5617 PyModule_AddIntMacro(m, AF_NETROM);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5618 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5619 #ifdef AF_BRIDGE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5620 /* Multiprotocol bridge */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5621 PyModule_AddIntMacro(m, AF_BRIDGE);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5622 #endif
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5623 #ifdef AF_ATMPVC
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5624 /* ATM PVCs */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5625 PyModule_AddIntMacro(m, AF_ATMPVC);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5626 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5627 #ifdef AF_AAL5
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5628 /* Reserved for Werner's ATM */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5629 PyModule_AddIntMacro(m, AF_AAL5);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5630 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5631 #ifdef AF_X25
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5632 /* Reserved for X.25 project */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5633 PyModule_AddIntMacro(m, AF_X25);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5634 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5635 #ifdef AF_INET6
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5636 PyModule_AddIntMacro(m, AF_INET6); /* IP version 6 */
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5637 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5638 #ifdef AF_ROSE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5639 /* Amateur Radio X.25 PLP */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5640 PyModule_AddIntMacro(m, AF_ROSE);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5641 #endif
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5642 #ifdef AF_DECnet
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5643 /* Reserved for DECnet project */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5644 PyModule_AddIntMacro(m, AF_DECnet);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5645 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5646 #ifdef AF_NETBEUI
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5647 /* Reserved for 802.2LLC project */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5648 PyModule_AddIntMacro(m, AF_NETBEUI);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5649 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5650 #ifdef AF_SECURITY
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5651 /* Security callback pseudo AF */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5652 PyModule_AddIntMacro(m, AF_SECURITY);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5653 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5654 #ifdef AF_KEY
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5655 /* PF_KEY key management API */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5656 PyModule_AddIntMacro(m, AF_KEY);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5657 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5658 #ifdef AF_NETLINK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5659 /* */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5660 PyModule_AddIntMacro(m, AF_NETLINK);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5661 PyModule_AddIntMacro(m, NETLINK_ROUTE);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	5662 #ifdef NETLINK_SKIP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5663 PyModule_AddIntMacro(m, NETLINK_SKIP);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	5664 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	5665 #ifdef NETLINK_W1
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5666 PyModule_AddIntMacro(m, NETLINK_W1);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5667 #endif
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5668 PyModule_AddIntMacro(m, NETLINK_USERSOCK);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5669 PyModule_AddIntMacro(m, NETLINK_FIREWALL);
36632 4d988dda6478 NETLINK_TCPDIAG and NETLINK_NFLOG aren't defined on older Linux Guido van Rossum <guido@python.org> parents: 36610 diff changeset	5670 #ifdef NETLINK_TCPDIAG
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5671 PyModule_AddIntMacro(m, NETLINK_TCPDIAG);
36632 4d988dda6478 NETLINK_TCPDIAG and NETLINK_NFLOG aren't defined on older Linux Guido van Rossum <guido@python.org> parents: 36610 diff changeset	5672 #endif
4d988dda6478 NETLINK_TCPDIAG and NETLINK_NFLOG aren't defined on older Linux Guido van Rossum <guido@python.org> parents: 36610 diff changeset	5673 #ifdef NETLINK_NFLOG
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5674 PyModule_AddIntMacro(m, NETLINK_NFLOG);
36632 4d988dda6478 NETLINK_TCPDIAG and NETLINK_NFLOG aren't defined on older Linux Guido van Rossum <guido@python.org> parents: 36610 diff changeset	5675 #endif
36298 9eeaa33f9640 Get socketmodule to build after adding netlink support. Neal Norwitz <nnorwitz@gmail.com> parents: 36289 diff changeset	5676 #ifdef NETLINK_XFRM
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5677 PyModule_AddIntMacro(m, NETLINK_XFRM);
36298 9eeaa33f9640 Get socketmodule to build after adding netlink support. Neal Norwitz <nnorwitz@gmail.com> parents: 36289 diff changeset	5678 #endif
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	5679 #ifdef NETLINK_ARPD
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5680 PyModule_AddIntMacro(m, NETLINK_ARPD);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	5681 #endif
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	5682 #ifdef NETLINK_ROUTE6
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5683 PyModule_AddIntMacro(m, NETLINK_ROUTE6);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5684 #endif
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5685 PyModule_AddIntMacro(m, NETLINK_IP6_FW);
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	5686 #ifdef NETLINK_DNRTMSG
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5687 PyModule_AddIntMacro(m, NETLINK_DNRTMSG);
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	5688 #endif
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	5689 #ifdef NETLINK_TAPBASE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5690 PyModule_AddIntMacro(m, NETLINK_TAPBASE);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5691 #endif
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36684 diff changeset	5692 #endif /* AF_NETLINK */
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5693 #ifdef AF_ROUTE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5694 /* Alias to emulate 4.4BSD */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5695 PyModule_AddIntMacro(m, AF_ROUTE);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5696 #endif
83885 155e6fb309f5 Fix issue #17996: expose socket.AF_LINK constant on BSD and OSX. Giampaolo Rodola' <g.rodola@gmail.com> parents: 83880 diff changeset	5697 #ifdef AF_LINK
155e6fb309f5 Fix issue #17996: expose socket.AF_LINK constant on BSD and OSX. Giampaolo Rodola' <g.rodola@gmail.com> parents: 83880 diff changeset	5698 PyModule_AddIntMacro(m, AF_LINK);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5699 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5700 #ifdef AF_ASH
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5701 /* Ash */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5702 PyModule_AddIntMacro(m, AF_ASH);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5703 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5704 #ifdef AF_ECONET
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5705 /* Acorn Econet */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5706 PyModule_AddIntMacro(m, AF_ECONET);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5707 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5708 #ifdef AF_ATMSVC
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5709 /* ATM SVCs */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5710 PyModule_AddIntMacro(m, AF_ATMSVC);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5711 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5712 #ifdef AF_SNA
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5713 /* Linux SNA Project (nutters!) */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5714 PyModule_AddIntMacro(m, AF_SNA);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5715 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5716 #ifdef AF_IRDA
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5717 /* IRDA sockets */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5718 PyModule_AddIntMacro(m, AF_IRDA);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5719 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5720 #ifdef AF_PPPOX
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5721 /* PPPoX sockets */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5722 PyModule_AddIntMacro(m, AF_PPPOX);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5723 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5724 #ifdef AF_WANPIPE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5725 /* Wanpipe API Sockets */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5726 PyModule_AddIntMacro(m, AF_WANPIPE);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5727 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5728 #ifdef AF_LLC
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5729 /* Linux LLC */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5730 PyModule_AddIntMacro(m, AF_LLC);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5731 #endif
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	5732
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	5733 #ifdef USE_BLUETOOTH
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5734 PyModule_AddIntMacro(m, AF_BLUETOOTH);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5735 PyModule_AddIntMacro(m, BTPROTO_L2CAP);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5736 PyModule_AddIntMacro(m, BTPROTO_HCI);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5737 PyModule_AddIntMacro(m, SOL_HCI);
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	5738 #if !defined(__NetBSD__) && !defined(__DragonFly__)
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5739 PyModule_AddIntMacro(m, HCI_FILTER);
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	5740 #endif
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	5741 #if !defined(__FreeBSD__)
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	5742 #if !defined(__NetBSD__) && !defined(__DragonFly__)
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5743 PyModule_AddIntMacro(m, HCI_TIME_STAMP);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5744 #endif
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5745 PyModule_AddIntMacro(m, HCI_DATA_DIR);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5746 PyModule_AddIntMacro(m, BTPROTO_SCO);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5747 #endif
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5748 PyModule_AddIntMacro(m, BTPROTO_RFCOMM);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5749 PyModule_AddStringConstant(m, "BDADDR_ANY", "00:00:00:00:00:00");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5750 PyModule_AddStringConstant(m, "BDADDR_LOCAL", "00:00:00:FF:FF:FF");
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	5751 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	5752
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	5753 #ifdef AF_CAN
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	5754 /* Controller Area Network */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5755 PyModule_AddIntMacro(m, AF_CAN);
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	5756 #endif
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	5757 #ifdef PF_CAN
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	5758 /* Controller Area Network */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5759 PyModule_AddIntMacro(m, PF_CAN);
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	5760 #endif
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	5761
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5762 /* Reliable Datagram Sockets */
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5763 #ifdef AF_RDS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5764 PyModule_AddIntMacro(m, AF_RDS);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5765 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5766 #ifdef PF_RDS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5767 PyModule_AddIntMacro(m, PF_RDS);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5768 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5769
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5770 /* Kernel event messages */
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5771 #ifdef PF_SYSTEM
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5772 PyModule_AddIntMacro(m, PF_SYSTEM);
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5773 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5774 #ifdef AF_SYSTEM
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5775 PyModule_AddIntMacro(m, AF_SYSTEM);
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5776 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5777
65668 add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5778 #ifdef AF_PACKET
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5779 PyModule_AddIntMacro(m, AF_PACKET);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5780 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5781 #ifdef PF_PACKET
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5782 PyModule_AddIntMacro(m, PF_PACKET);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5783 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5784 #ifdef PACKET_HOST
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5785 PyModule_AddIntMacro(m, PACKET_HOST);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5786 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5787 #ifdef PACKET_BROADCAST
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5788 PyModule_AddIntMacro(m, PACKET_BROADCAST);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5789 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5790 #ifdef PACKET_MULTICAST
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5791 PyModule_AddIntMacro(m, PACKET_MULTICAST);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5792 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5793 #ifdef PACKET_OTHERHOST
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5794 PyModule_AddIntMacro(m, PACKET_OTHERHOST);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5795 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5796 #ifdef PACKET_OUTGOING
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5797 PyModule_AddIntMacro(m, PACKET_OUTGOING);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5798 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5799 #ifdef PACKET_LOOPBACK
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5800 PyModule_AddIntMacro(m, PACKET_LOOPBACK);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5801 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5802 #ifdef PACKET_FASTROUTE
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5803 PyModule_AddIntMacro(m, PACKET_FASTROUTE);
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	5804 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5805
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	5806 #ifdef HAVE_LINUX_TIPC_H
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5807 PyModule_AddIntMacro(m, AF_TIPC);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5808
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5809 /* for addresses */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5810 PyModule_AddIntMacro(m, TIPC_ADDR_NAMESEQ);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5811 PyModule_AddIntMacro(m, TIPC_ADDR_NAME);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5812 PyModule_AddIntMacro(m, TIPC_ADDR_ID);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5813
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5814 PyModule_AddIntMacro(m, TIPC_ZONE_SCOPE);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5815 PyModule_AddIntMacro(m, TIPC_CLUSTER_SCOPE);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5816 PyModule_AddIntMacro(m, TIPC_NODE_SCOPE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5817
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5818 /* for setsockopt() */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5819 PyModule_AddIntMacro(m, SOL_TIPC);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5820 PyModule_AddIntMacro(m, TIPC_IMPORTANCE);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5821 PyModule_AddIntMacro(m, TIPC_SRC_DROPPABLE);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5822 PyModule_AddIntMacro(m, TIPC_DEST_DROPPABLE);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5823 PyModule_AddIntMacro(m, TIPC_CONN_TIMEOUT);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5824
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5825 PyModule_AddIntMacro(m, TIPC_LOW_IMPORTANCE);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5826 PyModule_AddIntMacro(m, TIPC_MEDIUM_IMPORTANCE);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5827 PyModule_AddIntMacro(m, TIPC_HIGH_IMPORTANCE);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5828 PyModule_AddIntMacro(m, TIPC_CRITICAL_IMPORTANCE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5829
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5830 /* for subscriptions */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5831 PyModule_AddIntMacro(m, TIPC_SUB_PORTS);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5832 PyModule_AddIntMacro(m, TIPC_SUB_SERVICE);
44643 d8e4342c145e Merged revisions 59883-59920 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44568 diff changeset	5833 #ifdef TIPC_SUB_CANCEL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5834 /* doesn't seem to be available everywhere */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5835 PyModule_AddIntMacro(m, TIPC_SUB_CANCEL);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5836 #endif
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5837 PyModule_AddIntMacro(m, TIPC_WAIT_FOREVER);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5838 PyModule_AddIntMacro(m, TIPC_PUBLISHED);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5839 PyModule_AddIntMacro(m, TIPC_WITHDRAWN);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5840 PyModule_AddIntMacro(m, TIPC_SUBSCR_TIMEOUT);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5841 PyModule_AddIntMacro(m, TIPC_CFG_SRV);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5842 PyModule_AddIntMacro(m, TIPC_TOP_SRV);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5843 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5844
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5845 /* Socket types */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5846 PyModule_AddIntMacro(m, SOCK_STREAM);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5847 PyModule_AddIntMacro(m, SOCK_DGRAM);
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	5848 /* We have incomplete socket support. */
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5849 PyModule_AddIntMacro(m, SOCK_RAW);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5850 PyModule_AddIntMacro(m, SOCK_SEQPACKET);
26597 7ddea4dfa519 Patch #650422: Use Posix AF_ constants instead of PF_ ones. Martin v. Löwis <martin@v.loewis.de> parents: 26551 diff changeset	5851 #if defined(SOCK_RDM)
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5852 PyModule_AddIntMacro(m, SOCK_RDM);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5853 #endif
65314 12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	5854 #ifdef SOCK_CLOEXEC
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5855 PyModule_AddIntMacro(m, SOCK_CLOEXEC);
65314 12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	5856 #endif
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	5857 #ifdef SOCK_NONBLOCK
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5858 PyModule_AddIntMacro(m, SOCK_NONBLOCK);
65314 12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	5859 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5860
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5861 #ifdef SO_DEBUG
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5862 PyModule_AddIntMacro(m, SO_DEBUG);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5863 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5864 #ifdef SO_ACCEPTCONN
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5865 PyModule_AddIntMacro(m, SO_ACCEPTCONN);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5866 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5867 #ifdef SO_REUSEADDR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5868 PyModule_AddIntMacro(m, SO_REUSEADDR);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	5869 #endif
32578 21fd6e62cd27 [Patch #982665 ] add SO_EXCLUSIVEADDRUSE constant Andrew M. Kuchling <amk@amk.ca> parents: 32521 diff changeset	5870 #ifdef SO_EXCLUSIVEADDRUSE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5871 PyModule_AddIntMacro(m, SO_EXCLUSIVEADDRUSE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5872 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5873
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5874 #ifdef SO_KEEPALIVE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5875 PyModule_AddIntMacro(m, SO_KEEPALIVE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5876 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5877 #ifdef SO_DONTROUTE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5878 PyModule_AddIntMacro(m, SO_DONTROUTE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5879 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5880 #ifdef SO_BROADCAST
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5881 PyModule_AddIntMacro(m, SO_BROADCAST);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5882 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5883 #ifdef SO_USELOOPBACK
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5884 PyModule_AddIntMacro(m, SO_USELOOPBACK);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5885 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5886 #ifdef SO_LINGER
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5887 PyModule_AddIntMacro(m, SO_LINGER);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5888 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5889 #ifdef SO_OOBINLINE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5890 PyModule_AddIntMacro(m, SO_OOBINLINE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5891 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5892 #ifdef SO_REUSEPORT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5893 PyModule_AddIntMacro(m, SO_REUSEPORT);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5894 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5895 #ifdef SO_SNDBUF
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5896 PyModule_AddIntMacro(m, SO_SNDBUF);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5897 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5898 #ifdef SO_RCVBUF
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5899 PyModule_AddIntMacro(m, SO_RCVBUF);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5900 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5901 #ifdef SO_SNDLOWAT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5902 PyModule_AddIntMacro(m, SO_SNDLOWAT);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5903 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5904 #ifdef SO_RCVLOWAT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5905 PyModule_AddIntMacro(m, SO_RCVLOWAT);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5906 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5907 #ifdef SO_SNDTIMEO
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5908 PyModule_AddIntMacro(m, SO_SNDTIMEO);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5909 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5910 #ifdef SO_RCVTIMEO
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5911 PyModule_AddIntMacro(m, SO_RCVTIMEO);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5912 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5913 #ifdef SO_ERROR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5914 PyModule_AddIntMacro(m, SO_ERROR);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5915 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5916 #ifdef SO_TYPE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5917 PyModule_AddIntMacro(m, SO_TYPE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5918 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5919 #ifdef SO_SETFIB
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5920 PyModule_AddIntMacro(m, SO_SETFIB);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5921 #endif
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5922 #ifdef SO_PASSCRED
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5923 PyModule_AddIntMacro(m, SO_PASSCRED);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5924 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5925 #ifdef SO_PEERCRED
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5926 PyModule_AddIntMacro(m, SO_PEERCRED);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5927 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5928 #ifdef LOCAL_PEERCRED
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5929 PyModule_AddIntMacro(m, LOCAL_PEERCRED);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5930 #endif
73128 6159311f0f44 Issue #12619: Expose socket.SO_BINDTODEVICE constant Victor Stinner <victor.stinner@haypocalc.com> parents: 72925 diff changeset	5931 #ifdef SO_BINDTODEVICE
6159311f0f44 Issue #12619: Expose socket.SO_BINDTODEVICE constant Victor Stinner <victor.stinner@haypocalc.com> parents: 72925 diff changeset	5932 PyModule_AddIntMacro(m, SO_BINDTODEVICE);
6159311f0f44 Issue #12619: Expose socket.SO_BINDTODEVICE constant Victor Stinner <victor.stinner@haypocalc.com> parents: 72925 diff changeset	5933 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5934
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5935 /* Maximum number of connections for "listen" */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5936 #ifdef SOMAXCONN
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5937 PyModule_AddIntMacro(m, SOMAXCONN);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	5938 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5939 PyModule_AddIntConstant(m, "SOMAXCONN", 5); /* Common value */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5940 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5941
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5942 /* Ancilliary message types */
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5943 #ifdef SCM_RIGHTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5944 PyModule_AddIntMacro(m, SCM_RIGHTS);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5945 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5946 #ifdef SCM_CREDENTIALS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5947 PyModule_AddIntMacro(m, SCM_CREDENTIALS);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5948 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5949 #ifdef SCM_CREDS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5950 PyModule_AddIntMacro(m, SCM_CREDS);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5951 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5952
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5953 /* Flags for send, recv */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5954 #ifdef MSG_OOB
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5955 PyModule_AddIntMacro(m, MSG_OOB);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5956 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5957 #ifdef MSG_PEEK
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5958 PyModule_AddIntMacro(m, MSG_PEEK);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5959 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5960 #ifdef MSG_DONTROUTE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5961 PyModule_AddIntMacro(m, MSG_DONTROUTE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5962 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5963 #ifdef MSG_DONTWAIT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5964 PyModule_AddIntMacro(m, MSG_DONTWAIT);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5965 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5966 #ifdef MSG_EOR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5967 PyModule_AddIntMacro(m, MSG_EOR);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5968 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5969 #ifdef MSG_TRUNC
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5970 PyModule_AddIntMacro(m, MSG_TRUNC);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5971 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5972 #ifdef MSG_CTRUNC
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5973 PyModule_AddIntMacro(m, MSG_CTRUNC);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5974 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5975 #ifdef MSG_WAITALL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5976 PyModule_AddIntMacro(m, MSG_WAITALL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5977 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5978 #ifdef MSG_BTAG
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5979 PyModule_AddIntMacro(m, MSG_BTAG);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5980 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5981 #ifdef MSG_ETAG
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5982 PyModule_AddIntMacro(m, MSG_ETAG);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5983 #endif
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5984 #ifdef MSG_NOSIGNAL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5985 PyModule_AddIntMacro(m, MSG_NOSIGNAL);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5986 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5987 #ifdef MSG_NOTIFICATION
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5988 PyModule_AddIntMacro(m, MSG_NOTIFICATION);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5989 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5990 #ifdef MSG_CMSG_CLOEXEC
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5991 PyModule_AddIntMacro(m, MSG_CMSG_CLOEXEC);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5992 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5993 #ifdef MSG_ERRQUEUE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5994 PyModule_AddIntMacro(m, MSG_ERRQUEUE);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5995 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5996 #ifdef MSG_CONFIRM
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	5997 PyModule_AddIntMacro(m, MSG_CONFIRM);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5998 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5999 #ifdef MSG_MORE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6000 PyModule_AddIntMacro(m, MSG_MORE);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6001 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6002 #ifdef MSG_EOF
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6003 PyModule_AddIntMacro(m, MSG_EOF);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6004 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6005 #ifdef MSG_BCAST
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6006 PyModule_AddIntMacro(m, MSG_BCAST);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6007 #endif
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6008 #ifdef MSG_MCAST
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6009 PyModule_AddIntMacro(m, MSG_MCAST);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6010 #endif
80834 5435a9278028 expose TCP_FASTOPEN and MSG_FASTOPEN Benjamin Peterson <benjamin@python.org> parents: 79475 diff changeset	6011 #ifdef MSG_FASTOPEN
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6012 PyModule_AddIntMacro(m, MSG_FASTOPEN);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6013 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6014
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6015 /* Protocol level and numbers, usable for [gs]etsockopt */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6016 #ifdef SOL_SOCKET
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6017 PyModule_AddIntMacro(m, SOL_SOCKET);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6018 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6019 #ifdef SOL_IP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6020 PyModule_AddIntMacro(m, SOL_IP);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	6021 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6022 PyModule_AddIntConstant(m, "SOL_IP", 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6023 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6024 #ifdef SOL_IPX
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6025 PyModule_AddIntMacro(m, SOL_IPX);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6026 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6027 #ifdef SOL_AX25
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6028 PyModule_AddIntMacro(m, SOL_AX25);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6029 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6030 #ifdef SOL_ATALK
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6031 PyModule_AddIntMacro(m, SOL_ATALK);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6032 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6033 #ifdef SOL_NETROM
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6034 PyModule_AddIntMacro(m, SOL_NETROM);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6035 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6036 #ifdef SOL_ROSE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6037 PyModule_AddIntMacro(m, SOL_ROSE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6038 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6039 #ifdef SOL_TCP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6040 PyModule_AddIntMacro(m, SOL_TCP);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	6041 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6042 PyModule_AddIntConstant(m, "SOL_TCP", 6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6043 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6044 #ifdef SOL_UDP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6045 PyModule_AddIntMacro(m, SOL_UDP);
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	6046 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6047 PyModule_AddIntConstant(m, "SOL_UDP", 17);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6048 #endif
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6049 #ifdef SOL_CAN_BASE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6050 PyModule_AddIntMacro(m, SOL_CAN_BASE);
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6051 #endif
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6052 #ifdef SOL_CAN_RAW
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6053 PyModule_AddIntMacro(m, SOL_CAN_RAW);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6054 PyModule_AddIntMacro(m, CAN_RAW);
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6055 #endif
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6056 #ifdef HAVE_LINUX_CAN_H
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6057 PyModule_AddIntMacro(m, CAN_EFF_FLAG);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6058 PyModule_AddIntMacro(m, CAN_RTR_FLAG);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6059 PyModule_AddIntMacro(m, CAN_ERR_FLAG);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6060
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6061 PyModule_AddIntMacro(m, CAN_SFF_MASK);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6062 PyModule_AddIntMacro(m, CAN_EFF_MASK);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6063 PyModule_AddIntMacro(m, CAN_ERR_MASK);
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6064 #endif
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6065 #ifdef HAVE_LINUX_CAN_RAW_H
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6066 PyModule_AddIntMacro(m, CAN_RAW_FILTER);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6067 PyModule_AddIntMacro(m, CAN_RAW_ERR_FILTER);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6068 PyModule_AddIntMacro(m, CAN_RAW_LOOPBACK);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6069 PyModule_AddIntMacro(m, CAN_RAW_RECV_OWN_MSGS);
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6070 #endif
82024 f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6071 #ifdef HAVE_LINUX_CAN_BCM_H
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6072 PyModule_AddIntMacro(m, CAN_BCM);
82024 f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6073 PyModule_AddIntConstant(m, "CAN_BCM_TX_SETUP", TX_SETUP);
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6074 PyModule_AddIntConstant(m, "CAN_BCM_TX_DELETE", TX_DELETE);
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6075 PyModule_AddIntConstant(m, "CAN_BCM_TX_READ", TX_READ);
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6076 PyModule_AddIntConstant(m, "CAN_BCM_TX_SEND", TX_SEND);
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6077 PyModule_AddIntConstant(m, "CAN_BCM_RX_SETUP", RX_SETUP);
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6078 PyModule_AddIntConstant(m, "CAN_BCM_RX_DELETE", RX_DELETE);
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6079 PyModule_AddIntConstant(m, "CAN_BCM_RX_READ", RX_READ);
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6080 PyModule_AddIntConstant(m, "CAN_BCM_TX_STATUS", TX_STATUS);
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6081 PyModule_AddIntConstant(m, "CAN_BCM_TX_EXPIRED", TX_EXPIRED);
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6082 PyModule_AddIntConstant(m, "CAN_BCM_RX_STATUS", RX_STATUS);
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6083 PyModule_AddIntConstant(m, "CAN_BCM_RX_TIMEOUT", RX_TIMEOUT);
f714af60508d Issue #15359: Add CAN_BCM protocol support to the socket module. Patch by Brian Charles-François Natali <cf.natali@gmail.com> parents: 81589 diff changeset	6084 PyModule_AddIntConstant(m, "CAN_BCM_RX_CHANGED", RX_CHANGED);
72758 e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6085 #endif
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6086 #ifdef SOL_RDS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6087 PyModule_AddIntMacro(m, SOL_RDS);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6088 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6089 #ifdef RDS_CANCEL_SENT_TO
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6090 PyModule_AddIntMacro(m, RDS_CANCEL_SENT_TO);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6091 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6092 #ifdef RDS_GET_MR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6093 PyModule_AddIntMacro(m, RDS_GET_MR);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6094 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6095 #ifdef RDS_FREE_MR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6096 PyModule_AddIntMacro(m, RDS_FREE_MR);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6097 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6098 #ifdef RDS_RECVERR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6099 PyModule_AddIntMacro(m, RDS_RECVERR);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6100 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6101 #ifdef RDS_CONG_MONITOR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6102 PyModule_AddIntMacro(m, RDS_CONG_MONITOR);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6103 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6104 #ifdef RDS_GET_MR_FOR_DEST
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6105 PyModule_AddIntMacro(m, RDS_GET_MR_FOR_DEST);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6106 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6107 #ifdef IPPROTO_IP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6108 PyModule_AddIntMacro(m, IPPROTO_IP);
8439 534602746079 Some systems (e.g. Linux) use enums for some symbols (like IPPROTO_IP) Guido van Rossum <guido@python.org> parents: 7942 diff changeset	6109 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6110 PyModule_AddIntConstant(m, "IPPROTO_IP", 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6111 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6112 #ifdef IPPROTO_HOPOPTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6113 PyModule_AddIntMacro(m, IPPROTO_HOPOPTS);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6114 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6115 #ifdef IPPROTO_ICMP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6116 PyModule_AddIntMacro(m, IPPROTO_ICMP);
8439 534602746079 Some systems (e.g. Linux) use enums for some symbols (like IPPROTO_IP) Guido van Rossum <guido@python.org> parents: 7942 diff changeset	6117 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6118 PyModule_AddIntConstant(m, "IPPROTO_ICMP", 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6119 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6120 #ifdef IPPROTO_IGMP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6121 PyModule_AddIntMacro(m, IPPROTO_IGMP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6122 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6123 #ifdef IPPROTO_GGP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6124 PyModule_AddIntMacro(m, IPPROTO_GGP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6125 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6126 #ifdef IPPROTO_IPV4
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6127 PyModule_AddIntMacro(m, IPPROTO_IPV4);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6128 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6129 #ifdef IPPROTO_IPV6
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6130 PyModule_AddIntMacro(m, IPPROTO_IPV6);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6131 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6132 #ifdef IPPROTO_IPIP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6133 PyModule_AddIntMacro(m, IPPROTO_IPIP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6134 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6135 #ifdef IPPROTO_TCP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6136 PyModule_AddIntMacro(m, IPPROTO_TCP);
8439 534602746079 Some systems (e.g. Linux) use enums for some symbols (like IPPROTO_IP) Guido van Rossum <guido@python.org> parents: 7942 diff changeset	6137 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6138 PyModule_AddIntConstant(m, "IPPROTO_TCP", 6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6139 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6140 #ifdef IPPROTO_EGP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6141 PyModule_AddIntMacro(m, IPPROTO_EGP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6142 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6143 #ifdef IPPROTO_PUP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6144 PyModule_AddIntMacro(m, IPPROTO_PUP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6145 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6146 #ifdef IPPROTO_UDP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6147 PyModule_AddIntMacro(m, IPPROTO_UDP);
8439 534602746079 Some systems (e.g. Linux) use enums for some symbols (like IPPROTO_IP) Guido van Rossum <guido@python.org> parents: 7942 diff changeset	6148 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6149 PyModule_AddIntConstant(m, "IPPROTO_UDP", 17);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6150 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6151 #ifdef IPPROTO_IDP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6152 PyModule_AddIntMacro(m, IPPROTO_IDP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6153 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6154 #ifdef IPPROTO_HELLO
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6155 PyModule_AddIntMacro(m, IPPROTO_HELLO);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6156 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6157 #ifdef IPPROTO_ND
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6158 PyModule_AddIntMacro(m, IPPROTO_ND);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6159 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6160 #ifdef IPPROTO_TP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6161 PyModule_AddIntMacro(m, IPPROTO_TP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6162 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6163 #ifdef IPPROTO_IPV6
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6164 PyModule_AddIntMacro(m, IPPROTO_IPV6);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6165 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6166 #ifdef IPPROTO_ROUTING
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6167 PyModule_AddIntMacro(m, IPPROTO_ROUTING);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6168 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6169 #ifdef IPPROTO_FRAGMENT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6170 PyModule_AddIntMacro(m, IPPROTO_FRAGMENT);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6171 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6172 #ifdef IPPROTO_RSVP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6173 PyModule_AddIntMacro(m, IPPROTO_RSVP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6174 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6175 #ifdef IPPROTO_GRE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6176 PyModule_AddIntMacro(m, IPPROTO_GRE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6177 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6178 #ifdef IPPROTO_ESP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6179 PyModule_AddIntMacro(m, IPPROTO_ESP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6180 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6181 #ifdef IPPROTO_AH
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6182 PyModule_AddIntMacro(m, IPPROTO_AH);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6183 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6184 #ifdef IPPROTO_MOBILE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6185 PyModule_AddIntMacro(m, IPPROTO_MOBILE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6186 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6187 #ifdef IPPROTO_ICMPV6
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6188 PyModule_AddIntMacro(m, IPPROTO_ICMPV6);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6189 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6190 #ifdef IPPROTO_NONE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6191 PyModule_AddIntMacro(m, IPPROTO_NONE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6192 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6193 #ifdef IPPROTO_DSTOPTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6194 PyModule_AddIntMacro(m, IPPROTO_DSTOPTS);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6195 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6196 #ifdef IPPROTO_XTP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6197 PyModule_AddIntMacro(m, IPPROTO_XTP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6198 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6199 #ifdef IPPROTO_EON
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6200 PyModule_AddIntMacro(m, IPPROTO_EON);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6201 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6202 #ifdef IPPROTO_PIM
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6203 PyModule_AddIntMacro(m, IPPROTO_PIM);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6204 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6205 #ifdef IPPROTO_IPCOMP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6206 PyModule_AddIntMacro(m, IPPROTO_IPCOMP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6207 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6208 #ifdef IPPROTO_VRRP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6209 PyModule_AddIntMacro(m, IPPROTO_VRRP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6210 #endif
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6211 #ifdef IPPROTO_SCTP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6212 PyModule_AddIntMacro(m, IPPROTO_SCTP);
72029 c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6213 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6214 #ifdef IPPROTO_BIP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6215 PyModule_AddIntMacro(m, IPPROTO_BIP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	6216 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	6217 /**/
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6218 #ifdef IPPROTO_RAW
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6219 PyModule_AddIntMacro(m, IPPROTO_RAW);
8439 534602746079 Some systems (e.g. Linux) use enums for some symbols (like IPPROTO_IP) Guido van Rossum <guido@python.org> parents: 7942 diff changeset	6220 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6221 PyModule_AddIntConstant(m, "IPPROTO_RAW", 255);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6222 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6223 #ifdef IPPROTO_MAX
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6224 PyModule_AddIntMacro(m, IPPROTO_MAX);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6225 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6226
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	6227 #ifdef SYSPROTO_CONTROL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6228 PyModule_AddIntMacro(m, SYSPROTO_CONTROL);
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	6229 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	6230
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6231 /* Some port configuration */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6232 #ifdef IPPORT_RESERVED
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6233 PyModule_AddIntMacro(m, IPPORT_RESERVED);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	6234 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6235 PyModule_AddIntConstant(m, "IPPORT_RESERVED", 1024);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6236 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6237 #ifdef IPPORT_USERRESERVED
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6238 PyModule_AddIntMacro(m, IPPORT_USERRESERVED);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	6239 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6240 PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", 5000);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6241 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6242
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6243 /* Some reserved IP v.4 addresses */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6244 #ifdef INADDR_ANY
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6245 PyModule_AddIntMacro(m, INADDR_ANY);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6246 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6247 PyModule_AddIntConstant(m, "INADDR_ANY", 0x00000000);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6248 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6249 #ifdef INADDR_BROADCAST
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6250 PyModule_AddIntMacro(m, INADDR_BROADCAST);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6251 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6252 PyModule_AddIntConstant(m, "INADDR_BROADCAST", 0xffffffff);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6253 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6254 #ifdef INADDR_LOOPBACK
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6255 PyModule_AddIntMacro(m, INADDR_LOOPBACK);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6256 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6257 PyModule_AddIntConstant(m, "INADDR_LOOPBACK", 0x7F000001);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6258 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6259 #ifdef INADDR_UNSPEC_GROUP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6260 PyModule_AddIntMacro(m, INADDR_UNSPEC_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6261 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6262 PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", 0xe0000000);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6263 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6264 #ifdef INADDR_ALLHOSTS_GROUP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6265 PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6266 INADDR_ALLHOSTS_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6267 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6268 PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP", 0xe0000001);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6269 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6270 #ifdef INADDR_MAX_LOCAL_GROUP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6271 PyModule_AddIntMacro(m, INADDR_MAX_LOCAL_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6272 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6273 PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6274 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6275 #ifdef INADDR_NONE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6276 PyModule_AddIntMacro(m, INADDR_NONE);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6277 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6278 PyModule_AddIntConstant(m, "INADDR_NONE", 0xffffffff);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6279 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6280
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6281 /* IPv4 [gs]etsockopt options */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6282 #ifdef IP_OPTIONS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6283 PyModule_AddIntMacro(m, IP_OPTIONS);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6284 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6285 #ifdef IP_HDRINCL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6286 PyModule_AddIntMacro(m, IP_HDRINCL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6287 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6288 #ifdef IP_TOS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6289 PyModule_AddIntMacro(m, IP_TOS);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6290 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6291 #ifdef IP_TTL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6292 PyModule_AddIntMacro(m, IP_TTL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6293 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6294 #ifdef IP_RECVOPTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6295 PyModule_AddIntMacro(m, IP_RECVOPTS);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6296 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6297 #ifdef IP_RECVRETOPTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6298 PyModule_AddIntMacro(m, IP_RECVRETOPTS);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6299 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6300 #ifdef IP_RECVDSTADDR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6301 PyModule_AddIntMacro(m, IP_RECVDSTADDR);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6302 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6303 #ifdef IP_RETOPTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6304 PyModule_AddIntMacro(m, IP_RETOPTS);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6305 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6306 #ifdef IP_MULTICAST_IF
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6307 PyModule_AddIntMacro(m, IP_MULTICAST_IF);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6308 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6309 #ifdef IP_MULTICAST_TTL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6310 PyModule_AddIntMacro(m, IP_MULTICAST_TTL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6311 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6312 #ifdef IP_MULTICAST_LOOP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6313 PyModule_AddIntMacro(m, IP_MULTICAST_LOOP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6314 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6315 #ifdef IP_ADD_MEMBERSHIP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6316 PyModule_AddIntMacro(m, IP_ADD_MEMBERSHIP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6317 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6318 #ifdef IP_DROP_MEMBERSHIP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6319 PyModule_AddIntMacro(m, IP_DROP_MEMBERSHIP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6320 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6321 #ifdef IP_DEFAULT_MULTICAST_TTL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6322 PyModule_AddIntMacro(m, IP_DEFAULT_MULTICAST_TTL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6323 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6324 #ifdef IP_DEFAULT_MULTICAST_LOOP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6325 PyModule_AddIntMacro(m, IP_DEFAULT_MULTICAST_LOOP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6326 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6327 #ifdef IP_MAX_MEMBERSHIPS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6328 PyModule_AddIntMacro(m, IP_MAX_MEMBERSHIPS);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6329 #endif
74012 59ea1d1a4137 Issue #12809: Expose IP_TRANSPARENT in the socket module. Patch by Michael Charles-François Natali <neologix@free.fr> parents: 74007 diff changeset	6330 #ifdef IP_TRANSPARENT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6331 PyModule_AddIntMacro(m, IP_TRANSPARENT);
74012 59ea1d1a4137 Issue #12809: Expose IP_TRANSPARENT in the socket module. Patch by Michael Charles-François Natali <neologix@free.fr> parents: 74007 diff changeset	6332 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6333
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6334 /* IPv6 [gs]etsockopt options, defined in RFC2553 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6335 #ifdef IPV6_JOIN_GROUP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6336 PyModule_AddIntMacro(m, IPV6_JOIN_GROUP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6337 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6338 #ifdef IPV6_LEAVE_GROUP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6339 PyModule_AddIntMacro(m, IPV6_LEAVE_GROUP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6340 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6341 #ifdef IPV6_MULTICAST_HOPS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6342 PyModule_AddIntMacro(m, IPV6_MULTICAST_HOPS);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6343 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6344 #ifdef IPV6_MULTICAST_IF
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6345 PyModule_AddIntMacro(m, IPV6_MULTICAST_IF);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6346 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6347 #ifdef IPV6_MULTICAST_LOOP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6348 PyModule_AddIntMacro(m, IPV6_MULTICAST_LOOP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6349 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6350 #ifdef IPV6_UNICAST_HOPS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6351 PyModule_AddIntMacro(m, IPV6_UNICAST_HOPS);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6352 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6353 /* Additional IPV6 socket options, defined in RFC 3493 */
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6354 #ifdef IPV6_V6ONLY
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6355 PyModule_AddIntMacro(m, IPV6_V6ONLY);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6356 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6357 /* Advanced IPV6 socket options, from RFC 3542 */
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6358 #ifdef IPV6_CHECKSUM
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6359 PyModule_AddIntMacro(m, IPV6_CHECKSUM);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6360 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6361 #ifdef IPV6_DONTFRAG
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6362 PyModule_AddIntMacro(m, IPV6_DONTFRAG);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6363 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6364 #ifdef IPV6_DSTOPTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6365 PyModule_AddIntMacro(m, IPV6_DSTOPTS);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6366 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6367 #ifdef IPV6_HOPLIMIT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6368 PyModule_AddIntMacro(m, IPV6_HOPLIMIT);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6369 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6370 #ifdef IPV6_HOPOPTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6371 PyModule_AddIntMacro(m, IPV6_HOPOPTS);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6372 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6373 #ifdef IPV6_NEXTHOP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6374 PyModule_AddIntMacro(m, IPV6_NEXTHOP);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6375 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6376 #ifdef IPV6_PATHMTU
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6377 PyModule_AddIntMacro(m, IPV6_PATHMTU);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6378 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6379 #ifdef IPV6_PKTINFO
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6380 PyModule_AddIntMacro(m, IPV6_PKTINFO);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6381 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6382 #ifdef IPV6_RECVDSTOPTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6383 PyModule_AddIntMacro(m, IPV6_RECVDSTOPTS);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6384 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6385 #ifdef IPV6_RECVHOPLIMIT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6386 PyModule_AddIntMacro(m, IPV6_RECVHOPLIMIT);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6387 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6388 #ifdef IPV6_RECVHOPOPTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6389 PyModule_AddIntMacro(m, IPV6_RECVHOPOPTS);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6390 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6391 #ifdef IPV6_RECVPKTINFO
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6392 PyModule_AddIntMacro(m, IPV6_RECVPKTINFO);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6393 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6394 #ifdef IPV6_RECVRTHDR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6395 PyModule_AddIntMacro(m, IPV6_RECVRTHDR);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6396 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6397 #ifdef IPV6_RECVTCLASS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6398 PyModule_AddIntMacro(m, IPV6_RECVTCLASS);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6399 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6400 #ifdef IPV6_RTHDR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6401 PyModule_AddIntMacro(m, IPV6_RTHDR);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6402 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6403 #ifdef IPV6_RTHDRDSTOPTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6404 PyModule_AddIntMacro(m, IPV6_RTHDRDSTOPTS);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6405 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6406 #ifdef IPV6_RTHDR_TYPE_0
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6407 PyModule_AddIntMacro(m, IPV6_RTHDR_TYPE_0);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6408 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6409 #ifdef IPV6_RECVPATHMTU
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6410 PyModule_AddIntMacro(m, IPV6_RECVPATHMTU);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6411 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6412 #ifdef IPV6_TCLASS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6413 PyModule_AddIntMacro(m, IPV6_TCLASS);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6414 #endif
24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6415 #ifdef IPV6_USE_MIN_MTU
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6416 PyModule_AddIntMacro(m, IPV6_USE_MIN_MTU);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6417 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6418
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6419 /* TCP options */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6420 #ifdef TCP_NODELAY
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6421 PyModule_AddIntMacro(m, TCP_NODELAY);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6422 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6423 #ifdef TCP_MAXSEG
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6424 PyModule_AddIntMacro(m, TCP_MAXSEG);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6425 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6426 #ifdef TCP_CORK
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6427 PyModule_AddIntMacro(m, TCP_CORK);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6428 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6429 #ifdef TCP_KEEPIDLE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6430 PyModule_AddIntMacro(m, TCP_KEEPIDLE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6431 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6432 #ifdef TCP_KEEPINTVL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6433 PyModule_AddIntMacro(m, TCP_KEEPINTVL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6434 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6435 #ifdef TCP_KEEPCNT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6436 PyModule_AddIntMacro(m, TCP_KEEPCNT);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6437 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6438 #ifdef TCP_SYNCNT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6439 PyModule_AddIntMacro(m, TCP_SYNCNT);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6440 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6441 #ifdef TCP_LINGER2
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6442 PyModule_AddIntMacro(m, TCP_LINGER2);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6443 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6444 #ifdef TCP_DEFER_ACCEPT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6445 PyModule_AddIntMacro(m, TCP_DEFER_ACCEPT);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6446 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6447 #ifdef TCP_WINDOW_CLAMP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6448 PyModule_AddIntMacro(m, TCP_WINDOW_CLAMP);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6449 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6450 #ifdef TCP_INFO
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6451 PyModule_AddIntMacro(m, TCP_INFO);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6452 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6453 #ifdef TCP_QUICKACK
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6454 PyModule_AddIntMacro(m, TCP_QUICKACK);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6455 #endif
80834 5435a9278028 expose TCP_FASTOPEN and MSG_FASTOPEN Benjamin Peterson <benjamin@python.org> parents: 79475 diff changeset	6456 #ifdef TCP_FASTOPEN
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6457 PyModule_AddIntMacro(m, TCP_FASTOPEN);
80834 5435a9278028 expose TCP_FASTOPEN and MSG_FASTOPEN Benjamin Peterson <benjamin@python.org> parents: 79475 diff changeset	6458 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6459
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6460 /* IPX options */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6461 #ifdef IPX_TYPE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6462 PyModule_AddIntMacro(m, IPX_TYPE);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6463 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6464
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6465 /* Reliable Datagram Sockets */
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6466 #ifdef RDS_CMSG_RDMA_ARGS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6467 PyModule_AddIntMacro(m, RDS_CMSG_RDMA_ARGS);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6468 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6469 #ifdef RDS_CMSG_RDMA_DEST
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6470 PyModule_AddIntMacro(m, RDS_CMSG_RDMA_DEST);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6471 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6472 #ifdef RDS_CMSG_RDMA_MAP
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6473 PyModule_AddIntMacro(m, RDS_CMSG_RDMA_MAP);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6474 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6475 #ifdef RDS_CMSG_RDMA_STATUS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6476 PyModule_AddIntMacro(m, RDS_CMSG_RDMA_STATUS);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6477 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6478 #ifdef RDS_CMSG_RDMA_UPDATE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6479 PyModule_AddIntMacro(m, RDS_CMSG_RDMA_UPDATE);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6480 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6481 #ifdef RDS_RDMA_READWRITE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6482 PyModule_AddIntMacro(m, RDS_RDMA_READWRITE);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6483 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6484 #ifdef RDS_RDMA_FENCE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6485 PyModule_AddIntMacro(m, RDS_RDMA_FENCE);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6486 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6487 #ifdef RDS_RDMA_INVALIDATE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6488 PyModule_AddIntMacro(m, RDS_RDMA_INVALIDATE);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6489 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6490 #ifdef RDS_RDMA_USE_ONCE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6491 PyModule_AddIntMacro(m, RDS_RDMA_USE_ONCE);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6492 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6493 #ifdef RDS_RDMA_DONTWAIT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6494 PyModule_AddIntMacro(m, RDS_RDMA_DONTWAIT);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6495 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6496 #ifdef RDS_RDMA_NOTIFY_ME
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6497 PyModule_AddIntMacro(m, RDS_RDMA_NOTIFY_ME);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6498 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6499 #ifdef RDS_RDMA_SILENT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6500 PyModule_AddIntMacro(m, RDS_RDMA_SILENT);
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6501 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6502
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6503 /* get{addr,name}info parameters */
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6504 #ifdef EAI_ADDRFAMILY
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6505 PyModule_AddIntMacro(m, EAI_ADDRFAMILY);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6506 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6507 #ifdef EAI_AGAIN
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6508 PyModule_AddIntMacro(m, EAI_AGAIN);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6509 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6510 #ifdef EAI_BADFLAGS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6511 PyModule_AddIntMacro(m, EAI_BADFLAGS);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6512 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6513 #ifdef EAI_FAIL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6514 PyModule_AddIntMacro(m, EAI_FAIL);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6515 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6516 #ifdef EAI_FAMILY
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6517 PyModule_AddIntMacro(m, EAI_FAMILY);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6518 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6519 #ifdef EAI_MEMORY
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6520 PyModule_AddIntMacro(m, EAI_MEMORY);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6521 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6522 #ifdef EAI_NODATA
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6523 PyModule_AddIntMacro(m, EAI_NODATA);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6524 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6525 #ifdef EAI_NONAME
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6526 PyModule_AddIntMacro(m, EAI_NONAME);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6527 #endif
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6528 #ifdef EAI_OVERFLOW
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6529 PyModule_AddIntMacro(m, EAI_OVERFLOW);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6530 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6531 #ifdef EAI_SERVICE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6532 PyModule_AddIntMacro(m, EAI_SERVICE);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6533 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6534 #ifdef EAI_SOCKTYPE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6535 PyModule_AddIntMacro(m, EAI_SOCKTYPE);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6536 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6537 #ifdef EAI_SYSTEM
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6538 PyModule_AddIntMacro(m, EAI_SYSTEM);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6539 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6540 #ifdef EAI_BADHINTS
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6541 PyModule_AddIntMacro(m, EAI_BADHINTS);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6542 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6543 #ifdef EAI_PROTOCOL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6544 PyModule_AddIntMacro(m, EAI_PROTOCOL);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6545 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6546 #ifdef EAI_MAX
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6547 PyModule_AddIntMacro(m, EAI_MAX);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6548 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6549 #ifdef AI_PASSIVE
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6550 PyModule_AddIntMacro(m, AI_PASSIVE);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6551 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6552 #ifdef AI_CANONNAME
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6553 PyModule_AddIntMacro(m, AI_CANONNAME);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6554 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6555 #ifdef AI_NUMERICHOST
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6556 PyModule_AddIntMacro(m, AI_NUMERICHOST);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6557 #endif
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6558 #ifdef AI_NUMERICSERV
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6559 PyModule_AddIntMacro(m, AI_NUMERICSERV);
31274 24d34ab4ef75 Add IPV6_ socket options from RFCs 3493 and 3542. Fixes #867012. Martin v. Löwis <martin@v.loewis.de> parents: 31207 diff changeset	6560 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6561 #ifdef AI_MASK
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6562 PyModule_AddIntMacro(m, AI_MASK);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6563 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6564 #ifdef AI_ALL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6565 PyModule_AddIntMacro(m, AI_ALL);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6566 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6567 #ifdef AI_V4MAPPED_CFG
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6568 PyModule_AddIntMacro(m, AI_V4MAPPED_CFG);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6569 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6570 #ifdef AI_ADDRCONFIG
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6571 PyModule_AddIntMacro(m, AI_ADDRCONFIG);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6572 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6573 #ifdef AI_V4MAPPED
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6574 PyModule_AddIntMacro(m, AI_V4MAPPED);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6575 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6576 #ifdef AI_DEFAULT
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6577 PyModule_AddIntMacro(m, AI_DEFAULT);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6578 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6579 #ifdef NI_MAXHOST
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6580 PyModule_AddIntMacro(m, NI_MAXHOST);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6581 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6582 #ifdef NI_MAXSERV
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6583 PyModule_AddIntMacro(m, NI_MAXSERV);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6584 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6585 #ifdef NI_NOFQDN
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6586 PyModule_AddIntMacro(m, NI_NOFQDN);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6587 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6588 #ifdef NI_NUMERICHOST
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6589 PyModule_AddIntMacro(m, NI_NUMERICHOST);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6590 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6591 #ifdef NI_NAMEREQD
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6592 PyModule_AddIntMacro(m, NI_NAMEREQD);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6593 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6594 #ifdef NI_NUMERICSERV
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6595 PyModule_AddIntMacro(m, NI_NUMERICSERV);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6596 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6597 #ifdef NI_DGRAM
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6598 PyModule_AddIntMacro(m, NI_DGRAM);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6599 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6600
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6601 /* shutdown() parameters */
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6602 #ifdef SHUT_RD
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6603 PyModule_AddIntMacro(m, SHUT_RD);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6604 #elif defined(SD_RECEIVE)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6605 PyModule_AddIntConstant(m, "SHUT_RD", SD_RECEIVE);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6606 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6607 PyModule_AddIntConstant(m, "SHUT_RD", 0);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6608 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6609 #ifdef SHUT_WR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6610 PyModule_AddIntMacro(m, SHUT_WR);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6611 #elif defined(SD_SEND)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6612 PyModule_AddIntConstant(m, "SHUT_WR", SD_SEND);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6613 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6614 PyModule_AddIntConstant(m, "SHUT_WR", 1);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6615 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6616 #ifdef SHUT_RDWR
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6617 PyModule_AddIntMacro(m, SHUT_RDWR);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6618 #elif defined(SD_BOTH)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6619 PyModule_AddIntConstant(m, "SHUT_RDWR", SD_BOTH);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6620 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6621 PyModule_AddIntConstant(m, "SHUT_RDWR", 2);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6622 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6623
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	6624 #ifdef SIO_RCVALL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6625 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6626 DWORD codes[] = {SIO_RCVALL, SIO_KEEPALIVE_VALS};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6627 const char *names[] = {"SIO_RCVALL", "SIO_KEEPALIVE_VALS"};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6628 int i;
72510 b534b56379cb Use the new Py_ARRAY_LENGTH macro Victor Stinner <victor.stinner@haypocalc.com> parents: 72117 diff changeset	6629 for(i = 0; i<Py_ARRAY_LENGTH(codes); ++i) {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6630 PyObject *tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6631 tmp = PyLong_FromUnsignedLong(codes[i]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6632 if (tmp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6633 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6634 PyModule_AddObject(m, names[i], tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6635 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6636 }
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6637 PyModule_AddIntMacro(m, RCVALL_OFF);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6638 PyModule_AddIntMacro(m, RCVALL_ON);
12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6639 PyModule_AddIntMacro(m, RCVALL_SOCKETLEVELONLY);
47663 92b79b6d1a3b Slowly apply part of #2065: py3k can be compiled with VS8.0 Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47583 diff changeset	6640 #ifdef RCVALL_IPLEVEL
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6641 PyModule_AddIntMacro(m, RCVALL_IPLEVEL);
47663 92b79b6d1a3b Slowly apply part of #2065: py3k can be compiled with VS8.0 Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47583 diff changeset	6642 #endif
92b79b6d1a3b Slowly apply part of #2065: py3k can be compiled with VS8.0 Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47583 diff changeset	6643 #ifdef RCVALL_MAX
83867 12cbb5183d98 Issue #17917: Use PyModule_AddIntMacro() instead of PyModule_AddIntConstant() Charles-Francois Natali <cf.natali@gmail.com> parents: 83795 diff changeset	6644 PyModule_AddIntMacro(m, RCVALL_MAX);
47663 92b79b6d1a3b Slowly apply part of #2065: py3k can be compiled with VS8.0 Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47583 diff changeset	6645 #endif
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	6646 #endif /* _MSTCPIP_ */
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	6647
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6648 /* Initialize gethostbyname lock */
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	6649 #if defined(USE_GETHOSTBYNAME_LOCK) \|\| defined(USE_GETADDRINFO_LOCK)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6650 netdb_lock = PyThread_allocate_lock();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6651 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6652 return m;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6653 }
18262 6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	6654
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	6655
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	6656 #ifndef HAVE_INET_PTON
43926 2de7d00fbf19 The patch from weck does a better job than my original idea. Thanks! Christian Heimes <christian@cheimes.de> parents: 43881 diff changeset	6657 #if !defined(NTDDI_VERSION) \|\| (NTDDI_VERSION < NTDDI_LONGHORN)
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	6658
18262 6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	6659 /* Simplistic emulation code for inet_pton that only works for IPv4 */
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	6660 /* These are not exposed because they do not set errno properly */
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	6661
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	6662 int
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	6663 inet_pton(int af, const char src, void dst)
18262 6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	6664 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6665 if (af == AF_INET) {
51579 648e07dd0825 Merged revisions 69364-69365,69409-69410,69413,69417,69435,69442,69447,69495,69519-69521 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51384 diff changeset	6666 #if (SIZEOF_INT != 4)
648e07dd0825 Merged revisions 69364-69365,69409-69410,69413,69417,69435,69442,69447,69495,69519-69521 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51384 diff changeset	6667 #error "Not sure if in_addr_t exists and int is not 32-bits."
648e07dd0825 Merged revisions 69364-69365,69409-69410,69413,69417,69435,69442,69447,69495,69519-69521 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 51384 diff changeset	6668 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6669 unsigned int packed_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6670 packed_addr = inet_addr(src);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6671 if (packed_addr == INADDR_NONE)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6672 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6673 memcpy(dst, &packed_addr, 4);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6674 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6675 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6676 /* Should set errno to EAFNOSUPPORT */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6677 return -1;
18262 6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	6678 }
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	6679
18790 7cd22bf56d7b Silence warnings in MSVC++: hide unused variables, add constness back to Martin v. Löwis <martin@v.loewis.de> parents: 18753 diff changeset	6680 const char *
7cd22bf56d7b Silence warnings in MSVC++: hide unused variables, add constness back to Martin v. Löwis <martin@v.loewis.de> parents: 18753 diff changeset	6681 inet_ntop(int af, const void src, char dst, socklen_t size)
18262 6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	6682 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6683 if (af == AF_INET) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6684 struct in_addr packed_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6685 if (size < 16)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6686 /* Should set errno to ENOSPC. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6687 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6688 memcpy(&packed_addr, src, sizeof(packed_addr));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6689 return strncpy(dst, inet_ntoa(packed_addr), size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6690 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6691 /* Should set errno to EAFNOSUPPORT */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6692 return NULL;
18262 6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	6693 }
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	6694
18262 6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	6695 #endif
43874 6b012f01a889 Fix for VS 2008 Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	6696 #endif

Mercurial > cpython-lru_cache-weakref

annotate Modules/socketmodule.c @ 85327:5b5ef012cd4e