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

annotate Modules/socketmodule.c @ 64392:7d1752d62050

Fix Issue9753: socket.dup() does not always work right on Windows

author	Daniel Stutzbach <daniel@stutzbachenterprises.com>
date	Fri, 03 Sep 2010 12:38:33 +0000
parents	2ccd043aad5c
children	aed04b3f0fe3

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,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 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,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 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
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 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])
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 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)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	45 - an Internet socket address is a pair (hostname, port)
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	46 where hostname can be anything recognized by gethostbyname()
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	47 (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	48 - 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	49 - 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	50 - 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	51 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	52 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	53 ("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	54 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	55 - 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	56 (addr_type, v1, v2, v3 [, scope]); where addr_type can be one of:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	57 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	58 and scope can be one of:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	59 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	60 The meaning of v1, v2 and v3 depends on the value of addr_type:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	61 if addr_type is TIPC_ADDR_NAME:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	62 v1 is the server type
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	63 v2 is the port identifier
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	64 v3 is ignored
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	65 if addr_type is TIPC_ADDR_NAMESEQ:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	66 v1 is the server type
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	67 v2 is the lower port number
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	68 v3 is the upper port number
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	69 if addr_type is TIPC_ADDR_ID:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	70 v1 is the node
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	71 v2 is the ref
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	72 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	73
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	74
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	75 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	76
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	77 - 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	78 - 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	79 - 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	80
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	81 */
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	82
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	83 #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	84 /*
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	85 * 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	86 * 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	87 * 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	88 */
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	89 # 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	90 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	91
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	92 #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	93 #include "structmember.h"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	94
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	95 #undef MAX
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	96 #define MAX(x, y) ((x) < (y) ? (y) : (x))
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	97
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	98 /* Socket object documentation */
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	99 PyDoc_STRVAR(sock_doc,
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	100 "socket([family[, type[, proto]]]) -> socket object\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	101 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	102 Open a socket of the given type. The family argument specifies the\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	103 address family; it defaults to AF_INET. The type argument specifies\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	104 whether this is a stream (SOCK_STREAM, this is the default)\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	105 or datagram (SOCK_DGRAM) socket. The protocol argument defaults to 0,\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	106 specifying the default protocol. Keyword arguments are accepted.\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	107 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	108 A socket object represents one endpoint of a network connection.\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	109 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	110 Methods of socket objects (keyword arguments not allowed):\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	111 \n\
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	112 _accept() -- accept connection, returning new socket fd and client address\n\
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	113 bind(addr) -- bind the socket to a local address\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	114 close() -- close the socket\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	115 connect(addr) -- connect the socket to a remote address\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	116 connect_ex(addr) -- connect, return an error code instead of an exception\n\
43881 70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	117 _dup() -- return a new socket fd duplicated from fileno()\n\
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	118 fileno() -- return underlying file descriptor\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	119 getpeername() -- return remote address [*]\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	120 getsockname() -- return local address\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	121 getsockopt(level, optname[, buflen]) -- get socket options\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	122 gettimeout() -- return timeout or None\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	123 listen(n) -- start listening for incoming connections\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	124 recv(buflen[, flags]) -- receive data\n\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	125 recv_into(buffer[, nbytes[, flags]]) -- receive data (into a buffer)\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	126 recvfrom(buflen[, flags]) -- receive data and sender\'s address\n\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	127 recvfrom_into(buffer[, nbytes, [, flags])\n\
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	128 -- receive data and sender\'s address (into a buffer)\n\
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	129 sendall(data[, flags]) -- send all data\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	130 send(data[, flags]) -- send data, may not send all of it\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	131 sendto(data[, flags], addr) -- send data to a given address\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	132 setblocking(0 \| 1) -- set or clear the blocking I/O flag\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	133 setsockopt(level, optname, value) -- set socket options\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	134 settimeout(None \| float) -- set or clear the timeout\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	135 shutdown(how) -- shut down traffic in one or both directions\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	136 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	137 [*] not available on all platforms!");
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	138
30722 651fc8d98d99 Fix a bunch of typos in documentation, docstrings and comments. Walter Dörwald <walter@livinglogic.de> parents: 30683 diff changeset	139 /* 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	140 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	141
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	142 /* 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	143 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	144 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	145 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	146
adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	147 #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	148 # 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	149 # 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	150 # 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	151 #endif
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	152
10579 1ed1eb5bc6ec Put back __osf__ support for gethostbyname_r(); the real bug was that Guido van Rossum <guido@python.org> parents: 10561 diff changeset	153 #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	154 # 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	155 #endif
1ed1eb5bc6ec Put back __osf__ support for gethostbyname_r(); the real bug was that Guido van Rossum <guido@python.org> parents: 10561 diff changeset	156
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	157 #ifdef HAVE_GETHOSTBYNAME_R
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	158 # if defined(_AIX) \|\| defined(__osf__)
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	159 # 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	160 # 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	161 # 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	162 # 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	163 /* 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	164 # 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	165 # 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	166 # endif
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	167 #endif
dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	168
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	169 #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	170 !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	171 # define USE_GETHOSTBYNAME_LOCK
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	172 #endif
9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	173
35635 27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	174 /* To use __FreeBSD_version */
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	175 #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	176 #include <sys/param.h>
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	177 #endif
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	178 /* 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	179 (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	180 #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	181 (defined(__FreeBSD__) && __FreeBSD_version+0 < 503000) \|\| \
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	182 defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| \
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	183 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	184 #define USE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	185 #endif
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	186
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	187 #ifdef USE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	188 #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	189 #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	190 #else
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	191 #define ACQUIRE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	192 #define RELEASE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	193 #endif
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	194
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	195 #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	196 # include "pythread.h"
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	197 #endif
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	198
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	199 #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	200 # 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	201 # 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	202 # 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	203 # 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	204 # include <ctype.h>
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	205 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	206
26551 0c995cd07026 Don't include <ioctl.h> unless on __VMS. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	207 #if defined(__VMS)
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	208 # include <ioctl.h>
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	209 #endif
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	210
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	211 #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	212 # 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	213 # 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	214 # 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	215 # include <os2.h>
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	216 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	217
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	218 #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	219 /* 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	220 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	221 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	222
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	223 /* 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	224 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	225 #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	226 #define _SGIAPI 1
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	227
33478 1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	228 #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	229 #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	230 #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	231 #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	232 #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	233 #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	234 #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	235 #endif
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	236
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	237 #define HAVE_INET_PTON
08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	238 #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	239 #endif
337fcc24985b Patch #608999: Fix portability problems with MIPSPro 7.x Martin v. Löwis <martin@v.loewis.de> parents: 25105 diff changeset	240
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	241 /* 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	242 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	243 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	244 #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	245 #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	246 #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	247
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	248 /* Generic includes */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	249 #ifdef HAVE_SYS_TYPES_H
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	250 #include <sys/types.h>
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	251 #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	252
21961 ea23e6e49290 Also fix the comment. Marc-André Lemburg <mal@egenix.com> parents: 21960 diff changeset	253 /* 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	254 #define PySocket_BUILDING_SOCKET
21960 7a917ad8f442 Fix the name of the header file. Marc-André Lemburg <mal@egenix.com> parents: 21959 diff changeset	255 #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	256
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	257 /* 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	258
3738 ce74bba8a6a6 Slightly different Windows ifdefs Guido van Rossum <guido@python.org> parents: 3702 diff changeset	259 #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	260
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	261 /* 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	262 # include <netdb.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	263
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	264 /* Headers needed for inet_ntoa() and inet_addr() */
42645 a5e984eda45a Remove support for BeOS Skip Montanaro <skip@pobox.com> parents: 42622 diff changeset	265 # 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	266 # 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	267 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	268 # 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	269 # 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	270 # 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	271
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	272 # 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	273
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20648 diff changeset	274 #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	275
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	276 /* MS_WINDOWS includes */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	277 # ifdef HAVE_FCNTL_H
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	278 # include <fcntl.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	279 # 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	280
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	281 #endif
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	282
31504 2abc52c3d4c2 remove support for missing ANSI C header files (limits.h, stddef.h, etc). Skip Montanaro <skip@pobox.com> parents: 31443 diff changeset	283 #include <stddef.h>
18263 41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	284
41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	285 #ifndef offsetof
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	286 # 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	287 #endif
41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	288
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	289 #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	290 # define O_NONBLOCK O_NDELAY
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	291 #endif
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	292
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	293 /* 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	294 #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	295 /* 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	296 * _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	297 * 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	298 */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	299 #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	300 /* 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	301 * 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	302 */
8480b72aa624 Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions. Trent Mick <trentm@activestate.com> parents: 33280 diff changeset	303 #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	304 # 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	305 #endif
33066 cda0455bd0a0 Bug #1001857: socketmodule does not build under cygwin Jason Tishler <jason@tishler.net> parents: 33063 diff changeset	306
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	307 #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	308 #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	309 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	310 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	311 #endif
43874 6b012f01a889 Fix for VS 2008 Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	312 #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	313
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	314 #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	315 /* 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	316 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	317 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	318 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	319 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	320 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	321 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	322 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	323 #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	324 /* 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	325 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	326 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	327 #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	328 #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	329
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	330 #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	331 #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	332 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	333
24078 702a5900df7d Mac OS X Jaguar (developer preview) seems to have a working getaddrinfo(). Jack Jansen <jack.jansen@cwi.nl> parents: 23832 diff changeset	334 #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	335
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	336 /* 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	337 #if !defined(HAVE_GETADDRINFO)
28913 b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	338 /* 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	339 #define getaddrinfo fake_getaddrinfo
b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	340 #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	341 #define freeaddrinfo fake_freeaddrinfo
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	342 #include "getaddrinfo.c"
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	343 #endif
18954 fefcc1e80cee Do not use the system getaddrinfo on Mac OS X. Fixes bug #445928. Martin v. Löwis <martin@v.loewis.de> parents: 18915 diff changeset	344 #if !defined(HAVE_GETNAMEINFO)
28913 b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	345 #define getnameinfo fake_getnameinfo
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	346 #include "getnameinfo.c"
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	347 #endif
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	348
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	349 #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	350 /* 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	351 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	352 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	353 {
64392 7d1752d62050 Fix Issue9753: socket.dup() does not always work right on Windows Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64277 diff changeset	354 WSAPROTOCOL_INFO info;
7d1752d62050 Fix Issue9753: socket.dup() does not always work right on Windows Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64277 diff changeset	355
7d1752d62050 Fix Issue9753: socket.dup() does not always work right on Windows Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64277 diff changeset	356 if (WSADuplicateSocket(handle, GetCurrentProcessId(), &info))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	357 return INVALID_SOCKET;
64392 7d1752d62050 Fix Issue9753: socket.dup() does not always work right on Windows Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64277 diff changeset	358
7d1752d62050 Fix Issue9753: socket.dup() does not always work right on Windows Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64277 diff changeset	359 return WSASocket(FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO,
7d1752d62050 Fix Issue9753: socket.dup() does not always work right on Windows Daniel Stutzbach <daniel@stutzbachenterprises.com> parents: 64277 diff changeset	360 FROM_PROTOCOL_INFO, &info, 0, 0);
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	361 }
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	362 #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	363 #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	364 /* 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	365 #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	366 #endif
a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	367
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	368 #ifdef MS_WIN32
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	369 #define EAFNOSUPPORT WSAEAFNOSUPPORT
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	370 #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	371 #endif
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	372
22115 d104bb50a194 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22096 diff changeset	373 #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	374 #define SOCKETCLOSE soclose
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	375 #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	376 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	377
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	378 #ifndef SOCKETCLOSE
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	379 #define SOCKETCLOSE close
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	380 #endif
dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	381
52561 8f51dd09f3f2 Merged revisions 70849,70852 via svnmerge from Jesse Noller <jnoller@gmail.com> parents: 51579 diff changeset	382 #if defined(HAVE_BLUETOOTH_H) \|\| defined(HAVE_BLUETOOTH_BLUETOOTH_H) && !defined(__NetBSD__)
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	383 #define USE_BLUETOOTH 1
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	384 #if defined(__FreeBSD__)
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	385 #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	386 #define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	387 #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	388 #define SOL_HCI SOL_HCI_RAW
229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	389 #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	390 #define sockaddr_l2 sockaddr_l2cap
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	391 #define sockaddr_rc sockaddr_rfcomm
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	392 #define hci_dev hci_node
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	393 #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	394 #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	395 #define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	396 #elif defined(__NetBSD__)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	397 #define sockaddr_l2 sockaddr_bt
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	398 #define sockaddr_rc sockaddr_bt
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	399 #define sockaddr_hci sockaddr_bt
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	400 #define sockaddr_sco sockaddr_bt
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	401 #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	402 #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	403 #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	404 #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	405 #else
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	406 #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	407 #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	408 #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	409 #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	410 #endif
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	411 #endif
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	412
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	413 #ifdef __VMS
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	414 /* 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	415 #define SEGMENT_SIZE (32 * 1024 -1)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	416 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	417
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	418 #define SAS2SA(x) ((struct sockaddr *)(x))
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	419
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	420 /*
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	421 * 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	422 */
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	423 #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	424 #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	425 #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	426 #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	427 #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	428 #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	429
41809 8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	430 #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	431 #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	432 #endif
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	433
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	434 /* 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	435 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	436
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	437 /* 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	438 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	439 static PyObject *socket_error;
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	440 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	441 static PyObject *socket_gaierror;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	442 static PyObject *socket_timeout;
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	443
21970 b1a871dc5196 Moved the declaration of PySocketSock_Type from socketmodule.h to Tim Peters <tim.peters@gmail.com> parents: 21964 diff changeset	444 /* 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	445 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	446 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	447 there has to be a circular reference. */
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24078 diff changeset	448 static PyTypeObject sock_type;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	449
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	450 #if defined(HAVE_POLL_H)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	451 #include <poll.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	452 #elif defined(HAVE_SYS_POLL_H)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	453 #include <sys/poll.h>
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	454 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	455
36476 c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	456 #ifdef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	457 /* Platform can select file descriptors beyond FD_SETSIZE */
c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	458 #define IS_SELECTABLE(s) 1
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	459 #elif defined(HAVE_POLL)
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	460 /* 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	461 #define IS_SELECTABLE(s) 1
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	462 /* 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	463 #else
c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	464 /* POSIX says selecting file descriptors beyond FD_SETSIZE
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	465 has undefined behaviour. If there's no timeout left, we don't have to
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	466 call select, so it's a safe, little white lie. */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	467 #define IS_SELECTABLE(s) ((s)->sock_fd < FD_SETSIZE \|\| 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	468 #endif
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	469
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	470 static PyObject*
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	471 select_error(void)
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	472 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	473 PyErr_SetString(socket_error, "unable to select on socket");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	474 return NULL;
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	475 }
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	476
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	477 /* 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	478 and return a NULL pointer from a function. */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	479
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	480 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	481 set_error(void)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	482 {
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	483 #ifdef MS_WINDOWS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	484 int err_no = WSAGetLastError();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	485 /* PyErr_SetExcFromWindowsErr() invokes FormatMessage() which
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	486 recognizes the error codes used by both GetLastError() and
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	487 WSAGetLastError */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	488 if (err_no)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	489 return PyErr_SetExcFromWindowsErr(socket_error, err_no);
1915 80818c106e3e * Modules/xxmodule.c: integrated with xxobject.c by Jack Guido van Rossum <guido@python.org> parents: 1867 diff changeset	490 #endif
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	491
22115 d104bb50a194 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22096 diff changeset	492 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	493 if (sock_errno() != NO_ERROR) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	494 APIRET rc;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	495 ULONG msglen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	496 char outbuf[100];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	497 int myerrorcode = sock_errno();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	498
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	499 /* Retrieve socket-related error message from MPTN.MSG file */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	500 rc = DosGetMessage(NULL, 0, outbuf, sizeof(outbuf),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	501 myerrorcode - SOCBASEERR + 26,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	502 "mptn.msg",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	503 &msglen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	504 if (rc == NO_ERROR) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	505 PyObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	506
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	507 /* OS/2 doesn't guarantee a terminator */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	508 outbuf[msglen] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	509 if (strlen(outbuf) > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	510 /* If non-empty msg, trim CRLF */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	511 char *lastc = &outbuf[ strlen(outbuf)-1 ];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	512 while (lastc > outbuf &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	513 isspace(Py_CHARMASK(*lastc))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	514 /* Trim trailing whitespace (CRLF) */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	515 *lastc-- = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	516 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	517 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	518 v = Py_BuildValue("(is)", myerrorcode, outbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	519 if (v != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	520 PyErr_SetObject(socket_error, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	521 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	522 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	523 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	524 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	525 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	526 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	527
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	528 return PyErr_SetFromErrno(socket_error);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	529 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	530
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	531
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	532 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	533 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	534 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	535 PyObject *v;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	536
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	537 #ifdef HAVE_HSTRERROR
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	538 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	539 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	540 v = Py_BuildValue("(is)", h_error, "host not found");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	541 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	542 if (v != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	543 PyErr_SetObject(socket_herror, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	544 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	545 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	546
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	547 return NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	548 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	549
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	550
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	551 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	552 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	553 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	554 PyObject *v;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	555
22096 9e5ff6747437 Patch #520062: Support IPv6 with VC.NET. Martin v. Löwis <martin@v.loewis.de> parents: 21970 diff changeset	556 #ifdef EAI_SYSTEM
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	557 /* EAI_SYSTEM is not available on Windows XP. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	558 if (error == EAI_SYSTEM)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	559 return set_error();
22096 9e5ff6747437 Patch #520062: Support IPv6 with VC.NET. Martin v. Löwis <martin@v.loewis.de> parents: 21970 diff changeset	560 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	561
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	562 #ifdef HAVE_GAI_STRERROR
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	563 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	564 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	565 v = Py_BuildValue("(is)", error, "getaddrinfo failed");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	566 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	567 if (v != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	568 PyErr_SetObject(socket_gaierror, v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	569 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	570 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	571
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	572 return NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	573 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	574
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	575 #ifdef __VMS
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	576 /* Function to send in segments */
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	577 static int
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	578 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	579 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	580 int n = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	581 int remaining = len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	582
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	583 while (remaining > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	584 unsigned int segment;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	585
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	586 segment = (remaining >= SEGMENT_SIZE ? SEGMENT_SIZE : remaining);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	587 n = send(sock_fd, buf, segment, flags);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	588 if (n < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	589 return n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	590 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	591 remaining -= segment;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	592 buf += segment;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	593 } /* end while */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	594
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	595 return len;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	596 }
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	597 #endif
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	598
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	599 /* 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	600 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	601 static int
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	602 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	603 {
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	604 #ifndef MS_WINDOWS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	605 int delay_flag;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	606 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	607
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	608 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	609 #ifndef MS_WINDOWS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	610 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	611 block = !block;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	612 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	613 #elif defined(__VMS)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	614 block = !block;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	615 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	616 #else /* !PYOS_OS2 && !__VMS */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	617 delay_flag = fcntl(s->sock_fd, F_GETFL, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	618 if (block)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	619 delay_flag &= (~O_NONBLOCK);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	620 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	621 delay_flag \|= O_NONBLOCK;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	622 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	623 #endif /* !PYOS_OS2 */
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	624 #else /* MS_WINDOWS */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	625 block = !block;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	626 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	627 #endif /* MS_WINDOWS */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	628 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	629
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	630 /* Since these don't return anything */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	631 return 1;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	632 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	633
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	634 /* 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	635 The argument writing indicates the direction.
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	636 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	637 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	638 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	639 static int
23722 75c51999c8d5 Correct several blunders in the timeout code, mostly my own fault (for Guido van Rossum <guido@python.org> parents: 23715 diff changeset	640 internal_select(PySocketSockObject *s, int writing)
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	641 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	642 int n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	643
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	644 /* Nothing to do unless we're in timeout mode (not non-blocking) */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	645 if (s->sock_timeout <= 0.0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	646 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	647
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	648 /* Guard against closed socket */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	649 if (s->sock_fd < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	650 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	651
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	652 /* Prefer poll, if available, since you can poll() any fd
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	653 * 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	654 #ifdef HAVE_POLL
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	655 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	656 struct pollfd pollfd;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	657 int timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	658
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	659 pollfd.fd = s->sock_fd;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	660 pollfd.events = writing ? POLLOUT : POLLIN;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	661
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	662 /* s->sock_timeout is in seconds, timeout in ms */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	663 timeout = (int)(s->sock_timeout * 1000 + 0.5);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	664 n = poll(&pollfd, 1, timeout);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	665 }
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	666 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	667 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	668 /* Construct the arguments to select */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	669 fd_set fds;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	670 struct timeval tv;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	671 tv.tv_sec = (int)s->sock_timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	672 tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	673 FD_ZERO(&fds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	674 FD_SET(s->sock_fd, &fds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	675
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	676 /* See if the socket is ready */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	677 if (writing)
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	678 n = select(Py_SAFE_DOWNCAST(s->sock_fd+1, SOCKET_T, int),
b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	679 NULL, &fds, NULL, &tv);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	680 else
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	681 n = select(Py_SAFE_DOWNCAST(s->sock_fd+1, SOCKET_T, int),
b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	682 &fds, NULL, NULL, &tv);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	683 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	684 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	685
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	686 if (n < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	687 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	688 if (n == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	689 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	690 return 0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	691 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	692
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	693 /* 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	694
24305 428cbbf05639 A Python float is a C double; redeclare defaulttimeout as such; stops Tim Peters <tim.peters@gmail.com> parents: 24303 diff changeset	695 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	696
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	697 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	698 init_sockobject(PySocketSockObject *s,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	699 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	700 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	701 s->sock_fd = fd;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	702 s->sock_family = family;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	703 s->sock_type = type;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	704 s->sock_proto = proto;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	705 s->sock_timeout = defaulttimeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	706
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	707 s->errorhandler = &set_error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	708
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	709 if (defaulttimeout >= 0.0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	710 internal_setblocking(s, 0);
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	711
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	712 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	713
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	714
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	715 /* Create a new socket object.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	716 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	717 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	718 in NEWOBJ()). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	719
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	720 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	721 new_sockobject(SOCKET_T fd, int family, int type, int proto)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	722 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	723 PySocketSockObject *s;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	724 s = (PySocketSockObject *)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	725 PyType_GenericNew(&sock_type, NULL, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	726 if (s != NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	727 init_sockobject(s, fd, family, type, proto);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	728 return s;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	729 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	730
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	731
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	732 /* 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	733 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	734 #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	735 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	736 #endif
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	737
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	738
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	739 /* 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	740 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	741 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	742 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	743 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	744
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	745 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	746 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	747 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	748 struct addrinfo hints, *res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	749 int error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	750 int d1, d2, d3, d4;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	751 char ch;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	752
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	753 memset((void ) addr_ret, '\0', sizeof(addr_ret));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	754 if (name[0] == '\0') {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	755 int siz;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	756 memset(&hints, 0, sizeof(hints));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	757 hints.ai_family = af;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	758 hints.ai_socktype = SOCK_DGRAM; /dummy/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	759 hints.ai_flags = AI_PASSIVE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	760 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	761 ACQUIRE_GETADDRINFO_LOCK
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	762 error = getaddrinfo(NULL, "0", &hints, &res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	763 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	764 /* We assume that those thread-unsafe getaddrinfo() versions
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	765 are safe regarding their return value, ie. that a
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	766 subsequent call to getaddrinfo() does not destroy the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	767 outcome of the first call. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	768 RELEASE_GETADDRINFO_LOCK
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	769 if (error) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	770 set_gaierror(error);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	771 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	772 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	773 switch (res->ai_family) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	774 case AF_INET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	775 siz = 4;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	776 break;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	777 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	778 case AF_INET6:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	779 siz = 16;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	780 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	781 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	782 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	783 freeaddrinfo(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	784 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	785 "unsupported address family");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	786 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	787 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	788 if (res->ai_next) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	789 freeaddrinfo(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	790 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	791 "wildcard resolved to multiple address");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	792 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	793 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	794 if (res->ai_addrlen < addr_ret_size)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	795 addr_ret_size = res->ai_addrlen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	796 memcpy(addr_ret, res->ai_addr, addr_ret_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	797 freeaddrinfo(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	798 return siz;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	799 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	800 if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	801 struct sockaddr_in *sin;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	802 if (af != AF_INET && af != AF_UNSPEC) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	803 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	804 "address family mismatched");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	805 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	806 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	807 sin = (struct sockaddr_in *)addr_ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	808 memset((void ) sin, '\0', sizeof(sin));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	809 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	810 #ifdef HAVE_SOCKADDR_SA_LEN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	811 sin->sin_len = sizeof(*sin);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	812 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	813 sin->sin_addr.s_addr = INADDR_BROADCAST;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	814 return sizeof(sin->sin_addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	815 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	816 if (sscanf(name, "%d.%d.%d.%d%c", &d1, &d2, &d3, &d4, &ch) == 4 &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	817 0 <= d1 && d1 <= 255 && 0 <= d2 && d2 <= 255 &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	818 0 <= d3 && d3 <= 255 && 0 <= d4 && d4 <= 255) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	819 struct sockaddr_in *sin;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	820 sin = (struct sockaddr_in *)addr_ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	821 sin->sin_addr.s_addr = htonl(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	822 ((long) d1 << 24) \| ((long) d2 << 16) \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	823 ((long) d3 << 8) \| ((long) d4 << 0));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	824 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	825 #ifdef HAVE_SOCKADDR_SA_LEN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	826 sin->sin_len = sizeof(*sin);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	827 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	828 return 4;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	829 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	830 memset(&hints, 0, sizeof(hints));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	831 hints.ai_family = af;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	832 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	833 ACQUIRE_GETADDRINFO_LOCK
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	834 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	835 #if defined(__digital__) && defined(__unix__)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	836 if (error == EAI_NONAME && af == AF_UNSPEC) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	837 /* On Tru64 V5.1, numeric-to-addr conversion fails
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	838 if no address family is given. Assume IPv4 for now.*/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	839 hints.ai_family = AF_INET;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	840 error = getaddrinfo(name, NULL, &hints, &res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	841 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	842 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	843 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	844 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	845 if (error) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	846 set_gaierror(error);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	847 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	848 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	849 if (res->ai_addrlen < addr_ret_size)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	850 addr_ret_size = res->ai_addrlen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	851 memcpy((char *) addr_ret, res->ai_addr, addr_ret_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	852 freeaddrinfo(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	853 switch (addr_ret->sa_family) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	854 case AF_INET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	855 return 4;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	856 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	857 case AF_INET6:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	858 return 16;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	859 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	860 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	861 PyErr_SetString(socket_error, "unknown address family");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	862 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	863 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	864 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	865
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	866
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	867 /* 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	868 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	869 size numbers). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	870
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	871 static PyObject *
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	872 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	873 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	874 char buf[NI_MAXHOST];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	875 int error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	876
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	877 error = getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	878 NI_NUMERICHOST);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	879 if (error) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	880 set_gaierror(error);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	881 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	882 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	883 return PyUnicode_FromString(buf);
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	884 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	885
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	886
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	887 #ifdef USE_BLUETOOTH
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	888 /* 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	889 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	890 an error occurred. */
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	891
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	892 static int
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	893 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	894 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	895 unsigned int b0, b1, b2, b3, b4, b5;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	896 char ch;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	897 int n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	898
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	899 n = sscanf(name, "%X:%X:%X:%X:%X:%X%c",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	900 &b5, &b4, &b3, &b2, &b1, &b0, &ch);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	901 if (n == 6 && (b0 \| b1 \| b2 \| b3 \| b4 \| b5) < 256) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	902 bdaddr->b[0] = b0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	903 bdaddr->b[1] = b1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	904 bdaddr->b[2] = b2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	905 bdaddr->b[3] = b3;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	906 bdaddr->b[4] = b4;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	907 bdaddr->b[5] = b5;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	908 return 6;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	909 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	910 PyErr_SetString(socket_error, "bad bluetooth address");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	911 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	912 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	913 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	914
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	915 /* 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	916 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	917 value (zero padded if necessary). */
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	918
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	919 static PyObject *
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	920 makebdaddr(bdaddr_t *bdaddr)
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	921 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	922 char buf[(6 * 2) + 5 + 1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	923
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	924 sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	925 bdaddr->b[5], bdaddr->b[4], bdaddr->b[3],
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	926 bdaddr->b[2], bdaddr->b[1], bdaddr->b[0]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	927 return PyUnicode_FromString(buf);
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	928 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	929 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	930
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	931
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	932 /* 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	933 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	934 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	935 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	936
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	937 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	938 static PyObject *
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	939 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	940 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	941 if (addrlen == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	942 /* No address -- may be recvfrom() from known socket */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	943 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	944 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	945 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	946
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	947 switch (addr->sa_family) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	948
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	949 case AF_INET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	950 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	951 struct sockaddr_in *a;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	952 PyObject addrobj = makeipaddr(addr, sizeof(a));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	953 PyObject *ret = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	954 if (addrobj) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	955 a = (struct sockaddr_in *)addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	956 ret = Py_BuildValue("Oi", addrobj, ntohs(a->sin_port));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	957 Py_DECREF(addrobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	958 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	959 return ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	960 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	961
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	962 #if defined(AF_UNIX)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	963 case AF_UNIX:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	964 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	965 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	966 #ifdef linux
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	967 if (a->sun_path[0] == 0) { /* Linux abstract namespace */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	968 addrlen -= offsetof(struct sockaddr_un, sun_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	969 return PyBytes_FromStringAndSize(a->sun_path, addrlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	970 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	971 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	972 #endif /* linux */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	973 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	974 /* regular NULL-terminated string */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	975 return PyUnicode_FromString(a->sun_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	976 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	977 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	978 #endif /* AF_UNIX */
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	979
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	980 #if defined(AF_NETLINK)
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	981 case AF_NETLINK:
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	982 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	983 struct sockaddr_nl a = (struct sockaddr_nl ) addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	984 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	985 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	986 #endif /* AF_NETLINK */
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	987
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	988 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	989 case AF_INET6:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	990 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	991 struct sockaddr_in6 *a;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	992 PyObject addrobj = makeipaddr(addr, sizeof(a));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	993 PyObject *ret = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	994 if (addrobj) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	995 a = (struct sockaddr_in6 *)addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	996 ret = Py_BuildValue("Oiii",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	997 addrobj,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	998 ntohs(a->sin6_port),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	999 a->sin6_flowinfo,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1000 a->sin6_scope_id);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1001 Py_DECREF(addrobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1002 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1003 return ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1004 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1005 #endif
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1006
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1007 #ifdef USE_BLUETOOTH
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1008 case AF_BLUETOOTH:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1009 switch (proto) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1010
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1011 case BTPROTO_L2CAP:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1012 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1013 struct sockaddr_l2 a = (struct sockaddr_l2 ) addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1014 PyObject *addrobj = makebdaddr(&_BT_L2_MEMB(a, bdaddr));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1015 PyObject *ret = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1016 if (addrobj) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1017 ret = Py_BuildValue("Oi",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1018 addrobj,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1019 _BT_L2_MEMB(a, psm));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1020 Py_DECREF(addrobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1021 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1022 return ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1023 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1024
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1025 case BTPROTO_RFCOMM:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1026 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1027 struct sockaddr_rc a = (struct sockaddr_rc ) addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1028 PyObject *addrobj = makebdaddr(&_BT_RC_MEMB(a, bdaddr));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1029 PyObject *ret = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1030 if (addrobj) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1031 ret = Py_BuildValue("Oi",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1032 addrobj,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1033 _BT_RC_MEMB(a, channel));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1034 Py_DECREF(addrobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1035 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1036 return ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1037 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1038
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1039 case BTPROTO_HCI:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1040 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1041 struct sockaddr_hci a = (struct sockaddr_hci ) addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1042 PyObject *ret = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1043 ret = Py_BuildValue("i", _BT_HCI_MEMB(a, dev));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1044 return ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1045 }
40893 32c4897b5d46 Merged revisions 53623-53858 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40638 diff changeset	1046
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1047 #if !defined(__FreeBSD__)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1048 case BTPROTO_SCO:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1049 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1050 struct sockaddr_sco a = (struct sockaddr_sco ) addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1051 return makebdaddr(&_BT_SCO_MEMB(a, bdaddr));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1052 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1053 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1054
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1055 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1056 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1057 "Unknown Bluetooth protocol");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1058 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1059 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1060 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1061
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	1062 #ifdef HAVE_NETPACKET_PACKET_H
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1063 case AF_PACKET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1064 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1065 struct sockaddr_ll a = (struct sockaddr_ll )addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1066 char *ifname = "";
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1067 struct ifreq ifr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1068 /* need to look up interface name give index */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1069 if (a->sll_ifindex) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1070 ifr.ifr_ifindex = a->sll_ifindex;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1071 if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1072 ifname = ifr.ifr_name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1073 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1074 return Py_BuildValue("shbhy#",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1075 ifname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1076 ntohs(a->sll_protocol),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1077 a->sll_pkttype,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1078 a->sll_hatype,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1079 a->sll_addr,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1080 a->sll_halen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1081 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1082 #endif
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1083
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	1084 #ifdef HAVE_LINUX_TIPC_H
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1085 case AF_TIPC:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1086 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1087 struct sockaddr_tipc a = (struct sockaddr_tipc ) addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1088 if (a->addrtype == TIPC_ADDR_NAMESEQ) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1089 return Py_BuildValue("IIIII",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1090 a->addrtype,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1091 a->addr.nameseq.type,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1092 a->addr.nameseq.lower,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1093 a->addr.nameseq.upper,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1094 a->scope);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1095 } else if (a->addrtype == TIPC_ADDR_NAME) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1096 return Py_BuildValue("IIIII",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1097 a->addrtype,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1098 a->addr.name.name.type,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1099 a->addr.name.name.instance,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1100 a->addr.name.name.instance,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1101 a->scope);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1102 } else if (a->addrtype == TIPC_ADDR_ID) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1103 return Py_BuildValue("IIIII",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1104 a->addrtype,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1105 a->addr.id.node,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1106 a->addr.id.ref,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1107 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1108 a->scope);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1109 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1110 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1111 "Invalid address type");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1112 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1113 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1114 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1115 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1116
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1117 /* More cases here... */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1118
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1119 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1120 /* If we don't know the address family, don't raise an
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1121 exception -- return it as an (int, bytes) tuple. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1122 return Py_BuildValue("iy#",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1123 addr->sa_family,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1124 addr->sa_data,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1125 sizeof(addr->sa_data));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1126
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1127 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1128 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1129
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1130
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1131 /* 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	1132 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	1133 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	1134 through len_ret. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1135
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1136 static int
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1137 getsockaddrarg(PySocketSockObject s, PyObject args,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1138 struct sockaddr addr_ret, int len_ret)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1139 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1140 switch (s->sock_family) {
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1141
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	1142 #if defined(AF_UNIX)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1143 case AF_UNIX:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1144 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1145 struct sockaddr_un* addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1146 char *path;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1147 int len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1148 if (!PyArg_Parse(args, "s#", &path, &len))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1149 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1150
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1151 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	1152 #ifdef linux
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1153 if (len > 0 && path[0] == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1154 /* Linux abstract namespace extension */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1155 if (len > sizeof addr->sun_path) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1156 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1157 "AF_UNIX path too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1158 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1159 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1160 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1161 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	1162 #endif /* linux */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1163 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1164 /* regular NULL-terminated string */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1165 if (len >= sizeof addr->sun_path) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1166 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1167 "AF_UNIX path too long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1168 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1169 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1170 addr->sun_path[len] = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1171 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1172 addr->sun_family = s->sock_family;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1173 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	1174 #if defined(PYOS_OS2)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1175 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	1176 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1177 *len_ret = len + offsetof(struct sockaddr_un, sun_path);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1178 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1179 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1180 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1181 #endif /* AF_UNIX */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1182
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1183 #if defined(AF_NETLINK)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1184 case AF_NETLINK:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1185 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1186 struct sockaddr_nl* addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1187 int pid, groups;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1188 addr = (struct sockaddr_nl *)addr_ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1189 if (!PyTuple_Check(args)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1190 PyErr_Format(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1191 PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1192 "getsockaddrarg: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1193 "AF_NETLINK address must be tuple, not %.500s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1194 Py_TYPE(args)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1195 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1196 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1197 if (!PyArg_ParseTuple(args, "II:getsockaddrarg", &pid, &groups))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1198 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1199 addr->nl_family = AF_NETLINK;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1200 addr->nl_pid = pid;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1201 addr->nl_groups = groups;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1202 len_ret = sizeof(addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1203 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1204 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1205 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1206
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1207 case AF_INET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1208 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1209 struct sockaddr_in* addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1210 char *host;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1211 int port, result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1212 if (!PyTuple_Check(args)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1213 PyErr_Format(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1214 PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1215 "getsockaddrarg: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1216 "AF_INET address must be tuple, not %.500s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1217 Py_TYPE(args)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1218 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1219 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1220 if (!PyArg_ParseTuple(args, "eti:getsockaddrarg",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1221 "idna", &host, &port))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1222 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1223 addr=(struct sockaddr_in*)addr_ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1224 result = setipaddr(host, (struct sockaddr *)addr,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1225 sizeof(*addr), AF_INET);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1226 PyMem_Free(host);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1227 if (result < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1228 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1229 if (port < 0 \|\| port > 0xffff) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1230 PyErr_SetString(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1231 PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1232 "getsockaddrarg: port must be 0-65535.");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1233 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1234 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1235 addr->sin_family = AF_INET;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1236 addr->sin_port = htons((short)port);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1237 len_ret = sizeof addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1238 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1239 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1240
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1241 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1242 case AF_INET6:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1243 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1244 struct sockaddr_in6* addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1245 char *host;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1246 int port, flowinfo, scope_id, result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1247 flowinfo = scope_id = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1248 if (!PyTuple_Check(args)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1249 PyErr_Format(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1250 PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1251 "getsockaddrarg: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1252 "AF_INET6 address must be tuple, not %.500s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1253 Py_TYPE(args)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1254 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1255 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1256 if (!PyArg_ParseTuple(args, "eti\|ii",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1257 "idna", &host, &port, &flowinfo,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1258 &scope_id)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1259 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1260 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1261 addr = (struct sockaddr_in6*)addr_ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1262 result = setipaddr(host, (struct sockaddr *)addr,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1263 sizeof(*addr), AF_INET6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1264 PyMem_Free(host);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1265 if (result < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1266 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1267 if (port < 0 \|\| port > 0xffff) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1268 PyErr_SetString(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1269 PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1270 "getsockaddrarg: port must be 0-65535.");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1271 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1272 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1273 addr->sin6_family = s->sock_family;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1274 addr->sin6_port = htons((short)port);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1275 addr->sin6_flowinfo = flowinfo;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1276 addr->sin6_scope_id = scope_id;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1277 len_ret = sizeof addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1278 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1279 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1280 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1281
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1282 #ifdef USE_BLUETOOTH
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1283 case AF_BLUETOOTH:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1284 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1285 switch (s->sock_proto) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1286 case BTPROTO_L2CAP:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1287 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1288 struct sockaddr_l2 *addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1289 char *straddr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1290
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1291 addr = (struct sockaddr_l2 *)addr_ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1292 memset(addr, 0, sizeof(struct sockaddr_l2));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1293 _BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1294 if (!PyArg_ParseTuple(args, "si", &straddr,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1295 &_BT_L2_MEMB(addr, psm))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1296 PyErr_SetString(socket_error, "getsockaddrarg: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1297 "wrong format");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1298 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1299 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1300 if (setbdaddr(straddr, &_BT_L2_MEMB(addr, bdaddr)) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1301 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1302
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1303 len_ret = sizeof addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1304 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1305 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1306 case BTPROTO_RFCOMM:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1307 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1308 struct sockaddr_rc *addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1309 char *straddr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1310
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1311 addr = (struct sockaddr_rc *)addr_ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1312 _BT_RC_MEMB(addr, family) = AF_BLUETOOTH;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1313 if (!PyArg_ParseTuple(args, "si", &straddr,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1314 &_BT_RC_MEMB(addr, channel))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1315 PyErr_SetString(socket_error, "getsockaddrarg: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1316 "wrong format");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1317 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1318 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1319 if (setbdaddr(straddr, &_BT_RC_MEMB(addr, bdaddr)) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1320 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1321
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1322 len_ret = sizeof addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1323 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1324 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1325 case BTPROTO_HCI:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1326 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1327 struct sockaddr_hci addr = (struct sockaddr_hci )addr_ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1328 _BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1329 if (!PyArg_ParseTuple(args, "i", &_BT_HCI_MEMB(addr, dev))) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1330 PyErr_SetString(socket_error, "getsockaddrarg: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1331 "wrong format");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1332 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1333 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1334 len_ret = sizeof addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1335 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1336 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1337 #if !defined(__FreeBSD__)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1338 case BTPROTO_SCO:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1339 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1340 struct sockaddr_sco *addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1341 char *straddr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1342
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1343 addr = (struct sockaddr_sco *)addr_ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1344 _BT_SCO_MEMB(addr, family) = AF_BLUETOOTH;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1345 if (!PyBytes_Check(args)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1346 PyErr_SetString(socket_error, "getsockaddrarg: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1347 "wrong format");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1348 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1349 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1350 straddr = PyBytes_AS_STRING(args);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1351 if (setbdaddr(straddr, &_BT_SCO_MEMB(addr, bdaddr)) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1352 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1353
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1354 len_ret = sizeof addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1355 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1356 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1357 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1358 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1359 PyErr_SetString(socket_error, "getsockaddrarg: unknown Bluetooth protocol");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1360 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1361 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1362 }
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1363 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1364
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	1365 #ifdef HAVE_NETPACKET_PACKET_H
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1366 case AF_PACKET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1367 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1368 struct sockaddr_ll* addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1369 struct ifreq ifr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1370 char *interfaceName;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1371 int protoNumber;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1372 int hatype = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1373 int pkttype = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1374 char *haddr = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1375 unsigned int halen = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1376
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1377 if (!PyTuple_Check(args)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1378 PyErr_Format(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1379 PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1380 "getsockaddrarg: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1381 "AF_PACKET address must be tuple, not %.500s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1382 Py_TYPE(args)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1383 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1384 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1385 if (!PyArg_ParseTuple(args, "si\|iiy#", &interfaceName,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1386 &protoNumber, &pkttype, &hatype,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1387 &haddr, &halen))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1388 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1389 strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1390 ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1391 if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1392 s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1393 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1394 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1395 if (halen > 8) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1396 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1397 "Hardware address must be 8 bytes or less");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1398 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1399 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1400 if (protoNumber < 0 \|\| protoNumber > 0xffff) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1401 PyErr_SetString(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1402 PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1403 "getsockaddrarg: protoNumber must be 0-65535.");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1404 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1405 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1406 addr = (struct sockaddr_ll*)addr_ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1407 addr->sll_family = AF_PACKET;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1408 addr->sll_protocol = htons((short)protoNumber);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1409 addr->sll_ifindex = ifr.ifr_ifindex;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1410 addr->sll_pkttype = pkttype;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1411 addr->sll_hatype = hatype;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1412 if (halen != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1413 memcpy(&addr->sll_addr, haddr, halen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1414 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1415 addr->sll_halen = halen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1416 len_ret = sizeof addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1417 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1418 }
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1419 #endif
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1420
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	1421 #ifdef HAVE_LINUX_TIPC_H
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1422 case AF_TIPC:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1423 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1424 unsigned int atype, v1, v2, v3;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1425 unsigned int scope = TIPC_CLUSTER_SCOPE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1426 struct sockaddr_tipc *addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1427
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1428 if (!PyTuple_Check(args)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1429 PyErr_Format(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1430 PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1431 "getsockaddrarg: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1432 "AF_TIPC address must be tuple, not %.500s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1433 Py_TYPE(args)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1434 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1435 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1436
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1437 if (!PyArg_ParseTuple(args,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1438 "IIII\|I;Invalid TIPC address format",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1439 &atype, &v1, &v2, &v3, &scope))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1440 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1441
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1442 addr = (struct sockaddr_tipc *) addr_ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1443 memset(addr, 0, sizeof(struct sockaddr_tipc));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1444
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1445 addr->family = AF_TIPC;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1446 addr->scope = scope;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1447 addr->addrtype = atype;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1448
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1449 if (atype == TIPC_ADDR_NAMESEQ) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1450 addr->addr.nameseq.type = v1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1451 addr->addr.nameseq.lower = v2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1452 addr->addr.nameseq.upper = v3;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1453 } else if (atype == TIPC_ADDR_NAME) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1454 addr->addr.name.name.type = v1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1455 addr->addr.name.name.instance = v2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1456 } else if (atype == TIPC_ADDR_ID) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1457 addr->addr.id.node = v1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1458 addr->addr.id.ref = v2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1459 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1460 /* Shouldn't happen */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1461 PyErr_SetString(PyExc_TypeError, "Invalid address type");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1462 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1463 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1464
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1465 len_ret = sizeof(addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1466
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1467 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1468 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1469 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1470
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1471 /* More cases here... */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1472
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1473 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1474 PyErr_SetString(socket_error, "getsockaddrarg: bad family");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1475 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1476
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1477 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1478 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1479
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1480
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1481 /* 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	1482 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	1483 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	1484
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1485 static int
13554 906efc1da247 Errare humanum est. Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13538 diff changeset	1486 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	1487 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1488 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	1489
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	1490 #if defined(AF_UNIX)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1491 case AF_UNIX:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1492 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1493 *len_ret = sizeof (struct sockaddr_un);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1494 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1495 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1496 #endif /* AF_UNIX */
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1497 #if defined(AF_NETLINK)
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1498 case AF_NETLINK:
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1499 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1500 *len_ret = sizeof (struct sockaddr_nl);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1501 return 1;
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1502 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1503 #endif
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1504
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1505 case AF_INET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1506 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1507 *len_ret = sizeof (struct sockaddr_in);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1508 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1509 }
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1510
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1511 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1512 case AF_INET6:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1513 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1514 *len_ret = sizeof (struct sockaddr_in6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1515 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1516 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1517 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1518
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1519 #ifdef USE_BLUETOOTH
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1520 case AF_BLUETOOTH:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1521 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1522 switch(s->sock_proto)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1523 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1524
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1525 case BTPROTO_L2CAP:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1526 *len_ret = sizeof (struct sockaddr_l2);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1527 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1528 case BTPROTO_RFCOMM:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1529 *len_ret = sizeof (struct sockaddr_rc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1530 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1531 case BTPROTO_HCI:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1532 *len_ret = sizeof (struct sockaddr_hci);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1533 return 1;
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1534 #if !defined(__FreeBSD__)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1535 case BTPROTO_SCO:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1536 *len_ret = sizeof (struct sockaddr_sco);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1537 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1538 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1539 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1540 PyErr_SetString(socket_error, "getsockaddrlen: "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1541 "unknown BT protocol");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1542 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1543
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1544 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1545 }
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1546 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1547
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	1548 #ifdef HAVE_NETPACKET_PACKET_H
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1549 case AF_PACKET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1550 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1551 *len_ret = sizeof (struct sockaddr_ll);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1552 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1553 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1554 #endif
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1555
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	1556 #ifdef HAVE_LINUX_TIPC_H
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1557 case AF_TIPC:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1558 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1559 *len_ret = sizeof (struct sockaddr_tipc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1560 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1561 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1562 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1563
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1564 /* More cases here... */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1565
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1566 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1567 PyErr_SetString(socket_error, "getsockaddrlen: bad family");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1568 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1569
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1570 }
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1571 }
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1572
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1573
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	1574 /* s._accept() -> (fd, address) */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1575
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1576 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	1577 sock_accept(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1578 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1579 sock_addr_t addrbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1580 SOCKET_T newfd = INVALID_SOCKET;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1581 socklen_t addrlen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1582 PyObject *sock = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1583 PyObject *addr = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1584 PyObject *res = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1585 int timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1586
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1587 if (!getsockaddrlen(s, &addrlen))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1588 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1589 memset(&addrbuf, 0, addrlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1590
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1591 if (!IS_SELECTABLE(s))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1592 return select_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1593
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1594 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1595 timeout = internal_select(s, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1596 if (!timeout)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1597 newfd = accept(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1598 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1599
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1600 if (timeout == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1601 PyErr_SetString(socket_timeout, "timed out");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1602 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1603 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1604
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1605 if (newfd == INVALID_SOCKET)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1606 return s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1607
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1608 sock = PyLong_FromSocket_t(newfd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1609 if (sock == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1610 SOCKETCLOSE(newfd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1611 goto finally;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1612 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1613
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1614 addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1615 addrlen, s->sock_proto);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1616 if (addr == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1617 goto finally;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1618
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1619 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	1620
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1621 finally:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1622 Py_XDECREF(sock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1623 Py_XDECREF(addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1624 return res;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1625 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1626
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1627 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	1628 "_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	1629 \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	1630 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	1631 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	1632 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	1633
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1634 /* s.setblocking(flag) method. Argument:
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1635 False -- non-blocking mode; same as settimeout(0)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1636 True -- blocking mode; same as settimeout(None)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1637 */
1867 758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	1638
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1639 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	1640 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	1641 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1642 int block;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1643
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1644 block = PyLong_AsLong(arg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1645 if (block == -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1646 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1647
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1648 s->sock_timeout = block ? -1.0 : 0.0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1649 internal_setblocking(s, block);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1650
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1651 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1652 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	1653 }
758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	1654
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1655 PyDoc_STRVAR(setblocking_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1656 "setblocking(flag)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1657 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1658 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	1659 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	1660 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	1661
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1662 /* s.settimeout(timeout) method. Argument:
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1663 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	1664 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	1665 > 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	1666 < 0 -- illegal; raises an exception
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1667 */
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1668 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	1669 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	1670 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1671 double timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1672
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1673 if (arg == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1674 timeout = -1.0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1675 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1676 timeout = PyFloat_AsDouble(arg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1677 if (timeout < 0.0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1678 if (!PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1679 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1680 "Timeout value out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1681 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1682 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1683 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1684
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1685 s->sock_timeout = timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1686 internal_setblocking(s, timeout < 0.0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1687
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1688 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1689 return Py_None;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1690 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1691
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1692 PyDoc_STRVAR(settimeout_doc,
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1693 "settimeout(timeout)\n\
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1694 \n\
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1695 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	1696 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	1697 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	1698 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	1699
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1700 /* s.gettimeout() method.
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1701 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	1702 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	1703 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	1704 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1705 if (s->sock_timeout < 0.0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1706 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1707 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1708 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1709 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1710 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	1711 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1712
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1713 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	1714 "gettimeout() -> timeout\n\
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1715 \n\
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1716 Returns the timeout in floating seconds associated with socket \n\
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1717 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	1718 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	1719
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	1720 /* 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	1721 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	1722 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	1723 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	1724
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1725 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	1726 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	1727 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1728 int level;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1729 int optname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1730 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1731 char *buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1732 int buflen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1733 int flag;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1734
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1735 if (PyArg_ParseTuple(args, "iii:setsockopt",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1736 &level, &optname, &flag)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1737 buf = (char *) &flag;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1738 buflen = sizeof flag;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1739 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1740 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1741 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1742 if (!PyArg_ParseTuple(args, "iiy#:setsockopt",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1743 &level, &optname, &buf, &buflen))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1744 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1745 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1746 res = setsockopt(s->sock_fd, level, optname, (void *)buf, buflen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1747 if (res < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1748 return s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1749 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1750 return Py_None;
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1751 }
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1752
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1753 PyDoc_STRVAR(setsockopt_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1754 "setsockopt(level, option, value)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1755 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1756 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	1757 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	1758
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1759
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	1760 /* 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	1761 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	1762 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	1763 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	1764
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1765 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	1766 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	1767 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1768 int level;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1769 int optname;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1770 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1771 PyObject *buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1772 socklen_t buflen = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1773
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1774 if (!PyArg_ParseTuple(args, "ii\|i:getsockopt",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1775 &level, &optname, &buflen))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1776 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1777
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1778 if (buflen == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1779 int flag = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1780 socklen_t flagsize = sizeof flag;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1781 res = getsockopt(s->sock_fd, level, optname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1782 (void *)&flag, &flagsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1783 if (res < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1784 return s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1785 return PyLong_FromLong(flag);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1786 }
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	1787 #ifdef __VMS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1788 /* socklen_t is unsigned so no negative test is needed,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1789 test buflen == 0 is previously done */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1790 if (buflen > 1024) {
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	1791 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1792 if (buflen <= 0 \|\| buflen > 1024) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1793 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1794 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1795 "getsockopt buflen out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1796 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1797 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1798 buf = PyBytes_FromStringAndSize((char *)NULL, buflen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1799 if (buf == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1800 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1801 res = getsockopt(s->sock_fd, level, optname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1802 (void *)PyBytes_AS_STRING(buf), &buflen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1803 if (res < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1804 Py_DECREF(buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1805 return s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1806 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1807 _PyBytes_Resize(&buf, buflen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1808 return buf;
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1809 }
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1810
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1811 PyDoc_STRVAR(getsockopt_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1812 "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	1813 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1814 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	1815 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	1816 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	1817
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1818
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	1819 /* s.bind(sockaddr) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1820
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1821 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	1822 sock_bind(PySocketSockObject s, PyObject addro)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1823 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1824 sock_addr_t addrbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1825 int addrlen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1826 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1827
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1828 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1829 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1830 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1831 res = bind(s->sock_fd, SAS2SA(&addrbuf), addrlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1832 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1833 if (res < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1834 return s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1835 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1836 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1837 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1838
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1839 PyDoc_STRVAR(bind_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1840 "bind(address)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1841 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1842 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	1843 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	1844 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	1845
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1846
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1847 /* s.close() method.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1848 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	1849 will surely fail. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1850
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1851 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	1852 sock_close(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1853 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1854 SOCKET_T fd;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1855
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1856 if ((fd = s->sock_fd) != -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1857 s->sock_fd = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1858 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1859 (void) SOCKETCLOSE(fd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1860 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1861 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1862 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1863 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1864 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1865
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1866 PyDoc_STRVAR(close_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1867 "close()\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1868 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1869 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	1870
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	1871 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	1872 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	1873 {
63890 60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	1874 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	1875 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	1876 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	1877 }
3f8cef837f07 Issue #8524: Add a forget() method to socket objects, so as to put the Antoine Pitrou <solipsis@pitrou.net> parents: 61466 diff changeset	1878
63890 60076f28c023 Followup to r83869 and issue #8524: rename socket.forget() to socket.detach() Antoine Pitrou <solipsis@pitrou.net> parents: 63856 diff changeset	1879 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	1880 "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	1881 \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	1882 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	1883 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	1884 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	1885
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1886 static int
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1887 internal_connect(PySocketSockObject s, struct sockaddr addr, int addrlen,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1888 int *timeoutp)
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1889 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1890 int res, timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1891
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1892 timeout = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1893 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	1894
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1895 #ifdef MS_WINDOWS
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1896
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1897 if (s->sock_timeout > 0.0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1898 if (res < 0 && WSAGetLastError() == WSAEWOULDBLOCK &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1899 IS_SELECTABLE(s)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1900 /* This is a mess. Best solution: trust select */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1901 fd_set fds;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1902 fd_set fds_exc;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1903 struct timeval tv;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1904 tv.tv_sec = (int)s->sock_timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1905 tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1906 FD_ZERO(&fds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1907 FD_SET(s->sock_fd, &fds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1908 FD_ZERO(&fds_exc);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1909 FD_SET(s->sock_fd, &fds_exc);
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	1910 res = select(Py_SAFE_DOWNCAST(s->sock_fd+1, SOCKET_T, int),
b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	1911 NULL, &fds, &fds_exc, &tv);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1912 if (res == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1913 res = WSAEWOULDBLOCK;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1914 timeout = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1915 } else if (res > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1916 if (FD_ISSET(s->sock_fd, &fds))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1917 /* The socket is in the writable set - this
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1918 means connected */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1919 res = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1920 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1921 /* As per MS docs, we need to call getsockopt()
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1922 to get the underlying error */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1923 int res_size = sizeof res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1924 /* It must be in the exception set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1925 assert(FD_ISSET(s->sock_fd, &fds_exc));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1926 if (0 == getsockopt(s->sock_fd, SOL_SOCKET, SO_ERROR,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1927 (char *)&res, &res_size))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1928 /* getsockopt also clears WSAGetLastError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1929 so reset it back. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1930 WSASetLastError(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1931 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1932 res = WSAGetLastError();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1933 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1934 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1935 /* else if (res < 0) an error occurred */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1936 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1937 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1938
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1939 if (res < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1940 res = WSAGetLastError();
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1941
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1942 #else
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1943
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1944 if (s->sock_timeout > 0.0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1945 if (res < 0 && errno == EINPROGRESS && IS_SELECTABLE(s)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1946 timeout = internal_select(s, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1947 if (timeout == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1948 /* Bug #1019808: in case of an EINPROGRESS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1949 use getsockopt(SO_ERROR) to get the real
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1950 error. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1951 socklen_t res_size = sizeof res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1952 (void)getsockopt(s->sock_fd, SOL_SOCKET,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1953 SO_ERROR, &res, &res_size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1954 if (res == EISCONN)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1955 res = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1956 errno = res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1957 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1958 else if (timeout == -1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1959 res = errno; /* had error */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1960 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1961 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1962 res = EWOULDBLOCK; /* timed out */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1963 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1964 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1965
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1966 if (res < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1967 res = errno;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1968
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1969 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1970 *timeoutp = timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1971
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1972 return res;
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1973 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1974
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	1975 /* s.connect(sockaddr) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1976
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1977 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	1978 sock_connect(PySocketSockObject s, PyObject addro)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1979 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1980 sock_addr_t addrbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1981 int addrlen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1982 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1983 int timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1984
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1985 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1986 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1987
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1988 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1989 res = internal_connect(s, SAS2SA(&addrbuf), addrlen, &timeout);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1990 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1991
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1992 if (timeout == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1993 PyErr_SetString(socket_timeout, "timed out");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1994 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1995 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1996 if (res != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1997 return s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1998 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	1999 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2000 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2001
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2002 PyDoc_STRVAR(connect_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2003 "connect(address)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2004 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2005 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	2006 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	2007
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2008
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	2009 /* 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	2010
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2011 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	2012 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	2013 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2014 sock_addr_t addrbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2015 int addrlen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2016 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2017 int timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2018
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2019 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2020 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2021
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2022 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2023 res = internal_connect(s, SAS2SA(&addrbuf), addrlen, &timeout);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2024 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2025
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2026 /* Signals are not errors (though they may raise exceptions). Adapted
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2027 from PyErr_SetFromErrnoWithFilenameObject(). */
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2028 #ifdef EINTR
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2029 if (res == EINTR && PyErr_CheckSignals())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2030 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2031 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2032
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2033 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	2034 }
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2035
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2036 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	2037 "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	2038 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2039 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	2040 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	2041
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2042
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	2043 /* 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	2044
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2045 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	2046 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	2047 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2048 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	2049 }
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: 900 diff changeset	2050
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2051 PyDoc_STRVAR(fileno_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2052 "fileno() -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2053 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2054 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	2055
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	2056
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2057 /* s.getsockname() method */
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2058
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2059 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	2060 sock_getsockname(PySocketSockObject *s)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2061 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2062 sock_addr_t addrbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2063 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2064 socklen_t addrlen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2065
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2066 if (!getsockaddrlen(s, &addrlen))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2067 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2068 memset(&addrbuf, 0, addrlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2069 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2070 res = getsockname(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2071 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2072 if (res < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2073 return s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2074 return makesockaddr(s->sock_fd, SAS2SA(&addrbuf), addrlen,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2075 s->sock_proto);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2076 }
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2077
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2078 PyDoc_STRVAR(getsockname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2079 "getsockname() -> address info\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2080 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2081 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	2082 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	2083
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2084
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2085 #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	2086 /* s.getpeername() method */
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2087
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2088 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	2089 sock_getpeername(PySocketSockObject *s)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2090 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2091 sock_addr_t addrbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2092 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2093 socklen_t addrlen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2094
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2095 if (!getsockaddrlen(s, &addrlen))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2096 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2097 memset(&addrbuf, 0, addrlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2098 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2099 res = getpeername(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2100 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2101 if (res < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2102 return s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2103 return makesockaddr(s->sock_fd, SAS2SA(&addrbuf), addrlen,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2104 s->sock_proto);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2105 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2106
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2107 PyDoc_STRVAR(getpeername_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2108 "getpeername() -> address info\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2109 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2110 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	2111 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	2112
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2113 #endif /* HAVE_GETPEERNAME */
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2114
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2115
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2116 /* s.listen(n) method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2117
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2118 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	2119 sock_listen(PySocketSockObject s, PyObject arg)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2120 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2121 int backlog;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2122 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2123
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2124 backlog = PyLong_AsLong(arg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2125 if (backlog == -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2126 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2127 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2128 if (backlog < 1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2129 backlog = 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2130 res = listen(s->sock_fd, backlog);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2131 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2132 if (res < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2133 return s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2134 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2135 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2136 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2137
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2138 PyDoc_STRVAR(listen_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2139 "listen(backlog)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2140 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2141 Enable a server to accept connections. The backlog argument must be at\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2142 least 1; it specifies the number of unaccepted connection that the system\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2143 will allow before refusing new connections.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2144
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2145
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2146 /*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2147 * 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	2148 * 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	2149 * the buffer, do it in the caller. This function returns the number of bytes
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2150 * succesfully read. If there was an error, it returns -1. Note that it is
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2151 * 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	2152 * bytes.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2153 */
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2154 static Py_ssize_t
b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2155 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	2156 {
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2157 Py_ssize_t outlen = -1;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2158 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	2159 #ifdef __VMS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2160 int remaining;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2161 char *read_buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2162 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2163
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2164 if (!IS_SELECTABLE(s)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2165 select_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2166 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2167 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2168 if (len == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2169 /* If 0 bytes were requested, do nothing. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2170 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2171 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2172
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2173 #ifndef __VMS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2174 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2175 timeout = internal_select(s, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2176 if (!timeout)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2177 outlen = recv(s->sock_fd, cbuf, len, flags);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2178 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2179
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2180 if (timeout == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2181 PyErr_SetString(socket_timeout, "timed out");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2182 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2183 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2184 if (outlen < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2185 /* Note: the call to errorhandler() ALWAYS indirectly returned
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2186 NULL, so ignore its return value */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2187 s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2188 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2189 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2190 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2191 read_buf = cbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2192 remaining = len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2193 while (remaining != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2194 unsigned int segment;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2195 int nread = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2196
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2197 segment = remaining /SEGMENT_SIZE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2198 if (segment != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2199 segment = SEGMENT_SIZE;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2200 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2201 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2202 segment = remaining;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2203 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2204
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2205 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2206 timeout = internal_select(s, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2207 if (!timeout)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2208 nread = recv(s->sock_fd, read_buf, segment, flags);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2209 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2210
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2211 if (timeout == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2212 PyErr_SetString(socket_timeout, "timed out");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2213 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2214 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2215 if (nread < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2216 s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2217 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2218 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2219 if (nread != remaining) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2220 read_buf += nread;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2221 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2222 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2223
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2224 remaining -= segment;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2225 read_buf += segment;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2226 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2227 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	2228 #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	2229
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2230 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	2231 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2232
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	2233
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	2234 /* 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	2235
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2236 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	2237 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	2238 {
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2239 Py_ssize_t recvlen, outlen;
b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2240 int flags = 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2241 PyObject *buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2242
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2243 if (!PyArg_ParseTuple(args, "n\|i:recv", &recvlen, &flags))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2244 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2245
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2246 if (recvlen < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2247 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2248 "negative buffersize in recv");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2249 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2250 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2251
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2252 /* Allocate a new string. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2253 buf = PyBytes_FromStringAndSize((char *) 0, recvlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2254 if (buf == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2255 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2256
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2257 /* Call the guts */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2258 outlen = sock_recv_guts(s, PyBytes_AS_STRING(buf), recvlen, flags);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2259 if (outlen < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2260 /* An error occurred, release the string and return an
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2261 error. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2262 Py_DECREF(buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2263 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2264 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2265 if (outlen != recvlen) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2266 /* We did not read as many bytes as we anticipated, resize the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2267 string if possible and be successful. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2268 _PyBytes_Resize(&buf, outlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2269 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2270
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2271 return buf;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2272 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2273
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2274 PyDoc_STRVAR(recv_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2275 "recv(buffersize[, flags]) -> data\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2276 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2277 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	2278 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	2279 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	2280 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	2281
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2282
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2283 /* 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	2284
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2285 static PyObject*
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2286 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	2287 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2288 static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2289
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2290 int flags = 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2291 Py_buffer pbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2292 char *buf;
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2293 Py_ssize_t buflen, readlen, recvlen = 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2294
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2295 /* Get the buffer's memory */
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2296 if (!PyArg_ParseTupleAndKeywords(args, kwds, "w*\|ni:recv_into", kwlist,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2297 &pbuf, &recvlen, &flags))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2298 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2299 buf = pbuf.buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2300 buflen = pbuf.len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2301
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2302 if (recvlen < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2303 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2304 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2305 "negative buffersize in recv_into");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2306 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2307 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2308 if (recvlen == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2309 /* If nbytes was not specified, use the buffer's length */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2310 recvlen = buflen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2311 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2312
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2313 /* Check if the buffer is large enough */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2314 if (buflen < recvlen) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2315 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2316 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2317 "buffer too small for requested bytes");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2318 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2319 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2320
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2321 /* Call the guts */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2322 readlen = sock_recv_guts(s, buf, recvlen, flags);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2323 if (readlen < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2324 /* Return an error. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2325 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2326 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2327 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2328
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2329 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2330 /* Return the number of bytes read. Note that we do not do anything
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2331 special here in the case that readlen < recvlen. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2332 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	2333 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2334
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2335 PyDoc_STRVAR(recv_into_doc,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2336 "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	2337 \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2338 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	2339 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	2340 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	2341 \n\
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2342 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	2343
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2344
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2345 /*
44349 4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	2346 * 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	2347 * 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	2348 * contain the buffer, do it in the caller. This function returns the number
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	2349 * of bytes succesfully read. If there was an error, it returns -1. Note
4dc01402d78a Merged revisions 59541-59561 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44158 diff changeset	2350 * 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	2351 * 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	2352 *
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2353 * '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	2354 * 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	2355 */
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2356 static Py_ssize_t
b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2357 sock_recvfrom_guts(PySocketSockObject s, char cbuf, Py_ssize_t len, int flags,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2358 PyObject** addr)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2359 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2360 sock_addr_t addrbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2361 int timeout;
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2362 Py_ssize_t n = -1;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2363 socklen_t addrlen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2364
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2365 *addr = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2366
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2367 if (!getsockaddrlen(s, &addrlen))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2368 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2369
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2370 if (!IS_SELECTABLE(s)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2371 select_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2372 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2373 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2374
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2375 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2376 memset(&addrbuf, 0, addrlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2377 timeout = internal_select(s, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2378 if (!timeout) {
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	2379 #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	2380 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2381 n = recvfrom(s->sock_fd, cbuf, len, flags,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2382 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	2383 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2384 n = recvfrom(s->sock_fd, cbuf, len, flags,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2385 (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	2386 #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	2387 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2388 n = recvfrom(s->sock_fd, cbuf, len, flags,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2389 SAS2SA(&addrbuf), &addrlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2390 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2391 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2392 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2393
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2394 if (timeout == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2395 PyErr_SetString(socket_timeout, "timed out");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2396 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2397 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2398 if (n < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2399 s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2400 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2401 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2402
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2403 if (!(*addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2404 addrlen, s->sock_proto)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2405 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2406
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2407 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	2408 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2409
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2410 /* 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	2411
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2412 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	2413 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	2414 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2415 PyObject *buf = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2416 PyObject *addr = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2417 PyObject *ret = NULL;
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2418 int flags = 0;
b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2419 Py_ssize_t recvlen, outlen;
b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2420
b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2421 if (!PyArg_ParseTuple(args, "n\|i:recvfrom", &recvlen, &flags))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2422 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2423
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2424 if (recvlen < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2425 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2426 "negative buffersize in recvfrom");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2427 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2428 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2429
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2430 buf = PyBytes_FromStringAndSize((char *) 0, recvlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2431 if (buf == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2432 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2433
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2434 outlen = sock_recvfrom_guts(s, PyBytes_AS_STRING(buf),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2435 recvlen, flags, &addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2436 if (outlen < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2437 goto finally;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2438 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2439
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2440 if (outlen != recvlen) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2441 /* We did not read as many bytes as we anticipated, resize the
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2442 string if possible and be succesful. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2443 if (_PyBytes_Resize(&buf, outlen) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2444 /* Oopsy, not so succesful after all. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2445 goto finally;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2446 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2447
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2448 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	2449
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2450 finally:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2451 Py_XDECREF(buf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2452 Py_XDECREF(addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2453 return ret;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2454 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2455
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2456 PyDoc_STRVAR(recvfrom_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2457 "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	2458 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2459 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	2460
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2461
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2462 /* 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	2463
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2464 static PyObject *
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2465 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	2466 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2467 static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2468
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2469 int flags = 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2470 Py_buffer pbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2471 char *buf;
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2472 Py_ssize_t readlen, buflen, recvlen = 0;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2473
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2474 PyObject *addr = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2475
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2476 if (!PyArg_ParseTupleAndKeywords(args, kwds, "w*\|ni:recvfrom_into",
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2477 kwlist, &pbuf,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2478 &recvlen, &flags))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2479 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2480 buf = pbuf.buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2481 buflen = pbuf.len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2482 assert(buf != 0 && buflen > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2483
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2484 if (recvlen < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2485 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2486 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2487 "negative buffersize in recvfrom_into");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2488 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2489 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2490 if (recvlen == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2491 /* If nbytes was not specified, use the buffer's length */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2492 recvlen = buflen;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2493 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2494
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2495 readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2496 if (readlen < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2497 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2498 /* Return an error */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2499 Py_XDECREF(addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2500 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2501 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2502
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2503 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2504 /* Return the number of bytes read and the address. Note that we do
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2505 not do anything special here in the case that readlen < recvlen. */
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2506 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	2507 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2508
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2509 PyDoc_STRVAR(recvfrom_into_doc,
a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2510 "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	2511 \n\
38673 a19c20c5e5c7 Merge the rest of the trunk. Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	2512 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	2513
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	2514
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	2515 /* 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	2516
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2517 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	2518 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	2519 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2520 char *buf;
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2521 Py_ssize_t len, n = -1;
b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2522 int flags = 0, timeout;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2523 Py_buffer pbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2524
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2525 if (!PyArg_ParseTuple(args, "y*\|i:send", &pbuf, &flags))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2526 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2527
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2528 if (!IS_SELECTABLE(s)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2529 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2530 return select_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2531 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2532 buf = pbuf.buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2533 len = pbuf.len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2534
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2535 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2536 timeout = internal_select(s, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2537 if (!timeout)
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2538 #ifdef __VMS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2539 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	2540 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2541 n = send(s->sock_fd, buf, len, flags);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2542 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2543 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2544
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2545 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2546
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2547 if (timeout == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2548 PyErr_SetString(socket_timeout, "timed out");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2549 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2550 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2551 if (n < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2552 return s->errorhandler();
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2553 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	2554 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2555
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2556 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	2557 "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	2558 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2559 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	2560 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	2561 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	2562
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2563
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2564 /* 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	2565
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2566 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	2567 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	2568 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2569 char *buf;
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2570 Py_ssize_t len, n = -1;
b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2571 int flags = 0, timeout;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2572 Py_buffer pbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2573
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2574 if (!PyArg_ParseTuple(args, "y*\|i:sendall", &pbuf, &flags))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2575 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2576 buf = pbuf.buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2577 len = pbuf.len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2578
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2579 if (!IS_SELECTABLE(s)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2580 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2581 return select_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2582 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2583
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2584 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2585 do {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2586 timeout = internal_select(s, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2587 n = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2588 if (timeout)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2589 break;
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38673 diff changeset	2590 #ifdef __VMS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2591 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	2592 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2593 n = send(s->sock_fd, buf, len, flags);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2594 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2595 if (n < 0) {
58144 d399f6dc9ee4 Merge the trivial portion of r74426 from trunk. Gregory P. Smith <greg@mad-scientist.com> parents: 56367 diff changeset	2596 #ifdef EINTR
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2597 /* We must handle EINTR here as there is no way for
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2598 * the caller to know how much was sent otherwise. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2599 if (errno == EINTR) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2600 /* Run signal handlers. If an exception was
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2601 * raised, abort and leave this socket in
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2602 * an unknown state. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2603 if (PyErr_CheckSignals())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2604 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2605 continue;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2606 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2607 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2608 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2609 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2610 buf += n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2611 len -= n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2612 } while (len > 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2613 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2614 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2615
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2616 if (timeout == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2617 PyErr_SetString(socket_timeout, "timed out");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2618 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2619 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2620 if (n < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2621 return s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2622
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2623 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2624 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	2625 }
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2626
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2627 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	2628 "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	2629 \n\
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2630 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	2631 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	2632 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	2633 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	2634
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2635
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	2636 /* 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	2637
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2638 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	2639 sock_sendto(PySocketSockObject s, PyObject args)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2640 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2641 Py_buffer pbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2642 PyObject *addro;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2643 char *buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2644 Py_ssize_t len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2645 sock_addr_t addrbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2646 int addrlen, n = -1, flags, timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2647
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2648 flags = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2649 if (!PyArg_ParseTuple(args, "y*O:sendto", &pbuf, &addro)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2650 PyErr_Clear();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2651 if (!PyArg_ParseTuple(args, "y*iO:sendto",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2652 &pbuf, &flags, &addro))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2653 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2654 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2655 buf = pbuf.buf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2656 len = pbuf.len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2657
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2658 if (!IS_SELECTABLE(s)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2659 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2660 return select_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2661 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2662
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2663 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2664 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2665 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2666 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2667
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2668 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2669 timeout = internal_select(s, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2670 if (!timeout)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2671 n = sendto(s->sock_fd, buf, len, flags, SAS2SA(&addrbuf), addrlen);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2672 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2673
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2674 PyBuffer_Release(&pbuf);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2675 if (timeout == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2676 PyErr_SetString(socket_timeout, "timed out");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2677 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2678 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2679 if (n < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2680 return s->errorhandler();
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	2681 return PyLong_FromSsize_t(n);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2682 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2683
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2684 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	2685 "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	2686 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2687 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	2688 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	2689
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2690
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2691 /* s.shutdown(how) method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2692
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2693 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	2694 sock_shutdown(PySocketSockObject s, PyObject arg)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2695 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2696 int how;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2697 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2698
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2699 how = PyLong_AsLong(arg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2700 if (how == -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2701 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2702 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2703 res = shutdown(s->sock_fd, how);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2704 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2705 if (res < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2706 return s->errorhandler();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2707 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2708 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2709 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2710
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2711 PyDoc_STRVAR(shutdown_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2712 "shutdown(flag)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2713 \n\
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	2714 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	2715 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	2716
47667 b1f4ea4eb555 Merged revisions 64214 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47663 diff changeset	2717 #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	2718 static PyObject*
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2719 sock_ioctl(PySocketSockObject s, PyObject arg)
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2720 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2721 unsigned long cmd = SIO_RCVALL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2722 PyObject *argO;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2723 DWORD recv;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2724
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2725 if (!PyArg_ParseTuple(arg, "kO:ioctl", &cmd, &argO))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2726 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2727
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2728 switch (cmd) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2729 case SIO_RCVALL: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2730 unsigned int option = RCVALL_ON;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2731 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	2732 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2733 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	2734 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	2735 return set_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2736 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2737 return PyLong_FromUnsignedLong(recv); }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2738 case SIO_KEEPALIVE_VALS: {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2739 struct tcp_keepalive ka;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2740 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	2741 &ka.onoff, &ka.keepalivetime, &ka.keepaliveinterval))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2742 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2743 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	2744 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	2745 return set_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2746 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2747 return PyLong_FromUnsignedLong(recv); }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2748 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2749 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	2750 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2751 }
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2752 }
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2753 PyDoc_STRVAR(sock_ioctl_doc,
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2754 "ioctl(cmd, option) -> long\n\
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2755 \n\
56252 debb245ebb40 http://bugs.python.org/issue6971 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 53824 diff changeset	2756 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	2757 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	2758 SIO_KEEPALIVE_VALS: 'option' is a tuple of (onoff, timeout, interval).");
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2759
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	2760 #endif
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2761
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2762 /* List of methods for socket objects */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2763
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2764 static PyMethodDef sock_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2765 {"_accept", (PyCFunction)sock_accept, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2766 accept_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2767 {"bind", (PyCFunction)sock_bind, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2768 bind_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2769 {"close", (PyCFunction)sock_close, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2770 close_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2771 {"connect", (PyCFunction)sock_connect, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2772 connect_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2773 {"connect_ex", (PyCFunction)sock_connect_ex, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2774 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	2775 {"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	2776 detach_doc},
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2777 {"fileno", (PyCFunction)sock_fileno, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2778 fileno_doc},
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2779 #ifdef HAVE_GETPEERNAME
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2780 {"getpeername", (PyCFunction)sock_getpeername,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2781 METH_NOARGS, getpeername_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2782 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2783 {"getsockname", (PyCFunction)sock_getsockname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2784 METH_NOARGS, getsockname_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2785 {"getsockopt", (PyCFunction)sock_getsockopt, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2786 getsockopt_doc},
47667 b1f4ea4eb555 Merged revisions 64214 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47663 diff changeset	2787 #if defined(MS_WINDOWS) && defined(SIO_RCVALL)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2788 {"ioctl", (PyCFunction)sock_ioctl, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2789 sock_ioctl_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2790 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2791 {"listen", (PyCFunction)sock_listen, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2792 listen_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2793 {"recv", (PyCFunction)sock_recv, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2794 recv_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2795 {"recv_into", (PyCFunction)sock_recv_into, METH_VARARGS \| METH_KEYWORDS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2796 recv_into_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2797 {"recvfrom", (PyCFunction)sock_recvfrom, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2798 recvfrom_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2799 {"recvfrom_into", (PyCFunction)sock_recvfrom_into, METH_VARARGS \| METH_KEYWORDS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2800 recvfrom_into_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2801 {"send", (PyCFunction)sock_send, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2802 send_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2803 {"sendall", (PyCFunction)sock_sendall, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2804 sendall_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2805 {"sendto", (PyCFunction)sock_sendto, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2806 sendto_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2807 {"setblocking", (PyCFunction)sock_setblocking, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2808 setblocking_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2809 {"settimeout", (PyCFunction)sock_settimeout, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2810 settimeout_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2811 {"gettimeout", (PyCFunction)sock_gettimeout, METH_NOARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2812 gettimeout_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2813 {"setsockopt", (PyCFunction)sock_setsockopt, METH_VARARGS,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2814 setsockopt_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2815 {"shutdown", (PyCFunction)sock_shutdown, METH_O,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2816 shutdown_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2817 {NULL, NULL} /* sentinel */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2818 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2819
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	2820 /* 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	2821 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	2822 {"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	2823 {"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	2824 {"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	2825 {"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	2826 {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	2827 };
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2828
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2829 /* 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	2830 First close the file description. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2831
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2832 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	2833 sock_dealloc(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2834 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2835 if (s->sock_fd != -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2836 (void) SOCKETCLOSE(s->sock_fd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2837 Py_TYPE(s)->tp_free((PyObject *)s);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2838 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2839
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2840
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	2841 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	2842 sock_repr(PySocketSockObject *s)
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	2843 {
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2844 #if SIZEOF_SOCKET_T > SIZEOF_LONG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2845 if (s->sock_fd > LONG_MAX) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2846 /* this can occur on Win64, and actually there is a special
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2847 ugly printf formatter for decimal pointer length integer
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2848 printing, only bother if necessary*/
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2849 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2850 "no printf formatter to display "
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2851 "the socket descriptor in decimal");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2852 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2853 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2854 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2855 return PyUnicode_FromFormat(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2856 "<socket object, fd=%ld, family=%d, type=%d, proto=%d>",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2857 (long)s->sock_fd, s->sock_family,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2858 s->sock_type,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2859 s->sock_proto);
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	2860 }
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	2861
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	2862
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2863 /* 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	2864
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2865 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	2866 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	2867 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2868 PyObject *new;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2869
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2870 new = type->tp_alloc(type, 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2871 if (new != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2872 ((PySocketSockObject *)new)->sock_fd = -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2873 ((PySocketSockObject *)new)->sock_timeout = -1.0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2874 ((PySocketSockObject *)new)->errorhandler = &set_error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2875 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2876 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	2877 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2878
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2879
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2880 /* 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	2881
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2882 /ARGSUSED/
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2883 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	2884 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	2885 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2886 PySocketSockObject s = (PySocketSockObject )self;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2887 PyObject *fdobj = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2888 SOCKET_T fd = INVALID_SOCKET;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2889 int family = AF_INET, type = SOCK_STREAM, proto = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2890 static char *keywords[] = {"family", "type", "proto", "fileno", 0};
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2891
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2892 if (!PyArg_ParseTupleAndKeywords(args, kwds,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2893 "\|iiiO:socket", keywords,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2894 &family, &type, &proto, &fdobj))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2895 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2896
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2897 if (fdobj != NULL && fdobj != Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2898 fd = PyLong_AsSocket_t(fdobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2899 if (fd == (SOCKET_T)(-1) && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2900 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2901 if (fd == INVALID_SOCKET) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2902 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2903 "can't use invalid socket value");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2904 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2905 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2906 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2907 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2908 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2909 fd = socket(family, type, proto);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2910 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2911
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2912 if (fd == INVALID_SOCKET) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2913 set_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2914 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2915 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2916 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2917 init_sockobject(s, fd, family, type, proto);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2918
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2919 return 0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2920
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2921 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2922
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	2923
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2924 /* 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	2925
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2926 static PyTypeObject sock_type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2927 PyVarObject_HEAD_INIT(0, 0) /* Must fill in type value later */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2928 "_socket.socket", /* tp_name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2929 sizeof(PySocketSockObject), /* tp_basicsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2930 0, /* tp_itemsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2931 (destructor)sock_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2932 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2933 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2934 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2935 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2936 (reprfunc)sock_repr, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2937 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2938 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2939 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2940 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2941 0, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2942 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2943 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2944 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2945 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2946 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2947 sock_doc, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2948 0, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2949 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2950 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2951 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2952 0, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2953 0, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2954 sock_methods, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2955 sock_memberlist, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2956 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2957 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2958 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2959 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2960 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2961 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2962 sock_initobj, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2963 PyType_GenericAlloc, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2964 sock_new, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2965 PyObject_Del, /* tp_free */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2966 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2967
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2968
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2969 /* Python interface to gethostname(). */
a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2970
a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2971 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2972 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	2973 socket_gethostname(PyObject self, PyObject unused)
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2974 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2975 char buf[1024];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2976 int res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2977 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2978 res = gethostname(buf, (int) sizeof buf - 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2979 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2980 if (res < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2981 return set_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2982 buf[sizeof buf - 1] = '\0';
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2983 return PyUnicode_FromString(buf);
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	2984 }
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2985
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2986 PyDoc_STRVAR(gethostname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2987 "gethostname() -> string\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2988 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2989 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	2990
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	2991
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2992 /* Python interface to gethostbyname(name). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2993
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2994 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2995 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	2996 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	2997 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2998 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	2999 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	3000 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	3001
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	3002 if (!PyArg_ParseTuple(args, "et:gethostbyname", "idna", &name))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3003 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3004 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	3005 goto finally;
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	3006 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	3007 finally:
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	3008 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	3009 return ret;
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3010 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3011
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3012 PyDoc_STRVAR(gethostbyname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3013 "gethostbyname(host) -> address\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3014 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3015 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	3016
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3017
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3018 /* 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	3019
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3020 static PyObject *
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3021 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	3022 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3023 char **pch;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3024 PyObject rtn_tuple = (PyObject )NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3025 PyObject name_list = (PyObject )NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3026 PyObject addr_list = (PyObject )NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3027 PyObject *tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3028
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3029 if (h == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3030 /* Let's get real error message to return */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3031 set_herror(h_errno);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3032 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3033 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3034
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3035 if (h->h_addrtype != af) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3036 /* Let's get real error message to return */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3037 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3038 (char *)strerror(EAFNOSUPPORT));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3039
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3040 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3041 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3042
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3043 switch (af) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3044
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3045 case AF_INET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3046 if (alen < sizeof(struct sockaddr_in))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3047 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3048 break;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3049
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3050 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3051 case AF_INET6:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3052 if (alen < sizeof(struct sockaddr_in6))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3053 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3054 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3055 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3056
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3057 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3058
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3059 if ((name_list = PyList_New(0)) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3060 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3061
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3062 if ((addr_list = PyList_New(0)) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3063 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3064
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3065 /* SF #1511317: h_aliases can be NULL */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3066 if (h->h_aliases) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3067 for (pch = h->h_aliases; *pch != NULL; pch++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3068 int status;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3069 tmp = PyUnicode_FromString(*pch);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3070 if (tmp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3071 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3072
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3073 status = PyList_Append(name_list, tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3074 Py_DECREF(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3075
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3076 if (status)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3077 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3078 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3079 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3080
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3081 for (pch = h->h_addr_list; *pch != NULL; pch++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3082 int status;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3083
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3084 switch (af) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3085
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3086 case AF_INET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3087 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3088 struct sockaddr_in sin;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3089 memset(&sin, 0, sizeof(sin));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3090 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	3091 #ifdef HAVE_SOCKADDR_SA_LEN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3092 sin.sin_len = sizeof(sin);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3093 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3094 memcpy(&sin.sin_addr, *pch, sizeof(sin.sin_addr));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3095 tmp = makeipaddr((struct sockaddr *)&sin, sizeof(sin));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3096
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3097 if (pch == h->h_addr_list && alen >= sizeof(sin))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3098 memcpy((char *) addr, &sin, sizeof(sin));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3099 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3100 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3101
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3102 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3103 case AF_INET6:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3104 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3105 struct sockaddr_in6 sin6;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3106 memset(&sin6, 0, sizeof(sin6));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3107 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	3108 #ifdef HAVE_SOCKADDR_SA_LEN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3109 sin6.sin6_len = sizeof(sin6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3110 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3111 memcpy(&sin6.sin6_addr, *pch, sizeof(sin6.sin6_addr));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3112 tmp = makeipaddr((struct sockaddr *)&sin6,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3113 sizeof(sin6));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3114
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3115 if (pch == h->h_addr_list && alen >= sizeof(sin6))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3116 memcpy((char *) addr, &sin6, sizeof(sin6));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3117 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3118 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3119 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3120
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3121 default: /* can't happen */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3122 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3123 "unsupported address family");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3124 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3125 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3126
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3127 if (tmp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3128 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3129
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3130 status = PyList_Append(addr_list, tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3131 Py_DECREF(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3132
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3133 if (status)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3134 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3135 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3136
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3137 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	3138
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3139 err:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3140 Py_XDECREF(name_list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3141 Py_XDECREF(addr_list);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3142 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	3143 }
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3144
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3145
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3146 /* 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	3147
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3148 /ARGSUSED/
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3149 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	3150 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	3151 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3152 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3153 struct hostent *h;
28949 ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28925 diff changeset	3154 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3155 struct sockaddr_storage addr;
28949 ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28925 diff changeset	3156 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3157 struct sockaddr_in addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3158 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3159 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	3160 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	3161 #ifdef HAVE_GETHOSTBYNAME_R
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3162 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	3163 #ifdef HAVE_GETHOSTBYNAME_R_3_ARG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3164 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	3165 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3166 char buf[16384];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3167 int buf_len = (sizeof buf) - 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3168 int errnop;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3169 #endif
5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3170 #if defined(HAVE_GETHOSTBYNAME_R_3_ARG) \|\| defined(HAVE_GETHOSTBYNAME_R_6_ARG)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3171 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	3172 #endif
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3173 #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	3174
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	3175 if (!PyArg_ParseTuple(args, "et:gethostbyname_ex", "idna", &name))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3176 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3177 if (setipaddr(name, (struct sockaddr *)&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	3178 goto finally;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3179 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	3180 #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	3181 #if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3182 result = gethostbyname_r(name, &hp_allocated, buf, buf_len,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3183 &h, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3184 #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3185 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	3186 #else /* HAVE_GETHOSTBYNAME_R_3_ARG */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3187 memset((void *) &data, '\0', sizeof(data));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3188 result = gethostbyname_r(name, &hp_allocated, &data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3189 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	3190 #endif
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3191 #else /* not HAVE_GETHOSTBYNAME_R */
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3192 #ifdef USE_GETHOSTBYNAME_LOCK
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3193 PyThread_acquire_lock(netdb_lock, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3194 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3195 h = gethostbyname(name);
10441 9ba5dffccb1b Jonathan Giddy writes: Guido van Rossum <guido@python.org> parents: 10401 diff changeset	3196 #endif /* HAVE_GETHOSTBYNAME_R */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3197 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3198 /* Some C libraries would require addr.__ss_family instead of
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3199 addr.ss_family.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3200 Therefore, we cast the sockaddr_storage into sockaddr to
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3201 access sa_family. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3202 sa = (struct sockaddr*)&addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3203 ret = gethost_common(h, (struct sockaddr *)&addr, sizeof(addr),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3204 sa->sa_family);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3205 #ifdef USE_GETHOSTBYNAME_LOCK
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3206 PyThread_release_lock(netdb_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3207 #endif
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	3208 finally:
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	3209 PyMem_Free(name);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3210 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	3211 }
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3212
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3213 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	3214 "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	3215 \n\
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3216 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	3217 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	3218
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3219
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3220 /* Python interface to gethostbyaddr(IP). */
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3221
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3222 /ARGSUSED/
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3223 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	3224 socket_gethostbyaddr(PyObject self, PyObject args)
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3225 {
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3226 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3227 struct sockaddr_storage addr;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3228 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3229 struct sockaddr_in addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3230 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3231 struct sockaddr sa = (struct sockaddr )&addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3232 char *ip_num;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3233 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	3234 PyObject *ret = NULL;
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3235 #ifdef HAVE_GETHOSTBYNAME_R
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3236 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	3237 #ifdef HAVE_GETHOSTBYNAME_R_3_ARG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3238 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	3239 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3240 /* glibcs up to 2.10 assume that the buf argument to
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3241 gethostbyaddr_r is 8-byte aligned, which at least llvm-gcc
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3242 does not ensure. The attribute below instructs the compiler
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3243 to maintain this alignment. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3244 char buf[16384] Py_ALIGNED(8);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3245 int buf_len = (sizeof buf) - 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3246 int errnop;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3247 #endif
5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3248 #if defined(HAVE_GETHOSTBYNAME_R_3_ARG) \|\| defined(HAVE_GETHOSTBYNAME_R_6_ARG)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3249 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	3250 #endif
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3251 #endif /* HAVE_GETHOSTBYNAME_R */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3252 char *ap;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3253 int al;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3254 int af;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3255
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	3256 if (!PyArg_ParseTuple(args, "et:gethostbyaddr", "idna", &ip_num))
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3257 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3258 af = AF_UNSPEC;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3259 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	3260 goto finally;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3261 af = sa->sa_family;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3262 ap = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3263 al = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3264 switch (af) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3265 case AF_INET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3266 ap = (char )&((struct sockaddr_in )sa)->sin_addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3267 al = sizeof(((struct sockaddr_in *)sa)->sin_addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3268 break;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3269 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3270 case AF_INET6:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3271 ap = (char )&((struct sockaddr_in6 )sa)->sin6_addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3272 al = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3273 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3274 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3275 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3276 PyErr_SetString(socket_error, "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	3277 goto finally;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3278 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3279 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	3280 #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	3281 #if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3282 result = gethostbyaddr_r(ap, al, af,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3283 &hp_allocated, buf, buf_len,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3284 &h, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3285 #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3286 h = gethostbyaddr_r(ap, al, af,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3287 &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	3288 #else /* HAVE_GETHOSTBYNAME_R_3_ARG */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3289 memset((void *) &data, '\0', sizeof(data));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3290 result = gethostbyaddr_r(ap, al, af, &hp_allocated, &data);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3291 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	3292 #endif
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3293 #else /* not HAVE_GETHOSTBYNAME_R */
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3294 #ifdef USE_GETHOSTBYNAME_LOCK
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3295 PyThread_acquire_lock(netdb_lock, 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3296 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3297 h = gethostbyaddr(ap, al, af);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3298 #endif /* HAVE_GETHOSTBYNAME_R */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3299 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3300 ret = gethost_common(h, (struct sockaddr *)&addr, sizeof(addr), af);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3301 #ifdef USE_GETHOSTBYNAME_LOCK
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3302 PyThread_release_lock(netdb_lock);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3303 #endif
64230 35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	3304 finally:
35304c2fe9e0 Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex and Martin v. Löwis <martin@v.loewis.de> parents: 64120 diff changeset	3305 PyMem_Free(ip_num);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3306 return ret;
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3307 }
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3308
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3309 PyDoc_STRVAR(gethostbyaddr_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3310 "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	3311 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3312 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	3313 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	3314
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3315
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3316 /* Python interface to getservbyname(name).
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3317 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	3318 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	3319
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3320 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3321 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	3322 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	3323 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3324 char name, proto=NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3325 struct servent *sp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3326 if (!PyArg_ParseTuple(args, "s\|s:getservbyname", &name, &proto))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3327 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3328 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3329 sp = getservbyname(name, proto);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3330 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3331 if (sp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3332 PyErr_SetString(socket_error, "service/proto not found");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3333 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3334 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3335 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	3336 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3337
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3338 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	3339 "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	3340 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3341 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	3342 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	3343 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	3344
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3345
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3346 /* 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	3347 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	3348 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	3349
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3350 /ARGSUSED/
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3351 static PyObject *
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3352 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	3353 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3354 int port;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3355 char *proto=NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3356 struct servent *sp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3357 if (!PyArg_ParseTuple(args, "i\|s:getservbyport", &port, &proto))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3358 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3359 if (port < 0 \|\| port > 0xffff) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3360 PyErr_SetString(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3361 PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3362 "getservbyport: port must be 0-65535.");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3363 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3364 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3365 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3366 sp = getservbyport(htons((short)port), proto);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3367 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3368 if (sp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3369 PyErr_SetString(socket_error, "port/proto not found");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3370 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3371 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3372 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	3373 }
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3374
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3375 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	3376 "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	3377 \n\
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3378 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	3379 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	3380 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	3381
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3382 /* Python interface to getprotobyname(name).
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3383 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	3384 already known or not useful (like the list of aliases). */
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3385
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3386 /ARGSUSED/
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3387 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	3388 socket_getprotobyname(PyObject self, PyObject args)
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3389 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3390 char *name;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3391 struct protoent *sp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3392 if (!PyArg_ParseTuple(args, "s:getprotobyname", &name))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3393 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3394 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3395 sp = getprotobyname(name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3396 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3397 if (sp == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3398 PyErr_SetString(socket_error, "protocol not found");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3399 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3400 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3401 return PyLong_FromLong((long) sp->p_proto);
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3402 }
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3403
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3404 PyDoc_STRVAR(getprotobyname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3405 "getprotobyname(name) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3406 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3407 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	3408
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3409
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	3410 #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	3411 /* 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	3412
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	3413 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	3414 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	3415 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3416 SOCKET_T fd, newfd;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3417 PyObject *newfdobj;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3418
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3419
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3420 fd = PyLong_AsSocket_t(fdobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3421 if (fd == (SOCKET_T)(-1) && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3422 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3423
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3424 newfd = dup_socket(fd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3425 if (newfd == INVALID_SOCKET)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3426 return set_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3427
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3428 newfdobj = PyLong_FromSocket_t(newfd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3429 if (newfdobj == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3430 SOCKETCLOSE(newfd);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3431 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	3432 }
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	3433
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	3434 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	3435 "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	3436 \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	3437 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	3438 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	3439 #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	3440
70cfc7b504c2 This is roughly socket2.diff from issue 1378, with a few changes applied Guido van Rossum <guido@python.org> parents: 43877 diff changeset	3441
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3442 #ifdef HAVE_SOCKETPAIR
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3443 /* 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	3444 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	3445 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	3446
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3447 /ARGSUSED/
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3448 static PyObject *
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3449 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	3450 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3451 PySocketSockObject s0 = NULL, s1 = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3452 SOCKET_T sv[2];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3453 int family, type = SOCK_STREAM, proto = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3454 PyObject *res = NULL;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3455
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3456 #if defined(AF_UNIX)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3457 family = AF_UNIX;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3458 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3459 family = AF_INET;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3460 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3461 if (!PyArg_ParseTuple(args, "\|iii:socketpair",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3462 &family, &type, &proto))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3463 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3464 /* Create a pair of socket fds */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3465 if (socketpair(family, type, proto, sv) < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3466 return set_error();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3467 s0 = new_sockobject(sv[0], family, type, proto);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3468 if (s0 == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3469 goto finally;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3470 s1 = new_sockobject(sv[1], family, type, proto);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3471 if (s1 == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3472 goto finally;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3473 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	3474
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3475 finally:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3476 if (res == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3477 if (s0 == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3478 SOCKETCLOSE(sv[0]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3479 if (s1 == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3480 SOCKETCLOSE(sv[1]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3481 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3482 Py_XDECREF(s0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3483 Py_XDECREF(s1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3484 return res;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3485 }
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3486
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3487 PyDoc_STRVAR(socketpair_doc,
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3488 "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	3489 \n\
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3490 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	3491 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	3492 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	3493 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	3494
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3495 #endif /* HAVE_SOCKETPAIR */
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3496
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3497
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3498 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	3499 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	3500 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3501 int x1, x2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3502
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3503 if (!PyArg_ParseTuple(args, "i:ntohs", &x1)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3504 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3505 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3506 if (x1 < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3507 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3508 "can't convert negative number to unsigned long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3509 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3510 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3511 x2 = (unsigned int)ntohs((unsigned short)x1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3512 return PyLong_FromLong(x2);
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3513 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3514
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3515 PyDoc_STRVAR(ntohs_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3516 "ntohs(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3517 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3518 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	3519
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3520
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3521 static PyObject *
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3522 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	3523 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3524 unsigned long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3525
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3526 if (PyLong_Check(arg)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3527 x = PyLong_AsUnsignedLong(arg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3528 if (x == (unsigned long) -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3529 return NULL;
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3530 #if SIZEOF_LONG > 4
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3531 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3532 unsigned long y;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3533 /* only want the trailing 32 bits */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3534 y = x & 0xFFFFFFFFUL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3535 if (y ^ x)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3536 return PyErr_Format(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3537 "long int larger than 32 bits");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3538 x = y;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3539 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3540 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3541 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3542 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3543 return PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3544 "expected int/long, %s found",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3545 Py_TYPE(arg)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3546 if (x == (unsigned long) -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3547 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3548 return PyLong_FromUnsignedLong(ntohl(x));
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3549 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3550
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3551 PyDoc_STRVAR(ntohl_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3552 "ntohl(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3553 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3554 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	3555
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3556
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3557 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	3558 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	3559 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3560 int x1, x2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3561
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3562 if (!PyArg_ParseTuple(args, "i:htons", &x1)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3563 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3564 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3565 if (x1 < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3566 PyErr_SetString(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3567 "can't convert negative number to unsigned long");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3568 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3569 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3570 x2 = (unsigned int)htons((unsigned short)x1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3571 return PyLong_FromLong(x2);
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3572 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3573
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3574 PyDoc_STRVAR(htons_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3575 "htons(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3576 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3577 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	3578
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3579
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3580 static PyObject *
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3581 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	3582 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3583 unsigned long x;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3584
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3585 if (PyLong_Check(arg)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3586 x = PyLong_AsUnsignedLong(arg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3587 if (x == (unsigned long) -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3588 return NULL;
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3589 #if SIZEOF_LONG > 4
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3590 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3591 unsigned long y;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3592 /* only want the trailing 32 bits */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3593 y = x & 0xFFFFFFFFUL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3594 if (y ^ x)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3595 return PyErr_Format(PyExc_OverflowError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3596 "long int larger than 32 bits");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3597 x = y;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3598 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3599 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3600 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3601 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3602 return PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3603 "expected int/long, %s found",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3604 Py_TYPE(arg)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3605 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	3606 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3607
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3608 PyDoc_STRVAR(htonl_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3609 "htonl(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3610 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3611 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	3612
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3613 /* 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	3614
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3615 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	3616 "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	3617 \n\
11219 2d7331f4dfe3 Port inet_ntoa and inet_aton to Windows: Guido van Rossum <guido@python.org> parents: 11217 diff changeset	3618 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	3619 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	3620
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3621 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	3622 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	3623 {
11268 3fe8d13328c8 It appears that inet_aton() doesn't really exist except in libresolv; Guido van Rossum <guido@python.org> parents: 11219 diff changeset	3624 #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	3625 #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	3626 #endif
27858 9453d8cdd01e Ummm, try to get it right this time Neal Norwitz <nnorwitz@gmail.com> parents: 27857 diff changeset	3627 #ifdef HAVE_INET_ATON
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3628 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	3629 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3630
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3631 #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	3632 #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	3633 #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	3634 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3635 /* Have to use inet_addr() instead */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3636 unsigned int packed_addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3637 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3638 char *ip_addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3639
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3640 if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3641 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	3642
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3643
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3644 #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	3645
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3646 #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	3647 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	3648 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3649 if (inet_aton(ip_addr, &buf))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3650 return PyBytes_FromStringAndSize((char *)(&buf),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3651 sizeof(buf));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3652
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3653 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3654 "illegal IP address string passed to inet_aton");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3655 return NULL;
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3656
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3657 #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	3658 } else {
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3659 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3660
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3661 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3662
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3663 #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	3664
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3665 /* special-case this address as inet_addr might return INADDR_NONE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3666 * for this */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3667 if (strcmp(ip_addr, "255.255.255.255") == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3668 packed_addr = 0xFFFFFFFF;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3669 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3670
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3671 packed_addr = inet_addr(ip_addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3672
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3673 if (packed_addr == INADDR_NONE) { /* invalid address */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3674 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3675 "illegal IP address string passed to inet_aton");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3676 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3677 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3678 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3679 return PyBytes_FromStringAndSize((char *) &packed_addr,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3680 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	3681
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3682 #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	3683 }
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3684 #endif
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3685
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3686 #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	3687 }
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3688
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3689 PyDoc_STRVAR(inet_ntoa_doc,
11937 ef98ee6aeb42 Fixed inet_ntoa() docstring. Fred Drake <fdrake@acm.org> parents: 11882 diff changeset	3690 "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	3691 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3692 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	3693
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3694 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	3695 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	3696 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3697 char *packed_str;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3698 int addr_len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3699 struct in_addr packed_addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3700
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3701 if (!PyArg_ParseTuple(args, "y#:inet_ntoa", &packed_str, &addr_len)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3702 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3703 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3704
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3705 if (addr_len != sizeof(packed_addr)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3706 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3707 "packed IP wrong length for inet_ntoa");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3708 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3709 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3710
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3711 memcpy(&packed_addr, packed_str, addr_len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3712
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3713 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	3714 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3715
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3716 #ifdef HAVE_INET_PTON
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3717
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3718 PyDoc_STRVAR(inet_pton_doc,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3719 "inet_pton(af, ip) -> packed IP address string\n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3720 \n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3721 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	3722 for use with low-level network functions.");
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3723
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3724 static PyObject *
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3725 socket_inet_pton(PyObject self, PyObject args)
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3726 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3727 int af;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3728 char* ip;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3729 int retval;
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	3730 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3731 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	3732 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3733 char packed[sizeof(struct in_addr)];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3734 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3735 if (!PyArg_ParseTuple(args, "is:inet_pton", &af, &ip)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3736 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3737 }
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3738
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	3739 #if !defined(ENABLE_IPV6) && defined(AF_INET6)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3740 if(af == AF_INET6) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3741 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3742 "can't use AF_INET6, IPv6 is disabled");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3743 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3744 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3745 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3746
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3747 retval = inet_pton(af, ip, packed);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3748 if (retval < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3749 PyErr_SetFromErrno(socket_error);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3750 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3751 } else if (retval == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3752 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3753 "illegal IP address string passed to inet_pton");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3754 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3755 } else if (af == AF_INET) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3756 return PyBytes_FromStringAndSize(packed,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3757 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	3758 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3759 } else if (af == AF_INET6) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3760 return PyBytes_FromStringAndSize(packed,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3761 sizeof(struct in6_addr));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3762 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3763 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3764 PyErr_SetString(socket_error, "unknown address family");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3765 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3766 }
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3767 }
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 37879 diff changeset	3768
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3769 PyDoc_STRVAR(inet_ntop_doc,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3770 "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	3771 \n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3772 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	3773
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3774 static PyObject *
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3775 socket_inet_ntop(PyObject self, PyObject args)
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3776 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3777 int af;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3778 char* packed;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3779 int len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3780 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	3781 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3782 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	3783 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3784 char ip[INET_ADDRSTRLEN + 1];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3785 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3786
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3787 /* Guarantee NUL-termination for PyUnicode_FromString() below */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3788 memset((void *) &ip[0], '\0', sizeof(ip));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3789
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3790 if (!PyArg_ParseTuple(args, "iy#:inet_ntop", &af, &packed, &len)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3791 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3792 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3793
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3794 if (af == AF_INET) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3795 if (len != sizeof(struct in_addr)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3796 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3797 "invalid length of packed IP address string");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3798 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3799 }
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	3800 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3801 } else if (af == AF_INET6) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3802 if (len != sizeof(struct in6_addr)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3803 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3804 "invalid length of packed IP address string");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3805 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3806 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3807 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3808 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3809 PyErr_Format(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3810 "unknown address family %d", af);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3811 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3812 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3813
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3814 retval = inet_ntop(af, packed, ip, sizeof(ip));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3815 if (!retval) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3816 PyErr_SetFromErrno(socket_error);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3817 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3818 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3819 return PyUnicode_FromString(retval);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3820 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3821
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3822 /* NOTREACHED */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3823 PyErr_SetString(PyExc_RuntimeError, "invalid handling of inet_ntop");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3824 return NULL;
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3825 }
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3826
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3827 #endif /* HAVE_INET_PTON */
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3828
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3829 /* 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	3830
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3831 /ARGSUSED/
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3832 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	3833 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	3834 {
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	3835 static char* kwnames[] = {"host", "port", "family", "type", "proto",
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	3836 "flags", 0};
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3837 struct addrinfo hints, *res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3838 struct addrinfo *res0 = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3839 PyObject *hobj = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3840 PyObject pobj = (PyObject )NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3841 char pbuf[30];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3842 char hptr, pptr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3843 int family, socktype, protocol, flags;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3844 int error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3845 PyObject all = (PyObject )NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3846 PyObject *idna = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3847
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3848 family = socktype = protocol = flags = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3849 family = AF_UNSPEC;
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	3850 if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO\|iiii: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	3851 kwnames, &hobj, &pobj, &family, &socktype,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3852 &protocol, &flags)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3853 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3854 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3855 if (hobj == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3856 hptr = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3857 } else if (PyUnicode_Check(hobj)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3858 idna = PyObject_CallMethod(hobj, "encode", "s", "idna");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3859 if (!idna)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3860 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3861 assert(PyBytes_Check(idna));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3862 hptr = PyBytes_AS_STRING(idna);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3863 } else if (PyBytes_Check(hobj)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3864 hptr = PyBytes_AsString(hobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3865 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3866 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3867 "getaddrinfo() argument 1 must be string or None");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3868 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3869 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3870 if (PyLong_CheckExact(pobj)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3871 long value = PyLong_AsLong(pobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3872 if (value == -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3873 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3874 PyOS_snprintf(pbuf, sizeof(pbuf), "%ld", value);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3875 pptr = pbuf;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3876 } else if (PyUnicode_Check(pobj)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3877 pptr = _PyUnicode_AsString(pobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3878 } else if (PyBytes_Check(pobj)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3879 pptr = PyBytes_AsString(pobj);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3880 } else if (pobj == Py_None) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3881 pptr = (char *)NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3882 } else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3883 PyErr_SetString(socket_error, "Int or String expected");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3884 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3885 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3886 memset(&hints, 0, sizeof(hints));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3887 hints.ai_family = family;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3888 hints.ai_socktype = socktype;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3889 hints.ai_protocol = protocol;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3890 hints.ai_flags = flags;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3891 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3892 ACQUIRE_GETADDRINFO_LOCK
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3893 error = getaddrinfo(hptr, pptr, &hints, &res0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3894 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3895 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3896 if (error) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3897 set_gaierror(error);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3898 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3899 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3900
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3901 if ((all = PyList_New(0)) == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3902 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3903 for (res = res0; res; res = res->ai_next) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3904 PyObject *single;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3905 PyObject *addr =
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3906 makesockaddr(-1, res->ai_addr, res->ai_addrlen, protocol);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3907 if (addr == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3908 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3909 single = Py_BuildValue("iiisO", res->ai_family,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3910 res->ai_socktype, res->ai_protocol,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3911 res->ai_canonname ? res->ai_canonname : "",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3912 addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3913 Py_DECREF(addr);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3914 if (single == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3915 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3916
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3917 if (PyList_Append(all, single))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3918 goto err;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3919 Py_XDECREF(single);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3920 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3921 Py_XDECREF(idna);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3922 if (res0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3923 freeaddrinfo(res0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3924 return all;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3925 err:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3926 Py_XDECREF(all);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3927 Py_XDECREF(idna);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3928 if (res0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3929 freeaddrinfo(res0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3930 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	3931 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3932
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3933 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	3934 "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	3935 -> 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	3936 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3937 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	3938
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3939 /* 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	3940
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3941 /ARGSUSED/
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3942 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	3943 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	3944 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3945 PyObject sa = (PyObject )NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3946 int flags;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3947 char *hostp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3948 int port, flowinfo, scope_id;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3949 char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3950 struct addrinfo hints, *res = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3951 int error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3952 PyObject ret = (PyObject )NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3953
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3954 flags = flowinfo = scope_id = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3955 if (!PyArg_ParseTuple(args, "Oi:getnameinfo", &sa, &flags))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3956 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3957 if (!PyTuple_Check(sa)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3958 PyErr_SetString(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3959 "getnameinfo() argument 1 must be a tuple");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3960 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3961 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3962 if (!PyArg_ParseTuple(sa, "si\|ii",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3963 &hostp, &port, &flowinfo, &scope_id))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3964 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3965 PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3966 memset(&hints, 0, sizeof(hints));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3967 hints.ai_family = AF_UNSPEC;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3968 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	3969 hints.ai_flags = AI_NUMERICHOST; /* don't do any name resolution */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3970 Py_BEGIN_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3971 ACQUIRE_GETADDRINFO_LOCK
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3972 error = getaddrinfo(hostp, pbuf, &hints, &res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3973 Py_END_ALLOW_THREADS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3974 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3975 if (error) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3976 set_gaierror(error);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3977 goto fail;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3978 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3979 if (res->ai_next) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3980 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3981 "sockaddr resolved to multiple addresses");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3982 goto fail;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3983 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3984 switch (res->ai_family) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3985 case AF_INET:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3986 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3987 if (PyTuple_GET_SIZE(sa) != 2) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3988 PyErr_SetString(socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3989 "IPv4 sockaddr must be 2 tuple");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3990 goto fail;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3991 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3992 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3993 }
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3994 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3995 case AF_INET6:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3996 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3997 struct sockaddr_in6 *sin6;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3998 sin6 = (struct sockaddr_in6 *)res->ai_addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	3999 sin6->sin6_flowinfo = flowinfo;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4000 sin6->sin6_scope_id = scope_id;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4001 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4002 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4003 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4004 }
64120 b624c7417ad4 Clean some 64-bit issues. Also, always spell "ssize_t" "Py_ssize_t". Antoine Pitrou <solipsis@pitrou.net> parents: 64113 diff changeset	4005 error = getnameinfo(res->ai_addr, (socklen_t) res->ai_addrlen,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4006 hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), flags);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4007 if (error) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4008 set_gaierror(error);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4009 goto fail;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4010 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4011 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	4012
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4013 fail:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4014 if (res)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4015 freeaddrinfo(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4016 return ret;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4017 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4018
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4019 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	4020 "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	4021 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4022 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	4023
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4024
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4025 /* 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	4026
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4027 static PyObject *
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4028 socket_getdefaulttimeout(PyObject *self)
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4029 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4030 if (defaulttimeout < 0.0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4031 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4032 return Py_None;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4033 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4034 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4035 return PyFloat_FromDouble(defaulttimeout);
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4036 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4037
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4038 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	4039 "getdefaulttimeout() -> timeout\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4040 \n\
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4041 Returns the default timeout in floating seconds for new socket objects.\n\
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4042 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	4043 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	4044
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4045 static PyObject *
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4046 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	4047 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4048 double timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4049
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4050 if (arg == Py_None)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4051 timeout = -1.0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4052 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4053 timeout = PyFloat_AsDouble(arg);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4054 if (timeout < 0.0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4055 if (!PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4056 PyErr_SetString(PyExc_ValueError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4057 "Timeout value out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4058 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4059 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4060 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4061
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4062 defaulttimeout = timeout;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4063
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4064 Py_INCREF(Py_None);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4065 return Py_None;
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4066 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4067
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4068 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	4069 "setdefaulttimeout(timeout)\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4070 \n\
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4071 Set the default timeout in floating seconds for new socket objects.\n\
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4072 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	4073 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	4074
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4075
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4076 /* 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	4077
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4078 static PyMethodDef socket_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4079 {"gethostbyname", socket_gethostbyname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4080 METH_VARARGS, gethostbyname_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4081 {"gethostbyname_ex", socket_gethostbyname_ex,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4082 METH_VARARGS, ghbn_ex_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4083 {"gethostbyaddr", socket_gethostbyaddr,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4084 METH_VARARGS, gethostbyaddr_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4085 {"gethostname", socket_gethostname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4086 METH_NOARGS, gethostname_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4087 {"getservbyname", socket_getservbyname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4088 METH_VARARGS, getservbyname_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4089 {"getservbyport", socket_getservbyport,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4090 METH_VARARGS, getservbyport_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4091 {"getprotobyname", socket_getprotobyname,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4092 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	4093 #ifndef NO_DUP
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4094 {"dup", socket_dup,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4095 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	4096 #endif
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4097 #ifdef HAVE_SOCKETPAIR
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4098 {"socketpair", socket_socketpair,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4099 METH_VARARGS, socketpair_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4100 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4101 {"ntohs", socket_ntohs,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4102 METH_VARARGS, ntohs_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4103 {"ntohl", socket_ntohl,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4104 METH_O, ntohl_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4105 {"htons", socket_htons,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4106 METH_VARARGS, htons_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4107 {"htonl", socket_htonl,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4108 METH_O, htonl_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4109 {"inet_aton", socket_inet_aton,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4110 METH_VARARGS, inet_aton_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4111 {"inet_ntoa", socket_inet_ntoa,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4112 METH_VARARGS, inet_ntoa_doc},
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4113 #ifdef HAVE_INET_PTON
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4114 {"inet_pton", socket_inet_pton,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4115 METH_VARARGS, inet_pton_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4116 {"inet_ntop", socket_inet_ntop,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4117 METH_VARARGS, inet_ntop_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4118 #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	4119 {"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	4120 METH_VARARGS \| METH_KEYWORDS, getaddrinfo_doc},
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4121 {"getnameinfo", socket_getnameinfo,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4122 METH_VARARGS, getnameinfo_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4123 {"getdefaulttimeout", (PyCFunction)socket_getdefaulttimeout,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4124 METH_NOARGS, getdefaulttimeout_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4125 {"setdefaulttimeout", socket_setdefaulttimeout,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4126 METH_O, setdefaulttimeout_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4127 {NULL, NULL} /* Sentinel */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4128 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4129
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4130
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	4131 #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	4132 #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	4133
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4134 /* 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	4135
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	4136 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	4137 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	4138 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4139 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	4140 }
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	4141
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	4142 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	4143 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	4144 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4145 WSADATA WSAData;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4146 int ret;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4147 ret = WSAStartup(0x0101, &WSAData);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4148 switch (ret) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4149 case 0: /* No error */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4150 Py_AtExit(os_cleanup);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4151 return 1; /* Success */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4152 case WSASYSNOTREADY:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4153 PyErr_SetString(PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4154 "WSAStartup failed: network not ready");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4155 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4156 case WSAVERNOTSUPPORTED:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4157 case WSAEINVAL:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4158 PyErr_SetString(
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4159 PyExc_ImportError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4160 "WSAStartup failed: requested version not supported");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4161 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4162 default:
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4163 PyErr_Format(PyExc_ImportError, "WSAStartup failed: error code %d", ret);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4164 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4165 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4166 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	4167 }
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	4168
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	4169 #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	4170
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4171
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4172 #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	4173 #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	4174
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4175 /* Additional initialization for OS/2 */
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4176
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4177 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	4178 os_init(void)
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4179 {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4180 #ifndef PYCC_GCC
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4181 int rc = sock_init();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4182
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4183 if (rc == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4184 return 1; /* Success */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4185 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4186
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4187 PyErr_Format(PyExc_ImportError, "OS/2 TCP/IP Error# %d", sock_errno());
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4188
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4189 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	4190 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4191 /* No need to initialise sockets with GCC/EMX */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4192 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	4193 #endif
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4194 }
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4195
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4196 #endif /* PYOS_OS2 */
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4197
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4198
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4199 #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	4200 static int
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4201 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	4202 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4203 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	4204 }
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4205 #endif
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4206
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4207
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	4208 /* 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	4209 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	4210 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	4211 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	4212 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4213 &sock_type,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4214 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	4215 };
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	4216
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4217
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4218 /* 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	4219
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4220 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	4221 "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	4222 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	4223 os-specific initialization fails. On Windows, this does WINSOCK
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	4224 initialization. When WINSOCK is initialized succesfully, a call to
8e062e572ea4 Sockets facelift. APIs that could return binary data (e.g. aton() and Guido van Rossum <guido@python.org> parents: 41770 diff changeset	4225 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	4226 */
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4227
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4228 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	4229 "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	4230 \n\
980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	4231 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	4232
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	4233 static struct PyModuleDef socketmodule = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4234 PyModuleDef_HEAD_INIT,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4235 PySocket_MODULE_NAME,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4236 socket_doc,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4237 -1,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4238 socket_methods,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4239 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4240 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4241 NULL,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4242 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	4243 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47301 diff changeset	4244
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24411 diff changeset	4245 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	4246 PyInit__socket(void)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4247 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4248 PyObject m, has_ipv6;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4249
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4250 if (!os_init())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4251 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4252
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4253 Py_TYPE(&sock_type) = &PyType_Type;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4254 m = PyModule_Create(&socketmodule);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4255 if (m == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4256 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4257
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4258 socket_error = PyErr_NewException("socket.error",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4259 PyExc_IOError, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4260 if (socket_error == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4261 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4262 PySocketModuleAPI.error = socket_error;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4263 Py_INCREF(socket_error);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4264 PyModule_AddObject(m, "error", socket_error);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4265 socket_herror = PyErr_NewException("socket.herror",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4266 socket_error, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4267 if (socket_herror == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4268 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4269 Py_INCREF(socket_herror);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4270 PyModule_AddObject(m, "herror", socket_herror);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4271 socket_gaierror = PyErr_NewException("socket.gaierror", socket_error,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4272 NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4273 if (socket_gaierror == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4274 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4275 Py_INCREF(socket_gaierror);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4276 PyModule_AddObject(m, "gaierror", socket_gaierror);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4277 socket_timeout = PyErr_NewException("socket.timeout",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4278 socket_error, NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4279 if (socket_timeout == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4280 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4281 Py_INCREF(socket_timeout);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4282 PyModule_AddObject(m, "timeout", socket_timeout);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4283 Py_INCREF((PyObject *)&sock_type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4284 if (PyModule_AddObject(m, "SocketType",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4285 (PyObject *)&sock_type) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4286 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4287 Py_INCREF((PyObject *)&sock_type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4288 if (PyModule_AddObject(m, "socket",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4289 (PyObject *)&sock_type) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4290 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	4291
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4292 #ifdef ENABLE_IPV6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4293 has_ipv6 = Py_True;
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4294 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4295 has_ipv6 = Py_False;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4296 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4297 Py_INCREF(has_ipv6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4298 PyModule_AddObject(m, "has_ipv6", has_ipv6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4299
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4300 /* Export C API */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4301 if (PyModule_AddObject(m, PySocket_CAPI_NAME,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4302 PyCapsule_New(&PySocketModuleAPI, PySocket_CAPSULE_NAME, NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4303 ) != 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4304 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4305
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4306 /* 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	4307 #ifdef AF_UNSPEC
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4308 PyModule_AddIntConstant(m, "AF_UNSPEC", AF_UNSPEC);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4309 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4310 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	4311 #ifdef AF_INET6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4312 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	4313 #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	4314 #if defined(AF_UNIX)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4315 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	4316 #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	4317 #ifdef AF_AX25
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4318 /* Amateur Radio AX.25 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4319 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	4320 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4321 #ifdef AF_IPX
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4322 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	4323 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4324 #ifdef AF_APPLETALK
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4325 /* Appletalk DDP */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4326 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	4327 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4328 #ifdef AF_NETROM
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4329 /* Amateur radio NetROM */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4330 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	4331 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4332 #ifdef AF_BRIDGE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4333 /* Multiprotocol bridge */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4334 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	4335 #endif
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4336 #ifdef AF_ATMPVC
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4337 /* ATM PVCs */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4338 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	4339 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4340 #ifdef AF_AAL5
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4341 /* Reserved for Werner's ATM */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4342 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	4343 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4344 #ifdef AF_X25
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4345 /* Reserved for X.25 project */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4346 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	4347 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4348 #ifdef AF_INET6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4349 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	4350 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4351 #ifdef AF_ROSE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4352 /* Amateur Radio X.25 PLP */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4353 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	4354 #endif
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4355 #ifdef AF_DECnet
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4356 /* Reserved for DECnet project */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4357 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	4358 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4359 #ifdef AF_NETBEUI
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4360 /* Reserved for 802.2LLC project */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4361 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	4362 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4363 #ifdef AF_SECURITY
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4364 /* Security callback pseudo AF */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4365 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	4366 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4367 #ifdef AF_KEY
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4368 /* PF_KEY key management API */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4369 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	4370 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4371 #ifdef AF_NETLINK
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4372 /* */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4373 PyModule_AddIntConstant(m, "AF_NETLINK", AF_NETLINK);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4374 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	4375 #ifdef NETLINK_SKIP
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4376 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	4377 #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	4378 #ifdef NETLINK_W1
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4379 PyModule_AddIntConstant(m, "NETLINK_W1", NETLINK_W1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4380 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4381 PyModule_AddIntConstant(m, "NETLINK_USERSOCK", NETLINK_USERSOCK);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4382 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	4383 #ifdef NETLINK_TCPDIAG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4384 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	4385 #endif
4d988dda6478 NETLINK_TCPDIAG and NETLINK_NFLOG aren't defined on older Linux Guido van Rossum <guido@python.org> parents: 36610 diff changeset	4386 #ifdef NETLINK_NFLOG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4387 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	4388 #endif
36298 9eeaa33f9640 Get socketmodule to build after adding netlink support. Neal Norwitz <nnorwitz@gmail.com> parents: 36289 diff changeset	4389 #ifdef NETLINK_XFRM
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4390 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	4391 #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	4392 #ifdef NETLINK_ARPD
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4393 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	4394 #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	4395 #ifdef NETLINK_ROUTE6
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4396 PyModule_AddIntConstant(m, "NETLINK_ROUTE6", NETLINK_ROUTE6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4397 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4398 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	4399 #ifdef NETLINK_DNRTMSG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4400 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	4401 #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	4402 #ifdef NETLINK_TAPBASE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4403 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	4404 #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	4405 #endif /* AF_NETLINK */
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4406 #ifdef AF_ROUTE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4407 /* Alias to emulate 4.4BSD */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4408 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	4409 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4410 #ifdef AF_ASH
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4411 /* Ash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4412 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	4413 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4414 #ifdef AF_ECONET
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4415 /* Acorn Econet */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4416 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	4417 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4418 #ifdef AF_ATMSVC
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4419 /* ATM SVCs */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4420 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	4421 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4422 #ifdef AF_SNA
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4423 /* Linux SNA Project (nutters!) */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4424 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	4425 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4426 #ifdef AF_IRDA
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4427 /* IRDA sockets */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4428 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	4429 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4430 #ifdef AF_PPPOX
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4431 /* PPPoX sockets */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4432 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	4433 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4434 #ifdef AF_WANPIPE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4435 /* Wanpipe API Sockets */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4436 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	4437 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4438 #ifdef AF_LLC
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4439 /* Linux LLC */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4440 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	4441 #endif
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	4442
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	4443 #ifdef USE_BLUETOOTH
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4444 PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4445 PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4446 PyModule_AddIntConstant(m, "BTPROTO_HCI", BTPROTO_HCI);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4447 PyModule_AddIntConstant(m, "SOL_HCI", SOL_HCI);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4448 PyModule_AddIntConstant(m, "HCI_FILTER", HCI_FILTER);
42084 229c28cb9afb Merged revisions 55817-55961 via svnmerge from Guido van Rossum <guido@python.org> parents: 41943 diff changeset	4449 #if !defined(__FreeBSD__)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4450 PyModule_AddIntConstant(m, "HCI_TIME_STAMP", HCI_TIME_STAMP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4451 PyModule_AddIntConstant(m, "HCI_DATA_DIR", HCI_DATA_DIR);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4452 PyModule_AddIntConstant(m, "BTPROTO_SCO", BTPROTO_SCO);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4453 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4454 PyModule_AddIntConstant(m, "BTPROTO_RFCOMM", BTPROTO_RFCOMM);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4455 PyModule_AddStringConstant(m, "BDADDR_ANY", "00:00:00:00:00:00");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4456 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	4457 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	4458
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	4459 #ifdef HAVE_NETPACKET_PACKET_H
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4460 PyModule_AddIntConstant(m, "AF_PACKET", AF_PACKET);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4461 PyModule_AddIntConstant(m, "PF_PACKET", PF_PACKET);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4462 PyModule_AddIntConstant(m, "PACKET_HOST", PACKET_HOST);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4463 PyModule_AddIntConstant(m, "PACKET_BROADCAST", PACKET_BROADCAST);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4464 PyModule_AddIntConstant(m, "PACKET_MULTICAST", PACKET_MULTICAST);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4465 PyModule_AddIntConstant(m, "PACKET_OTHERHOST", PACKET_OTHERHOST);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4466 PyModule_AddIntConstant(m, "PACKET_OUTGOING", PACKET_OUTGOING);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4467 PyModule_AddIntConstant(m, "PACKET_LOOPBACK", PACKET_LOOPBACK);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4468 PyModule_AddIntConstant(m, "PACKET_FASTROUTE", PACKET_FASTROUTE);
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	4469 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4470
44568 305d7d2ce047 Copied doc for reload() from trunk's function.rst to imp.rst Christian Heimes <christian@cheimes.de> parents: 44535 diff changeset	4471 #ifdef HAVE_LINUX_TIPC_H
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4472 PyModule_AddIntConstant(m, "AF_TIPC", AF_TIPC);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4473
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4474 /* for addresses */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4475 PyModule_AddIntConstant(m, "TIPC_ADDR_NAMESEQ", TIPC_ADDR_NAMESEQ);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4476 PyModule_AddIntConstant(m, "TIPC_ADDR_NAME", TIPC_ADDR_NAME);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4477 PyModule_AddIntConstant(m, "TIPC_ADDR_ID", TIPC_ADDR_ID);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4478
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4479 PyModule_AddIntConstant(m, "TIPC_ZONE_SCOPE", TIPC_ZONE_SCOPE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4480 PyModule_AddIntConstant(m, "TIPC_CLUSTER_SCOPE", TIPC_CLUSTER_SCOPE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4481 PyModule_AddIntConstant(m, "TIPC_NODE_SCOPE", TIPC_NODE_SCOPE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4482
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4483 /* for setsockopt() */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4484 PyModule_AddIntConstant(m, "SOL_TIPC", SOL_TIPC);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4485 PyModule_AddIntConstant(m, "TIPC_IMPORTANCE", TIPC_IMPORTANCE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4486 PyModule_AddIntConstant(m, "TIPC_SRC_DROPPABLE", TIPC_SRC_DROPPABLE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4487 PyModule_AddIntConstant(m, "TIPC_DEST_DROPPABLE",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4488 TIPC_DEST_DROPPABLE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4489 PyModule_AddIntConstant(m, "TIPC_CONN_TIMEOUT", TIPC_CONN_TIMEOUT);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4490
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4491 PyModule_AddIntConstant(m, "TIPC_LOW_IMPORTANCE",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4492 TIPC_LOW_IMPORTANCE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4493 PyModule_AddIntConstant(m, "TIPC_MEDIUM_IMPORTANCE",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4494 TIPC_MEDIUM_IMPORTANCE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4495 PyModule_AddIntConstant(m, "TIPC_HIGH_IMPORTANCE",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4496 TIPC_HIGH_IMPORTANCE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4497 PyModule_AddIntConstant(m, "TIPC_CRITICAL_IMPORTANCE",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4498 TIPC_CRITICAL_IMPORTANCE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4499
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4500 /* for subscriptions */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4501 PyModule_AddIntConstant(m, "TIPC_SUB_PORTS", TIPC_SUB_PORTS);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4502 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	4503 #ifdef TIPC_SUB_CANCEL
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4504 /* doesn't seem to be available everywhere */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4505 PyModule_AddIntConstant(m, "TIPC_SUB_CANCEL", TIPC_SUB_CANCEL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4506 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4507 PyModule_AddIntConstant(m, "TIPC_WAIT_FOREVER", TIPC_WAIT_FOREVER);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4508 PyModule_AddIntConstant(m, "TIPC_PUBLISHED", TIPC_PUBLISHED);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4509 PyModule_AddIntConstant(m, "TIPC_WITHDRAWN", TIPC_WITHDRAWN);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4510 PyModule_AddIntConstant(m, "TIPC_SUBSCR_TIMEOUT", TIPC_SUBSCR_TIMEOUT);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4511 PyModule_AddIntConstant(m, "TIPC_CFG_SRV", TIPC_CFG_SRV);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4512 PyModule_AddIntConstant(m, "TIPC_TOP_SRV", TIPC_TOP_SRV);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4513 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4514
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4515 /* Socket types */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4516 PyModule_AddIntConstant(m, "SOCK_STREAM", SOCK_STREAM);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4517 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	4518 /* We have incomplete socket support. */
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4519 PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4520 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	4521 #if defined(SOCK_RDM)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4522 PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4523 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4524
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4525 #ifdef SO_DEBUG
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4526 PyModule_AddIntConstant(m, "SO_DEBUG", SO_DEBUG);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4527 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4528 #ifdef SO_ACCEPTCONN
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4529 PyModule_AddIntConstant(m, "SO_ACCEPTCONN", SO_ACCEPTCONN);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4530 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4531 #ifdef SO_REUSEADDR
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4532 PyModule_AddIntConstant(m, "SO_REUSEADDR", SO_REUSEADDR);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4533 #endif
32578 21fd6e62cd27 [Patch #982665 ] add SO_EXCLUSIVEADDRUSE constant Andrew M. Kuchling <amk@amk.ca> parents: 32521 diff changeset	4534 #ifdef SO_EXCLUSIVEADDRUSE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4535 PyModule_AddIntConstant(m, "SO_EXCLUSIVEADDRUSE", SO_EXCLUSIVEADDRUSE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4536 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4537
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4538 #ifdef SO_KEEPALIVE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4539 PyModule_AddIntConstant(m, "SO_KEEPALIVE", SO_KEEPALIVE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4540 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4541 #ifdef SO_DONTROUTE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4542 PyModule_AddIntConstant(m, "SO_DONTROUTE", SO_DONTROUTE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4543 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4544 #ifdef SO_BROADCAST
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4545 PyModule_AddIntConstant(m, "SO_BROADCAST", SO_BROADCAST);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4546 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4547 #ifdef SO_USELOOPBACK
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4548 PyModule_AddIntConstant(m, "SO_USELOOPBACK", SO_USELOOPBACK);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4549 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4550 #ifdef SO_LINGER
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4551 PyModule_AddIntConstant(m, "SO_LINGER", SO_LINGER);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4552 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4553 #ifdef SO_OOBINLINE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4554 PyModule_AddIntConstant(m, "SO_OOBINLINE", SO_OOBINLINE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4555 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4556 #ifdef SO_REUSEPORT
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4557 PyModule_AddIntConstant(m, "SO_REUSEPORT", SO_REUSEPORT);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4558 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4559 #ifdef SO_SNDBUF
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4560 PyModule_AddIntConstant(m, "SO_SNDBUF", SO_SNDBUF);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4561 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4562 #ifdef SO_RCVBUF
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4563 PyModule_AddIntConstant(m, "SO_RCVBUF", SO_RCVBUF);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4564 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4565 #ifdef SO_SNDLOWAT
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4566 PyModule_AddIntConstant(m, "SO_SNDLOWAT", SO_SNDLOWAT);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4567 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4568 #ifdef SO_RCVLOWAT
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4569 PyModule_AddIntConstant(m, "SO_RCVLOWAT", SO_RCVLOWAT);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4570 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4571 #ifdef SO_SNDTIMEO
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4572 PyModule_AddIntConstant(m, "SO_SNDTIMEO", SO_SNDTIMEO);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4573 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4574 #ifdef SO_RCVTIMEO
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4575 PyModule_AddIntConstant(m, "SO_RCVTIMEO", SO_RCVTIMEO);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4576 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4577 #ifdef SO_ERROR
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4578 PyModule_AddIntConstant(m, "SO_ERROR", SO_ERROR);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4579 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4580 #ifdef SO_TYPE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4581 PyModule_AddIntConstant(m, "SO_TYPE", SO_TYPE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4582 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4583 #ifdef SO_SETFIB
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4584 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	4585 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4586
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4587 /* Maximum number of connections for "listen" */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4588 #ifdef SOMAXCONN
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4589 PyModule_AddIntConstant(m, "SOMAXCONN", SOMAXCONN);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4590 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4591 PyModule_AddIntConstant(m, "SOMAXCONN", 5); /* Common value */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4592 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4593
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4594 /* Flags for send, recv */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4595 #ifdef MSG_OOB
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4596 PyModule_AddIntConstant(m, "MSG_OOB", MSG_OOB);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4597 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4598 #ifdef MSG_PEEK
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4599 PyModule_AddIntConstant(m, "MSG_PEEK", MSG_PEEK);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4600 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4601 #ifdef MSG_DONTROUTE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4602 PyModule_AddIntConstant(m, "MSG_DONTROUTE", MSG_DONTROUTE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4603 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4604 #ifdef MSG_DONTWAIT
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4605 PyModule_AddIntConstant(m, "MSG_DONTWAIT", MSG_DONTWAIT);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4606 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4607 #ifdef MSG_EOR
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4608 PyModule_AddIntConstant(m, "MSG_EOR", MSG_EOR);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4609 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4610 #ifdef MSG_TRUNC
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4611 PyModule_AddIntConstant(m, "MSG_TRUNC", MSG_TRUNC);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4612 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4613 #ifdef MSG_CTRUNC
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4614 PyModule_AddIntConstant(m, "MSG_CTRUNC", MSG_CTRUNC);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4615 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4616 #ifdef MSG_WAITALL
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4617 PyModule_AddIntConstant(m, "MSG_WAITALL", MSG_WAITALL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4618 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4619 #ifdef MSG_BTAG
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4620 PyModule_AddIntConstant(m, "MSG_BTAG", MSG_BTAG);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4621 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4622 #ifdef MSG_ETAG
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4623 PyModule_AddIntConstant(m, "MSG_ETAG", MSG_ETAG);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4624 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4625
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4626 /* Protocol level and numbers, usable for [gs]etsockopt */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4627 #ifdef SOL_SOCKET
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4628 PyModule_AddIntConstant(m, "SOL_SOCKET", SOL_SOCKET);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4629 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4630 #ifdef SOL_IP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4631 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	4632 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4633 PyModule_AddIntConstant(m, "SOL_IP", 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4634 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4635 #ifdef SOL_IPX
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4636 PyModule_AddIntConstant(m, "SOL_IPX", SOL_IPX);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4637 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4638 #ifdef SOL_AX25
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4639 PyModule_AddIntConstant(m, "SOL_AX25", SOL_AX25);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4640 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4641 #ifdef SOL_ATALK
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4642 PyModule_AddIntConstant(m, "SOL_ATALK", SOL_ATALK);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4643 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4644 #ifdef SOL_NETROM
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4645 PyModule_AddIntConstant(m, "SOL_NETROM", SOL_NETROM);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4646 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4647 #ifdef SOL_ROSE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4648 PyModule_AddIntConstant(m, "SOL_ROSE", SOL_ROSE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4649 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4650 #ifdef SOL_TCP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4651 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	4652 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4653 PyModule_AddIntConstant(m, "SOL_TCP", 6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4654 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4655 #ifdef SOL_UDP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4656 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	4657 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4658 PyModule_AddIntConstant(m, "SOL_UDP", 17);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4659 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4660 #ifdef IPPROTO_IP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4661 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	4662 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4663 PyModule_AddIntConstant(m, "IPPROTO_IP", 0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4664 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4665 #ifdef IPPROTO_HOPOPTS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4666 PyModule_AddIntConstant(m, "IPPROTO_HOPOPTS", IPPROTO_HOPOPTS);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4667 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4668 #ifdef IPPROTO_ICMP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4669 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	4670 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4671 PyModule_AddIntConstant(m, "IPPROTO_ICMP", 1);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4672 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4673 #ifdef IPPROTO_IGMP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4674 PyModule_AddIntConstant(m, "IPPROTO_IGMP", IPPROTO_IGMP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4675 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4676 #ifdef IPPROTO_GGP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4677 PyModule_AddIntConstant(m, "IPPROTO_GGP", IPPROTO_GGP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4678 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4679 #ifdef IPPROTO_IPV4
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4680 PyModule_AddIntConstant(m, "IPPROTO_IPV4", IPPROTO_IPV4);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4681 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4682 #ifdef IPPROTO_IPV6
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4683 PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4684 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4685 #ifdef IPPROTO_IPIP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4686 PyModule_AddIntConstant(m, "IPPROTO_IPIP", IPPROTO_IPIP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4687 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4688 #ifdef IPPROTO_TCP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4689 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	4690 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4691 PyModule_AddIntConstant(m, "IPPROTO_TCP", 6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4692 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4693 #ifdef IPPROTO_EGP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4694 PyModule_AddIntConstant(m, "IPPROTO_EGP", IPPROTO_EGP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4695 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4696 #ifdef IPPROTO_PUP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4697 PyModule_AddIntConstant(m, "IPPROTO_PUP", IPPROTO_PUP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4698 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4699 #ifdef IPPROTO_UDP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4700 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	4701 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4702 PyModule_AddIntConstant(m, "IPPROTO_UDP", 17);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4703 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4704 #ifdef IPPROTO_IDP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4705 PyModule_AddIntConstant(m, "IPPROTO_IDP", IPPROTO_IDP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4706 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4707 #ifdef IPPROTO_HELLO
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4708 PyModule_AddIntConstant(m, "IPPROTO_HELLO", IPPROTO_HELLO);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4709 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4710 #ifdef IPPROTO_ND
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4711 PyModule_AddIntConstant(m, "IPPROTO_ND", IPPROTO_ND);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4712 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4713 #ifdef IPPROTO_TP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4714 PyModule_AddIntConstant(m, "IPPROTO_TP", IPPROTO_TP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4715 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4716 #ifdef IPPROTO_IPV6
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4717 PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4718 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4719 #ifdef IPPROTO_ROUTING
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4720 PyModule_AddIntConstant(m, "IPPROTO_ROUTING", IPPROTO_ROUTING);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4721 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4722 #ifdef IPPROTO_FRAGMENT
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4723 PyModule_AddIntConstant(m, "IPPROTO_FRAGMENT", IPPROTO_FRAGMENT);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4724 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4725 #ifdef IPPROTO_RSVP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4726 PyModule_AddIntConstant(m, "IPPROTO_RSVP", IPPROTO_RSVP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4727 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4728 #ifdef IPPROTO_GRE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4729 PyModule_AddIntConstant(m, "IPPROTO_GRE", IPPROTO_GRE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4730 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4731 #ifdef IPPROTO_ESP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4732 PyModule_AddIntConstant(m, "IPPROTO_ESP", IPPROTO_ESP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4733 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4734 #ifdef IPPROTO_AH
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4735 PyModule_AddIntConstant(m, "IPPROTO_AH", IPPROTO_AH);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4736 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4737 #ifdef IPPROTO_MOBILE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4738 PyModule_AddIntConstant(m, "IPPROTO_MOBILE", IPPROTO_MOBILE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4739 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4740 #ifdef IPPROTO_ICMPV6
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4741 PyModule_AddIntConstant(m, "IPPROTO_ICMPV6", IPPROTO_ICMPV6);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4742 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4743 #ifdef IPPROTO_NONE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4744 PyModule_AddIntConstant(m, "IPPROTO_NONE", IPPROTO_NONE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4745 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4746 #ifdef IPPROTO_DSTOPTS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4747 PyModule_AddIntConstant(m, "IPPROTO_DSTOPTS", IPPROTO_DSTOPTS);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4748 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4749 #ifdef IPPROTO_XTP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4750 PyModule_AddIntConstant(m, "IPPROTO_XTP", IPPROTO_XTP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4751 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4752 #ifdef IPPROTO_EON
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4753 PyModule_AddIntConstant(m, "IPPROTO_EON", IPPROTO_EON);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4754 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4755 #ifdef IPPROTO_PIM
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4756 PyModule_AddIntConstant(m, "IPPROTO_PIM", IPPROTO_PIM);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4757 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4758 #ifdef IPPROTO_IPCOMP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4759 PyModule_AddIntConstant(m, "IPPROTO_IPCOMP", IPPROTO_IPCOMP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4760 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4761 #ifdef IPPROTO_VRRP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4762 PyModule_AddIntConstant(m, "IPPROTO_VRRP", IPPROTO_VRRP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4763 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4764 #ifdef IPPROTO_BIP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4765 PyModule_AddIntConstant(m, "IPPROTO_BIP", IPPROTO_BIP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4766 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4767 /**/
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4768 #ifdef IPPROTO_RAW
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4769 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	4770 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4771 PyModule_AddIntConstant(m, "IPPROTO_RAW", 255);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4772 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4773 #ifdef IPPROTO_MAX
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4774 PyModule_AddIntConstant(m, "IPPROTO_MAX", IPPROTO_MAX);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4775 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4776
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4777 /* Some port configuration */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4778 #ifdef IPPORT_RESERVED
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4779 PyModule_AddIntConstant(m, "IPPORT_RESERVED", IPPORT_RESERVED);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4780 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4781 PyModule_AddIntConstant(m, "IPPORT_RESERVED", 1024);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4782 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4783 #ifdef IPPORT_USERRESERVED
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4784 PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", IPPORT_USERRESERVED);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4785 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4786 PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", 5000);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4787 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4788
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4789 /* Some reserved IP v.4 addresses */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4790 #ifdef INADDR_ANY
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4791 PyModule_AddIntConstant(m, "INADDR_ANY", INADDR_ANY);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4792 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4793 PyModule_AddIntConstant(m, "INADDR_ANY", 0x00000000);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4794 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4795 #ifdef INADDR_BROADCAST
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4796 PyModule_AddIntConstant(m, "INADDR_BROADCAST", INADDR_BROADCAST);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4797 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4798 PyModule_AddIntConstant(m, "INADDR_BROADCAST", 0xffffffff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4799 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4800 #ifdef INADDR_LOOPBACK
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4801 PyModule_AddIntConstant(m, "INADDR_LOOPBACK", INADDR_LOOPBACK);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4802 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4803 PyModule_AddIntConstant(m, "INADDR_LOOPBACK", 0x7F000001);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4804 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4805 #ifdef INADDR_UNSPEC_GROUP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4806 PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4807 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4808 PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", 0xe0000000);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4809 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4810 #ifdef INADDR_ALLHOSTS_GROUP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4811 PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4812 INADDR_ALLHOSTS_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4813 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4814 PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP", 0xe0000001);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4815 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4816 #ifdef INADDR_MAX_LOCAL_GROUP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4817 PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4818 INADDR_MAX_LOCAL_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4819 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4820 PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4821 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4822 #ifdef INADDR_NONE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4823 PyModule_AddIntConstant(m, "INADDR_NONE", INADDR_NONE);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	4824 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4825 PyModule_AddIntConstant(m, "INADDR_NONE", 0xffffffff);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4826 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4827
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4828 /* IPv4 [gs]etsockopt options */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4829 #ifdef IP_OPTIONS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4830 PyModule_AddIntConstant(m, "IP_OPTIONS", IP_OPTIONS);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4831 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4832 #ifdef IP_HDRINCL
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4833 PyModule_AddIntConstant(m, "IP_HDRINCL", IP_HDRINCL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4834 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4835 #ifdef IP_TOS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4836 PyModule_AddIntConstant(m, "IP_TOS", IP_TOS);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4837 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4838 #ifdef IP_TTL
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4839 PyModule_AddIntConstant(m, "IP_TTL", IP_TTL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4840 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4841 #ifdef IP_RECVOPTS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4842 PyModule_AddIntConstant(m, "IP_RECVOPTS", IP_RECVOPTS);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4843 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4844 #ifdef IP_RECVRETOPTS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4845 PyModule_AddIntConstant(m, "IP_RECVRETOPTS", IP_RECVRETOPTS);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4846 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4847 #ifdef IP_RECVDSTADDR
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4848 PyModule_AddIntConstant(m, "IP_RECVDSTADDR", IP_RECVDSTADDR);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4849 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4850 #ifdef IP_RETOPTS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4851 PyModule_AddIntConstant(m, "IP_RETOPTS", IP_RETOPTS);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4852 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4853 #ifdef IP_MULTICAST_IF
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4854 PyModule_AddIntConstant(m, "IP_MULTICAST_IF", IP_MULTICAST_IF);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4855 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4856 #ifdef IP_MULTICAST_TTL
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4857 PyModule_AddIntConstant(m, "IP_MULTICAST_TTL", IP_MULTICAST_TTL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4858 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4859 #ifdef IP_MULTICAST_LOOP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4860 PyModule_AddIntConstant(m, "IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4861 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4862 #ifdef IP_ADD_MEMBERSHIP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4863 PyModule_AddIntConstant(m, "IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4864 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4865 #ifdef IP_DROP_MEMBERSHIP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4866 PyModule_AddIntConstant(m, "IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4867 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4868 #ifdef IP_DEFAULT_MULTICAST_TTL
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4869 PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_TTL",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4870 IP_DEFAULT_MULTICAST_TTL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4871 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4872 #ifdef IP_DEFAULT_MULTICAST_LOOP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4873 PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_LOOP",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4874 IP_DEFAULT_MULTICAST_LOOP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4875 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4876 #ifdef IP_MAX_MEMBERSHIPS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4877 PyModule_AddIntConstant(m, "IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4878 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4879
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4880 /* IPv6 [gs]etsockopt options, defined in RFC2553 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4881 #ifdef IPV6_JOIN_GROUP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4882 PyModule_AddIntConstant(m, "IPV6_JOIN_GROUP", IPV6_JOIN_GROUP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4883 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4884 #ifdef IPV6_LEAVE_GROUP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4885 PyModule_AddIntConstant(m, "IPV6_LEAVE_GROUP", IPV6_LEAVE_GROUP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4886 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4887 #ifdef IPV6_MULTICAST_HOPS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4888 PyModule_AddIntConstant(m, "IPV6_MULTICAST_HOPS", IPV6_MULTICAST_HOPS);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4889 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4890 #ifdef IPV6_MULTICAST_IF
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4891 PyModule_AddIntConstant(m, "IPV6_MULTICAST_IF", IPV6_MULTICAST_IF);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4892 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4893 #ifdef IPV6_MULTICAST_LOOP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4894 PyModule_AddIntConstant(m, "IPV6_MULTICAST_LOOP", IPV6_MULTICAST_LOOP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4895 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4896 #ifdef IPV6_UNICAST_HOPS
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4897 PyModule_AddIntConstant(m, "IPV6_UNICAST_HOPS", IPV6_UNICAST_HOPS);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4898 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4899 /* 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	4900 #ifdef IPV6_V6ONLY
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4901 PyModule_AddIntConstant(m, "IPV6_V6ONLY", IPV6_V6ONLY);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4902 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4903 /* 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	4904 #ifdef IPV6_CHECKSUM
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4905 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	4906 #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	4907 #ifdef IPV6_DONTFRAG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4908 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	4909 #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	4910 #ifdef IPV6_DSTOPTS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4911 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	4912 #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	4913 #ifdef IPV6_HOPLIMIT
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4914 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	4915 #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	4916 #ifdef IPV6_HOPOPTS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4917 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	4918 #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	4919 #ifdef IPV6_NEXTHOP
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4920 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	4921 #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	4922 #ifdef IPV6_PATHMTU
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4923 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	4924 #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	4925 #ifdef IPV6_PKTINFO
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4926 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	4927 #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	4928 #ifdef IPV6_RECVDSTOPTS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4929 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	4930 #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	4931 #ifdef IPV6_RECVHOPLIMIT
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4932 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	4933 #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	4934 #ifdef IPV6_RECVHOPOPTS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4935 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	4936 #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	4937 #ifdef IPV6_RECVPKTINFO
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4938 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	4939 #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	4940 #ifdef IPV6_RECVRTHDR
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4941 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	4942 #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	4943 #ifdef IPV6_RECVTCLASS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4944 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	4945 #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	4946 #ifdef IPV6_RTHDR
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4947 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	4948 #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	4949 #ifdef IPV6_RTHDRDSTOPTS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4950 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	4951 #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	4952 #ifdef IPV6_RTHDR_TYPE_0
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4953 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	4954 #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	4955 #ifdef IPV6_RECVPATHMTU
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4956 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	4957 #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	4958 #ifdef IPV6_TCLASS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4959 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	4960 #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	4961 #ifdef IPV6_USE_MIN_MTU
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4962 PyModule_AddIntConstant(m, "IPV6_USE_MIN_MTU", IPV6_USE_MIN_MTU);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4963 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4964
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4965 /* TCP options */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4966 #ifdef TCP_NODELAY
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4967 PyModule_AddIntConstant(m, "TCP_NODELAY", TCP_NODELAY);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4968 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4969 #ifdef TCP_MAXSEG
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4970 PyModule_AddIntConstant(m, "TCP_MAXSEG", TCP_MAXSEG);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4971 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4972 #ifdef TCP_CORK
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4973 PyModule_AddIntConstant(m, "TCP_CORK", TCP_CORK);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4974 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4975 #ifdef TCP_KEEPIDLE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4976 PyModule_AddIntConstant(m, "TCP_KEEPIDLE", TCP_KEEPIDLE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4977 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4978 #ifdef TCP_KEEPINTVL
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4979 PyModule_AddIntConstant(m, "TCP_KEEPINTVL", TCP_KEEPINTVL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4980 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4981 #ifdef TCP_KEEPCNT
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4982 PyModule_AddIntConstant(m, "TCP_KEEPCNT", TCP_KEEPCNT);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4983 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4984 #ifdef TCP_SYNCNT
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4985 PyModule_AddIntConstant(m, "TCP_SYNCNT", TCP_SYNCNT);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4986 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4987 #ifdef TCP_LINGER2
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4988 PyModule_AddIntConstant(m, "TCP_LINGER2", TCP_LINGER2);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4989 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4990 #ifdef TCP_DEFER_ACCEPT
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4991 PyModule_AddIntConstant(m, "TCP_DEFER_ACCEPT", TCP_DEFER_ACCEPT);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4992 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4993 #ifdef TCP_WINDOW_CLAMP
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4994 PyModule_AddIntConstant(m, "TCP_WINDOW_CLAMP", TCP_WINDOW_CLAMP);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4995 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4996 #ifdef TCP_INFO
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4997 PyModule_AddIntConstant(m, "TCP_INFO", TCP_INFO);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4998 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	4999 #ifdef TCP_QUICKACK
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5000 PyModule_AddIntConstant(m, "TCP_QUICKACK", TCP_QUICKACK);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5001 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5002
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5003
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5004 /* IPX options */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5005 #ifdef IPX_TYPE
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5006 PyModule_AddIntConstant(m, "IPX_TYPE", IPX_TYPE);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5007 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5008
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5009 /* 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	5010 #ifdef EAI_ADDRFAMILY
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5011 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	5012 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5013 #ifdef EAI_AGAIN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5014 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	5015 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5016 #ifdef EAI_BADFLAGS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5017 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	5018 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5019 #ifdef EAI_FAIL
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5020 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	5021 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5022 #ifdef EAI_FAMILY
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5023 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	5024 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5025 #ifdef EAI_MEMORY
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5026 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	5027 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5028 #ifdef EAI_NODATA
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5029 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	5030 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5031 #ifdef EAI_NONAME
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5032 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	5033 #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	5034 #ifdef EAI_OVERFLOW
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5035 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	5036 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5037 #ifdef EAI_SERVICE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5038 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	5039 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5040 #ifdef EAI_SOCKTYPE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5041 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	5042 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5043 #ifdef EAI_SYSTEM
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5044 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	5045 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5046 #ifdef EAI_BADHINTS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5047 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	5048 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5049 #ifdef EAI_PROTOCOL
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5050 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	5051 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5052 #ifdef EAI_MAX
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5053 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	5054 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5055 #ifdef AI_PASSIVE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5056 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	5057 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5058 #ifdef AI_CANONNAME
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5059 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	5060 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5061 #ifdef AI_NUMERICHOST
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5062 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	5063 #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	5064 #ifdef AI_NUMERICSERV
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5065 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	5066 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5067 #ifdef AI_MASK
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5068 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	5069 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5070 #ifdef AI_ALL
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5071 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	5072 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5073 #ifdef AI_V4MAPPED_CFG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5074 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	5075 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5076 #ifdef AI_ADDRCONFIG
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5077 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	5078 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5079 #ifdef AI_V4MAPPED
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5080 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	5081 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5082 #ifdef AI_DEFAULT
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5083 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	5084 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5085 #ifdef NI_MAXHOST
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5086 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	5087 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5088 #ifdef NI_MAXSERV
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5089 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	5090 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5091 #ifdef NI_NOFQDN
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5092 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	5093 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5094 #ifdef NI_NUMERICHOST
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5095 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	5096 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5097 #ifdef NI_NAMEREQD
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5098 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	5099 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5100 #ifdef NI_NUMERICSERV
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5101 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	5102 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5103 #ifdef NI_DGRAM
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5104 PyModule_AddIntConstant(m, "NI_DGRAM", NI_DGRAM);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5105 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5106
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5107 /* shutdown() parameters */
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	5108 #ifdef SHUT_RD
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5109 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	5110 #elif defined(SD_RECEIVE)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5111 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	5112 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5113 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	5114 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	5115 #ifdef SHUT_WR
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5116 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	5117 #elif defined(SD_SEND)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5118 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	5119 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5120 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	5121 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	5122 #ifdef SHUT_RDWR
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5123 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	5124 #elif defined(SD_BOTH)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5125 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	5126 #else
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5127 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	5128 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	5129
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	5130 #ifdef SIO_RCVALL
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5131 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5132 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	5133 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	5134 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5135 for(i = 0; i<sizeof(codes)/sizeof(*codes); ++i) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5136 PyObject *tmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5137 tmp = PyLong_FromUnsignedLong(codes[i]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5138 if (tmp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5139 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5140 PyModule_AddObject(m, names[i], tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5141 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5142 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5143 PyModule_AddIntConstant(m, "RCVALL_OFF", RCVALL_OFF);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5144 PyModule_AddIntConstant(m, "RCVALL_ON", RCVALL_ON);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5145 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	5146 #ifdef RCVALL_IPLEVEL
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5147 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	5148 #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	5149 #ifdef RCVALL_MAX
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5150 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	5151 #endif
44535 420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	5152 #endif /* _MSTCPIP_ */
420fe6d7d5f4 Merged revisions 59703-59773 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	5153
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5154 /* Initialize gethostbyname lock */
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	5155 #if defined(USE_GETHOSTBYNAME_LOCK) \|\| defined(USE_GETADDRINFO_LOCK)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5156 netdb_lock = PyThread_allocate_lock();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5157 #endif
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5158 return m;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5159 }
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	5160
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5161
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5162 #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	5163 #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	5164
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	5165 /* 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	5166 /* 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	5167
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	5168 int
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5169 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	5170 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5171 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	5172 #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	5173 #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	5174 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5175 unsigned int packed_addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5176 packed_addr = inet_addr(src);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5177 if (packed_addr == INADDR_NONE)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5178 return 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5179 memcpy(dst, &packed_addr, 4);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5180 return 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5181 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5182 /* Should set errno to EAFNOSUPPORT */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5183 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	5184 }
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5185
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	5186 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	5187 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	5188 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5189 if (af == AF_INET) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5190 struct in_addr packed_addr;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5191 if (size < 16)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5192 /* Should set errno to ENOSPC. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5193 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5194 memcpy(&packed_addr, src, sizeof(packed_addr));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5195 return strncpy(dst, inet_ntoa(packed_addr), size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5196 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5197 /* Should set errno to EAFNOSUPPORT */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61085 diff changeset	5198 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	5199 }
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5200
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	5201 #endif
43874 6b012f01a889 Fix for VS 2008 Christian Heimes <christian@cheimes.de> parents: 43777 diff changeset	5202 #endif

Mercurial > cpython-lru_cache-weakref

annotate Modules/socketmodule.c @ 64392:7d1752d62050