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

annotate Modules/socketmodule.c @ 77142:70ec1f671c19

Added test for namespace package dynamic path updates.

author	Eric V. Smith <eric@trueblade.com>
date	Fri, 25 May 2012 11:25:27 -0400
parents	51b4bddd0e92
children	9cf08b779954

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
2565 912813d573b4 fixed up comments describing interface Guido van Rossum <guido@python.org> parents: 2532 diff changeset	18 - socket.error: exception raised for socket specific errors
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
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	98 #undef MAX
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	99 #define MAX(x, y) ((x) < (y) ? (y) : (x))
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	100
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	101 /* Socket object documentation */
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	102 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	103 "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	104 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	105 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	106 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	107 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	108 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	109 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	110 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	111 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	112 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	113 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	114 \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	115 _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	116 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	117 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	118 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	119 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	120 _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	121 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	122 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	123 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	124 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	125 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	126 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	127 recv(buflen[, flags]) -- receive data\n\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	128 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	129 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	130 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	131 -- 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	132 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	133 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	134 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	135 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	136 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	137 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	138 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	139 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	140 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	141 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	142 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	143 [*] not available on all platforms!");
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	144
30722 651fc8d98d99 Fix a bunch of typos in documentation, docstrings and comments. Walter Dörwald <walter@livinglogic.de> parents: 30683 diff changeset	145 /* 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	146 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	147
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	148 /* 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	149 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	150 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	151 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	152
adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	153 #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	154 # 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	155 # 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	156 # 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	157 #endif
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	158
72045 b4b84e87dc6b Close #12826: fix socketmodule.c for OpenBSD, include sys/uio.h Victor Stinner <vstinner@wyplay.com> parents: 72030 diff changeset	159 #if defined(__OpenBSD__)
b4b84e87dc6b Close #12826: fix socketmodule.c for OpenBSD, include sys/uio.h Victor Stinner <vstinner@wyplay.com> parents: 72030 diff changeset	160 # 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	161 #endif
b4b84e87dc6b Close #12826: fix socketmodule.c for OpenBSD, include sys/uio.h Victor Stinner <vstinner@wyplay.com> parents: 72030 diff changeset	162
10579 1ed1eb5bc6ec Put back __osf__ support for gethostbyname_r(); the real bug was that Guido van Rossum <guido@python.org> parents: 10561 diff changeset	163 #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	164 # 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	165 #endif
1ed1eb5bc6ec Put back __osf__ support for gethostbyname_r(); the real bug was that Guido van Rossum <guido@python.org> parents: 10561 diff changeset	166
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	167 #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	168 # 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	169 # 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	170 # 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	171 # 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	172 # 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	173 /* 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	174 # 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	175 # 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	176 # endif
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	177 #endif
dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	178
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	179 #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	180 !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	181 # define USE_GETHOSTBYNAME_LOCK
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	182 #endif
9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	183
35635 27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	184 /* To use __FreeBSD_version */
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	185 #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	186 #include <sys/param.h>
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	187 #endif
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	188 /* 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	189 (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	190 #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	191 (defined(__FreeBSD__) && __FreeBSD_version+0 < 503000) \|\| \
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	192 defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| \
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	193 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	194 #define USE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	195 #endif
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	196
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	197 #ifdef USE_GETADDRINFO_LOCK
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 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	199 #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	200 #else
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	201 #define ACQUIRE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	202 #define RELEASE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	203 #endif
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	204
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	205 #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	206 # include "pythread.h"
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	207 #endif
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	208
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	209 #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	210 # 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	211 # 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	212 # 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	213 # 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	214 # include <ctype.h>
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	215 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	216
26551 0c995cd07026 Don't include <ioctl.h> unless on __VMS. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	217 #if defined(__VMS)
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	218 # include <ioctl.h>
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	219 #endif
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	220
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	221 #ifdef __APPLE__
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	222 # 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	223 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	224
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	225
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	226 #if defined(PYOS_OS2)
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	227 # define INCL_DOS
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	228 # define INCL_DOSERRORS
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	229 # define INCL_NOPMAPI
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	230 # include <os2.h>
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	231 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	232
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	233 #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	234 /* 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	235 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	236 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	237
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	238 /* 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	239 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	240 #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	241 #define _SGIAPI 1
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	242
33478 1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	243 #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	244 #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	245 #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	246 #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	247 #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	248 #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	249 #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	250 #endif
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	251
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	252 #define HAVE_INET_PTON
08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	253 #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	254 #endif
337fcc24985b Patch #608999: Fix portability problems with MIPSPro 7.x Martin v. Löwis <martin@v.loewis.de> parents: 25105 diff changeset	255
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	256 /* 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	257 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	258 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	259 #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	260 #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	261 #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	262
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	263 /* Generic includes */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	264 #ifdef HAVE_SYS_TYPES_H
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	265 #include <sys/types.h>
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	266 #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	267
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	268 #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	269 #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	270 #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	271
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	272 #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	273 #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	274 #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	275
21961 ea23e6e49290 Also fix the comment. Marc-André Lemburg <mal@egenix.com> parents: 21960 diff changeset	276 /* 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	277 #define PySocket_BUILDING_SOCKET
21960 7a917ad8f442 Fix the name of the header file. Marc-André Lemburg <mal@egenix.com> parents: 21959 diff changeset	278 #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	279
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 /* 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	281
3738 ce74bba8a6a6 Slightly different Windows ifdefs Guido van Rossum <guido@python.org> parents: 3702 diff changeset	282 #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	283
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 /* 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	285 # include <netdb.h>
72030 9fc5231c36e0 Attempt to address Windows buildbot failures Nick Coghlan <ncoghlan@gmail.com> parents: 72029 diff changeset	286 # 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	287
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	288 /* Headers needed for inet_ntoa() and inet_addr() */
42645 a5e984eda45a Remove support for BeOS Skip Montanaro <skip@pobox.com> parents: 42622 diff changeset	289 # if defined(PYOS_OS2) && 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	290 # include <netdb.h>
20871 f576ffd57966 SF patch 473749 compile under OS/2 VA C++, from Michael Muller. Tim Peters <tim.peters@gmail.com> parents: 20853 diff changeset	291 typedef size_t socklen_t;
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	292 # 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	293 # 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	294 # endif
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	295
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	296 # 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	297
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20648 diff changeset	298 #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	299
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	300 /* MS_WINDOWS includes */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	301 # ifdef HAVE_FCNTL_H
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	302 # include <fcntl.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	303 # 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	304
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	305 #endif
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	306
31504 2abc52c3d4c2 remove support for missing ANSI C header files (limits.h, stddef.h, etc). Skip Montanaro <skip@pobox.com> parents: 31443 diff changeset	307 #include <stddef.h>
18263 41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	308
41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	309 #ifndef offsetof
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	310 # 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	311 #endif
41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	312
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	313 #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	314 # define O_NONBLOCK O_NDELAY
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	315 #endif
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	316
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	317 /* 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	318 #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	319 /* 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	320 * _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	321 * 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	322 */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	323 #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	324 /* 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	325 * 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	326 */
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	327 #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	328 # 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	329 #endif
33066 cda0455bd0a0 Bug #1001857: socketmodule does not build under cygwin Jason Tishler <jason@tishler.net> parents: 33063 diff changeset	330
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	331 #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	332 #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	333 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	334 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	335 #endif
43874 6b012f01a889 Fix for VS 2008 Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	336 #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	337
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	338 #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	339 /* 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	340 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	341 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	342 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	343 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	344 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	345 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	346 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	347 #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	348 /* 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	349 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	350 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	351 #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	352 #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	353
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	354 #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	355 #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	356 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	357
24078 702a5900df7d Mac OS X Jaguar (developer preview) seems to have a working getaddrinfo(). Jack Jansen <jack.jansen@cwi.nl> parents: 23832 diff changeset	358 #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	359
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	360 /* 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	361 #if !defined(HAVE_GETADDRINFO)
28913 b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	362 /* 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	363 #define getaddrinfo fake_getaddrinfo
b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	364 #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	365 #define freeaddrinfo fake_freeaddrinfo
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	366 #include "getaddrinfo.c"
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	367 #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	368 #if !defined(HAVE_GETNAMEINFO)
28913 b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	369 #define getnameinfo fake_getnameinfo
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	370 #include "getnameinfo.c"
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	371 #endif
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	372
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	373 #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	374 /* 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	375 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	376 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	377 {
64393 633166d4fc12 Merged revisions 84450 via svnmerge from Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64121 diff changeset	378 WSAPROTOCOL_INFO info;
633166d4fc12 Merged revisions 84450 via svnmerge from Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64121 diff changeset	379
633166d4fc12 Merged revisions 84450 via svnmerge from Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64121 diff changeset	380 if (WSADuplicateSocket(handle, GetCurrentProcessId(), &info))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	381 return INVALID_SOCKET;
64393 633166d4fc12 Merged revisions 84450 via svnmerge from Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64121 diff changeset	382
633166d4fc12 Merged revisions 84450 via svnmerge from Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64121 diff changeset	383 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	384 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	385 }
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	386 #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	387 #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	388 /* 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	389 #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	390 #endif
a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	391
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	392 #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	393 #undef EAFNOSUPPORT
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	394 #define EAFNOSUPPORT WSAEAFNOSUPPORT
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	395 #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	396 #endif
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	397
22115 d104bb50a194 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22096 diff changeset	398 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	399 #define SOCKETCLOSE soclose
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	400 #define NO_DUP /* Sockets are Not Actual File Handles under OS/2 */
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	401 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	402
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	403 #ifndef SOCKETCLOSE
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	404 #define SOCKETCLOSE close
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	405 #endif
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	406
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	407 #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	408 #define USE_BLUETOOTH 1
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	409 #if defined(__FreeBSD__)
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	410 #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	411 #define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	412 #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	413 #define SOL_HCI SOL_HCI_RAW
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	414 #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	415 #define sockaddr_l2 sockaddr_l2cap
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	416 #define sockaddr_rc sockaddr_rfcomm
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	417 #define hci_dev hci_node
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	418 #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	419 #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	420 #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	421 #elif defined(__NetBSD__) \|\| defined(__DragonFly__)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	422 #define sockaddr_l2 sockaddr_bt
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	423 #define sockaddr_rc sockaddr_bt
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	424 #define sockaddr_hci sockaddr_bt
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	425 #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	426 #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	427 #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	428 #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	429 #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	430 #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	431 #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	432 #else
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	433 #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	434 #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	435 #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	436 #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	437 #endif
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	438 #endif
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	439
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	440 #ifdef __VMS
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	441 /* 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	442 #define SEGMENT_SIZE (32 * 1024 -1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	443 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	444
74142 683a1b1ff15d Issue #8623: Fix some strict-aliasing warnings. Patch by David Watson. Charles-François Natali <neologix@free.fr> parents: 74012 diff changeset	445 /* 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	446 #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	447
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	448 /*
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	449 * 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	450 */
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	451 #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	452 #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	453 #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	454 #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	455 #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	456 #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	457
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	458 #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	459 #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	460 #endif
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	461
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	462 /* 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	463 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	464
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	465 /* 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	466 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	467 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	468 static PyObject *socket_gaierror;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	469 static PyObject *socket_timeout;
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	470
21970 b1a871dc5196 Moved the declaration of PySocketSock_Type from socketmodule.h to Tim Peters <tim.peters@gmail.com> parents: 21964 diff changeset	471 /* 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	472 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	473 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	474 there has to be a circular reference. */
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24078 diff changeset	475 static PyTypeObject sock_type;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	476
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	477 #if defined(HAVE_POLL_H)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	478 #include <poll.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	479 #elif defined(HAVE_SYS_POLL_H)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	480 #include <sys/poll.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	481 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	482
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	483 /* 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	484 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	485 (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	486 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	487 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	488 #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	489 #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	490 #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	491 #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	492 #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	493
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	494 #ifdef HAVE_POLL
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	495 /* 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	496 #define IS_SELECTABLE(s) 1
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	497 /* 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	498 #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	499 /* 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	500 * 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	501 #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	502 #endif
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	503
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	504 static PyObject*
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	505 select_error(void)
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	506 {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	507 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	508 return NULL;
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	509 }
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	510
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	511 #ifdef MS_WINDOWS
64991 6c1f10e07455 Fix compilation under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 64988 diff changeset	512 #ifndef WSAEAGAIN
6c1f10e07455 Fix compilation under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 64988 diff changeset	513 #define WSAEAGAIN WSAEWOULDBLOCK
6c1f10e07455 Fix compilation under Windows Antoine Pitrou <solipsis@pitrou.net> parents: 64988 diff changeset	514 #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	515 #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	516 (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	517 #else
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	518 #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	519 (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	520 #endif
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	521
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	522 /* 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	523 and return a NULL pointer from a function. */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	524
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	525 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	526 set_error(void)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	527 {
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	528 #ifdef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	529 int err_no = WSAGetLastError();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	530 /* PyErr_SetExcFromWindowsErr() invokes FormatMessage() which
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	531 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	532 WSAGetLastError */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	533 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	534 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	535 #endif
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	536
22115 d104bb50a194 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22096 diff changeset	537 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	538 if (sock_errno() != NO_ERROR) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	539 APIRET rc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	540 ULONG msglen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	541 char outbuf[100];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	542 int myerrorcode = sock_errno();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	543
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	544 /* Retrieve socket-related error message from MPTN.MSG file */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	545 rc = DosGetMessage(NULL, 0, outbuf, sizeof(outbuf),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	546 myerrorcode - SOCBASEERR + 26,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	547 "mptn.msg",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	548 &msglen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	549 if (rc == NO_ERROR) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	550 PyObject *v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	551
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	552 /* OS/2 doesn't guarantee a terminator */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	553 outbuf[msglen] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	554 if (strlen(outbuf) > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	555 /* If non-empty msg, trim CRLF */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	556 char *lastc = &outbuf[ strlen(outbuf)-1 ];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	557 while (lastc > outbuf &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	558 isspace(Py_CHARMASK(*lastc))) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	559 /* Trim trailing whitespace (CRLF) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	560 *lastc-- = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	561 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	562 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	563 v = Py_BuildValue("(is)", myerrorcode, outbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	564 if (v != NULL) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	565 PyErr_SetObject(PyExc_OSError, v);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	566 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	567 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	568 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	569 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	570 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	571 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	572
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	573 return PyErr_SetFromErrno(PyExc_OSError);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	574 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	575
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	576
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	577 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	578 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	579 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	580 PyObject *v;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	581
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	582 #ifdef HAVE_HSTRERROR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	583 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	584 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	585 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	586 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	587 if (v != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	588 PyErr_SetObject(socket_herror, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	589 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	590 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	591
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	592 return NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	593 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	594
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	595
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	596 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	597 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	598 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	599 PyObject *v;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	600
22096 9e5ff6747437 Patch #520062: Support IPv6 with VC.NET. Martin v. Löwis <martin@v.loewis.de> parents: 21970 diff changeset	601 #ifdef EAI_SYSTEM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	602 /* 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	603 if (error == EAI_SYSTEM)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	604 return set_error();
22096 9e5ff6747437 Patch #520062: Support IPv6 with VC.NET. Martin v. Löwis <martin@v.loewis.de> parents: 21970 diff changeset	605 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	606
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	607 #ifdef HAVE_GAI_STRERROR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	608 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	609 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	610 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	611 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	612 if (v != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	613 PyErr_SetObject(socket_gaierror, v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	614 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	615 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	616
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	617 return NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	618 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	619
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	620 #ifdef __VMS
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	621 /* Function to send in segments */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	622 static int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	623 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	624 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	625 int n = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	626 int remaining = len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	627
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	628 while (remaining > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	629 unsigned int segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	630
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	631 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	632 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	633 if (n < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	634 return 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 remaining -= segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	637 buf += segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	638 } /* end while */
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 return len;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	641 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	642 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	643
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	644 /* 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	645 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	646 static int
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	647 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	648 {
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	649 #ifndef MS_WINDOWS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	650 int delay_flag;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	651 #endif
65314 12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	652 #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	653 if (block)
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	654 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	655 else
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	656 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	657 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	658
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	659 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	660 #ifndef MS_WINDOWS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	661 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	662 block = !block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	663 ioctl(s->sock_fd, FIONBIO, (caddr_t)&block, sizeof(block));
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	664 #elif defined(__VMS)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	665 block = !block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	666 ioctl(s->sock_fd, FIONBIO, (unsigned int *)&block);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	667 #else /* !PYOS_OS2 && !__VMS */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	668 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	669 if (block)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	670 delay_flag &= (~O_NONBLOCK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	671 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	672 delay_flag \|= O_NONBLOCK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	673 fcntl(s->sock_fd, F_SETFL, delay_flag);
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	674 #endif /* !PYOS_OS2 */
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	675 #else /* MS_WINDOWS */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	676 block = !block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	677 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	678 #endif /* MS_WINDOWS */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	679 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	680
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	681 /* Since these don't return anything */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	682 return 1;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	683 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	684
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	685 /* 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	686 The argument writing indicates the direction.
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	687 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	688 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	689 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	690 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	691 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	692 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	693 int n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	694
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	695 /* 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	696 if (s->sock_timeout <= 0.0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	697 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	698
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	699 /* Guard against closed socket */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	700 if (s->sock_fd < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	701 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	702
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	703 /* 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	704 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	705 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	706
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	707 /* 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	708 * 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	709 #ifdef HAVE_POLL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	710 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	711 struct pollfd pollfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	712 int timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	713
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	714 pollfd.fd = s->sock_fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	715 pollfd.events = writing ? POLLOUT : POLLIN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	716
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	717 /* 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	718 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	719 n = poll(&pollfd, 1, timeout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	720 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	721 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	722 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	723 /* Construct the arguments to select */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	724 fd_set fds;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	725 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	726 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	727 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	728 FD_ZERO(&fds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	729 FD_SET(s->sock_fd, &fds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	730
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	731 /* See if the socket is ready */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	732 if (writing)
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	733 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	734 NULL, &fds, NULL, &tv);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	735 else
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	736 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	737 &fds, NULL, NULL, &tv);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	738 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	739 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	740
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	741 if (n < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	742 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	743 if (n == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	744 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	745 return 0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	746 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	747
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	748 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	749 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	750 {
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	751 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	752 }
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	753
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	754 /*
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	755 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	756 (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	757 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	758 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	759
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	760 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	761 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	762 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	763 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	764 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	765 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	766 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	767 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	768 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	769 }
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	770 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	771 */
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	772
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	773 #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	774 { \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	775 _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	776 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	777 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	778 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	779 _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	780 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	781 _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	782 } \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	783 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	784 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	785
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	786 #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	787 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	788 (!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	789 break; \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	790 _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	791 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	792 } \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	793 } \
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	794
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	795 /* 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	796
24305 428cbbf05639 A Python float is a C double; redeclare defaulttimeout as such; stops Tim Peters <tim.peters@gmail.com> parents: 24303 diff changeset	797 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	798
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	799 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	800 init_sockobject(PySocketSockObject *s,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	801 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	802 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	803 s->sock_fd = fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	804 s->sock_family = family;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	805 s->sock_type = type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	806 s->sock_proto = proto;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	807
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	808 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	809 #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	810 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	811 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	812 else
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	813 #endif
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	814 {
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	815 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	816 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	817 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	818 }
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	819
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	820 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	821
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	822
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	823 /* Create a new socket object.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	824 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	825 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	826 in NEWOBJ()). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	827
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	828 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	829 new_sockobject(SOCKET_T fd, int family, int type, int proto)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	830 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	831 PySocketSockObject *s;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	832 s = (PySocketSockObject *)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	833 PyType_GenericNew(&sock_type, NULL, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	834 if (s != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	835 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	836 return s;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	837 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	838
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	839
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	840 /* 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	841 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	842 #if defined(USE_GETHOSTBYNAME_LOCK) \|\| defined(USE_GETADDRINFO_LOCK)
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	843 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	844 #endif
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	845
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	846
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	847 /* 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	848 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	849 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	850 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	851 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	852
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	853 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	854 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	855 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	856 struct addrinfo hints, *res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	857 int error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	858 int d1, d2, d3, d4;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	859 char ch;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	860
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	861 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	862 if (name[0] == '\0') {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	863 int siz;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	864 memset(&hints, 0, sizeof(hints));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	865 hints.ai_family = af;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	866 hints.ai_socktype = SOCK_DGRAM; /dummy/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	867 hints.ai_flags = AI_PASSIVE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	868 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	869 ACQUIRE_GETADDRINFO_LOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	870 error = getaddrinfo(NULL, "0", &hints, &res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	871 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	872 /* 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	873 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	874 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	875 outcome of the first call. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	876 RELEASE_GETADDRINFO_LOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	877 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	878 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	879 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	880 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	881 switch (res->ai_family) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	882 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	883 siz = 4;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	884 break;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	885 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	886 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	887 siz = 16;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	888 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	889 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	890 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	891 freeaddrinfo(res);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	892 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	893 "unsupported address family");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	894 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	895 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	896 if (res->ai_next) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	897 freeaddrinfo(res);
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	898 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	899 "wildcard resolved to multiple address");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	900 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	901 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	902 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	903 addr_ret_size = res->ai_addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	904 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	905 freeaddrinfo(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	906 return siz;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	907 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	908 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	909 struct sockaddr_in *sin;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	910 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	911 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	912 "address family mismatched");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	913 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	914 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	915 sin = (struct sockaddr_in *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	916 memset((void ) sin, '\0', sizeof(sin));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	917 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	918 #ifdef HAVE_SOCKADDR_SA_LEN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	919 sin->sin_len = sizeof(*sin);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	920 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	921 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	922 return sizeof(sin->sin_addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	923 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	924 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	925 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	926 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	927 struct sockaddr_in *sin;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	928 sin = (struct sockaddr_in *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	929 sin->sin_addr.s_addr = htonl(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	930 ((long) d1 << 24) \| ((long) d2 << 16) \|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	931 ((long) d3 << 8) \| ((long) d4 << 0));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	932 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	933 #ifdef HAVE_SOCKADDR_SA_LEN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	934 sin->sin_len = sizeof(*sin);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	935 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	936 return 4;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	937 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	938 memset(&hints, 0, sizeof(hints));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	939 hints.ai_family = af;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	940 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	941 ACQUIRE_GETADDRINFO_LOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	942 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	943 #if defined(__digital__) && defined(__unix__)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	944 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	945 /* 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	946 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	947 hints.ai_family = AF_INET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	948 error = getaddrinfo(name, NULL, &hints, &res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	949 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	950 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	951 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	952 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	953 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	954 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	955 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	956 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	957 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	958 addr_ret_size = res->ai_addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	959 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	960 freeaddrinfo(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	961 switch (addr_ret->sa_family) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	962 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	963 return 4;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	964 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	965 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	966 return 16;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	967 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	968 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	969 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	970 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	971 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	972 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	973
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	974
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	975 /* 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	976 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	977 size numbers). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	978
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	979 static PyObject *
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	980 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	981 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	982 char buf[NI_MAXHOST];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	983 int error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	984
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	985 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	986 NI_NUMERICHOST);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	987 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	988 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	989 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	990 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	991 return PyUnicode_FromString(buf);
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	992 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	993
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	994
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	995 #ifdef USE_BLUETOOTH
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	996 /* 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	997 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	998 an error occurred. */
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	999
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1000 static int
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1001 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	1002 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1003 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	1004 char ch;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1005 int n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1006
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1007 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	1008 &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	1009 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	1010 bdaddr->b[0] = b0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1011 bdaddr->b[1] = b1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1012 bdaddr->b[2] = b2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1013 bdaddr->b[3] = b3;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1014 bdaddr->b[4] = b4;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1015 bdaddr->b[5] = b5;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1016 return 6;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1017 } else {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1018 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	1019 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1020 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1021 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1022
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1023 /* 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	1024 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	1025 value (zero padded if necessary). */
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1026
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1027 static PyObject *
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1028 makebdaddr(bdaddr_t *bdaddr)
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1029 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1030 char buf[(6 * 2) + 5 + 1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1031
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1032 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	1033 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	1034 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	1035 return PyUnicode_FromString(buf);
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1036 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1037 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1038
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1039
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1040 /* 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	1041 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	1042 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	1043 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	1044
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1045 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1046 static PyObject *
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	1047 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	1048 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1049 if (addrlen == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1050 /* 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	1051 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1052 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1053 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1054
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1055 switch (addr->sa_family) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1056
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1057 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1058 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1059 struct sockaddr_in *a;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1060 PyObject addrobj = makeipaddr(addr, sizeof(a));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1061 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1062 if (addrobj) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1063 a = (struct sockaddr_in *)addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1064 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	1065 Py_DECREF(addrobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1066 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1067 return ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1068 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1069
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	1070 #if defined(AF_UNIX)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1071 case AF_UNIX:
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 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	1074 #ifdef linux
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1075 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	1076 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	1077 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	1078 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1079 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	1080 #endif /* linux */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1081 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1082 /* 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	1083 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	1084 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1085 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1086 #endif /* AF_UNIX */
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1087
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1088 #if defined(AF_NETLINK)
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1089 case AF_NETLINK:
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1090 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1091 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	1092 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	1093 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1094 #endif /* AF_NETLINK */
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1095
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1096 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1097 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1098 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1099 struct sockaddr_in6 *a;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1100 PyObject addrobj = makeipaddr(addr, sizeof(a));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1101 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1102 if (addrobj) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1103 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	1104 ret = Py_BuildValue("OiII",
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1105 addrobj,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1106 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	1107 ntohl(a->sin6_flowinfo),
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1108 a->sin6_scope_id);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1109 Py_DECREF(addrobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1110 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1111 return ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1112 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1113 #endif
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1114
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1115 #ifdef USE_BLUETOOTH
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1116 case AF_BLUETOOTH:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1117 switch (proto) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1118
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1119 case BTPROTO_L2CAP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1120 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1121 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	1122 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	1123 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1124 if (addrobj) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1125 ret = Py_BuildValue("Oi",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1126 addrobj,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1127 _BT_L2_MEMB(a, psm));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1128 Py_DECREF(addrobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1129 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1130 return ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1131 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1132
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1133 case BTPROTO_RFCOMM:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1134 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1135 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	1136 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	1137 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1138 if (addrobj) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1139 ret = Py_BuildValue("Oi",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1140 addrobj,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1141 _BT_RC_MEMB(a, channel));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1142 Py_DECREF(addrobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1143 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1144 return ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1145 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1146
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1147 case BTPROTO_HCI:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1148 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1149 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	1150 #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	1151 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	1152 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1153 PyObject *ret = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1154 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	1155 return ret;
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1156 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1157 }
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1158
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1159 #if !defined(__FreeBSD__)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1160 case BTPROTO_SCO:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1161 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1162 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	1163 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	1164 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1165 #endif
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 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1168 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1169 "Unknown Bluetooth protocol");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1170 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1171 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1172 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1173
65668 add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	1174 #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	1175 case AF_PACKET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1176 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1177 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	1178 char *ifname = "";
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1179 struct ifreq ifr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1180 /* 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	1181 if (a->sll_ifindex) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1182 ifr.ifr_ifindex = a->sll_ifindex;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1183 if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1184 ifname = ifr.ifr_name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1185 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1186 return Py_BuildValue("shbhy#",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1187 ifname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1188 ntohs(a->sll_protocol),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1189 a->sll_pkttype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1190 a->sll_hatype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1191 a->sll_addr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1192 a->sll_halen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1193 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1194 #endif
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1195
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	1196 #ifdef HAVE_LINUX_TIPC_H
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1197 case AF_TIPC:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1198 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1199 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	1200 if (a->addrtype == TIPC_ADDR_NAMESEQ) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1201 return Py_BuildValue("IIIII",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1202 a->addrtype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1203 a->addr.nameseq.type,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1204 a->addr.nameseq.lower,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1205 a->addr.nameseq.upper,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1206 a->scope);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1207 } 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	1208 return Py_BuildValue("IIIII",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1209 a->addrtype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1210 a->addr.name.name.type,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1211 a->addr.name.name.instance,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1212 a->addr.name.name.instance,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1213 a->scope);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1214 } 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	1215 return Py_BuildValue("IIIII",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1216 a->addrtype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1217 a->addr.id.node,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1218 a->addr.id.ref,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1219 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1220 a->scope);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1221 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1222 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1223 "Invalid address type");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1224 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1225 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1226 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1227 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1228
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	1229 #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	1230 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	1231 {
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1232 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	1233 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	1234 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	1235 /* 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	1236 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	1237 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	1238 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	1239 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	1240 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1241
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1242 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	1243 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	1244 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	1245 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1246 #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	1247
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1248 #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	1249 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	1250 switch(proto) {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1251 #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	1252 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	1253 {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1254 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	1255 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	1256 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1257 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1258 default:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1259 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	1260 "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	1261 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1262 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1263 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1264
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1265 /* More cases here... */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1266
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1267 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1268 /* 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	1269 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	1270 return Py_BuildValue("iy#",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1271 addr->sa_family,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1272 addr->sa_data,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1273 sizeof(addr->sa_data));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1274
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1275 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1276 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1277
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1278
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1279 /* 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	1280 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	1281 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	1282 through len_ret. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1283
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1284 static int
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1285 getsockaddrarg(PySocketSockObject s, PyObject args,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1286 struct sockaddr addr_ret, int len_ret)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1287 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1288 switch (s->sock_family) {
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1289
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	1290 #if defined(AF_UNIX)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1291 case AF_UNIX:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1292 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1293 struct sockaddr_un* addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1294 char *path;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1295 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	1296 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	1297
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1298 /* 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	1299 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	1300 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	1301 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	1302 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	1303 }
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1304 else
1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1305 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	1306 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	1307 goto unix_out;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1308
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1309 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	1310 #ifdef linux
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1311 if (len > 0 && path[0] == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1312 /* Linux abstract namespace extension */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1313 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	1314 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1315 "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	1316 goto unix_out;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1317 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1318 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1319 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	1320 #endif /* linux */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1321 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1322 /* regular NULL-terminated string */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1323 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	1324 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1325 "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	1326 goto unix_out;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1327 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1328 addr->sun_path[len] = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1329 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1330 addr->sun_family = s->sock_family;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1331 memcpy(addr->sun_path, path, len);
31896 ca2fb5cf2fd5 Fixes for AF_UNIX support on OS/2: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 31867 diff changeset	1332 #if defined(PYOS_OS2)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1333 len_ret = sizeof(addr);
31896 ca2fb5cf2fd5 Fixes for AF_UNIX support on OS/2: Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 31867 diff changeset	1334 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1335 *len_ret = len + offsetof(struct sockaddr_un, sun_path);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1336 #endif
73998 1f23bb74f4bc Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem Antoine Pitrou <solipsis@pitrou.net> parents: 73683 diff changeset	1337 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	1338 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	1339 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	1340 return retval;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1341 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1342 #endif /* AF_UNIX */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1343
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1344 #if defined(AF_NETLINK)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1345 case AF_NETLINK:
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_nl* addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1348 int pid, groups;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1349 addr = (struct sockaddr_nl *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1350 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1351 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1352 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1353 "getsockaddrarg: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1354 "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	1355 Py_TYPE(args)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1356 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1357 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1358 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	1359 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1360 addr->nl_family = AF_NETLINK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1361 addr->nl_pid = pid;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1362 addr->nl_groups = groups;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1363 len_ret = sizeof(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1364 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1365 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1366 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1367
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1368 #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	1369 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	1370 /* 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	1371 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1372
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1373 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1374 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1375 struct sockaddr_in* addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1376 char *host;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1377 int port, result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1378 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1379 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1380 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1381 "getsockaddrarg: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1382 "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	1383 Py_TYPE(args)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1384 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1385 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1386 if (!PyArg_ParseTuple(args, "eti:getsockaddrarg",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1387 "idna", &host, &port))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1388 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1389 addr=(struct sockaddr_in*)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1390 result = setipaddr(host, (struct sockaddr *)addr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1391 sizeof(*addr), AF_INET);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1392 PyMem_Free(host);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1393 if (result < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1394 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1395 if (port < 0 \|\| port > 0xffff) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1396 PyErr_SetString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1397 PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1398 "getsockaddrarg: port must be 0-65535.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1399 return 0;
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->sin_family = AF_INET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1402 addr->sin_port = htons((short)port);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1403 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1404 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1405 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1406
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1407 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1408 case AF_INET6:
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 struct sockaddr_in6* addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1411 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	1412 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	1413 unsigned int flowinfo, scope_id;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1414 flowinfo = scope_id = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1415 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1416 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1417 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1418 "getsockaddrarg: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1419 "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	1420 Py_TYPE(args)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1421 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1422 }
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	1423 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	1424 "idna", &host, &port, &flowinfo,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1425 &scope_id)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1426 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1427 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1428 addr = (struct sockaddr_in6*)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1429 result = setipaddr(host, (struct sockaddr *)addr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1430 sizeof(*addr), AF_INET6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1431 PyMem_Free(host);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1432 if (result < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1433 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1434 if (port < 0 \|\| port > 0xffff) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1435 PyErr_SetString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1436 PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1437 "getsockaddrarg: port must be 0-65535.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1438 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1439 }
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	1440 if (flowinfo < 0 \|\| flowinfo > 0xfffff) {
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	1441 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	1442 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	1443 "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	1444 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	1445 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1446 addr->sin6_family = s->sock_family;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1447 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	1448 addr->sin6_flowinfo = htonl(flowinfo);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1449 addr->sin6_scope_id = scope_id;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1450 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1451 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1452 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1453 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1454
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1455 #ifdef USE_BLUETOOTH
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1456 case AF_BLUETOOTH:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1457 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1458 switch (s->sock_proto) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1459 case BTPROTO_L2CAP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1460 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1461 struct sockaddr_l2 *addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1462 char *straddr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1463
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1464 addr = (struct sockaddr_l2 *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1465 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	1466 _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	1467 if (!PyArg_ParseTuple(args, "si", &straddr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1468 &_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	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 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	1474 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1475
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1476 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1477 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1478 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1479 case BTPROTO_RFCOMM:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1480 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1481 struct sockaddr_rc *addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1482 char *straddr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1483
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1484 addr = (struct sockaddr_rc *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1485 _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	1486 if (!PyArg_ParseTuple(args, "si", &straddr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1487 &_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	1488 PyErr_SetString(PyExc_OSError, "getsockaddrarg: "
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1489 "wrong format");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1490 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1491 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1492 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	1493 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1494
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1495 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1496 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1497 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1498 case BTPROTO_HCI:
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 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	1501 #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	1502 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	1503
50d170bb71c7 Issue #6697: Fixed instances of _PyUnicode_AsString() result not checked for NULL Alexander Belopolsky <alexander.belopolsky@gmail.com> parents: 66663 diff changeset	1504 _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	1505 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	1506 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	1507 "wrong format");
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1508 return 0;
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1509 }
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1510 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	1511 return 0;
15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1512 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1513 _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	1514 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	1515 PyErr_SetString(PyExc_OSError, "getsockaddrarg: "
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1516 "wrong format");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1517 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1518 }
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	1519 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1520 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1521 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1522 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1523 #if !defined(__FreeBSD__)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1524 case BTPROTO_SCO:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1525 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1526 struct sockaddr_sco *addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1527 char *straddr;
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_sco *)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1530 _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	1531 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	1532 PyErr_SetString(PyExc_OSError, "getsockaddrarg: "
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1533 "wrong format");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1534 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1535 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1536 straddr = PyBytes_AS_STRING(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1537 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	1538 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1539
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1540 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1541 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1542 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1543 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1544 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1545 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	1546 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1547 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1548 }
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1549 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1550
65668 add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	1551 #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	1552 case AF_PACKET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1553 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1554 struct sockaddr_ll* addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1555 struct ifreq ifr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1556 char *interfaceName;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1557 int protoNumber;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1558 int hatype = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1559 int pkttype = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1560 char *haddr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1561 unsigned int halen = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1562
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1563 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1564 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1565 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1566 "getsockaddrarg: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1567 "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	1568 Py_TYPE(args)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1569 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1570 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1571 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	1572 &protoNumber, &pkttype, &hatype,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1573 &haddr, &halen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1574 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1575 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	1576 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	1577 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	1578 s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1579 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1580 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1581 if (halen > 8) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1582 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1583 "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	1584 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1585 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1586 if (protoNumber < 0 \|\| protoNumber > 0xffff) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1587 PyErr_SetString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1588 PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1589 "getsockaddrarg: protoNumber must be 0-65535.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1590 return 0;
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 addr = (struct sockaddr_ll*)addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1593 addr->sll_family = AF_PACKET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1594 addr->sll_protocol = htons((short)protoNumber);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1595 addr->sll_ifindex = ifr.ifr_ifindex;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1596 addr->sll_pkttype = pkttype;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1597 addr->sll_hatype = hatype;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1598 if (halen != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1599 memcpy(&addr->sll_addr, haddr, halen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1600 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1601 addr->sll_halen = halen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1602 len_ret = sizeof addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1603 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1604 }
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1605 #endif
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1606
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	1607 #ifdef HAVE_LINUX_TIPC_H
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1608 case AF_TIPC:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1609 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1610 unsigned int atype, v1, v2, v3;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1611 unsigned int scope = TIPC_CLUSTER_SCOPE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1612 struct sockaddr_tipc *addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1613
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1614 if (!PyTuple_Check(args)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1615 PyErr_Format(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1616 PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1617 "getsockaddrarg: "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1618 "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	1619 Py_TYPE(args)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1620 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1621 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1622
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1623 if (!PyArg_ParseTuple(args,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1624 "IIII\|I;Invalid TIPC address format",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1625 &atype, &v1, &v2, &v3, &scope))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1626 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1627
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1628 addr = (struct sockaddr_tipc *) addr_ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1629 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	1630
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1631 addr->family = AF_TIPC;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1632 addr->scope = scope;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1633 addr->addrtype = atype;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1634
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1635 if (atype == TIPC_ADDR_NAMESEQ) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1636 addr->addr.nameseq.type = v1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1637 addr->addr.nameseq.lower = v2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1638 addr->addr.nameseq.upper = v3;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1639 } else if (atype == TIPC_ADDR_NAME) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1640 addr->addr.name.name.type = v1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1641 addr->addr.name.name.instance = v2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1642 } else if (atype == TIPC_ADDR_ID) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1643 addr->addr.id.node = v1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1644 addr->addr.id.ref = v2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1645 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1646 /* Shouldn't happen */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1647 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	1648 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1649 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1650
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1651 len_ret = sizeof(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1652
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1653 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1654 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1655 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1656
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	1657 #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	1658 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	1659 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	1660 case CAN_RAW:
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1661 {
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1662 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	1663 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	1664 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	1665 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	1666 Py_ssize_t len;
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1667
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1668 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	1669 &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	1670 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	1671
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1672 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	1673
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1674 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	1675 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	1676 } else if (len < sizeof(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	1677 strcpy(ifr.ifr_name, PyBytes_AS_STRING(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	1678 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	1679 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	1680 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	1681 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	1682 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1683 } else {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1684 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	1685 "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	1686 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	1687 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	1688 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1689
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1690 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	1691 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	1692
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1693 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	1694 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	1695 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	1696 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1697 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1698 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	1699 "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	1700 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	1701 }
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 #endif
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1703
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1704 #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	1705 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	1706 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	1707 #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	1708 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	1709 {
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1710 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	1711
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1712 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	1713 addr->sc_family = AF_SYSTEM;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1714 addr->ss_sysaddr = AF_SYS_CONTROL;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1715
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1716 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	1717 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	1718 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	1719
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1720 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	1721 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	1722 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1723 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1724
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1725 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	1726 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	1727 "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	1728 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	1729 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1730 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1731 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	1732 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	1733 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	1734
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1735 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	1736 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	1737 "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	1738 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1739 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1740
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1741 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	1742 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	1743 } 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	1744 &(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	1745 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	1746 "expected str or tuple of two ints");
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1747
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1748 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1749 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1750
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1751 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	1752 return 1;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1753 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1754 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1755 default:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1756 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	1757 "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	1758 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1759 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1760 #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	1761
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1762 /* More cases here... */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1763
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1764 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1765 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	1766 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1767
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1768 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1769 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1770
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1771
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1772 /* 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	1773 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	1774 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	1775
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1776 static int
13554 906efc1da247 Errare humanum est. Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13538 diff changeset	1777 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	1778 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1779 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	1780
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	1781 #if defined(AF_UNIX)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1782 case AF_UNIX:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1783 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1784 *len_ret = sizeof (struct sockaddr_un);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1785 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1786 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1787 #endif /* AF_UNIX */
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1788 #if defined(AF_NETLINK)
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1789 case AF_NETLINK:
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1790 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1791 *len_ret = sizeof (struct sockaddr_nl);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1792 return 1;
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1793 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1794 #endif
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1795
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1796 #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	1797 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	1798 /* 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	1799 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	1800
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1801 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1802 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1803 *len_ret = sizeof (struct sockaddr_in);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1804 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1805 }
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1806
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1807 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1808 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1809 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1810 *len_ret = sizeof (struct sockaddr_in6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1811 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1812 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1813 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1814
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1815 #ifdef USE_BLUETOOTH
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1816 case AF_BLUETOOTH:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1817 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1818 switch(s->sock_proto)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1819 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1820
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1821 case BTPROTO_L2CAP:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1822 *len_ret = sizeof (struct sockaddr_l2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1823 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1824 case BTPROTO_RFCOMM:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1825 *len_ret = sizeof (struct sockaddr_rc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1826 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1827 case BTPROTO_HCI:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1828 *len_ret = sizeof (struct sockaddr_hci);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1829 return 1;
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1830 #if !defined(__FreeBSD__)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1831 case BTPROTO_SCO:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1832 *len_ret = sizeof (struct sockaddr_sco);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1833 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1834 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1835 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1836 PyErr_SetString(PyExc_OSError, "getsockaddrlen: "
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1837 "unknown BT protocol");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1838 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1839
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1840 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1841 }
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1842 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1843
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	1844 #ifdef HAVE_NETPACKET_PACKET_H
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1845 case AF_PACKET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1846 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1847 *len_ret = sizeof (struct sockaddr_ll);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1848 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1849 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1850 #endif
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1851
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	1852 #ifdef HAVE_LINUX_TIPC_H
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1853 case AF_TIPC:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1854 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1855 *len_ret = sizeof (struct sockaddr_tipc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1856 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1857 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1858 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1859
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	1860 #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	1861 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	1862 {
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1863 *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	1864 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	1865 }
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	1866 #endif
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1867
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1868 #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	1869 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	1870 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	1871 #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	1872 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	1873 *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	1874 return 1;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1875 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1876 default:
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1877 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	1878 "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	1879 return 0;
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1880 }
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	1881 #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	1882
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1883 /* More cases here... */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1884
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1885 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	1886 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	1887 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1888
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	1889 }
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1890 }
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1891
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1892
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	1893 /* 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	1894 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	1895 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	1896 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	1897 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	1898 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	1899 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	1900 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	1901 #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	1902 /* 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	1903 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	1904 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	1905 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	1906 {
c64216addd7f Add support for the send/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 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	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 (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	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 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	1912 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	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 *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	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 #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	1919 /* 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	1920 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	1921 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	1922 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	1923 {
c64216addd7f Add support for the send/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 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	1925
c64216addd7f Add support for the send/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 /* 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	1927 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	1928 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	1929 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	1930 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	1931 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	1932 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	1933 *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	1934 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	1935 }
c64216addd7f Add support for the send/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 #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	1937
c64216addd7f Add support for the send/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 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	1939 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	1940 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	1941 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	1942 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	1943 {
c64216addd7f Add support for the send/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 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	1945 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	1946 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	1947
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	1948 /* 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	1949 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	1950 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	1951 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	1952 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	1953 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	1954 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	1955 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	1956 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1957
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1958 /* 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	1959 *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	1960 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	1961 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	1962 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	1963 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	1964 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1965 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	1966 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	1967
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1968 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	1969 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	1970 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	1971 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	1972 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	1973 *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	1974 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	1975 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1976
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1977 /* 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	1978 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	1979 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	1980 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	1981 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	1982 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	1983 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	1984 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	1985 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	1986 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1987 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	1988
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1989 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	1990 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	1991 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	1992 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	1993 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	1994 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	1995 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	1996 *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	1997 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	1998 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	1999 *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	2000 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	2001 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2002 #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	2003
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	2004
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	2005 /* s._accept() -> (fd, address) */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2006
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2007 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	2008 sock_accept(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2009 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2010 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2011 SOCKET_T newfd = INVALID_SOCKET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2012 socklen_t addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2013 PyObject *sock = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2014 PyObject *addr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2015 PyObject *res = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2016 int timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2017 if (!getsockaddrlen(s, &addrlen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2018 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2019 memset(&addrbuf, 0, addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2020
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2021 if (!IS_SELECTABLE(s))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2022 return select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2023
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2024 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2025 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	2026 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	2027 if (!timeout) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2028 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	2029 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2030 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2031
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2032 if (timeout == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2033 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2034 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2035 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2036 END_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2037
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2038 if (newfd == INVALID_SOCKET)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2039 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2040
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2041 sock = PyLong_FromSocket_t(newfd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2042 if (sock == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2043 SOCKETCLOSE(newfd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2044 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2045 }
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 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	2048 addrlen, s->sock_proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2049 if (addr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2050 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2051
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2052 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	2053
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2054 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2055 Py_XDECREF(sock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2056 Py_XDECREF(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2057 return res;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2058 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2059
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2060 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	2061 "_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	2062 \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	2063 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	2064 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	2065 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	2066
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2067 /* s.setblocking(flag) method. Argument:
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2068 False -- non-blocking mode; same as settimeout(0)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2069 True -- blocking mode; same as settimeout(None)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2070 */
1867 758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	2071
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2072 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	2073 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	2074 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2075 int block;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2076
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2077 block = PyLong_AsLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2078 if (block == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2079 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2080
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2081 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	2082 internal_setblocking(s, block);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2083
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2084 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2085 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	2086 }
758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	2087
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2088 PyDoc_STRVAR(setblocking_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2089 "setblocking(flag)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2090 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2091 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	2092 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	2093 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	2094
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2095 /* s.settimeout(timeout) method. Argument:
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2096 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	2097 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	2098 > 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	2099 < 0 -- illegal; raises an exception
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2100 */
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2101 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	2102 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	2103 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2104 double timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2105
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2106 if (arg == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2107 timeout = -1.0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2108 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2109 timeout = PyFloat_AsDouble(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2110 if (timeout < 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2111 if (!PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2112 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2113 "Timeout value out of range");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2114 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2115 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2116 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2117
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2118 s->sock_timeout = timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2119 internal_setblocking(s, timeout < 0.0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2120
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2121 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2122 return Py_None;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2123 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2124
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2125 PyDoc_STRVAR(settimeout_doc,
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2126 "settimeout(timeout)\n\
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2127 \n\
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	2128 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	2129 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	2130 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	2131 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	2132
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2133 /* s.gettimeout() method.
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	2134 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	2135 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	2136 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	2137 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2138 if (s->sock_timeout < 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2139 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2140 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2141 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2142 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2143 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	2144 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2145
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2146 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	2147 "gettimeout() -> timeout\n\
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2148 \n\
71864 ab3432a81c26 #12725: fix working. Patch by Ben Hayden. Ezio Melotti <ezio.melotti@gmail.com> parents: 70012 diff changeset	2149 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	2150 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	2151 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	2152
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	2153 /* 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	2154 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	2155 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	2156 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	2157
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2158 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	2159 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	2160 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2161 int level;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2162 int optname;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2163 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2164 char *buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2165 int buflen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2166 int flag;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2167
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2168 if (PyArg_ParseTuple(args, "iii:setsockopt",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2169 &level, &optname, &flag)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2170 buf = (char *) &flag;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2171 buflen = sizeof flag;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2172 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2173 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2174 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2175 if (!PyArg_ParseTuple(args, "iiy#:setsockopt",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2176 &level, &optname, &buf, &buflen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2177 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2178 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2179 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	2180 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2181 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2182 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2183 return Py_None;
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2184 }
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2185
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2186 PyDoc_STRVAR(setsockopt_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2187 "setsockopt(level, option, value)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2188 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2189 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	2190 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	2191
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2192
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	2193 /* 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	2194 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	2195 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	2196 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	2197
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2198 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	2199 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	2200 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2201 int level;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2202 int optname;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2203 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2204 PyObject *buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2205 socklen_t buflen = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2206
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2207 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	2208 &level, &optname, &buflen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2209 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2210
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2211 if (buflen == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2212 int flag = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2213 socklen_t flagsize = sizeof flag;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2214 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	2215 (void *)&flag, &flagsize);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2216 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2217 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2218 return PyLong_FromLong(flag);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2219 }
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	2220 #ifdef __VMS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2221 /* 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	2222 test buflen == 0 is previously done */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2223 if (buflen > 1024) {
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	2224 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2225 if (buflen <= 0 \|\| buflen > 1024) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2226 #endif
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	2227 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2228 "getsockopt buflen out of range");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2229 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2230 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2231 buf = PyBytes_FromStringAndSize((char *)NULL, buflen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2232 if (buf == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2233 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2234 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	2235 (void *)PyBytes_AS_STRING(buf), &buflen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2236 if (res < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2237 Py_DECREF(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2238 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2239 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2240 _PyBytes_Resize(&buf, buflen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2241 return buf;
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2242 }
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2243
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2244 PyDoc_STRVAR(getsockopt_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2245 "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	2246 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2247 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	2248 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	2249 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	2250
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	2251
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	2252 /* s.bind(sockaddr) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2253
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2254 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	2255 sock_bind(PySocketSockObject s, PyObject addro)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2256 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2257 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2258 int addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2259 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2260
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2261 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	2262 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2263 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2264 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	2265 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2266 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2267 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2268 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2269 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2270 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2271
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2272 PyDoc_STRVAR(bind_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2273 "bind(address)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2274 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2275 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	2276 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	2277 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	2278
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2279
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2280 /* s.close() method.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2281 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	2282 will surely fail. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2283
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2284 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	2285 sock_close(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2286 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2287 SOCKET_T fd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2288
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2289 if ((fd = s->sock_fd) != -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2290 s->sock_fd = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2291 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2292 (void) SOCKETCLOSE(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2293 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2294 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2295 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2296 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2297 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2298
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2299 PyDoc_STRVAR(close_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2300 "close()\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2301 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2302 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	2303
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	2304 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	2305 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	2306 {
63890 60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	2307 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	2308 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	2309 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	2310 }
3f8cef837f07 Issue #8524: Add a forget() method to socket objects, so as to put the Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	2311
63890 60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	2312 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	2313 "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	2314 \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	2315 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	2316 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	2317 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	2318
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2319 static int
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	2320 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	2321 int *timeoutp)
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2322 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2323 int res, timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2324
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2325 timeout = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2326 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	2327
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2328 #ifdef MS_WINDOWS
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2329
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2330 if (s->sock_timeout > 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2331 if (res < 0 && WSAGetLastError() == WSAEWOULDBLOCK &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2332 IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2333 /* 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	2334 fd_set fds;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2335 fd_set fds_exc;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2336 struct timeval tv;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2337 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	2338 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	2339 FD_ZERO(&fds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2340 FD_SET(s->sock_fd, &fds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2341 FD_ZERO(&fds_exc);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2342 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	2343 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	2344 NULL, &fds, &fds_exc, &tv);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2345 if (res == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2346 res = WSAEWOULDBLOCK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2347 timeout = 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2348 } else if (res > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2349 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	2350 /* 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	2351 means connected */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2352 res = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2353 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2354 /* 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	2355 to get the underlying error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2356 int res_size = sizeof res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2357 /* 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	2358 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	2359 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	2360 (char *)&res, &res_size))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2361 /* getsockopt also clears WSAGetLastError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2362 so reset it back. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2363 WSASetLastError(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2364 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2365 res = WSAGetLastError();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2366 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2367 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2368 /* 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	2369 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2370 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2371
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2372 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2373 res = WSAGetLastError();
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2374
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2375 #else
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2376
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2377 if (s->sock_timeout > 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2378 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	2379 timeout = internal_select(s, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2380 if (timeout == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2381 /* 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	2382 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	2383 error. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2384 socklen_t res_size = sizeof res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2385 (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	2386 SO_ERROR, &res, &res_size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2387 if (res == EISCONN)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2388 res = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2389 errno = res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2390 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2391 else if (timeout == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2392 res = errno; /* had error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2393 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2394 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2395 res = EWOULDBLOCK; /* timed out */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2396 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2397 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2398
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2399 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2400 res = errno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2401
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2402 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2403 *timeoutp = timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2404
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2405 return res;
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2406 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2407
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	2408 /* s.connect(sockaddr) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2409
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2410 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	2411 sock_connect(PySocketSockObject s, PyObject addro)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2412 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2413 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2414 int addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2415 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2416 int timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2417
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2418 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	2419 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2420
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2421 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2422 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	2423 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2424
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2425 if (timeout == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2426 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2427 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2428 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2429 if (res != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2430 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2431 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2432 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2433 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2434
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2435 PyDoc_STRVAR(connect_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2436 "connect(address)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2437 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2438 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	2439 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	2440
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2441
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	2442 /* 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	2443
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2444 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	2445 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	2446 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2447 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2448 int addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2449 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2450 int timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2451
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2452 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	2453 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2454
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2455 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2456 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	2457 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2458
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2459 /* 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	2460 from PyErr_SetFromErrnoWithFilenameObject(). */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2461 #ifdef EINTR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2462 if (res == EINTR && PyErr_CheckSignals())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2463 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2464 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2465
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2466 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	2467 }
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2468
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2469 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	2470 "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	2471 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2472 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	2473 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	2474
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2475
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	2476 /* 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	2477
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2478 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	2479 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	2480 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2481 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	2482 }
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: 900 diff changeset	2483
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2484 PyDoc_STRVAR(fileno_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2485 "fileno() -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2486 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2487 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	2488
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	2489
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2490 /* s.getsockname() method */
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 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_getsockname(PySocketSockObject *s)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2494 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2495 sock_addr_t addrbuf;
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 socklen_t addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2498
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2499 if (!getsockaddrlen(s, &addrlen))
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 memset(&addrbuf, 0, addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2502 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2503 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	2504 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2505 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2506 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2507 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	2508 s->sock_proto);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2509 }
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2510
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2511 PyDoc_STRVAR(getsockname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2512 "getsockname() -> address info\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2513 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2514 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	2515 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	2516
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2517
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2518 #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	2519 /* s.getpeername() method */
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2520
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2521 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	2522 sock_getpeername(PySocketSockObject *s)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2523 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2524 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2525 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2526 socklen_t addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2527
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2528 if (!getsockaddrlen(s, &addrlen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2529 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2530 memset(&addrbuf, 0, addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2531 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2532 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	2533 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2534 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2535 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2536 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	2537 s->sock_proto);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2538 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2539
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2540 PyDoc_STRVAR(getpeername_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2541 "getpeername() -> address info\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2542 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2543 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	2544 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	2545
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2546 #endif /* HAVE_GETPEERNAME */
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2547
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2548
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2549 /* s.listen(n) method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2550
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2551 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	2552 sock_listen(PySocketSockObject s, PyObject arg)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2553 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2554 int backlog;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2555 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2556
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2557 backlog = PyLong_AsLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2558 if (backlog == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2559 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2560 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	2561 /* 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	2562 * (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	2563 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	2564 backlog = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2565 res = listen(s->sock_fd, backlog);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2566 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2567 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2568 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2569 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2570 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2571 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2572
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2573 PyDoc_STRVAR(listen_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2574 "listen(backlog)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2575 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2576 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	2577 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	2578 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	2579 connections.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2580
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2581
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2582 /*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2583 * 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	2584 * 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	2585 * 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	2586 * 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	2587 * 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	2588 * bytes.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2589 */
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2590
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2591 static Py_ssize_t
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2592 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	2593 {
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2594 Py_ssize_t outlen = -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2595 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	2596 #ifdef __VMS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2597 int remaining;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2598 char *read_buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2599 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2600
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2601 if (!IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2602 select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2603 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2604 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2605 if (len == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2606 /* 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	2607 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2608 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2609
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2610 #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	2611 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2612 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	2613 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	2614 if (!timeout)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2615 outlen = recv(s->sock_fd, cbuf, len, flags);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2616 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2617
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2618 if (timeout == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2619 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2620 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2621 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2622 END_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2623 if (outlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2624 /* 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	2625 NULL, so ignore its return value */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2626 s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2627 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2628 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2629 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2630 read_buf = cbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2631 remaining = len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2632 while (remaining != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2633 unsigned int segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2634 int nread = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2635
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2636 segment = remaining /SEGMENT_SIZE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2637 if (segment != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2638 segment = SEGMENT_SIZE;
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 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2641 segment = remaining;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2642 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2643
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2644 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2645 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	2646 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	2647 if (!timeout)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2648 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	2649 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2650 if (timeout == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2651 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2652 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2653 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2654 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	2655
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2656 if (nread < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2657 s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2658 return -1;
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 if (nread != remaining) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2661 read_buf += nread;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2662 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2663 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2664
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2665 remaining -= segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2666 read_buf += segment;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2667 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2668 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	2669 #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	2670
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2671 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	2672 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2673
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	2674
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	2675 /* 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	2676
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2677 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	2678 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	2679 {
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2680 Py_ssize_t recvlen, outlen;
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2681 int flags = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2682 PyObject *buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2683
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2684 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	2685 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2686
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2687 if (recvlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2688 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2689 "negative buffersize in recv");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2690 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2691 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2692
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2693 /* Allocate a new string. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2694 buf = PyBytes_FromStringAndSize((char *) 0, recvlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2695 if (buf == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2696 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2697
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2698 /* Call the guts */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2699 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	2700 if (outlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2701 /* 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	2702 error. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2703 Py_DECREF(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2704 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2705 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2706 if (outlen != recvlen) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2707 /* 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	2708 string if possible and be successful. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2709 _PyBytes_Resize(&buf, outlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2710 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2711
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2712 return buf;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2713 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2714
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2715 PyDoc_STRVAR(recv_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2716 "recv(buffersize[, flags]) -> data\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2717 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2718 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	2719 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	2720 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	2721 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	2722
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2723
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2724 /* 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	2725
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2726 static PyObject*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2727 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	2728 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2729 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	2730
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2731 int flags = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2732 Py_buffer pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2733 char *buf;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2734 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	2735
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2736 /* Get the buffer's memory */
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2737 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	2738 &pbuf, &recvlen, &flags))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2739 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2740 buf = pbuf.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2741 buflen = pbuf.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2742
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2743 if (recvlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2744 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2745 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2746 "negative buffersize in recv_into");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2747 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2748 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2749 if (recvlen == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2750 /* 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	2751 recvlen = buflen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2752 }
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 /* 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	2755 if (buflen < recvlen) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2756 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2757 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2758 "buffer too small for requested bytes");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2759 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2760 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2761
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2762 /* Call the guts */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2763 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	2764 if (readlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2765 /* Return an error. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2766 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2767 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2768 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2769
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2770 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2771 /* 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	2772 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	2773 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	2774 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2775
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2776 PyDoc_STRVAR(recv_into_doc,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2777 "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	2778 \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2779 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	2780 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	2781 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	2782 \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2783 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	2784
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2785
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2786 /*
44349 4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	2787 * 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	2788 * 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	2789 * 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	2790 * 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	2791 * 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	2792 * 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	2793 *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2794 * '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	2795 * 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	2796 */
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2797 static Py_ssize_t
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2798 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	2799 PyObject** addr)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2800 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2801 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2802 int timeout;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2803 Py_ssize_t n = -1;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2804 socklen_t addrlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2805
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2806 *addr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2807
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2808 if (!getsockaddrlen(s, &addrlen))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2809 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2810
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2811 if (!IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2812 select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2813 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2814 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2815
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2816 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2817 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2818 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	2819 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	2820 if (!timeout) {
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	2821 #ifndef MS_WINDOWS
22115 d104bb50a194 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22096 diff changeset	2822 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2823 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	2824 SAS2SA(&addrbuf), &addrlen);
6718 32f2eda2946c Left-aligned preprocessor directives and changed C++ comments to C Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2825 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2826 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	2827 (void *) &addrbuf, &addrlen);
6718 32f2eda2946c Left-aligned preprocessor directives and changed C++ comments to C Guido van Rossum <guido@python.org> parents: 6626 diff changeset	2828 #endif
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	2829 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2830 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	2831 SAS2SA(&addrbuf), &addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2832 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2833 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2834 Py_END_ALLOW_THREADS
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 if (timeout == 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2837 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2838 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2839 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	2840 END_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2841 if (n < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2842 s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2843 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2844 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2845
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2846 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	2847 addrlen, s->sock_proto)))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2848 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2849
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2850 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	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
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2853 /* 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	2854
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2855 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	2856 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	2857 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2858 PyObject *buf = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2859 PyObject *addr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2860 PyObject *ret = NULL;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2861 int flags = 0;
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2862 Py_ssize_t recvlen, outlen;
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2863
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2864 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	2865 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2866
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2867 if (recvlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2868 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2869 "negative buffersize in recvfrom");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2870 return NULL;
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
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2873 buf = PyBytes_FromStringAndSize((char *) 0, recvlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2874 if (buf == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2875 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2876
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2877 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	2878 recvlen, flags, &addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2879 if (outlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2880 goto finally;
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 if (outlen != recvlen) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2884 /* 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	2885 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	2886 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	2887 /* 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	2888 goto finally;
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 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	2892
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2893 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2894 Py_XDECREF(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2895 Py_XDECREF(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2896 return ret;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2897 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2898
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2899 PyDoc_STRVAR(recvfrom_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2900 "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	2901 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2902 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	2903
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2904
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2905 /* 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	2906
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2907 static PyObject *
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2908 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	2909 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2910 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	2911
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2912 int flags = 0;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2913 Py_buffer pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2914 char *buf;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2915 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	2916
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2917 PyObject *addr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2918
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	2919 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	2920 kwlist, &pbuf,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2921 &recvlen, &flags))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2922 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2923 buf = pbuf.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2924 buflen = pbuf.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2925 assert(buf != 0 && buflen > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2926
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2927 if (recvlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2928 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2929 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2930 "negative buffersize in recvfrom_into");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2931 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2932 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2933 if (recvlen == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2934 /* 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	2935 recvlen = buflen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2936 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2937
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2938 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	2939 if (readlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2940 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2941 /* Return an error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2942 Py_XDECREF(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2943 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2944 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2945
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2946 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	2947 /* 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	2948 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	2949 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	2950 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2951
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2952 PyDoc_STRVAR(recvfrom_into_doc,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2953 "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	2954 \n\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2955 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	2956
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2957
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	2958 /* 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	2959 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	2960 #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	2961 /*
c64216addd7f Add support for the send/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 * 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	2963 * 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	2964 * 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	2965 * 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	2966 * 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	2967 * 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	2968 * 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	2969 * 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	2970 */
c64216addd7f Add support for the send/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 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	2972 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	2973 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	2974 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	2975 {
c64216addd7f Add support for the send/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 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	2977 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	2978 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	2979 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	2980 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	2981 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	2982 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	2983 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	2984 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	2985 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	2986
c64216addd7f Add support for the send/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 /* 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	2988 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	2989 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	2990 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	2991 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	2992 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	2993 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	2994 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	2995 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	2996 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	2997
c64216addd7f Add support for the send/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 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	2999 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	3000 "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	3001 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	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 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	3004 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	3005
c64216addd7f Add support for the send/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 /* 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	3007 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	3008 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	3009 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	3010 }
c64216addd7f Add support for the send/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
c64216addd7f Add support for the send/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 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	3013 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	3014 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	3015 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	3016 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	3017 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	3018 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	3019 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	3020 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	3021 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	3022 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	3023 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	3024 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	3025 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	3026 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	3027 }
c64216addd7f Add support for the send/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 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	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 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	3031 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	3032 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	3033 }
c64216addd7f Add support for the send/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 /* 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	3036 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	3037 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	3038 /* 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	3039 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	3040 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	3041 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	3042 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	3043 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	3044
c64216addd7f Add support for the send/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 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	3046 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	3047 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	3048 "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	3049 "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	3050 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	3051 }
c64216addd7f Add support for the send/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 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	3053 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	3054 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	3055 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	3056 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	3057 }
c64216addd7f Add support for the send/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 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	3060 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	3061 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	3062 (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	3063 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	3064 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	3065 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	3066 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	3067 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	3068 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	3069
c64216addd7f Add support for the send/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 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	3071 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	3072 }
c64216addd7f Add support for the send/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 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	3075 (*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	3076 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	3077 (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	3078 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	3079 ((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	3080 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	3081 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	3082 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	3083 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	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 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	3086 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	3087 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	3088 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	3089
c64216addd7f Add support for the send/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 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	3091 #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	3092 /* 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	3093 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	3094 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	3095 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	3096 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	3097 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	3098 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	3099 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	3100 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	3101 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	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 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	3104 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	3105 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	3106 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	3107 }
c64216addd7f Add support for the send/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 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	3109 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	3110 }
c64216addd7f Add support for the send/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 #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	3112 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	3113 }
c64216addd7f Add support for the send/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
c64216addd7f Add support for the send/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
c64216addd7f Add support for the send/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 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	3117 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	3118 {
c64216addd7f Add support for the send/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 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	3120
c64216addd7f Add support for the send/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 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	3122 _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	3123 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	3124 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	3125 }
c64216addd7f Add support for the send/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
c64216addd7f Add support for the send/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 /* 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	3128
c64216addd7f Add support for the send/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 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	3130 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	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 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	3133 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	3134 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	3135 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	3136
c64216addd7f Add support for the send/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 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	3138 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	3139
c64216addd7f Add support for the send/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 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	3141 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	3142 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	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 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	3145 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	3146 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	3147 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	3148
c64216addd7f Add support for the send/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 /* 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	3150 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	3151 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	3152 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	3153 &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	3154 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	3155 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	3156 }
c64216addd7f Add support for the send/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
c64216addd7f Add support for the send/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 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	3159 "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	3160 \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	3161 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	3162 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	3163 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	3164 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	3165 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	3166 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	3167 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	3168 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	3169 \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	3170 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	3171 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	3172 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	3173 (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	3174 (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	3175 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	3176 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	3177 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	3178 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	3179 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	3180 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	3181 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	3182 \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	3183 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	3184 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	3185 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	3186
c64216addd7f Add support for the send/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
c64216addd7f Add support for the send/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 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	3189 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	3190 {
c64216addd7f Add support for the send/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 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	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
c64216addd7f Add support for the send/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 /* 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	3195
c64216addd7f Add support for the send/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 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	3197 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	3198 {
c64216addd7f Add support for the send/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 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	3200 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	3201 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	3202 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	3203 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	3204 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	3205
c64216addd7f Add support for the send/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 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	3207 &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	3208 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	3209
c64216addd7f Add support for the send/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 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	3211 "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	3212 "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	3213 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	3214 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	3215 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	3216 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	3217 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	3218 }
c64216addd7f Add support for the send/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
c64216addd7f Add support for the send/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 /* 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	3221 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	3222 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	3223 (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	3224 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	3225 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	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 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	3228 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	3229 "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	3230 "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	3231 &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	3232 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	3233 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	3234 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	3235 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3236
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3237 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	3238 &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	3239 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	3240 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	3241 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	3242 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	3243 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	3244 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	3245 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	3246 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3247
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3248 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	3249 "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	3250 \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	3251 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	3252 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	3253 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	3254 (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	3255 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	3256 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	3257 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	3258 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	3259 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	3260 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	3261 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	3262 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	3263 \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	3264 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	3265 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	3266 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	3267 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	3268 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	3269 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	3270 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	3271 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	3272 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	3273 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	3274 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	3275 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	3276 \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	3277 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	3278 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	3279 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	3280 #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	3281
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3282
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	3283 /* 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	3284
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3285 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	3286 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	3287 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3288 char *buf;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	3289 Py_ssize_t len, n = -1;
2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	3290 int flags = 0, timeout;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3291 Py_buffer pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3292
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3293 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	3294 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3295
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3296 if (!IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3297 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3298 return select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3299 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3300 buf = pbuf.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3301 len = pbuf.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3302
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3303 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3304 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	3305 timeout = internal_select_ex(s, 1, interval);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3306 if (!timeout)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3307 #ifdef __VMS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3308 n = sendsegmented(s->sock_fd, buf, len, flags);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3309 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3310 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	3311 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3312 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3313 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	3314 PyBuffer_Release(&pbuf);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3315 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3316 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3317 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3318 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	3319
0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3320 PyBuffer_Release(&pbuf);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3321 if (n < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3322 return s->errorhandler();
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	3323 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	3324 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3325
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3326 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	3327 "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	3328 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3329 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	3330 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	3331 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	3332
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3333
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3334 /* 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	3335
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3336 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	3337 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	3338 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3339 char *buf;
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	3340 Py_ssize_t len, n = -1;
64961 5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3341 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	3342 Py_buffer pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3343
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3344 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	3345 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3346 buf = pbuf.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3347 len = pbuf.len;
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 if (!IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3350 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3351 return select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3352 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3353
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3354 do {
64961 5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3355 Py_BEGIN_ALLOW_THREADS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3356 timeout = internal_select(s, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3357 n = -1;
64961 5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3358 if (!timeout) {
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3359 #ifdef __VMS
64961 5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3360 n = sendsegmented(s->sock_fd, buf, len, flags);
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	3361 #else
64961 5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3362 n = send(s->sock_fd, buf, len, flags);
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3363 #endif
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3364 }
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3365 Py_END_ALLOW_THREADS
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3366 if (timeout == 1) {
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3367 PyBuffer_Release(&pbuf);
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3368 PyErr_SetString(socket_timeout, "timed out");
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3369 return NULL;
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3370 }
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3371 /* PyErr_CheckSignals() might change errno */
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3372 saved_errno = errno;
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3373 /* 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	3374 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	3375 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	3376 if (PyErr_CheckSignals()) {
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3377 PyBuffer_Release(&pbuf);
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3378 return NULL;
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3379 }
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3380 if (n < 0) {
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3381 /* If interrupted, try again */
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3382 if (saved_errno == EINTR)
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3383 continue;
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3384 else
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3385 break;
5a7bb85a5d99 Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 64393 diff changeset	3386 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3387 buf += n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3388 len -= n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3389 } while (len > 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3390 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3391
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3392 if (n < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3393 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3394
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3395 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3396 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	3397 }
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3398
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3399 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	3400 "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	3401 \n\
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	3402 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	3403 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	3404 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	3405 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	3406
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3407
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	3408 /* 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	3409
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3410 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	3411 sock_sendto(PySocketSockObject s, PyObject args)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3412 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3413 Py_buffer pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3414 PyObject *addro;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3415 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	3416 Py_ssize_t len, arglen;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3417 sock_addr_t addrbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3418 int addrlen, n = -1, flags, timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3419
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3420 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	3421 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	3422 switch (arglen) {
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3423 case 2:
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3424 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	3425 break;
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3426 case 3:
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3427 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	3428 &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	3429 break;
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3430 default:
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3431 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	3432 "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	3433 arglen);
70399 9d33770071b2 socket.sendto(): exit directly after setting the error Victor Stinner <victor.stinner@haypocalc.com> parents: 70226 diff changeset	3434 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3435 }
68659 c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3436 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	3437 return NULL;
c61b72b0650d Issue #5421: Fix misleading error message when one of socket.sendto()'s Antoine Pitrou <solipsis@pitrou.net> parents: 68585 diff changeset	3438
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3439 buf = pbuf.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3440 len = pbuf.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3441
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3442 if (!IS_SELECTABLE(s)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3443 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3444 return select_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3445 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3446
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3447 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	3448 PyBuffer_Release(&pbuf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3449 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3450 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3451
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3452 BEGIN_SELECT_LOOP(s)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3453 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	3454 timeout = internal_select_ex(s, 1, interval);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3455 if (!timeout)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3456 n = sendto(s->sock_fd, buf, len, flags, SAS2SA(&addrbuf), addrlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3457 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3458
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3459 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	3460 PyBuffer_Release(&pbuf);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3461 PyErr_SetString(socket_timeout, "timed out");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3462 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3463 }
64988 0f8c2eb89f46 Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN, Antoine Pitrou <solipsis@pitrou.net> parents: 64959 diff changeset	3464 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	3465 PyBuffer_Release(&pbuf);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3466 if (n < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3467 return s->errorhandler();
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	3468 return PyLong_FromSsize_t(n);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3469 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3470
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3471 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	3472 "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	3473 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3474 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	3475 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	3476
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3477
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	3478 /* 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	3479 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	3480 #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	3481 /* 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	3482
c64216addd7f Add support for the send/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 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	3484 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	3485 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3486 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	3487 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	3488 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	3489 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	3490 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	3491 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	3492 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	3493 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	3494 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	3495 } *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	3496 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	3497 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	3498 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	3499 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	3500 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	3501 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	3502
c64216addd7f Add support for the send/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 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	3504 &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	3505 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	3506
c64216addd7f Add support for the send/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 /* 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	3508 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	3509 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	3510 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	3511 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	3512 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	3513 }
c64216addd7f Add support for the send/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 /* 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	3516 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	3517 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	3518 "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	3519 "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	3520 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	3521 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	3522 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	3523 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	3524 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	3525 }
c64216addd7f Add support for the send/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 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	3527 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	3528 ((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	3529 (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	3530 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	3531 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	3532 }
c64216addd7f Add support for the send/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 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	3534 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	3535 "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	3536 "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	3537 &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	3538 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	3539 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	3540 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	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
c64216addd7f Add support for the send/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 (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	3544 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	3545 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	3546 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	3547 "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	3548 "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	3549 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	3550 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	3551 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3552
c64216addd7f Add support for the send/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 #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	3554 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	3555 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	3556 "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	3557 "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	3558 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	3559 }
c64216addd7f Add support for the send/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 #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	3561 /* 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	3562 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	3563 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	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 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	3568 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	3569 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	3570
c64216addd7f Add support for the send/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 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	3572 "(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	3573 &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	3574 &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	3575 &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	3576 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	3577 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	3578
c64216addd7f Add support for the send/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 #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	3580 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	3581 #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	3582 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	3583 #endif
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	3584 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	3585 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	3586 }
c64216addd7f Add support for the send/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 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	3588 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	3589 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	3590 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	3591 }
c64216addd7f Add support for the send/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 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	3593 }
c64216addd7f Add support for the send/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
c64216addd7f Add support for the send/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 /* 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	3596 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	3597 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	3598
c64216addd7f Add support for the send/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 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	3600 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	3601 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	3602 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	3603 }
c64216addd7f Add support for the send/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 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	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 /* 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	3607 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	3608 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	3609 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	3610 returns NULL if it doesn't. Zero-filling 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	3611 ensures that 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	3612 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	3613
c64216addd7f Add support for the send/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 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	3615 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	3616 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	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 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	3619 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	3620 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	3621 "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	3622 (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	3623 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	3624 }
c64216addd7f Add support for the send/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 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	3626 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	3627 "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	3628 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	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 (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	3631 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	3632
c64216addd7f Add support for the send/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 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	3634 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	3635 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	3636 }
c64216addd7f Add support for the send/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 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	3638 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	3639 "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	3640 "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	3641 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	3642 }
c64216addd7f Add support for the send/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 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	3644 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	3645 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	3646 }
c64216addd7f Add support for the send/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 }
c64216addd7f Add support for the send/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 /* 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	3650 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	3651 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	3652 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	3653 }
c64216addd7f Add support for the send/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
c64216addd7f Add support for the send/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 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	3656 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	3657 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	3658 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	3659 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	3660 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	3661 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	3662 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	3663 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	3664 }
c64216addd7f Add support for the send/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 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	3666
c64216addd7f Add support for the send/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 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	3668 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	3669 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	3670 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3671 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	3672
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3673 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	3674 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	3675 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	3676 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	3677 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	3678 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	3679 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	3680 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	3681 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	3682 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	3683 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	3684 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	3685 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3686
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3687 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	3688 "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	3689 \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	3690 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	3691 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	3692 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	3693 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	3694 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	3695 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	3696 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	3697 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	3698 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	3699 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	3700 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	3701 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	3702 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	3703 #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	3704
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	3705
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3706 /* s.shutdown(how) method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3707
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3708 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	3709 sock_shutdown(PySocketSockObject s, PyObject arg)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3710 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3711 int how;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3712 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3713
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3714 how = PyLong_AsLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3715 if (how == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3716 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3717 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3718 res = shutdown(s->sock_fd, how);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3719 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3720 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3721 return s->errorhandler();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3722 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3723 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3724 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3725
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3726 PyDoc_STRVAR(shutdown_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3727 "shutdown(flag)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3728 \n\
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	3729 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	3730 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	3731
47667 b1f4ea4eb555 Merged revisions 64214 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47663 diff changeset	3732 #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	3733 static PyObject*
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3734 sock_ioctl(PySocketSockObject s, PyObject arg)
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3735 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3736 unsigned long cmd = SIO_RCVALL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3737 PyObject *argO;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3738 DWORD recv;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3739
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3740 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	3741 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3742
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3743 switch (cmd) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3744 case SIO_RCVALL: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3745 unsigned int option = RCVALL_ON;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3746 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	3747 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3748 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	3749 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	3750 return set_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3751 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3752 return PyLong_FromUnsignedLong(recv); }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3753 case SIO_KEEPALIVE_VALS: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3754 struct tcp_keepalive ka;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3755 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	3756 &ka.onoff, &ka.keepalivetime, &ka.keepaliveinterval))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3757 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3758 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	3759 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	3760 return set_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3761 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3762 return PyLong_FromUnsignedLong(recv); }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3763 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3764 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	3765 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3766 }
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3767 }
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3768 PyDoc_STRVAR(sock_ioctl_doc,
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3769 "ioctl(cmd, option) -> long\n\
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3770 \n\
56252 debb245ebb40 http://bugs.python.org/issue6971 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 53824 diff changeset	3771 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	3772 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	3773 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	3774 #endif
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3775
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3776 #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	3777 static PyObject*
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3778 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	3779 {
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3780 WSAPROTOCOL_INFO info;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3781 DWORD processId;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3782 int result;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3783
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3784 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	3785 return NULL;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3786
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3787 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	3788 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	3789 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	3790 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	3791 return set_error();
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3792 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	3793 }
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3794 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	3795 "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	3796 \n\
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3797 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	3798 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	3799 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	3800 socket.fromshare().");
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3801
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3802
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	3803 #endif
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3804
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3805 /* List of methods for socket objects */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3806
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3807 static PyMethodDef sock_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3808 {"_accept", (PyCFunction)sock_accept, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3809 accept_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3810 {"bind", (PyCFunction)sock_bind, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3811 bind_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3812 {"close", (PyCFunction)sock_close, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3813 close_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3814 {"connect", (PyCFunction)sock_connect, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3815 connect_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3816 {"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	3817 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	3818 {"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	3819 detach_doc},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3820 {"fileno", (PyCFunction)sock_fileno, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3821 fileno_doc},
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3822 #ifdef HAVE_GETPEERNAME
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3823 {"getpeername", (PyCFunction)sock_getpeername,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3824 METH_NOARGS, getpeername_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3825 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3826 {"getsockname", (PyCFunction)sock_getsockname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3827 METH_NOARGS, getsockname_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3828 {"getsockopt", (PyCFunction)sock_getsockopt, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3829 getsockopt_doc},
47667 b1f4ea4eb555 Merged revisions 64214 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47663 diff changeset	3830 #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	3831 {"ioctl", (PyCFunction)sock_ioctl, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3832 sock_ioctl_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3833 #endif
76150 51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3834 #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	3835 {"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	3836 sock_share_doc},
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3837 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3838 {"listen", (PyCFunction)sock_listen, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3839 listen_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3840 {"recv", (PyCFunction)sock_recv, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3841 recv_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3842 {"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	3843 recv_into_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3844 {"recvfrom", (PyCFunction)sock_recvfrom, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3845 recvfrom_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3846 {"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	3847 recvfrom_into_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3848 {"send", (PyCFunction)sock_send, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3849 send_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3850 {"sendall", (PyCFunction)sock_sendall, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3851 sendall_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3852 {"sendto", (PyCFunction)sock_sendto, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3853 sendto_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3854 {"setblocking", (PyCFunction)sock_setblocking, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3855 setblocking_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3856 {"settimeout", (PyCFunction)sock_settimeout, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3857 settimeout_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3858 {"gettimeout", (PyCFunction)sock_gettimeout, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3859 gettimeout_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3860 {"setsockopt", (PyCFunction)sock_setsockopt, METH_VARARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3861 setsockopt_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3862 {"shutdown", (PyCFunction)sock_shutdown, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3863 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	3864 #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	3865 {"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	3866 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	3867 {"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	3868 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	3869 {"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	3870 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	3871 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3872 {NULL, NULL} /* sentinel */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3873 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3874
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	3875 /* 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	3876 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	3877 {"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	3878 {"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	3879 {"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	3880 {"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	3881 {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	3882 };
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3883
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3884 /* 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	3885 First close the file description. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3886
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3887 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	3888 sock_dealloc(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3889 {
65707 cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3890 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	3891 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	3892 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	3893 ++Py_REFCNT(s);
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3894 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	3895 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	3896 "unclosed %R", s))
cff78ffb932a Issue #10093: ResourceWarnings are now issued when files and sockets are Antoine Pitrou <solipsis@pitrou.net> parents: 65667 diff changeset	3897 /* 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	3898 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	3899 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	3900 PyErr_Restore(exc, val, tb);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3901 (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	3902 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	3903 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3904 Py_TYPE(s)->tp_free((PyObject *)s);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3905 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3906
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3907
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3908 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	3909 sock_repr(PySocketSockObject *s)
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3910 {
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	3911 #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	3912 if (s->sock_fd > LONG_MAX) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3913 /* 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	3914 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	3915 printing, only bother if necessary*/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3916 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3917 "no printf formatter to display "
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3918 "the socket descriptor in decimal");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3919 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3920 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3921 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3922 return PyUnicode_FromFormat(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3923 "<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	3924 (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	3925 s->sock_type,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3926 s->sock_proto);
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3927 }
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3928
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3929
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3930 /* 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	3931
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3932 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	3933 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	3934 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3935 PyObject *new;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3936
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3937 new = type->tp_alloc(type, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3938 if (new != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3939 ((PySocketSockObject *)new)->sock_fd = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3940 ((PySocketSockObject *)new)->sock_timeout = -1.0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3941 ((PySocketSockObject *)new)->errorhandler = &set_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3942 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3943 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	3944 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3945
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3946
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3947 /* 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	3948
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3949 /ARGSUSED/
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3950 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	3951 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	3952 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3953 PySocketSockObject s = (PySocketSockObject )self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3954 PyObject *fdobj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3955 SOCKET_T fd = INVALID_SOCKET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3956 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	3957 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	3958
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3959 if (!PyArg_ParseTupleAndKeywords(args, kwds,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3960 "\|iiiO:socket", keywords,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3961 &family, &type, &proto, &fdobj))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3962 return -1;
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 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	3965 #ifdef MS_WINDOWS
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3966 /* 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	3967 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	3968 WSAPROTOCOL_INFO info;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3969 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	3970 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	3971 "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	3972 "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	3973 return -1;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3974 }
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3975 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	3976 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	3977 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	3978 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	3979 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	3980 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	3981 set_error();
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3982 return -1;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3983 }
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3984 family = info.iAddressFamily;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3985 type = info.iSocketType;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3986 proto = info.iProtocol;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3987 }
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3988 else
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3989 #endif
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3990 {
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3991 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	3992 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	3993 return -1;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3994 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	3995 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	3996 "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	3997 return -1;
51b4bddd0e92 Issue #14310: inter-process socket duplication for windows Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 76035 diff changeset	3998 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	3999 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4000 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4001 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4002 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4003 fd = socket(family, type, proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4004 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4005
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4006 if (fd == INVALID_SOCKET) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4007 set_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4008 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4009 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4010 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4011 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	4012
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4013 return 0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	4014
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	4015 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	4016
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	4017
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	4018 /* 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	4019
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4020 static PyTypeObject sock_type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4021 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	4022 "_socket.socket", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4023 sizeof(PySocketSockObject), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4024 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4025 (destructor)sock_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4026 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4027 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4028 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4029 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4030 (reprfunc)sock_repr, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4031 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4032 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4033 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4034 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4035 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4036 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4037 PyObject_GenericGetAttr, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4038 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4039 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4040 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	4041 sock_doc, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4042 0, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4043 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4044 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4045 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4046 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4047 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4048 sock_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4049 sock_memberlist, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4050 0, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4051 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4052 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4053 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4054 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4055 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4056 sock_initobj, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4057 PyType_GenericAlloc, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4058 sock_new, /* tp_new */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4059 PyObject_Del, /* tp_free */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4060 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4061
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4062
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	4063 /* Python interface to gethostname(). */
a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	4064
a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	4065 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	4066 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	4067 socket_gethostname(PyObject self, PyObject unused)
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	4068 {
65721 a4fd3dc74299 Issue #9377: Use Unicode API for gethostname on Windows. Martin v. Löwis <martin@v.loewis.de> parents: 65707 diff changeset	4069 #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	4070 /* 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	4071 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	4072 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	4073 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	4074 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	4075 wchar_t *name;
65981 49b0d423023e Fixed socket_gethostname() on windows. Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> parents: 65727 diff changeset	4076 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	4077
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4078 if (GetComputerNameExW(ComputerNamePhysicalDnsHostname, buf, &size))
73683 d48b4a1c511a Use the new Unicode API Victor Stinner <victor.stinner@haypocalc.com> parents: 73594 diff changeset	4079 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	4080
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4081 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	4082 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	4083
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4084 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	4085 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	4086
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4087 /* 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	4088 names */
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4089 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	4090 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	4091 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	4092 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	4093 name,
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4094 &size))
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4095 {
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4096 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	4097 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	4098 }
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4099
488a2e41e89d socket_gethostname() uses a wchar_t* with PyMem_Malloc() to avoid the Victor Stinner <victor.stinner@haypocalc.com> parents: 73478 diff changeset	4100 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	4101 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	4102 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	4103 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4104 char buf[1024];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4105 int res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4106 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4107 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	4108 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4109 if (res < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4110 return set_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4111 buf[sizeof buf - 1] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4112 return PyUnicode_FromString(buf);
65721 a4fd3dc74299 Issue #9377: Use Unicode API for gethostname on Windows. Martin v. Löwis <martin@v.loewis.de> parents: 65707 diff changeset	4113 #endif
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	4114 }
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	4115
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4116 PyDoc_STRVAR(gethostname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4117 "gethostname() -> string\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4118 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4119 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	4120
68194 a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4121 #ifdef HAVE_SETHOSTNAME
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4122 PyDoc_STRVAR(sethostname_doc,
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4123 "sethostname(name)\n\n\
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4124 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	4125
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4126 static PyObject *
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4127 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	4128 {
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4129 PyObject *hnobj;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4130 Py_buffer buf;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4131 int res, flag = 0;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4132
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4133 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	4134 PyErr_Clear();
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4135 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	4136 PyUnicode_FSConverter, &hnobj))
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4137 return NULL;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4138 flag = 1;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4139 }
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4140 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	4141 if (!res) {
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4142 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	4143 PyBuffer_Release(&buf);
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4144 }
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4145 if (flag)
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4146 Py_DECREF(hnobj);
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4147 if (res)
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4148 return set_error();
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4149 Py_RETURN_NONE;
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4150 }
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	4151 #endif
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	4152
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4153 /* Python interface to gethostbyname(name). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4154
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4155 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	4156 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	4157 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	4158 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4159 char *name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4160 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	4161 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	4162
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4163 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	4164 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4165 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	4166 goto finally;
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4167 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	4168 finally:
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4169 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	4170 return ret;
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4171 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4172
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4173 PyDoc_STRVAR(gethostbyname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4174 "gethostbyname(host) -> address\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4175 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4176 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	4177
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4178
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4179 /* 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	4180
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4181 static PyObject *
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4182 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	4183 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4184 char **pch;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4185 PyObject rtn_tuple = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4186 PyObject name_list = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4187 PyObject addr_list = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4188 PyObject *tmp;
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 (h == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4191 /* 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	4192 set_herror(h_errno);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4193 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4194 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4195
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4196 if (h->h_addrtype != af) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4197 /* 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	4198 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	4199 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4200 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4201 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4202
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4203 switch (af) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4204
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4205 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4206 if (alen < sizeof(struct sockaddr_in))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4207 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4208 break;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	4209
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	4210 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4211 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4212 if (alen < sizeof(struct sockaddr_in6))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4213 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4214 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4215 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4216
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4217 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4218
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4219 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	4220 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4221
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4222 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	4223 goto err;
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 /* 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	4226 if (h->h_aliases) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4227 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	4228 int status;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4229 tmp = PyUnicode_FromString(*pch);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4230 if (tmp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4231 goto err;
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 status = PyList_Append(name_list, tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4234 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4235
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4236 if (status)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4237 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4238 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4239 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4240
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4241 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	4242 int status;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4243
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4244 switch (af) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4245
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4246 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4247 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4248 struct sockaddr_in sin;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4249 memset(&sin, 0, sizeof(sin));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4250 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	4251 #ifdef HAVE_SOCKADDR_SA_LEN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4252 sin.sin_len = sizeof(sin);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4253 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4254 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	4255 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	4256
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4257 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	4258 memcpy((char *) addr, &sin, sizeof(sin));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4259 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4260 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	4261
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	4262 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4263 case AF_INET6:
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 struct sockaddr_in6 sin6;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4266 memset(&sin6, 0, sizeof(sin6));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4267 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	4268 #ifdef HAVE_SOCKADDR_SA_LEN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4269 sin6.sin6_len = sizeof(sin6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4270 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4271 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	4272 tmp = makeipaddr((struct sockaddr *)&sin6,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4273 sizeof(sin6));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4274
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4275 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	4276 memcpy((char *) addr, &sin6, sizeof(sin6));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4277 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4278 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4279 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4280
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4281 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	4282 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4283 "unsupported address family");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4284 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4285 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4286
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4287 if (tmp == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4288 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4289
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4290 status = PyList_Append(addr_list, tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4291 Py_DECREF(tmp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4292
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4293 if (status)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4294 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4295 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4296
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4297 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	4298
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4299 err:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4300 Py_XDECREF(name_list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4301 Py_XDECREF(addr_list);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4302 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	4303 }
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4304
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4305
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4306 /* 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	4307
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4308 /ARGSUSED/
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4309 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	4310 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	4311 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4312 char *name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4313 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	4314 sock_addr_t addr;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4315 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	4316 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	4317 #ifdef HAVE_GETHOSTBYNAME_R
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4318 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	4319 #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	4320 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	4321 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4322 char buf[16384];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4323 int buf_len = (sizeof buf) - 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4324 int errnop;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4325 #endif
75469 2f10c1ad4b21 Issue #10951: Fix warnings in the socket module. Ross Lagerwall <rosslagerwall@gmail.com> parents: 74741 diff changeset	4326 #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	4327 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	4328 #endif
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4329 #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	4330
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4331 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	4332 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	4333 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	4334 goto finally;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4335 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	4336 #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	4337 #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	4338 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	4339 &h, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4340 #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	4341 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	4342 #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	4343 memset((void *) &data, '\0', sizeof(data));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4344 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	4345 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	4346 #endif
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4347 #else /* not HAVE_GETHOSTBYNAME_R */
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	4348 #ifdef USE_GETHOSTBYNAME_LOCK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4349 PyThread_acquire_lock(netdb_lock, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4350 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4351 h = gethostbyname(name);
10441 9ba5dffccb1b Jonathan Giddy writes: Guido van Rossum <guido@python.org> parents: 10401 diff changeset	4352 #endif /* HAVE_GETHOSTBYNAME_R */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4353 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4354 /* 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	4355 addr.ss_family.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4356 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	4357 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	4358 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	4359 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	4360 sa->sa_family);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	4361 #ifdef USE_GETHOSTBYNAME_LOCK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4362 PyThread_release_lock(netdb_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4363 #endif
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4364 finally:
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4365 PyMem_Free(name);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4366 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	4367 }
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4368
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4369 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	4370 "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	4371 \n\
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4372 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	4373 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	4374
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	4375
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4376 /* Python interface to gethostbyaddr(IP). */
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4377
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4378 /ARGSUSED/
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4379 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	4380 socket_gethostbyaddr(PyObject self, PyObject args)
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4381 {
74142 683a1b1ff15d Issue #8623: Fix some strict-aliasing warnings. Patch by David Watson. Charles-François Natali <neologix@free.fr> parents: 74012 diff changeset	4382 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	4383 struct sockaddr *sa = SAS2SA(&addr);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4384 char *ip_num;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4385 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	4386 PyObject *ret = NULL;
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	4387 #ifdef HAVE_GETHOSTBYNAME_R
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4388 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	4389 #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	4390 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	4391 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4392 /* 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	4393 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	4394 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	4395 to maintain this alignment. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4396 char buf[16384] Py_ALIGNED(8);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4397 int buf_len = (sizeof buf) - 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4398 int errnop;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4399 #endif
75469 2f10c1ad4b21 Issue #10951: Fix warnings in the socket module. Ross Lagerwall <rosslagerwall@gmail.com> parents: 74741 diff changeset	4400 #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	4401 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	4402 #endif
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	4403 #endif /* HAVE_GETHOSTBYNAME_R */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4404 char *ap;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4405 int al;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4406 int af;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4407
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4408 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	4409 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4410 af = AF_UNSPEC;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4411 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	4412 goto finally;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4413 af = sa->sa_family;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4414 ap = NULL;
68102 e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 66799 diff changeset	4415 /* al = 0; */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4416 switch (af) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4417 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4418 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	4419 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	4420 break;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	4421 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4422 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4423 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	4424 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	4425 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4426 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4427 default:
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4428 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	4429 goto finally;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4430 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4431 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	4432 #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	4433 #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	4434 gethostbyaddr_r(ap, al, af,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4435 &hp_allocated, buf, buf_len,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4436 &h, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	4437 #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	4438 h = gethostbyaddr_r(ap, al, af,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4439 &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	4440 #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	4441 memset((void *) &data, '\0', sizeof(data));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4442 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	4443 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	4444 #endif
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	4445 #else /* not HAVE_GETHOSTBYNAME_R */
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	4446 #ifdef USE_GETHOSTBYNAME_LOCK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4447 PyThread_acquire_lock(netdb_lock, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4448 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4449 h = gethostbyaddr(ap, al, af);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	4450 #endif /* HAVE_GETHOSTBYNAME_R */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4451 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	4452 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	4453 #ifdef USE_GETHOSTBYNAME_LOCK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4454 PyThread_release_lock(netdb_lock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4455 #endif
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4456 finally:
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	4457 PyMem_Free(ip_num);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4458 return ret;
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4459 }
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	4460
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4461 PyDoc_STRVAR(gethostbyaddr_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4462 "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	4463 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4464 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	4465 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	4466
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4467
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4468 /* Python interface to getservbyname(name).
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4469 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	4470 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	4471
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4472 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	4473 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	4474 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	4475 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4476 char name, proto=NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4477 struct servent *sp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4478 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	4479 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4480 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4481 sp = getservbyname(name, proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4482 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4483 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	4484 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	4485 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4486 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4487 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	4488 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4489
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4490 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	4491 "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	4492 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4493 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	4494 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	4495 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	4496
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4497
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4498 /* 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	4499 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	4500 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	4501
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4502 /ARGSUSED/
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4503 static PyObject *
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4504 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	4505 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4506 int port;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4507 char *proto=NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4508 struct servent *sp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4509 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	4510 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4511 if (port < 0 \|\| port > 0xffff) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4512 PyErr_SetString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4513 PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4514 "getservbyport: port must be 0-65535.");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4515 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4516 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4517 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4518 sp = getservbyport(htons((short)port), proto);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4519 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4520 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	4521 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	4522 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4523 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4524 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	4525 }
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4526
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4527 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	4528 "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	4529 \n\
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	4530 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	4531 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	4532 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	4533
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4534 /* Python interface to getprotobyname(name).
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4535 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	4536 already known or not useful (like the list of aliases). */
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4537
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4538 /ARGSUSED/
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4539 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	4540 socket_getprotobyname(PyObject self, PyObject args)
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4541 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4542 char *name;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4543 struct protoent *sp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4544 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	4545 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4546 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4547 sp = getprotobyname(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4548 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4549 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	4550 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	4551 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4552 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4553 return PyLong_FromLong((long) sp->p_proto);
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4554 }
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4555
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4556 PyDoc_STRVAR(getprotobyname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4557 "getprotobyname(name) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4558 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4559 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	4560
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	4561
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	4562 #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	4563 /* 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	4564
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4565 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	4566 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	4567 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4568 SOCKET_T fd, newfd;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4569 PyObject *newfdobj;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4570
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4571
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4572 fd = PyLong_AsSocket_t(fdobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4573 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	4574 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4575
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4576 newfd = dup_socket(fd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4577 if (newfd == INVALID_SOCKET)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4578 return set_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4579
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4580 newfdobj = PyLong_FromSocket_t(newfd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4581 if (newfdobj == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4582 SOCKETCLOSE(newfd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4583 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	4584 }
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4585
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4586 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	4587 "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	4588 \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	4589 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	4590 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	4591 #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	4592
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	4593
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4594 #ifdef HAVE_SOCKETPAIR
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4595 /* 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	4596 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	4597 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	4598
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4599 /ARGSUSED/
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4600 static PyObject *
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4601 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	4602 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4603 PySocketSockObject s0 = NULL, s1 = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4604 SOCKET_T sv[2];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4605 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	4606 PyObject *res = NULL;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4607
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4608 #if defined(AF_UNIX)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4609 family = AF_UNIX;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4610 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4611 family = AF_INET;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4612 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4613 if (!PyArg_ParseTuple(args, "\|iii:socketpair",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4614 &family, &type, &proto))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4615 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4616 /* Create a pair of socket fds */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4617 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	4618 return set_error();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4619 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	4620 if (s0 == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4621 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4622 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	4623 if (s1 == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4624 goto finally;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4625 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	4626
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4627 finally:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4628 if (res == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4629 if (s0 == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4630 SOCKETCLOSE(sv[0]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4631 if (s1 == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4632 SOCKETCLOSE(sv[1]);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4633 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4634 Py_XDECREF(s0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4635 Py_XDECREF(s1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4636 return res;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4637 }
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4638
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4639 PyDoc_STRVAR(socketpair_doc,
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4640 "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	4641 \n\
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4642 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	4643 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	4644 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	4645 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	4646
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4647 #endif /* HAVE_SOCKETPAIR */
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4648
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4649
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4650 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	4651 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	4652 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4653 int x1, x2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4654
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4655 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	4656 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4657 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4658 if (x1 < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4659 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4660 "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	4661 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4662 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4663 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	4664 return PyLong_FromLong(x2);
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4665 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4666
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4667 PyDoc_STRVAR(ntohs_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4668 "ntohs(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4669 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4670 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	4671
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4672
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4673 static PyObject *
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	4674 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	4675 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4676 unsigned long x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4677
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4678 if (PyLong_Check(arg)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4679 x = PyLong_AsUnsignedLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4680 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	4681 return NULL;
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	4682 #if SIZEOF_LONG > 4
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4683 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4684 unsigned long y;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4685 /* only want the trailing 32 bits */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4686 y = x & 0xFFFFFFFFUL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4687 if (y ^ x)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4688 return PyErr_Format(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4689 "long int larger than 32 bits");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4690 x = y;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4691 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4692 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4693 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4694 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4695 return PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4696 "expected int/long, %s found",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4697 Py_TYPE(arg)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4698 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	4699 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4700 return PyLong_FromUnsignedLong(ntohl(x));
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4701 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4702
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4703 PyDoc_STRVAR(ntohl_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4704 "ntohl(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4705 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4706 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	4707
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4708
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4709 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	4710 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	4711 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4712 int x1, x2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4713
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4714 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	4715 return NULL;
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 if (x1 < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4718 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4719 "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	4720 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4721 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4722 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	4723 return PyLong_FromLong(x2);
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(htons_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4727 "htons(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 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	4730
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4731
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4732 static PyObject *
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	4733 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	4734 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4735 unsigned long x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4736
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4737 if (PyLong_Check(arg)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4738 x = PyLong_AsUnsignedLong(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4739 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	4740 return NULL;
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	4741 #if SIZEOF_LONG > 4
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4742 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4743 unsigned long y;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4744 /* only want the trailing 32 bits */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4745 y = x & 0xFFFFFFFFUL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4746 if (y ^ x)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4747 return PyErr_Format(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4748 "long int larger than 32 bits");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4749 x = y;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4750 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4751 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4752 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4753 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4754 return PyErr_Format(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4755 "expected int/long, %s found",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4756 Py_TYPE(arg)->tp_name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4757 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	4758 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	4759
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4760 PyDoc_STRVAR(htonl_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4761 "htonl(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4762 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4763 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	4764
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	4765 /* 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	4766
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4767 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	4768 "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	4769 \n\
11219 2d7331f4dfe3 Port inet_ntoa and inet_aton to Windows: Guido van Rossum <guido@python.org> parents: 11217 diff changeset	4770 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	4771 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	4772
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4773 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	4774 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	4775 {
11268 3fe8d13328c8 It appears that inet_aton() doesn't really exist except in libresolv; Guido van Rossum <guido@python.org> parents: 11219 diff changeset	4776 #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	4777 #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	4778 #endif
27858 9453d8cdd01e Ummm, try to get it right this time Neal Norwitz <nnorwitz@gmail.com> parents: 27857 diff changeset	4779 #ifdef HAVE_INET_ATON
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4780 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	4781 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4782
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4783 #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	4784 #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	4785 #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	4786 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4787 /* Have to use inet_addr() instead */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4788 unsigned int packed_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4789 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4790 char *ip_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4791
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4792 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	4793 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	4794
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	4795
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	4796 #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	4797
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4798 #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	4799 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	4800 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4801 if (inet_aton(ip_addr, &buf))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4802 return PyBytes_FromStringAndSize((char *)(&buf),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4803 sizeof(buf));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4804
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4805 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4806 "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	4807 return NULL;
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	4808
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4809 #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	4810 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4811 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4812
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4813 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4814
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4815 #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	4816
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4817 /* 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	4818 * for this */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4819 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	4820 packed_addr = 0xFFFFFFFF;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4821 } else {
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 packed_addr = inet_addr(ip_addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4824
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4825 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	4826 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4827 "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	4828 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4829 }
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 PyBytes_FromStringAndSize((char *) &packed_addr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4832 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	4833
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4834 #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	4835 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4836 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4837
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	4838 #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	4839 }
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4840
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4841 PyDoc_STRVAR(inet_ntoa_doc,
11937 ef98ee6aeb42 Fixed inet_ntoa() docstring. Fred Drake <fdrake@acm.org> parents: 11882 diff changeset	4842 "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	4843 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4844 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	4845
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	4846 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	4847 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	4848 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4849 char *packed_str;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4850 int addr_len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4851 struct in_addr packed_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4852
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4853 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	4854 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4855 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4856
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4857 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	4858 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4859 "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	4860 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4861 }
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 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	4864
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4865 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	4866 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	4867
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4868 #ifdef HAVE_INET_PTON
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4869
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4870 PyDoc_STRVAR(inet_pton_doc,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4871 "inet_pton(af, ip) -> packed IP address string\n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4872 \n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4873 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	4874 for use with low-level network functions.");
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4875
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4876 static PyObject *
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4877 socket_inet_pton(PyObject self, PyObject args)
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4878 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4879 int af;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4880 char* ip;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4881 int retval;
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	4882 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4883 char packed[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	4884 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4885 char packed[sizeof(struct in_addr)];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4886 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4887 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	4888 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4889 }
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4890
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	4891 #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	4892 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	4893 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4894 "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	4895 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4896 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4897 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4898
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4899 retval = inet_pton(af, ip, packed);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4900 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	4901 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4902 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4903 } 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	4904 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4905 "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	4906 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4907 } else if (af == AF_INET) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4908 return PyBytes_FromStringAndSize(packed,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4909 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	4910 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4911 } else if (af == AF_INET6) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4912 return PyBytes_FromStringAndSize(packed,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4913 sizeof(struct in6_addr));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4914 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4915 } else {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4916 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	4917 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4918 }
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4919 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	4920
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4921 PyDoc_STRVAR(inet_ntop_doc,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4922 "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	4923 \n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4924 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	4925
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4926 static PyObject *
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4927 socket_inet_ntop(PyObject self, PyObject args)
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4928 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4929 int af;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4930 char* packed;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4931 int len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4932 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	4933 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4934 char ip[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	4935 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4936 char ip[INET_ADDRSTRLEN + 1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4937 #endif
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 /* 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	4940 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	4941
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4942 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	4943 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4944 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4945
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4946 if (af == AF_INET) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4947 if (len != sizeof(struct in_addr)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4948 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4949 "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	4950 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4951 }
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	4952 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4953 } else if (af == AF_INET6) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4954 if (len != sizeof(struct in6_addr)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4955 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4956 "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	4957 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4958 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4959 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4960 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4961 PyErr_Format(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4962 "unknown address family %d", af);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4963 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4964 }
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 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	4967 if (!retval) {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	4968 PyErr_SetFromErrno(PyExc_OSError);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4969 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4970 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4971 return PyUnicode_FromString(retval);
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
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4974 /* NOTREACHED */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4975 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	4976 return NULL;
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4977 }
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4978
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4979 #endif /* HAVE_INET_PTON */
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4980
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4981 /* 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	4982
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4983 /ARGSUSED/
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4984 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	4985 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	4986 {
70399 9d33770071b2 socket.sendto(): exit directly after setting the error Victor Stinner <victor.stinner@haypocalc.com> parents: 70226 diff changeset	4987 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	4988 "flags", 0};
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4989 struct addrinfo hints, *res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4990 struct addrinfo *res0 = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4991 PyObject *hobj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4992 PyObject pobj = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4993 char pbuf[30];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4994 char hptr, pptr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4995 int family, socktype, protocol, flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4996 int error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4997 PyObject all = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4998 PyObject *idna = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	4999
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5000 family = socktype = protocol = flags = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5001 family = AF_UNSPEC;
70399 9d33770071b2 socket.sendto(): exit directly after setting the error Victor Stinner <victor.stinner@haypocalc.com> parents: 70226 diff changeset	5002 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	5003 kwnames, &hobj, &pobj, &family, &socktype,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5004 &protocol, &flags)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5005 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5006 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5007 if (hobj == Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5008 hptr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5009 } 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	5010 _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	5011
5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 72807 diff changeset	5012 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	5013 if (!idna)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5014 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5015 assert(PyBytes_Check(idna));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5016 hptr = PyBytes_AS_STRING(idna);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5017 } else if (PyBytes_Check(hobj)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5018 hptr = PyBytes_AsString(hobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5019 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5020 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5021 "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	5022 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5023 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5024 if (PyLong_CheckExact(pobj)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5025 long value = PyLong_AsLong(pobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5026 if (value == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5027 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5028 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	5029 pptr = pbuf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5030 } else if (PyUnicode_Check(pobj)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5031 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	5032 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	5033 goto err;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5034 } 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	5035 pptr = PyBytes_AS_STRING(pobj);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5036 } else if (pobj == Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5037 pptr = (char *)NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5038 } else {
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5039 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	5040 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5041 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5042 memset(&hints, 0, sizeof(hints));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5043 hints.ai_family = family;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5044 hints.ai_socktype = socktype;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5045 hints.ai_protocol = protocol;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5046 hints.ai_flags = flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5047 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5048 ACQUIRE_GETADDRINFO_LOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5049 error = getaddrinfo(hptr, pptr, &hints, &res0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5050 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5051 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	5052 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5053 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5054 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5055 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5056
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5057 if ((all = PyList_New(0)) == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5058 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5059 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	5060 PyObject *single;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5061 PyObject *addr =
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5062 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	5063 if (addr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5064 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5065 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	5066 res->ai_socktype, res->ai_protocol,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5067 res->ai_canonname ? res->ai_canonname : "",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5068 addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5069 Py_DECREF(addr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5070 if (single == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5071 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5072
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5073 if (PyList_Append(all, single))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5074 goto err;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5075 Py_XDECREF(single);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5076 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5077 Py_XDECREF(idna);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5078 if (res0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5079 freeaddrinfo(res0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5080 return all;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5081 err:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5082 Py_XDECREF(all);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5083 Py_XDECREF(idna);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5084 if (res0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5085 freeaddrinfo(res0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5086 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	5087 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5088
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	5089 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	5090 "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	5091 -> 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	5092 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	5093 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	5094
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5095 /* 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	5096
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5097 /ARGSUSED/
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5098 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	5099 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	5100 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5101 PyObject sa = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5102 int flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5103 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	5104 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	5105 unsigned int flowinfo, scope_id;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5106 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	5107 struct addrinfo hints, *res = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5108 int error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5109 PyObject ret = (PyObject )NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5110
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5111 flags = flowinfo = scope_id = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5112 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	5113 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5114 if (!PyTuple_Check(sa)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5115 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5116 "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	5117 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5118 }
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	5119 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	5120 &hostp, &port, &flowinfo, &scope_id))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5121 return NULL;
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	5122 if (flowinfo < 0 \|\| flowinfo > 0xfffff) {
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	5123 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	5124 "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	5125 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	5126 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5127 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	5128 memset(&hints, 0, sizeof(hints));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5129 hints.ai_family = AF_UNSPEC;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5130 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	5131 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	5132 Py_BEGIN_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5133 ACQUIRE_GETADDRINFO_LOCK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5134 error = getaddrinfo(hostp, pbuf, &hints, &res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5135 Py_END_ALLOW_THREADS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5136 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	5137 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5138 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5139 goto fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5140 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5141 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	5142 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5143 "sockaddr resolved to multiple addresses");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5144 goto fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5145 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5146 switch (res->ai_family) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5147 case AF_INET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5148 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5149 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	5150 PyErr_SetString(PyExc_OSError,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5151 "IPv4 sockaddr must be 2 tuple");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5152 goto fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5153 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5154 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5155 }
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	5156 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5157 case AF_INET6:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5158 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5159 struct sockaddr_in6 *sin6;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5160 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	5161 sin6->sin6_flowinfo = htonl(flowinfo);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5162 sin6->sin6_scope_id = scope_id;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5163 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5164 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5165 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5166 }
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	5167 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	5168 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	5169 if (error) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5170 set_gaierror(error);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5171 goto fail;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5172 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5173 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	5174
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5175 fail:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5176 if (res)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5177 freeaddrinfo(res);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5178 return ret;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5179 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5180
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	5181 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	5182 "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	5183 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	5184 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	5185
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5186
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5187 /* 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	5188
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5189 static PyObject *
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5190 socket_getdefaulttimeout(PyObject *self)
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5191 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5192 if (defaulttimeout < 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5193 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5194 return Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5195 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5196 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5197 return PyFloat_FromDouble(defaulttimeout);
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5198 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5199
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5200 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	5201 "getdefaulttimeout() -> timeout\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5202 \n\
71864 ab3432a81c26 #12725: fix working. Patch by Ben Hayden. Ezio Melotti <ezio.melotti@gmail.com> parents: 70012 diff changeset	5203 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	5204 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	5205 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	5206
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5207 static PyObject *
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5208 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	5209 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5210 double timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5211
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5212 if (arg == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5213 timeout = -1.0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5214 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5215 timeout = PyFloat_AsDouble(arg);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5216 if (timeout < 0.0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5217 if (!PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5218 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5219 "Timeout value out of range");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5220 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5221 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5222 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5223
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5224 defaulttimeout = timeout;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5225
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5226 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5227 return Py_None;
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5228 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5229
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5230 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	5231 "setdefaulttimeout(timeout)\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5232 \n\
71864 ab3432a81c26 #12725: fix working. Patch by Ben Hayden. Ezio Melotti <ezio.melotti@gmail.com> parents: 70012 diff changeset	5233 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	5234 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	5235 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	5236
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5237 #ifdef HAVE_IF_NAMEINDEX
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5238 /* 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	5239
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5240 static PyObject *
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5241 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	5242 {
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5243 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	5244 int i;
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5245 struct if_nameindex *ni;
70399 9d33770071b2 socket.sendto(): exit directly after setting the error Victor Stinner <victor.stinner@haypocalc.com> parents: 70226 diff changeset	5246
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5247 ni = if_nameindex();
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5248 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	5249 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	5250 return NULL;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5251 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5252
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5253 list = PyList_New(0);
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5254 if (list == NULL) {
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5255 if_freenameindex(ni);
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5256 return NULL;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5257 }
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 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	5260 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	5261 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	5262
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5263 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	5264 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	5265 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	5266 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	5267 return NULL;
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5268 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5269 Py_DECREF(ni_tuple);
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5270 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5271
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5272 if_freenameindex(ni);
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5273 return list;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5274 }
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 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	5277 "if_nameindex()\n\
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5278 \n\
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5279 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	5280
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5281 static PyObject *
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5282 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	5283 {
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5284 PyObject *oname;
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5285 unsigned long index;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5286
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5287 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	5288 PyUnicode_FSConverter, &oname))
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5289 return NULL;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5290
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5291 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	5292 Py_DECREF(oname);
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5293 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	5294 /* 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	5295 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	5296 return NULL;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5297 }
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 return PyLong_FromUnsignedLong(index);
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5300 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5301
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5302 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	5303 "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	5304 \n\
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5305 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	5306
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5307 static PyObject *
70136 c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5308 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	5309 {
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5310 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	5311 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	5312
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5313 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	5314 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	5315 return NULL;
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5316
cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5317 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	5318 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	5319 return NULL;
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5320 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5321
70226 cc60d0283fad Issue #1746656: make if_nameindex(), if_indextoname() and if_nametoindex() Charles-François Natali <neologix@free.fr> parents: 70151 diff changeset	5322 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	5323 }
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5324
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5325 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	5326 "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	5327 \n\
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5328 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	5329
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5330 #endif /* HAVE_IF_NAMEINDEX */
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5331
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5332
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	5333 #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	5334 /* 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	5335
c64216addd7f Add support for the send/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 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	5337 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	5338 {
c64216addd7f Add support for the send/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 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	5340 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	5341
c64216addd7f Add support for the send/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 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	5343 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	5344 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	5345 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	5346 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	5347 }
c64216addd7f Add support for the send/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 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	5349 }
c64216addd7f Add support for the send/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
c64216addd7f Add support for the send/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 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	5352 "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	5353 \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	5354 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	5355 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	5356 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	5357 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	5358 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	5359 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	5360 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	5361
c64216addd7f Add support for the send/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
c64216addd7f Add support for the send/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 #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	5364 /* 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	5365
c64216addd7f Add support for the send/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 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	5367 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	5368 {
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5369 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	5370 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	5371
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5372 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	5373 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	5374 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	5375 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	5376 "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	5377 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	5378 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5379 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	5380 }
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5381
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5382 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	5383 "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	5384 \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	5385 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	5386 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	5387 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	5388 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	5389 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	5390 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	5391 #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	5392 #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	5393
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	5394
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	5395 /* 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	5396
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5397 static PyMethodDef socket_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5398 {"gethostbyname", socket_gethostbyname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5399 METH_VARARGS, gethostbyname_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5400 {"gethostbyname_ex", socket_gethostbyname_ex,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5401 METH_VARARGS, ghbn_ex_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5402 {"gethostbyaddr", socket_gethostbyaddr,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5403 METH_VARARGS, gethostbyaddr_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5404 {"gethostname", socket_gethostname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5405 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	5406 #ifdef HAVE_SETHOSTNAME
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	5407 {"sethostname", socket_sethostname,
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	5408 METH_VARARGS, sethostname_doc},
a2d61117c2d2 Issue #10866: Add socket.sethostname(). Initial patch by Ross Lagerwall. Antoine Pitrou <solipsis@pitrou.net> parents: 68102 diff changeset	5409 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5410 {"getservbyname", socket_getservbyname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5411 METH_VARARGS, getservbyname_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5412 {"getservbyport", socket_getservbyport,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5413 METH_VARARGS, getservbyport_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5414 {"getprotobyname", socket_getprotobyname,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5415 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	5416 #ifndef NO_DUP
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5417 {"dup", socket_dup,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5418 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	5419 #endif
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	5420 #ifdef HAVE_SOCKETPAIR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5421 {"socketpair", socket_socketpair,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5422 METH_VARARGS, socketpair_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5423 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5424 {"ntohs", socket_ntohs,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5425 METH_VARARGS, ntohs_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5426 {"ntohl", socket_ntohl,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5427 METH_O, ntohl_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5428 {"htons", socket_htons,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5429 METH_VARARGS, htons_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5430 {"htonl", socket_htonl,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5431 METH_O, htonl_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5432 {"inet_aton", socket_inet_aton,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5433 METH_VARARGS, inet_aton_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5434 {"inet_ntoa", socket_inet_ntoa,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5435 METH_VARARGS, inet_ntoa_doc},
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	5436 #ifdef HAVE_INET_PTON
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5437 {"inet_pton", socket_inet_pton,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5438 METH_VARARGS, inet_pton_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5439 {"inet_ntop", socket_inet_ntop,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5440 METH_VARARGS, inet_ntop_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5441 #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	5442 {"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	5443 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	5444 {"getnameinfo", socket_getnameinfo,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5445 METH_VARARGS, getnameinfo_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5446 {"getdefaulttimeout", (PyCFunction)socket_getdefaulttimeout,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5447 METH_NOARGS, getdefaulttimeout_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5448 {"setdefaulttimeout", socket_setdefaulttimeout,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5449 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	5450 #ifdef HAVE_IF_NAMEINDEX
c2515cb23d9b Issue #1746656: Add if_nameindex, if_nametoindex, if_indextoname Gregory P. Smith <greg@krypto.org> parents: 70013 diff changeset	5451 {"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	5452 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	5453 {"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	5454 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	5455 {"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	5456 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	5457 #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	5458 #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	5459 {"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	5460 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	5461 #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	5462 {"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	5463 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	5464 #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	5465 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5466 {NULL, NULL} /* Sentinel */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5467 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5468
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	5469
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	5470 #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	5471 #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	5472
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5473 /* 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	5474
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	5475 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	5476 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	5477 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5478 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	5479 }
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	5480
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 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	5482 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	5483 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5484 WSADATA WSAData;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5485 int ret;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5486 ret = WSAStartup(0x0101, &WSAData);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5487 switch (ret) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5488 case 0: /* No error */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5489 Py_AtExit(os_cleanup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5490 return 1; /* Success */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5491 case WSASYSNOTREADY:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5492 PyErr_SetString(PyExc_ImportError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5493 "WSAStartup failed: network not ready");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5494 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5495 case WSAVERNOTSUPPORTED:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5496 case WSAEINVAL:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5497 PyErr_SetString(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5498 PyExc_ImportError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5499 "WSAStartup failed: requested version not supported");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5500 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5501 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5502 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	5503 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5504 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5505 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	5506 }
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	5507
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	5508 #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	5509
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5510
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5511 #ifdef PYOS_OS2
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5512 #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	5513
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5514 /* Additional initialization for OS/2 */
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	5515
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	5516 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	5517 os_init(void)
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	5518 {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5519 #ifndef PYCC_GCC
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5520 int rc = sock_init();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5521
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5522 if (rc == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5523 return 1; /* Success */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5524 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5525
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5526 PyErr_Format(PyExc_ImportError, "OS/2 TCP/IP Error# %d", sock_errno());
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5527
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5528 return 0; /* Failure */
22115 d104bb50a194 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22096 diff changeset	5529 #else
68585 bf94b6a73fc8 #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 65668 diff changeset	5530 /* No need to initialize sockets with GCC/EMX */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5531 return 1; /* Success */
22115 d104bb50a194 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22096 diff changeset	5532 #endif
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	5533 }
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	5534
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	5535 #endif /* PYOS_OS2 */
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	5536
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5537
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5538 #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	5539 static int
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5540 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	5541 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5542 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	5543 }
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5544 #endif
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5545
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5546
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	5547 /* 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	5548 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	5549 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	5550 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	5551 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5552 &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	5553 NULL,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5554 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	5555 };
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	5556
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5557
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5558 /* 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	5559
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5560 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	5561 "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	5562 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	5563 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	5564 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	5565 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	5566 */
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5567
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	5568 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	5569 "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	5570 \n\
980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	5571 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	5572
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	5573 static struct PyModuleDef socketmodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5574 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5575 PySocket_MODULE_NAME,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5576 socket_doc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5577 -1,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5578 socket_methods,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5579 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5580 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5581 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5582 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	5583 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	5584
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24411 diff changeset	5585 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	5586 PyInit__socket(void)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5587 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5588 PyObject m, has_ipv6;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5589
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5590 if (!os_init())
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 Py_TYPE(&sock_type) = &PyType_Type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5594 m = PyModule_Create(&socketmodule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5595 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5596 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5597
72879 41a1de81ef2b PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy. Antoine Pitrou <solipsis@pitrou.net> parents: 72835 diff changeset	5598 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	5599 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	5600 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	5601 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	5602 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	5603 PyExc_OSError, NULL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5604 if (socket_herror == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5605 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5606 Py_INCREF(socket_herror);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5607 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	5608 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	5609 NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5610 if (socket_gaierror == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5611 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5612 Py_INCREF(socket_gaierror);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5613 PyModule_AddObject(m, "gaierror", socket_gaierror);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5614 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	5615 PyExc_OSError, NULL);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5616 if (socket_timeout == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5617 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	5618 PySocketModuleAPI.timeout_error = socket_timeout;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5619 Py_INCREF(socket_timeout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5620 PyModule_AddObject(m, "timeout", socket_timeout);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5621 Py_INCREF((PyObject *)&sock_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5622 if (PyModule_AddObject(m, "SocketType",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5623 (PyObject *)&sock_type) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5624 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5625 Py_INCREF((PyObject *)&sock_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5626 if (PyModule_AddObject(m, "socket",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5627 (PyObject *)&sock_type) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5628 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	5629
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	5630 #ifdef ENABLE_IPV6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5631 has_ipv6 = Py_True;
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	5632 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5633 has_ipv6 = Py_False;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5634 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5635 Py_INCREF(has_ipv6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5636 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	5637
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5638 /* Export C API */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5639 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	5640 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	5641 ) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5642 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5643
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5644 /* 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	5645 #ifdef AF_UNSPEC
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5646 PyModule_AddIntConstant(m, "AF_UNSPEC", AF_UNSPEC);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5647 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5648 PyModule_AddIntConstant(m, "AF_INET", AF_INET);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5649 #ifdef AF_INET6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5650 PyModule_AddIntConstant(m, "AF_INET6", AF_INET6);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5651 #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	5652 #if defined(AF_UNIX)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5653 PyModule_AddIntConstant(m, "AF_UNIX", AF_UNIX);
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	5654 #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	5655 #ifdef AF_AX25
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5656 /* Amateur Radio AX.25 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5657 PyModule_AddIntConstant(m, "AF_AX25", 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	5658 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5659 #ifdef AF_IPX
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5660 PyModule_AddIntConstant(m, "AF_IPX", 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	5661 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5662 #ifdef AF_APPLETALK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5663 /* Appletalk DDP */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5664 PyModule_AddIntConstant(m, "AF_APPLETALK", 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	5665 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5666 #ifdef AF_NETROM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5667 /* Amateur radio NetROM */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5668 PyModule_AddIntConstant(m, "AF_NETROM", 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	5669 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5670 #ifdef AF_BRIDGE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5671 /* Multiprotocol bridge */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5672 PyModule_AddIntConstant(m, "AF_BRIDGE", 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	5673 #endif
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5674 #ifdef AF_ATMPVC
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5675 /* ATM PVCs */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5676 PyModule_AddIntConstant(m, "AF_ATMPVC", AF_ATMPVC);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5677 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5678 #ifdef AF_AAL5
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5679 /* Reserved for Werner's ATM */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5680 PyModule_AddIntConstant(m, "AF_AAL5", 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	5681 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5682 #ifdef AF_X25
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5683 /* Reserved for X.25 project */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5684 PyModule_AddIntConstant(m, "AF_X25", 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	5685 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5686 #ifdef AF_INET6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5687 PyModule_AddIntConstant(m, "AF_INET6", 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	5688 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5689 #ifdef AF_ROSE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5690 /* Amateur Radio X.25 PLP */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5691 PyModule_AddIntConstant(m, "AF_ROSE", 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	5692 #endif
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5693 #ifdef AF_DECnet
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5694 /* Reserved for DECnet project */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5695 PyModule_AddIntConstant(m, "AF_DECnet", AF_DECnet);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5696 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5697 #ifdef AF_NETBEUI
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5698 /* Reserved for 802.2LLC project */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5699 PyModule_AddIntConstant(m, "AF_NETBEUI", AF_NETBEUI);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5700 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5701 #ifdef AF_SECURITY
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5702 /* Security callback pseudo AF */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5703 PyModule_AddIntConstant(m, "AF_SECURITY", AF_SECURITY);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5704 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5705 #ifdef AF_KEY
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5706 /* PF_KEY key management API */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5707 PyModule_AddIntConstant(m, "AF_KEY", AF_KEY);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5708 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5709 #ifdef AF_NETLINK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5710 /* */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5711 PyModule_AddIntConstant(m, "AF_NETLINK", AF_NETLINK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5712 PyModule_AddIntConstant(m, "NETLINK_ROUTE", 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	5713 #ifdef NETLINK_SKIP
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5714 PyModule_AddIntConstant(m, "NETLINK_SKIP", 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	5715 #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	5716 #ifdef NETLINK_W1
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5717 PyModule_AddIntConstant(m, "NETLINK_W1", NETLINK_W1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5718 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5719 PyModule_AddIntConstant(m, "NETLINK_USERSOCK", NETLINK_USERSOCK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5720 PyModule_AddIntConstant(m, "NETLINK_FIREWALL", 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	5721 #ifdef NETLINK_TCPDIAG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5722 PyModule_AddIntConstant(m, "NETLINK_TCPDIAG", 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	5723 #endif
4d988dda6478 NETLINK_TCPDIAG and NETLINK_NFLOG aren't defined on older Linux Guido van Rossum <guido@python.org> parents: 36610 diff changeset	5724 #ifdef NETLINK_NFLOG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5725 PyModule_AddIntConstant(m, "NETLINK_NFLOG", 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	5726 #endif
36298 9eeaa33f9640 Get socketmodule to build after adding netlink support. Neal Norwitz <nnorwitz@gmail.com> parents: 36289 diff changeset	5727 #ifdef NETLINK_XFRM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5728 PyModule_AddIntConstant(m, "NETLINK_XFRM", NETLINK_XFRM);
36298 9eeaa33f9640 Get socketmodule to build after adding netlink support. Neal Norwitz <nnorwitz@gmail.com> parents: 36289 diff changeset	5729 #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	5730 #ifdef NETLINK_ARPD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5731 PyModule_AddIntConstant(m, "NETLINK_ARPD", 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	5732 #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	5733 #ifdef NETLINK_ROUTE6
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5734 PyModule_AddIntConstant(m, "NETLINK_ROUTE6", NETLINK_ROUTE6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5735 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5736 PyModule_AddIntConstant(m, "NETLINK_IP6_FW", NETLINK_IP6_FW);
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	5737 #ifdef NETLINK_DNRTMSG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5738 PyModule_AddIntConstant(m, "NETLINK_DNRTMSG", 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	5739 #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	5740 #ifdef NETLINK_TAPBASE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5741 PyModule_AddIntConstant(m, "NETLINK_TAPBASE", NETLINK_TAPBASE);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5742 #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	5743 #endif /* AF_NETLINK */
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5744 #ifdef AF_ROUTE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5745 /* Alias to emulate 4.4BSD */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5746 PyModule_AddIntConstant(m, "AF_ROUTE", AF_ROUTE);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5747 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5748 #ifdef AF_ASH
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5749 /* Ash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5750 PyModule_AddIntConstant(m, "AF_ASH", AF_ASH);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5751 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5752 #ifdef AF_ECONET
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5753 /* Acorn Econet */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5754 PyModule_AddIntConstant(m, "AF_ECONET", AF_ECONET);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5755 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5756 #ifdef AF_ATMSVC
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5757 /* ATM SVCs */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5758 PyModule_AddIntConstant(m, "AF_ATMSVC", AF_ATMSVC);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5759 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5760 #ifdef AF_SNA
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5761 /* Linux SNA Project (nutters!) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5762 PyModule_AddIntConstant(m, "AF_SNA", AF_SNA);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5763 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5764 #ifdef AF_IRDA
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5765 /* IRDA sockets */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5766 PyModule_AddIntConstant(m, "AF_IRDA", AF_IRDA);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5767 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5768 #ifdef AF_PPPOX
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5769 /* PPPoX sockets */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5770 PyModule_AddIntConstant(m, "AF_PPPOX", AF_PPPOX);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5771 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5772 #ifdef AF_WANPIPE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5773 /* Wanpipe API Sockets */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5774 PyModule_AddIntConstant(m, "AF_WANPIPE", AF_WANPIPE);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5775 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5776 #ifdef AF_LLC
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5777 /* Linux LLC */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5778 PyModule_AddIntConstant(m, "AF_LLC", AF_LLC);
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	5779 #endif
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	5780
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	5781 #ifdef USE_BLUETOOTH
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5782 PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5783 PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5784 PyModule_AddIntConstant(m, "BTPROTO_HCI", BTPROTO_HCI);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5785 PyModule_AddIntConstant(m, "SOL_HCI", SOL_HCI);
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	5786 #if !defined(__NetBSD__) && !defined(__DragonFly__)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5787 PyModule_AddIntConstant(m, "HCI_FILTER", HCI_FILTER);
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	5788 #endif
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	5789 #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	5790 #if !defined(__NetBSD__) && !defined(__DragonFly__)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5791 PyModule_AddIntConstant(m, "HCI_TIME_STAMP", HCI_TIME_STAMP);
65429 15859740aae6 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65245 diff changeset	5792 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5793 PyModule_AddIntConstant(m, "HCI_DATA_DIR", HCI_DATA_DIR);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5794 PyModule_AddIntConstant(m, "BTPROTO_SCO", BTPROTO_SCO);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5795 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5796 PyModule_AddIntConstant(m, "BTPROTO_RFCOMM", BTPROTO_RFCOMM);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5797 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	5798 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	5799 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	5800
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	5801 #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	5802 /* Controller Area Network */
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	5803 PyModule_AddIntConstant(m, "AF_CAN", 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	5804 #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	5805 #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	5806 /* Controller Area Network */
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	5807 PyModule_AddIntConstant(m, "PF_CAN", 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	5808 #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	5809
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5810 /* 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	5811 #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	5812 PyModule_AddIntConstant(m, "AF_RDS", AF_RDS);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5813 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5814 #ifdef PF_RDS
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5815 PyModule_AddIntConstant(m, "PF_RDS", PF_RDS);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5816 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	5817
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5818 /* 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	5819 #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	5820 PyModule_AddIntConstant(m, "PF_SYSTEM", PF_SYSTEM);
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5821 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5822 #ifdef AF_SYSTEM
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5823 PyModule_AddIntConstant(m, "AF_SYSTEM", AF_SYSTEM);
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5824 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	5825
65668 add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5826 #ifdef AF_PACKET
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5827 PyModule_AddIntMacro(m, AF_PACKET);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5828 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5829 #ifdef PF_PACKET
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5830 PyModule_AddIntMacro(m, PF_PACKET);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5831 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5832 #ifdef PACKET_HOST
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5833 PyModule_AddIntMacro(m, PACKET_HOST);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5834 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5835 #ifdef PACKET_BROADCAST
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5836 PyModule_AddIntMacro(m, PACKET_BROADCAST);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5837 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5838 #ifdef PACKET_MULTICAST
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5839 PyModule_AddIntMacro(m, PACKET_MULTICAST);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5840 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5841 #ifdef PACKET_OTHERHOST
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5842 PyModule_AddIntMacro(m, PACKET_OTHERHOST);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5843 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5844 #ifdef PACKET_OUTGOING
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5845 PyModule_AddIntMacro(m, PACKET_OUTGOING);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5846 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5847 #ifdef PACKET_LOOPBACK
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5848 PyModule_AddIntMacro(m, PACKET_LOOPBACK);
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5849 #endif
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5850 #ifdef PACKET_FASTROUTE
add1bc05e426 Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65429 diff changeset	5851 PyModule_AddIntMacro(m, PACKET_FASTROUTE);
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	5852 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	5853
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	5854 #ifdef HAVE_LINUX_TIPC_H
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5855 PyModule_AddIntConstant(m, "AF_TIPC", AF_TIPC);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5856
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5857 /* for addresses */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5858 PyModule_AddIntConstant(m, "TIPC_ADDR_NAMESEQ", TIPC_ADDR_NAMESEQ);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5859 PyModule_AddIntConstant(m, "TIPC_ADDR_NAME", TIPC_ADDR_NAME);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5860 PyModule_AddIntConstant(m, "TIPC_ADDR_ID", TIPC_ADDR_ID);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5861
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5862 PyModule_AddIntConstant(m, "TIPC_ZONE_SCOPE", TIPC_ZONE_SCOPE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5863 PyModule_AddIntConstant(m, "TIPC_CLUSTER_SCOPE", TIPC_CLUSTER_SCOPE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5864 PyModule_AddIntConstant(m, "TIPC_NODE_SCOPE", TIPC_NODE_SCOPE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5865
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5866 /* for setsockopt() */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5867 PyModule_AddIntConstant(m, "SOL_TIPC", SOL_TIPC);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5868 PyModule_AddIntConstant(m, "TIPC_IMPORTANCE", TIPC_IMPORTANCE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5869 PyModule_AddIntConstant(m, "TIPC_SRC_DROPPABLE", TIPC_SRC_DROPPABLE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5870 PyModule_AddIntConstant(m, "TIPC_DEST_DROPPABLE",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5871 TIPC_DEST_DROPPABLE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5872 PyModule_AddIntConstant(m, "TIPC_CONN_TIMEOUT", TIPC_CONN_TIMEOUT);
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 PyModule_AddIntConstant(m, "TIPC_LOW_IMPORTANCE",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5875 TIPC_LOW_IMPORTANCE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5876 PyModule_AddIntConstant(m, "TIPC_MEDIUM_IMPORTANCE",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5877 TIPC_MEDIUM_IMPORTANCE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5878 PyModule_AddIntConstant(m, "TIPC_HIGH_IMPORTANCE",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5879 TIPC_HIGH_IMPORTANCE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5880 PyModule_AddIntConstant(m, "TIPC_CRITICAL_IMPORTANCE",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5881 TIPC_CRITICAL_IMPORTANCE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5882
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5883 /* for subscriptions */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5884 PyModule_AddIntConstant(m, "TIPC_SUB_PORTS", TIPC_SUB_PORTS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5885 PyModule_AddIntConstant(m, "TIPC_SUB_SERVICE", TIPC_SUB_SERVICE);
44643 d8e4342c145e Merged revisions 59883-59920 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44568 diff changeset	5886 #ifdef TIPC_SUB_CANCEL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5887 /* doesn't seem to be available everywhere */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5888 PyModule_AddIntConstant(m, "TIPC_SUB_CANCEL", TIPC_SUB_CANCEL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5889 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5890 PyModule_AddIntConstant(m, "TIPC_WAIT_FOREVER", TIPC_WAIT_FOREVER);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5891 PyModule_AddIntConstant(m, "TIPC_PUBLISHED", TIPC_PUBLISHED);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5892 PyModule_AddIntConstant(m, "TIPC_WITHDRAWN", TIPC_WITHDRAWN);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5893 PyModule_AddIntConstant(m, "TIPC_SUBSCR_TIMEOUT", TIPC_SUBSCR_TIMEOUT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5894 PyModule_AddIntConstant(m, "TIPC_CFG_SRV", TIPC_CFG_SRV);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5895 PyModule_AddIntConstant(m, "TIPC_TOP_SRV", TIPC_TOP_SRV);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5896 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5897
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5898 /* Socket types */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5899 PyModule_AddIntConstant(m, "SOCK_STREAM", SOCK_STREAM);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5900 PyModule_AddIntConstant(m, "SOCK_DGRAM", SOCK_DGRAM);
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	5901 /* We have incomplete socket support. */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5902 PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5903 PyModule_AddIntConstant(m, "SOCK_SEQPACKET", 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	5904 #if defined(SOCK_RDM)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5905 PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5906 #endif
65314 12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	5907 #ifdef SOCK_CLOEXEC
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	5908 PyModule_AddIntConstant(m, "SOCK_CLOEXEC", SOCK_CLOEXEC);
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	5909 #endif
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	5910 #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	5911 PyModule_AddIntConstant(m, "SOCK_NONBLOCK", SOCK_NONBLOCK);
12442ac3f7dd Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, Antoine Pitrou <solipsis@pitrou.net> parents: 65243 diff changeset	5912 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5913
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5914 #ifdef SO_DEBUG
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5915 PyModule_AddIntConstant(m, "SO_DEBUG", SO_DEBUG);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5916 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5917 #ifdef SO_ACCEPTCONN
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5918 PyModule_AddIntConstant(m, "SO_ACCEPTCONN", SO_ACCEPTCONN);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5919 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5920 #ifdef SO_REUSEADDR
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5921 PyModule_AddIntConstant(m, "SO_REUSEADDR", SO_REUSEADDR);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	5922 #endif
32578 21fd6e62cd27 [Patch #982665 ] add SO_EXCLUSIVEADDRUSE constant Andrew M. Kuchling <amk@amk.ca> parents: 32521 diff changeset	5923 #ifdef SO_EXCLUSIVEADDRUSE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5924 PyModule_AddIntConstant(m, "SO_EXCLUSIVEADDRUSE", SO_EXCLUSIVEADDRUSE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5925 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5926
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5927 #ifdef SO_KEEPALIVE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5928 PyModule_AddIntConstant(m, "SO_KEEPALIVE", SO_KEEPALIVE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5929 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5930 #ifdef SO_DONTROUTE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5931 PyModule_AddIntConstant(m, "SO_DONTROUTE", SO_DONTROUTE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5932 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5933 #ifdef SO_BROADCAST
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5934 PyModule_AddIntConstant(m, "SO_BROADCAST", SO_BROADCAST);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5935 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5936 #ifdef SO_USELOOPBACK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5937 PyModule_AddIntConstant(m, "SO_USELOOPBACK", SO_USELOOPBACK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5938 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5939 #ifdef SO_LINGER
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5940 PyModule_AddIntConstant(m, "SO_LINGER", SO_LINGER);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5941 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5942 #ifdef SO_OOBINLINE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5943 PyModule_AddIntConstant(m, "SO_OOBINLINE", SO_OOBINLINE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5944 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5945 #ifdef SO_REUSEPORT
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5946 PyModule_AddIntConstant(m, "SO_REUSEPORT", SO_REUSEPORT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5947 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5948 #ifdef SO_SNDBUF
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5949 PyModule_AddIntConstant(m, "SO_SNDBUF", SO_SNDBUF);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5950 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5951 #ifdef SO_RCVBUF
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5952 PyModule_AddIntConstant(m, "SO_RCVBUF", SO_RCVBUF);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5953 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5954 #ifdef SO_SNDLOWAT
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5955 PyModule_AddIntConstant(m, "SO_SNDLOWAT", SO_SNDLOWAT);
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 SO_RCVLOWAT
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5958 PyModule_AddIntConstant(m, "SO_RCVLOWAT", SO_RCVLOWAT);
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 SO_SNDTIMEO
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5961 PyModule_AddIntConstant(m, "SO_SNDTIMEO", SO_SNDTIMEO);
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 SO_RCVTIMEO
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5964 PyModule_AddIntConstant(m, "SO_RCVTIMEO", SO_RCVTIMEO);
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 SO_ERROR
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5967 PyModule_AddIntConstant(m, "SO_ERROR", SO_ERROR);
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 SO_TYPE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5970 PyModule_AddIntConstant(m, "SO_TYPE", SO_TYPE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5971 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5972 #ifdef SO_SETFIB
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5973 PyModule_AddIntConstant(m, "SO_SETFIB", SO_SETFIB);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5974 #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	5975 #ifdef SO_PASSCRED
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5976 PyModule_AddIntConstant(m, "SO_PASSCRED", SO_PASSCRED);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5977 #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	5978 #ifdef SO_PEERCRED
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5979 PyModule_AddIntConstant(m, "SO_PEERCRED", SO_PEERCRED);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5980 #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	5981 #ifdef LOCAL_PEERCRED
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5982 PyModule_AddIntConstant(m, "LOCAL_PEERCRED", LOCAL_PEERCRED);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	5983 #endif
73128 6159311f0f44 Issue #12619: Expose socket.SO_BINDTODEVICE constant Victor Stinner <victor.stinner@haypocalc.com> parents: 72925 diff changeset	5984 #ifdef SO_BINDTODEVICE
6159311f0f44 Issue #12619: Expose socket.SO_BINDTODEVICE constant Victor Stinner <victor.stinner@haypocalc.com> parents: 72925 diff changeset	5985 PyModule_AddIntMacro(m, SO_BINDTODEVICE);
6159311f0f44 Issue #12619: Expose socket.SO_BINDTODEVICE constant Victor Stinner <victor.stinner@haypocalc.com> parents: 72925 diff changeset	5986 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5987
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5988 /* Maximum number of connections for "listen" */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5989 #ifdef SOMAXCONN
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5990 PyModule_AddIntConstant(m, "SOMAXCONN", SOMAXCONN);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	5991 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5992 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	5993 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	5994
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 /* 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	5996 #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	5997 PyModule_AddIntConstant(m, "SCM_RIGHTS", 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	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 SCM_CREDENTIALS
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6000 PyModule_AddIntConstant(m, "SCM_CREDENTIALS", SCM_CREDENTIALS);
c64216addd7f Add support for the send/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 SCM_CREDS
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6003 PyModule_AddIntConstant(m, "SCM_CREDS", SCM_CREDS);
c64216addd7f Add support for the send/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
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6006 /* Flags for send, recv */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6007 #ifdef MSG_OOB
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6008 PyModule_AddIntConstant(m, "MSG_OOB", MSG_OOB);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6009 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6010 #ifdef MSG_PEEK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6011 PyModule_AddIntConstant(m, "MSG_PEEK", MSG_PEEK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6012 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6013 #ifdef MSG_DONTROUTE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6014 PyModule_AddIntConstant(m, "MSG_DONTROUTE", MSG_DONTROUTE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6015 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6016 #ifdef MSG_DONTWAIT
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6017 PyModule_AddIntConstant(m, "MSG_DONTWAIT", MSG_DONTWAIT);
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 MSG_EOR
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6020 PyModule_AddIntConstant(m, "MSG_EOR", MSG_EOR);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6021 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6022 #ifdef MSG_TRUNC
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6023 PyModule_AddIntConstant(m, "MSG_TRUNC", MSG_TRUNC);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6024 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6025 #ifdef MSG_CTRUNC
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6026 PyModule_AddIntConstant(m, "MSG_CTRUNC", MSG_CTRUNC);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6027 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6028 #ifdef MSG_WAITALL
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6029 PyModule_AddIntConstant(m, "MSG_WAITALL", MSG_WAITALL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6030 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6031 #ifdef MSG_BTAG
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6032 PyModule_AddIntConstant(m, "MSG_BTAG", MSG_BTAG);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6033 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6034 #ifdef MSG_ETAG
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6035 PyModule_AddIntConstant(m, "MSG_ETAG", MSG_ETAG);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6036 #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	6037 #ifdef MSG_NOSIGNAL
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6038 PyModule_AddIntConstant(m, "MSG_NOSIGNAL", MSG_NOSIGNAL);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6039 #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	6040 #ifdef MSG_NOTIFICATION
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6041 PyModule_AddIntConstant(m, "MSG_NOTIFICATION", MSG_NOTIFICATION);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6042 #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	6043 #ifdef MSG_CMSG_CLOEXEC
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6044 PyModule_AddIntConstant(m, "MSG_CMSG_CLOEXEC", MSG_CMSG_CLOEXEC);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6045 #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	6046 #ifdef MSG_ERRQUEUE
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6047 PyModule_AddIntConstant(m, "MSG_ERRQUEUE", MSG_ERRQUEUE);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6048 #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	6049 #ifdef MSG_CONFIRM
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6050 PyModule_AddIntConstant(m, "MSG_CONFIRM", MSG_CONFIRM);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6051 #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	6052 #ifdef MSG_MORE
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6053 PyModule_AddIntConstant(m, "MSG_MORE", MSG_MORE);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6054 #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	6055 #ifdef MSG_EOF
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6056 PyModule_AddIntConstant(m, "MSG_EOF", MSG_EOF);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6057 #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	6058 #ifdef MSG_BCAST
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6059 PyModule_AddIntConstant(m, "MSG_BCAST", MSG_BCAST);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6060 #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	6061 #ifdef MSG_MCAST
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6062 PyModule_AddIntConstant(m, "MSG_MCAST", MSG_MCAST);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6063 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6064
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6065 /* 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	6066 #ifdef SOL_SOCKET
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6067 PyModule_AddIntConstant(m, "SOL_SOCKET", SOL_SOCKET);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6068 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6069 #ifdef SOL_IP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6070 PyModule_AddIntConstant(m, "SOL_IP", 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	6071 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6072 PyModule_AddIntConstant(m, "SOL_IP", 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6073 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6074 #ifdef SOL_IPX
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6075 PyModule_AddIntConstant(m, "SOL_IPX", SOL_IPX);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6076 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6077 #ifdef SOL_AX25
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6078 PyModule_AddIntConstant(m, "SOL_AX25", SOL_AX25);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6079 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6080 #ifdef SOL_ATALK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6081 PyModule_AddIntConstant(m, "SOL_ATALK", SOL_ATALK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6082 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6083 #ifdef SOL_NETROM
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6084 PyModule_AddIntConstant(m, "SOL_NETROM", SOL_NETROM);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6085 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6086 #ifdef SOL_ROSE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6087 PyModule_AddIntConstant(m, "SOL_ROSE", SOL_ROSE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6088 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6089 #ifdef SOL_TCP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6090 PyModule_AddIntConstant(m, "SOL_TCP", 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	6091 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6092 PyModule_AddIntConstant(m, "SOL_TCP", 6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6093 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6094 #ifdef SOL_UDP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6095 PyModule_AddIntConstant(m, "SOL_UDP", 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	6096 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6097 PyModule_AddIntConstant(m, "SOL_UDP", 17);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6098 #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	6099 #ifdef SOL_CAN_BASE
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6100 PyModule_AddIntConstant(m, "SOL_CAN_BASE", SOL_CAN_BASE);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6101 #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	6102 #ifdef SOL_CAN_RAW
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6103 PyModule_AddIntConstant(m, "SOL_CAN_RAW", SOL_CAN_RAW);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6104 PyModule_AddIntConstant(m, "CAN_RAW", CAN_RAW);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6105 #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	6106 #ifdef HAVE_LINUX_CAN_H
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6107 PyModule_AddIntConstant(m, "CAN_EFF_FLAG", CAN_EFF_FLAG);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6108 PyModule_AddIntConstant(m, "CAN_RTR_FLAG", CAN_RTR_FLAG);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6109 PyModule_AddIntConstant(m, "CAN_ERR_FLAG", CAN_ERR_FLAG);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6110
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6111 PyModule_AddIntConstant(m, "CAN_SFF_MASK", CAN_SFF_MASK);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6112 PyModule_AddIntConstant(m, "CAN_EFF_MASK", CAN_EFF_MASK);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6113 PyModule_AddIntConstant(m, "CAN_ERR_MASK", CAN_ERR_MASK);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6114 #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	6115 #ifdef HAVE_LINUX_CAN_RAW_H
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6116 PyModule_AddIntConstant(m, "CAN_RAW_FILTER", CAN_RAW_FILTER);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6117 PyModule_AddIntConstant(m, "CAN_RAW_ERR_FILTER", CAN_RAW_ERR_FILTER);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6118 PyModule_AddIntConstant(m, "CAN_RAW_LOOPBACK", CAN_RAW_LOOPBACK);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6119 PyModule_AddIntConstant(m, "CAN_RAW_RECV_OWN_MSGS", CAN_RAW_RECV_OWN_MSGS);
e767318baccd Issue #10141: socket: add SocketCAN (PF_CAN) support. Initial patch by Matthias Charles-François Natali <neologix@free.fr> parents: 72510 diff changeset	6120 #endif
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6121 #ifdef SOL_RDS
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6122 PyModule_AddIntConstant(m, "SOL_RDS", SOL_RDS);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6123 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6124 #ifdef RDS_CANCEL_SENT_TO
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6125 PyModule_AddIntConstant(m, "RDS_CANCEL_SENT_TO", RDS_CANCEL_SENT_TO);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6126 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6127 #ifdef RDS_GET_MR
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6128 PyModule_AddIntConstant(m, "RDS_GET_MR", RDS_GET_MR);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6129 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6130 #ifdef RDS_FREE_MR
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6131 PyModule_AddIntConstant(m, "RDS_FREE_MR", RDS_FREE_MR);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6132 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6133 #ifdef RDS_RECVERR
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6134 PyModule_AddIntConstant(m, "RDS_RECVERR", RDS_RECVERR);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6135 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6136 #ifdef RDS_CONG_MONITOR
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6137 PyModule_AddIntConstant(m, "RDS_CONG_MONITOR", RDS_CONG_MONITOR);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6138 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6139 #ifdef RDS_GET_MR_FOR_DEST
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6140 PyModule_AddIntConstant(m, "RDS_GET_MR_FOR_DEST", RDS_GET_MR_FOR_DEST);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6141 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6142 #ifdef IPPROTO_IP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6143 PyModule_AddIntConstant(m, "IPPROTO_IP", 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	6144 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6145 PyModule_AddIntConstant(m, "IPPROTO_IP", 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6146 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6147 #ifdef IPPROTO_HOPOPTS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6148 PyModule_AddIntConstant(m, "IPPROTO_HOPOPTS", IPPROTO_HOPOPTS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6149 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6150 #ifdef IPPROTO_ICMP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6151 PyModule_AddIntConstant(m, "IPPROTO_ICMP", 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	6152 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6153 PyModule_AddIntConstant(m, "IPPROTO_ICMP", 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6154 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6155 #ifdef IPPROTO_IGMP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6156 PyModule_AddIntConstant(m, "IPPROTO_IGMP", IPPROTO_IGMP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6157 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6158 #ifdef IPPROTO_GGP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6159 PyModule_AddIntConstant(m, "IPPROTO_GGP", IPPROTO_GGP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6160 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6161 #ifdef IPPROTO_IPV4
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6162 PyModule_AddIntConstant(m, "IPPROTO_IPV4", IPPROTO_IPV4);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6163 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6164 #ifdef IPPROTO_IPV6
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6165 PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6166 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6167 #ifdef IPPROTO_IPIP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6168 PyModule_AddIntConstant(m, "IPPROTO_IPIP", IPPROTO_IPIP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6169 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6170 #ifdef IPPROTO_TCP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6171 PyModule_AddIntConstant(m, "IPPROTO_TCP", 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	6172 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6173 PyModule_AddIntConstant(m, "IPPROTO_TCP", 6);
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_EGP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6176 PyModule_AddIntConstant(m, "IPPROTO_EGP", IPPROTO_EGP);
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_PUP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6179 PyModule_AddIntConstant(m, "IPPROTO_PUP", IPPROTO_PUP);
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_UDP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6182 PyModule_AddIntConstant(m, "IPPROTO_UDP", 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	6183 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6184 PyModule_AddIntConstant(m, "IPPROTO_UDP", 17);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6185 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6186 #ifdef IPPROTO_IDP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6187 PyModule_AddIntConstant(m, "IPPROTO_IDP", IPPROTO_IDP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6188 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6189 #ifdef IPPROTO_HELLO
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6190 PyModule_AddIntConstant(m, "IPPROTO_HELLO", IPPROTO_HELLO);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6191 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6192 #ifdef IPPROTO_ND
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6193 PyModule_AddIntConstant(m, "IPPROTO_ND", IPPROTO_ND);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6194 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6195 #ifdef IPPROTO_TP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6196 PyModule_AddIntConstant(m, "IPPROTO_TP", IPPROTO_TP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6197 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6198 #ifdef IPPROTO_IPV6
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6199 PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6200 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6201 #ifdef IPPROTO_ROUTING
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6202 PyModule_AddIntConstant(m, "IPPROTO_ROUTING", IPPROTO_ROUTING);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6203 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6204 #ifdef IPPROTO_FRAGMENT
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6205 PyModule_AddIntConstant(m, "IPPROTO_FRAGMENT", IPPROTO_FRAGMENT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6206 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6207 #ifdef IPPROTO_RSVP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6208 PyModule_AddIntConstant(m, "IPPROTO_RSVP", IPPROTO_RSVP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6209 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6210 #ifdef IPPROTO_GRE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6211 PyModule_AddIntConstant(m, "IPPROTO_GRE", IPPROTO_GRE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6212 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6213 #ifdef IPPROTO_ESP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6214 PyModule_AddIntConstant(m, "IPPROTO_ESP", IPPROTO_ESP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6215 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6216 #ifdef IPPROTO_AH
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6217 PyModule_AddIntConstant(m, "IPPROTO_AH", IPPROTO_AH);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6218 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6219 #ifdef IPPROTO_MOBILE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6220 PyModule_AddIntConstant(m, "IPPROTO_MOBILE", IPPROTO_MOBILE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6221 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6222 #ifdef IPPROTO_ICMPV6
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6223 PyModule_AddIntConstant(m, "IPPROTO_ICMPV6", IPPROTO_ICMPV6);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6224 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6225 #ifdef IPPROTO_NONE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6226 PyModule_AddIntConstant(m, "IPPROTO_NONE", IPPROTO_NONE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6227 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6228 #ifdef IPPROTO_DSTOPTS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6229 PyModule_AddIntConstant(m, "IPPROTO_DSTOPTS", IPPROTO_DSTOPTS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6230 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6231 #ifdef IPPROTO_XTP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6232 PyModule_AddIntConstant(m, "IPPROTO_XTP", IPPROTO_XTP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6233 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6234 #ifdef IPPROTO_EON
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6235 PyModule_AddIntConstant(m, "IPPROTO_EON", IPPROTO_EON);
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 IPPROTO_PIM
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6238 PyModule_AddIntConstant(m, "IPPROTO_PIM", IPPROTO_PIM);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6239 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6240 #ifdef IPPROTO_IPCOMP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6241 PyModule_AddIntConstant(m, "IPPROTO_IPCOMP", IPPROTO_IPCOMP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6242 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6243 #ifdef IPPROTO_VRRP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6244 PyModule_AddIntConstant(m, "IPPROTO_VRRP", IPPROTO_VRRP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6245 #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	6246 #ifdef IPPROTO_SCTP
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6247 PyModule_AddIntConstant(m, "IPPROTO_SCTP", IPPROTO_SCTP);
c64216addd7f Add support for the send/recvmsg API to the socket module. Patch by David Watson and Heiko Wundram. (Closes #6560) Nick Coghlan <ncoghlan@gmail.com> parents: 71865 diff changeset	6248 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6249 #ifdef IPPROTO_BIP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6250 PyModule_AddIntConstant(m, "IPPROTO_BIP", IPPROTO_BIP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	6251 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	6252 /**/
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6253 #ifdef IPPROTO_RAW
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6254 PyModule_AddIntConstant(m, "IPPROTO_RAW", 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	6255 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6256 PyModule_AddIntConstant(m, "IPPROTO_RAW", 255);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6257 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6258 #ifdef IPPROTO_MAX
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6259 PyModule_AddIntConstant(m, "IPPROTO_MAX", IPPROTO_MAX);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6260 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6261
74741 aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	6262 #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	6263 PyModule_AddIntConstant(m, "SYSPROTO_CONTROL", SYSPROTO_CONTROL);
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	6264 #endif
aa3680d2c24d Issue #13777: Add PF_SYSTEM sockets on OS X. Martin v. Löwis <martin@v.loewis.de> parents: 74234 diff changeset	6265
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6266 /* Some port configuration */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6267 #ifdef IPPORT_RESERVED
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6268 PyModule_AddIntConstant(m, "IPPORT_RESERVED", IPPORT_RESERVED);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	6269 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6270 PyModule_AddIntConstant(m, "IPPORT_RESERVED", 1024);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6271 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6272 #ifdef IPPORT_USERRESERVED
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6273 PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", IPPORT_USERRESERVED);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	6274 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6275 PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", 5000);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6276 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6277
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6278 /* Some reserved IP v.4 addresses */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6279 #ifdef INADDR_ANY
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6280 PyModule_AddIntConstant(m, "INADDR_ANY", INADDR_ANY);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6281 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6282 PyModule_AddIntConstant(m, "INADDR_ANY", 0x00000000);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6283 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6284 #ifdef INADDR_BROADCAST
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6285 PyModule_AddIntConstant(m, "INADDR_BROADCAST", INADDR_BROADCAST);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6286 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6287 PyModule_AddIntConstant(m, "INADDR_BROADCAST", 0xffffffff);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6288 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6289 #ifdef INADDR_LOOPBACK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6290 PyModule_AddIntConstant(m, "INADDR_LOOPBACK", INADDR_LOOPBACK);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6291 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6292 PyModule_AddIntConstant(m, "INADDR_LOOPBACK", 0x7F000001);
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 INADDR_UNSPEC_GROUP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6295 PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6296 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6297 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	6298 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6299 #ifdef INADDR_ALLHOSTS_GROUP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6300 PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6301 INADDR_ALLHOSTS_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6302 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6303 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	6304 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6305 #ifdef INADDR_MAX_LOCAL_GROUP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6306 PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6307 INADDR_MAX_LOCAL_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6308 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6309 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	6310 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6311 #ifdef INADDR_NONE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6312 PyModule_AddIntConstant(m, "INADDR_NONE", INADDR_NONE);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	6313 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6314 PyModule_AddIntConstant(m, "INADDR_NONE", 0xffffffff);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6315 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6316
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6317 /* IPv4 [gs]etsockopt options */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6318 #ifdef IP_OPTIONS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6319 PyModule_AddIntConstant(m, "IP_OPTIONS", IP_OPTIONS);
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_HDRINCL
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6322 PyModule_AddIntConstant(m, "IP_HDRINCL", IP_HDRINCL);
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_TOS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6325 PyModule_AddIntConstant(m, "IP_TOS", IP_TOS);
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_TTL
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6328 PyModule_AddIntConstant(m, "IP_TTL", IP_TTL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6329 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6330 #ifdef IP_RECVOPTS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6331 PyModule_AddIntConstant(m, "IP_RECVOPTS", IP_RECVOPTS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6332 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6333 #ifdef IP_RECVRETOPTS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6334 PyModule_AddIntConstant(m, "IP_RECVRETOPTS", IP_RECVRETOPTS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6335 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6336 #ifdef IP_RECVDSTADDR
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6337 PyModule_AddIntConstant(m, "IP_RECVDSTADDR", IP_RECVDSTADDR);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6338 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6339 #ifdef IP_RETOPTS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6340 PyModule_AddIntConstant(m, "IP_RETOPTS", IP_RETOPTS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6341 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6342 #ifdef IP_MULTICAST_IF
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6343 PyModule_AddIntConstant(m, "IP_MULTICAST_IF", IP_MULTICAST_IF);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6344 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6345 #ifdef IP_MULTICAST_TTL
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6346 PyModule_AddIntConstant(m, "IP_MULTICAST_TTL", IP_MULTICAST_TTL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6347 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6348 #ifdef IP_MULTICAST_LOOP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6349 PyModule_AddIntConstant(m, "IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6350 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6351 #ifdef IP_ADD_MEMBERSHIP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6352 PyModule_AddIntConstant(m, "IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6353 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6354 #ifdef IP_DROP_MEMBERSHIP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6355 PyModule_AddIntConstant(m, "IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
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 #ifdef IP_DEFAULT_MULTICAST_TTL
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6358 PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_TTL",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6359 IP_DEFAULT_MULTICAST_TTL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6360 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6361 #ifdef IP_DEFAULT_MULTICAST_LOOP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6362 PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_LOOP",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6363 IP_DEFAULT_MULTICAST_LOOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6364 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6365 #ifdef IP_MAX_MEMBERSHIPS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6366 PyModule_AddIntConstant(m, "IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6367 #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	6368 #ifdef IP_TRANSPARENT
59ea1d1a4137 Issue #12809: Expose IP_TRANSPARENT in the socket module. Patch by Michael Charles-François Natali <neologix@free.fr> parents: 74007 diff changeset	6369 PyModule_AddIntConstant(m, "IP_TRANSPARENT", IP_TRANSPARENT);
59ea1d1a4137 Issue #12809: Expose IP_TRANSPARENT in the socket module. Patch by Michael Charles-François Natali <neologix@free.fr> parents: 74007 diff changeset	6370 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6371
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6372 /* 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	6373 #ifdef IPV6_JOIN_GROUP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6374 PyModule_AddIntConstant(m, "IPV6_JOIN_GROUP", IPV6_JOIN_GROUP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6375 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6376 #ifdef IPV6_LEAVE_GROUP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6377 PyModule_AddIntConstant(m, "IPV6_LEAVE_GROUP", IPV6_LEAVE_GROUP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6378 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6379 #ifdef IPV6_MULTICAST_HOPS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6380 PyModule_AddIntConstant(m, "IPV6_MULTICAST_HOPS", IPV6_MULTICAST_HOPS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6381 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6382 #ifdef IPV6_MULTICAST_IF
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6383 PyModule_AddIntConstant(m, "IPV6_MULTICAST_IF", IPV6_MULTICAST_IF);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6384 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6385 #ifdef IPV6_MULTICAST_LOOP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6386 PyModule_AddIntConstant(m, "IPV6_MULTICAST_LOOP", IPV6_MULTICAST_LOOP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6387 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6388 #ifdef IPV6_UNICAST_HOPS
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6389 PyModule_AddIntConstant(m, "IPV6_UNICAST_HOPS", IPV6_UNICAST_HOPS);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6390 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6391 /* 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	6392 #ifdef IPV6_V6ONLY
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6393 PyModule_AddIntConstant(m, "IPV6_V6ONLY", IPV6_V6ONLY);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6394 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6395 /* 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	6396 #ifdef IPV6_CHECKSUM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6397 PyModule_AddIntConstant(m, "IPV6_CHECKSUM", 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	6398 #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	6399 #ifdef IPV6_DONTFRAG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6400 PyModule_AddIntConstant(m, "IPV6_DONTFRAG", 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	6401 #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	6402 #ifdef IPV6_DSTOPTS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6403 PyModule_AddIntConstant(m, "IPV6_DSTOPTS", 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	6404 #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	6405 #ifdef IPV6_HOPLIMIT
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6406 PyModule_AddIntConstant(m, "IPV6_HOPLIMIT", 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	6407 #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	6408 #ifdef IPV6_HOPOPTS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6409 PyModule_AddIntConstant(m, "IPV6_HOPOPTS", 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	6410 #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	6411 #ifdef IPV6_NEXTHOP
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6412 PyModule_AddIntConstant(m, "IPV6_NEXTHOP", 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	6413 #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	6414 #ifdef IPV6_PATHMTU
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6415 PyModule_AddIntConstant(m, "IPV6_PATHMTU", 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	6416 #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	6417 #ifdef IPV6_PKTINFO
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6418 PyModule_AddIntConstant(m, "IPV6_PKTINFO", 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	6419 #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	6420 #ifdef IPV6_RECVDSTOPTS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6421 PyModule_AddIntConstant(m, "IPV6_RECVDSTOPTS", 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	6422 #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	6423 #ifdef IPV6_RECVHOPLIMIT
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6424 PyModule_AddIntConstant(m, "IPV6_RECVHOPLIMIT", 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	6425 #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	6426 #ifdef IPV6_RECVHOPOPTS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6427 PyModule_AddIntConstant(m, "IPV6_RECVHOPOPTS", 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	6428 #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	6429 #ifdef IPV6_RECVPKTINFO
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6430 PyModule_AddIntConstant(m, "IPV6_RECVPKTINFO", 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	6431 #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	6432 #ifdef IPV6_RECVRTHDR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6433 PyModule_AddIntConstant(m, "IPV6_RECVRTHDR", 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	6434 #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	6435 #ifdef IPV6_RECVTCLASS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6436 PyModule_AddIntConstant(m, "IPV6_RECVTCLASS", 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	6437 #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	6438 #ifdef IPV6_RTHDR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6439 PyModule_AddIntConstant(m, "IPV6_RTHDR", 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	6440 #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	6441 #ifdef IPV6_RTHDRDSTOPTS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6442 PyModule_AddIntConstant(m, "IPV6_RTHDRDSTOPTS", 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	6443 #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	6444 #ifdef IPV6_RTHDR_TYPE_0
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6445 PyModule_AddIntConstant(m, "IPV6_RTHDR_TYPE_0", 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	6446 #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	6447 #ifdef IPV6_RECVPATHMTU
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6448 PyModule_AddIntConstant(m, "IPV6_RECVPATHMTU", 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	6449 #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	6450 #ifdef IPV6_TCLASS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6451 PyModule_AddIntConstant(m, "IPV6_TCLASS", 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	6452 #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	6453 #ifdef IPV6_USE_MIN_MTU
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6454 PyModule_AddIntConstant(m, "IPV6_USE_MIN_MTU", IPV6_USE_MIN_MTU);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6455 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6456
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6457 /* TCP options */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6458 #ifdef TCP_NODELAY
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6459 PyModule_AddIntConstant(m, "TCP_NODELAY", TCP_NODELAY);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6460 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6461 #ifdef TCP_MAXSEG
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6462 PyModule_AddIntConstant(m, "TCP_MAXSEG", TCP_MAXSEG);
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 #ifdef TCP_CORK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6465 PyModule_AddIntConstant(m, "TCP_CORK", TCP_CORK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6466 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6467 #ifdef TCP_KEEPIDLE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6468 PyModule_AddIntConstant(m, "TCP_KEEPIDLE", TCP_KEEPIDLE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6469 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6470 #ifdef TCP_KEEPINTVL
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6471 PyModule_AddIntConstant(m, "TCP_KEEPINTVL", TCP_KEEPINTVL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6472 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6473 #ifdef TCP_KEEPCNT
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6474 PyModule_AddIntConstant(m, "TCP_KEEPCNT", TCP_KEEPCNT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6475 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6476 #ifdef TCP_SYNCNT
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6477 PyModule_AddIntConstant(m, "TCP_SYNCNT", TCP_SYNCNT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6478 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6479 #ifdef TCP_LINGER2
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6480 PyModule_AddIntConstant(m, "TCP_LINGER2", TCP_LINGER2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6481 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6482 #ifdef TCP_DEFER_ACCEPT
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6483 PyModule_AddIntConstant(m, "TCP_DEFER_ACCEPT", TCP_DEFER_ACCEPT);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6484 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6485 #ifdef TCP_WINDOW_CLAMP
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6486 PyModule_AddIntConstant(m, "TCP_WINDOW_CLAMP", TCP_WINDOW_CLAMP);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6487 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6488 #ifdef TCP_INFO
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6489 PyModule_AddIntConstant(m, "TCP_INFO", TCP_INFO);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6490 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6491 #ifdef TCP_QUICKACK
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6492 PyModule_AddIntConstant(m, "TCP_QUICKACK", TCP_QUICKACK);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6493 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6494
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6495
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6496 /* IPX options */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6497 #ifdef IPX_TYPE
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6498 PyModule_AddIntConstant(m, "IPX_TYPE", IPX_TYPE);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6499 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6500
73478 2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6501 /* 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	6502 #ifdef RDS_CMSG_RDMA_ARGS
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6503 PyModule_AddIntConstant(m, "RDS_CMSG_RDMA_ARGS", RDS_CMSG_RDMA_ARGS);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6504 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6505 #ifdef RDS_CMSG_RDMA_DEST
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6506 PyModule_AddIntConstant(m, "RDS_CMSG_RDMA_DEST", RDS_CMSG_RDMA_DEST);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6507 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6508 #ifdef RDS_CMSG_RDMA_MAP
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6509 PyModule_AddIntConstant(m, "RDS_CMSG_RDMA_MAP", RDS_CMSG_RDMA_MAP);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6510 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6511 #ifdef RDS_CMSG_RDMA_STATUS
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6512 PyModule_AddIntConstant(m, "RDS_CMSG_RDMA_STATUS", RDS_CMSG_RDMA_STATUS);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6513 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6514 #ifdef RDS_CMSG_RDMA_UPDATE
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6515 PyModule_AddIntConstant(m, "RDS_CMSG_RDMA_UPDATE", RDS_CMSG_RDMA_UPDATE);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6516 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6517 #ifdef RDS_RDMA_READWRITE
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6518 PyModule_AddIntConstant(m, "RDS_RDMA_READWRITE", RDS_RDMA_READWRITE);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6519 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6520 #ifdef RDS_RDMA_FENCE
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6521 PyModule_AddIntConstant(m, "RDS_RDMA_FENCE", RDS_RDMA_FENCE);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6522 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6523 #ifdef RDS_RDMA_INVALIDATE
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6524 PyModule_AddIntConstant(m, "RDS_RDMA_INVALIDATE", RDS_RDMA_INVALIDATE);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6525 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6526 #ifdef RDS_RDMA_USE_ONCE
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6527 PyModule_AddIntConstant(m, "RDS_RDMA_USE_ONCE", RDS_RDMA_USE_ONCE);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6528 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6529 #ifdef RDS_RDMA_DONTWAIT
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6530 PyModule_AddIntConstant(m, "RDS_RDMA_DONTWAIT", RDS_RDMA_DONTWAIT);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6531 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6532 #ifdef RDS_RDMA_NOTIFY_ME
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6533 PyModule_AddIntConstant(m, "RDS_RDMA_NOTIFY_ME", RDS_RDMA_NOTIFY_ME);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6534 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6535 #ifdef RDS_RDMA_SILENT
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6536 PyModule_AddIntConstant(m, "RDS_RDMA_SILENT", RDS_RDMA_SILENT);
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6537 #endif
2293ca739223 Issue #7777: socket: Add Reliable Datagram Sockets (PF_RDS) support. Charles-François Natali <neologix@free.fr> parents: 73128 diff changeset	6538
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6539 /* 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	6540 #ifdef EAI_ADDRFAMILY
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6541 PyModule_AddIntConstant(m, "EAI_ADDRFAMILY", EAI_ADDRFAMILY);
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_AGAIN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6544 PyModule_AddIntConstant(m, "EAI_AGAIN", EAI_AGAIN);
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_BADFLAGS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6547 PyModule_AddIntConstant(m, "EAI_BADFLAGS", EAI_BADFLAGS);
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 EAI_FAIL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6550 PyModule_AddIntConstant(m, "EAI_FAIL", EAI_FAIL);
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 EAI_FAMILY
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6553 PyModule_AddIntConstant(m, "EAI_FAMILY", EAI_FAMILY);
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 EAI_MEMORY
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6556 PyModule_AddIntConstant(m, "EAI_MEMORY", EAI_MEMORY);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6557 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6558 #ifdef EAI_NODATA
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6559 PyModule_AddIntConstant(m, "EAI_NODATA", EAI_NODATA);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6560 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6561 #ifdef EAI_NONAME
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6562 PyModule_AddIntConstant(m, "EAI_NONAME", EAI_NONAME);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6563 #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	6564 #ifdef EAI_OVERFLOW
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6565 PyModule_AddIntConstant(m, "EAI_OVERFLOW", 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	6566 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6567 #ifdef EAI_SERVICE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6568 PyModule_AddIntConstant(m, "EAI_SERVICE", EAI_SERVICE);
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 EAI_SOCKTYPE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6571 PyModule_AddIntConstant(m, "EAI_SOCKTYPE", EAI_SOCKTYPE);
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 EAI_SYSTEM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6574 PyModule_AddIntConstant(m, "EAI_SYSTEM", EAI_SYSTEM);
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 EAI_BADHINTS
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6577 PyModule_AddIntConstant(m, "EAI_BADHINTS", EAI_BADHINTS);
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 EAI_PROTOCOL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6580 PyModule_AddIntConstant(m, "EAI_PROTOCOL", EAI_PROTOCOL);
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 EAI_MAX
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6583 PyModule_AddIntConstant(m, "EAI_MAX", EAI_MAX);
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 AI_PASSIVE
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6586 PyModule_AddIntConstant(m, "AI_PASSIVE", AI_PASSIVE);
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 AI_CANONNAME
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6589 PyModule_AddIntConstant(m, "AI_CANONNAME", AI_CANONNAME);
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 AI_NUMERICHOST
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6592 PyModule_AddIntConstant(m, "AI_NUMERICHOST", AI_NUMERICHOST);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6593 #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	6594 #ifdef AI_NUMERICSERV
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6595 PyModule_AddIntConstant(m, "AI_NUMERICSERV", 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	6596 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6597 #ifdef AI_MASK
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6598 PyModule_AddIntConstant(m, "AI_MASK", AI_MASK);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6599 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6600 #ifdef AI_ALL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6601 PyModule_AddIntConstant(m, "AI_ALL", AI_ALL);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6602 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6603 #ifdef AI_V4MAPPED_CFG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6604 PyModule_AddIntConstant(m, "AI_V4MAPPED_CFG", 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	6605 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6606 #ifdef AI_ADDRCONFIG
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6607 PyModule_AddIntConstant(m, "AI_ADDRCONFIG", AI_ADDRCONFIG);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6608 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6609 #ifdef AI_V4MAPPED
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6610 PyModule_AddIntConstant(m, "AI_V4MAPPED", AI_V4MAPPED);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6611 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6612 #ifdef AI_DEFAULT
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6613 PyModule_AddIntConstant(m, "AI_DEFAULT", AI_DEFAULT);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6614 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6615 #ifdef NI_MAXHOST
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6616 PyModule_AddIntConstant(m, "NI_MAXHOST", NI_MAXHOST);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6617 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6618 #ifdef NI_MAXSERV
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6619 PyModule_AddIntConstant(m, "NI_MAXSERV", NI_MAXSERV);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6620 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6621 #ifdef NI_NOFQDN
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6622 PyModule_AddIntConstant(m, "NI_NOFQDN", NI_NOFQDN);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6623 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6624 #ifdef NI_NUMERICHOST
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6625 PyModule_AddIntConstant(m, "NI_NUMERICHOST", NI_NUMERICHOST);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6626 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6627 #ifdef NI_NAMEREQD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6628 PyModule_AddIntConstant(m, "NI_NAMEREQD", NI_NAMEREQD);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6629 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6630 #ifdef NI_NUMERICSERV
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6631 PyModule_AddIntConstant(m, "NI_NUMERICSERV", NI_NUMERICSERV);
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6632 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	6633 #ifdef NI_DGRAM
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6634 PyModule_AddIntConstant(m, "NI_DGRAM", NI_DGRAM);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6635 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6636
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6637 /* shutdown() parameters */
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6638 #ifdef SHUT_RD
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6639 PyModule_AddIntConstant(m, "SHUT_RD", SHUT_RD);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6640 #elif defined(SD_RECEIVE)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6641 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	6642 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6643 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	6644 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6645 #ifdef SHUT_WR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6646 PyModule_AddIntConstant(m, "SHUT_WR", SHUT_WR);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6647 #elif defined(SD_SEND)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6648 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	6649 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6650 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	6651 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6652 #ifdef SHUT_RDWR
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6653 PyModule_AddIntConstant(m, "SHUT_RDWR", SHUT_RDWR);
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6654 #elif defined(SD_BOTH)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6655 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	6656 #else
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6657 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	6658 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	6659
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	6660 #ifdef SIO_RCVALL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6661 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6662 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	6663 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	6664 int i;
72510 b534b56379cb Use the new Py_ARRAY_LENGTH macro Victor Stinner <victor.stinner@haypocalc.com> parents: 72117 diff changeset	6665 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	6666 PyObject *tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6667 tmp = PyLong_FromUnsignedLong(codes[i]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6668 if (tmp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6669 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6670 PyModule_AddObject(m, names[i], tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	6671 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6672 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6673 PyModule_AddIntConstant(m, "RCVALL_OFF", RCVALL_OFF);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6674 PyModule_AddIntConstant(m, "RCVALL_ON", RCVALL_ON);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6675 PyModule_AddIntConstant(m, "RCVALL_SOCKETLEVELONLY", 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	6676 #ifdef RCVALL_IPLEVEL
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6677 PyModule_AddIntConstant(m, "RCVALL_IPLEVEL", 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	6678 #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	6679 #ifdef RCVALL_MAX
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6680 PyModule_AddIntConstant(m, "RCVALL_MAX", 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	6681 #endif
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	6682 #endif /* _MSTCPIP_ */
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	6683
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6684 /* Initialize gethostbyname lock */
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	6685 #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	6686 netdb_lock = PyThread_allocate_lock();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6687 #endif
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6688 return m;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6689 }
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	6690
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	6691
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	6692 #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	6693 #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	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 /* 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	6696 /* 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	6697
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	6698 int
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	6699 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	6700 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6701 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	6702 #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	6703 #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	6704 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6705 unsigned int packed_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6706 packed_addr = inet_addr(src);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6707 if (packed_addr == INADDR_NONE)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6708 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6709 memcpy(dst, &packed_addr, 4);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6710 return 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6711 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6712 /* Should set errno to EAFNOSUPPORT */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6713 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	6714 }
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	6715
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	6716 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	6717 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	6718 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6719 if (af == AF_INET) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6720 struct in_addr packed_addr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6721 if (size < 16)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6722 /* Should set errno to ENOSPC. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6723 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6724 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	6725 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	6726 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6727 /* Should set errno to EAFNOSUPPORT */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61086 diff changeset	6728 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	6729 }
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	6730
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	6731 #endif
43874 6b012f01a889 Fix for VS 2008 Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	6732 #endif

Mercurial > cpython-lru_cache-weakref

annotate Modules/socketmodule.c @ 77142:70ec1f671c19