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

annotate Modules/socketmodule.c @ 68256:b36cb4602e21 2.7

Dummy-merge 2.6 branch into 2.7 branch.

author	Georg Brandl <georg@python.org>
date	Sat, 05 Mar 2011 15:15:07 +0100
parents	f5e3de87b14b 787b969d37f0
children	cd8d3c2d3bce

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
44561 ac51cfe5c5c6 Issue #1646: Make socket support TIPC. The socket module now has support Christian Heimes <christian@cheimes.de> parents: 44474 diff changeset	10 portable manner, though AF_PACKET, AF_NETLINK and AF_TIPC are supported
ac51cfe5c5c6 Issue #1646: Make socket support TIPC. The socket module now has support Christian Heimes <christian@cheimes.de> parents: 44474 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,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 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,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	22 a subclass of socket.error
25105 39e09f30f7ef Update the module doc comment. Guido van Rossum <guido@python.org> parents: 24687 diff changeset	23 - socket.fromfd(fd, family, type[, proto]) --> new socket object (created
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	24 from an existing file descriptor)
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	25 - 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	26 - 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	27 - 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	28 - 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	29 - 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	30 - socket.getservbyport(portnumber[, protocolname]) --> service name
25105 39e09f30f7ef Update the module doc comment. Guido van Rossum <guido@python.org> parents: 24687 diff changeset	31 - socket.socket([family[, type [, proto]]]) --> new socket object
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	32 - 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	33 - 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	34 - 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	35 - 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	36 - 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	37 - socket.getaddrinfo(host, port [, family, socktype, proto, flags])
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	38 --> 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	39 - socket.getnameinfo(sockaddr, flags) --> (host, port)
2565 912813d573b4 fixed up comments describing interface Guido van Rossum <guido@python.org> parents: 2532 diff changeset	40 - 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	41 - 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	42 - 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	43 - 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	44 - socket.getdefaulttimeout() -> None \| float
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	45 - socket.setdefaulttimeout(None \| float)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	46 - an Internet socket address is a pair (hostname, port)
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	47 where hostname can be anything recognized by gethostbyname()
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	48 (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	49 - 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	50 - 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	51 - 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	52 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	53 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	54 ("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	55 specify packet-type and ha-type/addr.
44561 ac51cfe5c5c6 Issue #1646: Make socket support TIPC. The socket module now has support Christian Heimes <christian@cheimes.de> parents: 44474 diff changeset	56 - an AF_TIPC socket address is expressed as
ac51cfe5c5c6 Issue #1646: Make socket support TIPC. The socket module now has support Christian Heimes <christian@cheimes.de> parents: 44474 diff changeset	57 (addr_type, v1, v2, v3 [, scope]); where addr_type can be one of:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	58 TIPC_ADDR_NAMESEQ, TIPC_ADDR_NAME, and TIPC_ADDR_ID;
44561 ac51cfe5c5c6 Issue #1646: Make socket support TIPC. The socket module now has support Christian Heimes <christian@cheimes.de> parents: 44474 diff changeset	59 and scope can be one of:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	60 TIPC_ZONE_SCOPE, TIPC_CLUSTER_SCOPE, and TIPC_NODE_SCOPE.
44561 ac51cfe5c5c6 Issue #1646: Make socket support TIPC. The socket module now has support Christian Heimes <christian@cheimes.de> parents: 44474 diff changeset	61 The meaning of v1, v2 and v3 depends on the value of addr_type:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	62 if addr_type is TIPC_ADDR_NAME:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	63 v1 is the server type
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	64 v2 is the port identifier
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	65 v3 is ignored
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	66 if addr_type is TIPC_ADDR_NAMESEQ:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	67 v1 is the server type
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	68 v2 is the lower port number
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	69 v3 is the upper port number
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	70 if addr_type is TIPC_ADDR_ID:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	71 v1 is the node
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	72 v2 is the ref
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	73 v3 is ignored
44561 ac51cfe5c5c6 Issue #1646: Make socket support TIPC. The socket module now has support Christian Heimes <christian@cheimes.de> parents: 44474 diff changeset	74
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	75
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	76 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	77
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 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	79 - 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	80 - 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	81
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	82 */
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	83
37934 ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	84 #ifdef __APPLE__
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	85 /*
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	86 * inet_aton is not available on OSX 10.3, yet we want to use a binary
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	87 * that was build on 10.4 or later to work on that release, weak linking
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	88 * comes to the rescue.
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	89 */
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	90 # pragma weak inet_aton
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	91 #endif
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	92
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	93 #include "Python.h"
37069 dd49847a60d3 RFE #567972: Socket objects' family, type and proto properties are Georg Brandl <georg@python.org> parents: 36684 diff changeset	94 #include "structmember.h"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	95
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	96 #undef MAX
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	97 #define MAX(x, y) ((x) < (y) ? (y) : (x))
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	98
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	99 /* Socket object documentation */
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	100 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	101 "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	102 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	103 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	104 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	105 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	106 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	107 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	108 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	109 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	110 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	111 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	112 \n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	113 accept() -- accept a connection, returning new socket and client 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 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	115 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	116 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	117 connect_ex(addr) -- connect, return an error code instead of an exception\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	118 dup() -- return a new socket object identical to the current one [*]\n\
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	119 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	120 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	121 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	122 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	123 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	124 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	125 makefile([mode, [bufsize]]) -- return a file object for 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	126 recv(buflen[, flags]) -- receive data\n\
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	127 recv_into(buffer[, nbytes[, flags]]) -- receive data (into a buffer)\n\
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	128 recvfrom(buflen[, flags]) -- receive data and sender\'s address\n\
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	129 recvfrom_into(buffer[, nbytes, [, flags])\n\
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	130 -- 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	131 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	132 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	133 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	134 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	135 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	136 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	137 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	138 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	139 [*] not available on all platforms!");
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	140
30722 651fc8d98d99 Fix a bunch of typos in documentation, docstrings and comments. Walter Dörwald <walter@livinglogic.de> parents: 30683 diff changeset	141 /* 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	142 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	143
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	144 /* 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	145 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	146 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	147 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	148
adf87d13a0c1 (1) On Linux, we really need to trust the configure script to select Guido van Rossum <guido@python.org> parents: 11268 diff changeset	149 #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	150 # 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	151 # 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	152 # 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	153 #endif
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	154
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 #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	156 # 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	157 #endif
1ed1eb5bc6ec Put back __osf__ support for gethostbyname_r(); the real bug was that Guido van Rossum <guido@python.org> parents: 10561 diff changeset	158
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	159 #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	160 # 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	161 # 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	162 # 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	163 # 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	164 # 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	165 /* 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	166 # 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	167 # 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	168 # endif
10454 dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	169 #endif
dad14ffe1c22 Implement two suggestions by Jonathan Giddy: (1) in AIX, clear the Guido van Rossum <guido@python.org> parents: 10453 diff changeset	170
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	171 #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	172 !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	173 # define USE_GETHOSTBYNAME_LOCK
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	174 #endif
9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	175
35635 27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	176 /* To use __FreeBSD_version */
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	177 #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	178 #include <sys/param.h>
27e1426b7f31 Patch #1288833: Removed thread lock from socket.getaddrinfo on Hye-Shik Chang <hyeshik@gmail.com> parents: 35551 diff changeset	179 #endif
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	180 /* 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	181 (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	182 #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	183 (defined(__FreeBSD__) && __FreeBSD_version+0 < 503000) \|\| \
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	184 defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| \
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	185 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	186 #define USE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	187 #endif
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	188
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	189 #ifdef USE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	190 #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	191 #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	192 #else
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	193 #define ACQUIRE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	194 #define RELEASE_GETADDRINFO_LOCK
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	195 #endif
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	196
e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	197 #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	198 # include "pythread.h"
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	199 #endif
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	200
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	201 #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	202 # 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	203 # 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	204 # 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	205 # 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	206 # include <ctype.h>
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	207 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	208
26551 0c995cd07026 Don't include <ioctl.h> unless on __VMS. Martin v. Löwis <martin@v.loewis.de> parents: 26550 diff changeset	209 #if defined(__VMS)
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	210 # include <ioctl.h>
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	211 #endif
b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	212
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	213 #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	214 # 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	215 # 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	216 # 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	217 # include <os2.h>
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	218 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	219
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	220 #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	221 /* 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	222 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	223 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	224
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	225 /* 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	226 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	227 #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	228 #define _SGIAPI 1
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	229
33478 1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	230 #undef _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	231 #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	232 #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	233 #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	234 #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	235 #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	236 #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	237 #endif
1b3ac674a57c Patch for compilation on IRIX from rwgk on http://python.org/sf/728330 Trent Mick <trentm@activestate.com> parents: 33427 diff changeset	238
29929 08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	239 #define HAVE_INET_PTON
08d2636b8e58 Get socketmodule compiling on IRIX 6.5.10. Jeremy Hylton <jeremy@alum.mit.edu> parents: 29790 diff changeset	240 #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	241 #endif
337fcc24985b Patch #608999: Fix portability problems with MIPSPro 7.x Martin v. Löwis <martin@v.loewis.de> parents: 25105 diff changeset	242
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	243 /* Irix 6.5 fails to define this variable at all. This is needed
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	244 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	245 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	246 #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	247 #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	248 #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	249
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	250 /* Generic includes */
38716 42808526511c Patch #1495999: Part two of Windows CE changes. Martin v. Löwis <martin@v.loewis.de> parents: 38655 diff changeset	251 #ifdef HAVE_SYS_TYPES_H
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	252 #include <sys/types.h>
38716 42808526511c Patch #1495999: Part two of Windows CE changes. Martin v. Löwis <martin@v.loewis.de> parents: 38655 diff changeset	253 #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	254
21961 ea23e6e49290 Also fix the comment. Marc-André Lemburg <mal@egenix.com> parents: 21960 diff changeset	255 /* 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	256 #define PySocket_BUILDING_SOCKET
21960 7a917ad8f442 Fix the name of the header file. Marc-André Lemburg <mal@egenix.com> parents: 21959 diff changeset	257 #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	258
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	259 /* 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	260
3738 ce74bba8a6a6 Slightly different Windows ifdefs Guido van Rossum <guido@python.org> parents: 3702 diff changeset	261 #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	262
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	263 /* 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	264 # 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	265
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	266 /* Headers needed for inet_ntoa() and inet_addr() */
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	267 # ifdef __BEOS__
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 # include <net/netdb.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	269 # elif defined(PYOS_OS2) && defined(PYCC_VACPP)
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 # 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	271 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	272 # 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	273 # 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	274 # 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	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 # ifndef RISCOS
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	277 # 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	278 # else
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	279 # include <sys/ioctl.h>
90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	280 # include <socklib.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	281 # define NO_DUP
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20648 diff changeset	282 int h_errno; /* not used */
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	283 # define INET_ADDRSTRLEN 16
21959 3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	284 # 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	285
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20648 diff changeset	286 #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	287
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	288 /* MS_WINDOWS includes */
38716 42808526511c Patch #1495999: Part two of Windows CE changes. Martin v. Löwis <martin@v.loewis.de> parents: 38655 diff changeset	289 # ifdef HAVE_FCNTL_H
42808526511c Patch #1495999: Part two of Windows CE changes. Martin v. Löwis <martin@v.loewis.de> parents: 38655 diff changeset	290 # include <fcntl.h>
42808526511c Patch #1495999: Part two of Windows CE changes. Martin v. Löwis <martin@v.loewis.de> parents: 38655 diff changeset	291 # 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	292
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	293 #endif
3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	294
31504 2abc52c3d4c2 remove support for missing ANSI C header files (limits.h, stddef.h, etc). Skip Montanaro <skip@pobox.com> parents: 31443 diff changeset	295 #include <stddef.h>
18263 41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	296
41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	297 #ifndef offsetof
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	298 # 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	299 #endif
41491d196748 Provide a definition for offsetof. Martin v. Löwis <martin@v.loewis.de> parents: 18262 diff changeset	300
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	301 #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	302 # define O_NONBLOCK O_NDELAY
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	303 #endif
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	304
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	305 /* 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	306 #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	307 /* 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	308 * _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	309 * 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	310 */
38716 42808526511c Patch #1495999: Part two of Windows CE changes. Martin v. Löwis <martin@v.loewis.de> parents: 38655 diff changeset	311 #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	312 /* 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	313 * 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	314 */
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	315 #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	316 # 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	317 #endif
33066 cda0455bd0a0 Bug #1001857: socketmodule does not build under cygwin Jason Tishler <jason@tishler.net> parents: 33063 diff changeset	318
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	319 #ifndef HAVE_INET_PTON
43972 a8dd8874ff2d Backport of the PCbuild9 directory from the py3k branch. Christian Heimes <christian@cheimes.de> parents: 43876 diff changeset	320 #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	321 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	322 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	323 #endif
43972 a8dd8874ff2d Backport of the PCbuild9 directory from the py3k branch. Christian Heimes <christian@cheimes.de> parents: 43876 diff changeset	324 #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	325
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	326 #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	327 /* 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	328 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	329 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	330 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	331 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	332 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	333 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	334 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	335 #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	336 /* 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	337 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	338 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	339 #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	340 #endif
37934 ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	341
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	342 #ifdef HAVE_INET_ATON
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	343 #define USE_INET_ATON_WEAKLINK
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	344 #endif
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	345
24078 702a5900df7d Mac OS X Jaguar (developer preview) seems to have a working getaddrinfo(). Jack Jansen <jack.jansen@cwi.nl> parents: 23832 diff changeset	346 #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	347
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	348 /* 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	349 #if !defined(HAVE_GETADDRINFO)
28913 b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	350 /* 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	351 #define getaddrinfo fake_getaddrinfo
b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	352 #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	353 #define freeaddrinfo fake_freeaddrinfo
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	354 #include "getaddrinfo.c"
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	355 #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	356 #if !defined(HAVE_GETNAMEINFO)
28913 b04c074586aa Patch #725942: Always rename emulation functions. Martin v. Löwis <martin@v.loewis.de> parents: 28818 diff changeset	357 #define getnameinfo fake_getnameinfo
18246 c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	358 #include "getnameinfo.c"
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	359 #endif
c4db09b87424 Patch #401196: Configuration machinery for IPv6. Martin v. Löwis <martin@v.loewis.de> parents: 17806 diff changeset	360
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	361 #if defined(MS_WINDOWS) \|\| defined(__BEOS__)
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	362 /* BeOS suffers from the same socket dichotomy as Win32... - [cjh] */
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	363 /* seem to be a few differences in the API */
12436 dff7b26116de Use an explicit macro SOCKETCLOSE which expands to closesocket (on Guido van Rossum <guido@python.org> parents: 12319 diff changeset	364 #define SOCKETCLOSE closesocket
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	365 #define NO_DUP /* Actually it exists on NT 3.5, but what the heck... */
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
65430 7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	382 #if (defined(HAVE_BLUETOOTH_H) \|\| defined(HAVE_BLUETOOTH_BLUETOOTH_H)) && !defined(__NetBSD__) && !defined(__DragonFly__)
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	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
40842 90e22fea8363 Patch #1432399: Add HCI sockets. Martin v. Löwis <martin@v.loewis.de> parents: 40837 diff changeset	387 #define BTPROTO_HCI BLUETOOTH_PROTO_HCI
41946 c36ac67eef5b Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different Hye-Shik Chang <hyeshik@gmail.com> parents: 41341 diff changeset	388 #define SOL_HCI SOL_HCI_RAW
c36ac67eef5b Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different Hye-Shik Chang <hyeshik@gmail.com> parents: 41341 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
41946 c36ac67eef5b Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different Hye-Shik Chang <hyeshik@gmail.com> parents: 41341 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)
40842 90e22fea8363 Patch #1432399: Add HCI sockets. Martin v. Löwis <martin@v.loewis.de> parents: 40837 diff changeset	395 #define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
65430 7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	396 #elif defined(__NetBSD__) \|\| defined(__DragonFly__)
39242 0e9a269a2189 Allow socketmodule to compile on NetBSD -current, whose bluetooth API Matt Fleming <mattjfleming@googlemail.com> parents: 39059 diff changeset	397 #define sockaddr_l2 sockaddr_bt
0e9a269a2189 Allow socketmodule to compile on NetBSD -current, whose bluetooth API Matt Fleming <mattjfleming@googlemail.com> parents: 39059 diff changeset	398 #define sockaddr_rc sockaddr_bt
40842 90e22fea8363 Patch #1432399: Add HCI sockets. Martin v. Löwis <martin@v.loewis.de> parents: 40837 diff changeset	399 #define sockaddr_hci sockaddr_bt
39242 0e9a269a2189 Allow socketmodule to compile on NetBSD -current, whose bluetooth API Matt Fleming <mattjfleming@googlemail.com> parents: 39059 diff changeset	400 #define sockaddr_sco sockaddr_bt
65430 7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	401 #define SOL_HCI BTPROTO_HCI
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	402 #define HCI_DATA_DIR SO_HCI_DIRECTION
39242 0e9a269a2189 Allow socketmodule to compile on NetBSD -current, whose bluetooth API Matt Fleming <mattjfleming@googlemail.com> parents: 39059 diff changeset	403 #define _BT_L2_MEMB(sa, memb) ((sa)->bt_##memb)
0e9a269a2189 Allow socketmodule to compile on NetBSD -current, whose bluetooth API Matt Fleming <mattjfleming@googlemail.com> parents: 39059 diff changeset	404 #define _BT_RC_MEMB(sa, memb) ((sa)->bt_##memb)
40842 90e22fea8363 Patch #1432399: Add HCI sockets. Martin v. Löwis <martin@v.loewis.de> parents: 40837 diff changeset	405 #define _BT_HCI_MEMB(sa, memb) ((sa)->bt_##memb)
39242 0e9a269a2189 Allow socketmodule to compile on NetBSD -current, whose bluetooth API Matt Fleming <mattjfleming@googlemail.com> parents: 39059 diff changeset	406 #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	407 #else
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	408 #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	409 #define _BT_RC_MEMB(sa, memb) ((sa)->rc_##memb)
40842 90e22fea8363 Patch #1432399: Add HCI sockets. Martin v. Löwis <martin@v.loewis.de> parents: 40837 diff changeset	410 #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	411 #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	412 #endif
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	413 #endif
afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	414
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	415 #ifdef __VMS
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	416 /* TCP/IP Services for VMS uses a maximum send/recv buffer length */
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	417 #define SEGMENT_SIZE (32 * 1024 -1)
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	418 #endif
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	419
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	420 #define SAS2SA(x) ((struct sockaddr *)(x))
40416 c43787e6d706 Patch #1544279: Improve thread-safety of the socket module by moving Martin v. Löwis <martin@v.loewis.de> parents: 39502 diff changeset	421
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	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 * 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	424 */
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 #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	426 #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	427 #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	428 #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	429 #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	430 #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	431
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	432 /* 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	433 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	434
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	435 /* 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	436 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	437 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	438 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	439 static PyObject *socket_gaierror;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	440 static PyObject *socket_timeout;
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	441
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	442 #ifdef RISCOS
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	443 /* Global variable which is !=0 if Python is running in a RISC OS taskwindow */
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	444 static int taskwindow;
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	445 #endif
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	446
21970 b1a871dc5196 Moved the declaration of PySocketSock_Type from socketmodule.h to Tim Peters <tim.peters@gmail.com> parents: 21964 diff changeset	447 /* 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	448 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	449 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	450 there has to be a circular reference. */
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24078 diff changeset	451 static PyTypeObject sock_type;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	452
39059 52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	453 #if defined(HAVE_POLL_H)
52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	454 #include <poll.h>
52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	455 #elif defined(HAVE_SYS_POLL_H)
52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	456 #include <sys/poll.h>
52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	457 #endif
52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	458
36476 c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	459 #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	460 /* 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	461 #define IS_SELECTABLE(s) 1
39059 52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	462 #elif defined(HAVE_POLL)
52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	463 /* Instead of select(), we'll use poll() since poll() works on any fd. */
52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	464 #define IS_SELECTABLE(s) 1
52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	465 /* 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	466 #else
c073dffbe70e Introduce Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE. Martin v. Löwis <martin@v.loewis.de> parents: 36452 diff changeset	467 /* POSIX says selecting file descriptors beyond FD_SETSIZE
39059 52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	468 has undefined behaviour. If there's no timeout left, we don't have to
52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	469 call select, so it's a safe, little white lie. */
52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	470 #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	471 #endif
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	472
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	473 static PyObject*
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	474 select_error(void)
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	475 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	476 PyErr_SetString(socket_error, "unable to select on socket");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	477 return NULL;
36452 7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	478 }
7789cc557e1e Bug #876637, prevent stack corruption when socket descriptor Neal Norwitz <nnorwitz@gmail.com> parents: 36324 diff changeset	479
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	480 /* 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	481 and return a NULL pointer from a function. */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	482
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	483 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	484 set_error(void)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	485 {
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	486 #ifdef MS_WINDOWS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	487 int err_no = WSAGetLastError();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	488 /* PyErr_SetExcFromWindowsErr() invokes FormatMessage() which
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	489 recognizes the error codes used by both GetLastError() and
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	490 WSAGetLastError */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	491 if (err_no)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	492 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	493 #endif
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	494
22115 d104bb50a194 OS/2 EMX port changes (Modules part of patch #450267): Andrew MacIntyre <andymac@bullseye.apana.org.au> parents: 22096 diff changeset	495 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	496 if (sock_errno() != NO_ERROR) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	497 APIRET rc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	498 ULONG msglen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	499 char outbuf[100];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	500 int myerrorcode = sock_errno();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	501
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	502 /* Retrieve socket-related error message from MPTN.MSG file */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	503 rc = DosGetMessage(NULL, 0, outbuf, sizeof(outbuf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	504 myerrorcode - SOCBASEERR + 26,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	505 "mptn.msg",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	506 &msglen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	507 if (rc == NO_ERROR) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	508 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	509
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	510 /* OS/2 doesn't guarantee a terminator */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	511 outbuf[msglen] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	512 if (strlen(outbuf) > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	513 /* If non-empty msg, trim CRLF */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	514 char *lastc = &outbuf[ strlen(outbuf)-1 ];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	515 while (lastc > outbuf &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	516 isspace(Py_CHARMASK(*lastc))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	517 /* Trim trailing whitespace (CRLF) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	518 *lastc-- = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	519 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	520 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	521 v = Py_BuildValue("(is)", myerrorcode, outbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	522 if (v != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	523 PyErr_SetObject(socket_error, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	524 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	525 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	526 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	527 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	528 }
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	529 #endif
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	530
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	531 #if defined(RISCOS)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	532 if (_inet_error.errnum != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	533 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	534 v = Py_BuildValue("(is)", errno, _inet_err());
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	535 if (v != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	536 PyErr_SetObject(socket_error, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	537 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	538 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	539 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	540 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	541 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	542
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	543 return PyErr_SetFromErrno(socket_error);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	544 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	545
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	546
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	547 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	548 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	549 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	550 PyObject *v;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	551
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	552 #ifdef HAVE_HSTRERROR
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	553 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	554 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	555 v = Py_BuildValue("(is)", h_error, "host not found");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	556 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	557 if (v != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	558 PyErr_SetObject(socket_herror, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	559 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	560 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	561
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	562 return NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	563 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	564
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	565
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	566 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	567 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	568 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	569 PyObject *v;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	570
22096 9e5ff6747437 Patch #520062: Support IPv6 with VC.NET. Martin v. Löwis <martin@v.loewis.de> parents: 21970 diff changeset	571 #ifdef EAI_SYSTEM
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	572 /* EAI_SYSTEM is not available on Windows XP. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	573 if (error == EAI_SYSTEM)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	574 return set_error();
22096 9e5ff6747437 Patch #520062: Support IPv6 with VC.NET. Martin v. Löwis <martin@v.loewis.de> parents: 21970 diff changeset	575 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	576
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	577 #ifdef HAVE_GAI_STRERROR
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	578 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	579 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	580 v = Py_BuildValue("(is)", error, "getaddrinfo failed");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	581 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	582 if (v != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	583 PyErr_SetObject(socket_gaierror, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	584 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	585 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	586
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	587 return NULL;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	588 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	589
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	590 #ifdef __VMS
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	591 /* Function to send in segments */
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	592 static int
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	593 sendsegmented(int sock_fd, char *buf, int len, int flags)
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	594 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	595 int n = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	596 int remaining = len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	597
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	598 while (remaining > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	599 unsigned int segment;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	600
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	601 segment = (remaining >= SEGMENT_SIZE ? SEGMENT_SIZE : remaining);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	602 n = send(sock_fd, buf, segment, flags);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	603 if (n < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	604 return n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	605 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	606 remaining -= segment;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	607 buf += segment;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	608 } /* end while */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	609
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	610 return len;
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	611 }
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	612 #endif
c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	613
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	614 /* 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	615 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	616 static int
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	617 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	618 {
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	619 #ifndef RISCOS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	620 #ifndef MS_WINDOWS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	621 int delay_flag;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	622 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	623 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	624
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	625 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	626 #ifdef __BEOS__
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	627 block = !block;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	628 setsockopt(s->sock_fd, SOL_SOCKET, SO_NONBLOCK,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	629 (void *)(&block), sizeof(int));
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	630 #else
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	631 #ifndef RISCOS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	632 #ifndef MS_WINDOWS
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	633 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	634 block = !block;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	635 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	636 #elif defined(__VMS)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	637 block = !block;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	638 ioctl(s->sock_fd, FIONBIO, (unsigned int *)&block);
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	639 #else /* !PYOS_OS2 && !__VMS */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	640 delay_flag = fcntl(s->sock_fd, F_GETFL, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	641 if (block)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	642 delay_flag &= (~O_NONBLOCK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	643 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	644 delay_flag \|= O_NONBLOCK;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	645 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	646 #endif /* !PYOS_OS2 */
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	647 #else /* MS_WINDOWS */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	648 block = !block;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	649 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	650 #endif /* MS_WINDOWS */
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	651 #else /* RISCOS */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	652 block = !block;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	653 socketioctl(s->sock_fd, FIONBIO, (u_long*)&block);
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	654 #endif /* RISCOS */
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	655 #endif /* __BEOS__ */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	656 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	657
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	658 /* Since these don't return anything */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	659 return 1;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	660 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	661
39059 52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	662 /* 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	663 The argument writing indicates the direction.
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	664 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	665 after they've reacquired the interpreter lock.
39354 85fdcdfca85c Patch #1519025 and bug #926423: If a KeyboardInterrupt occurs during Neal Norwitz <nnorwitz@gmail.com> parents: 39251 diff changeset	666 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	667 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	668 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	669 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	670 int n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	671
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	672 /* Nothing to do unless we're in timeout mode (not non-blocking) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	673 if (s->sock_timeout <= 0.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	674 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	675
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	676 /* Guard against closed socket */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	677 if (s->sock_fd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	678 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	679
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	680 /* Prefer poll, if available, since you can poll() any fd
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	681 * which can't be done with select(). */
39059 52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	682 #ifdef HAVE_POLL
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	683 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	684 struct pollfd pollfd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	685 int timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	686
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	687 pollfd.fd = s->sock_fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	688 pollfd.events = writing ? POLLOUT : POLLIN;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	689
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	690 /* s->sock_timeout is in seconds, timeout in ms */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	691 timeout = (int)(s->sock_timeout * 1000 + 0.5);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	692 n = poll(&pollfd, 1, timeout);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	693 }
39059 52a8738f5ab4 #1494314: Fix a regression with high-numbered sockets in 2.4.3. This Anthony Baxter <anthonybaxter@gmail.com> parents: 39043 diff changeset	694 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	695 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	696 /* Construct the arguments to select */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	697 fd_set fds;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	698 struct timeval tv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	699 tv.tv_sec = (int)s->sock_timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	700 tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	701 FD_ZERO(&fds);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	702 FD_SET(s->sock_fd, &fds);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	703
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	704 /* See if the socket is ready */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	705 if (writing)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	706 n = select(s->sock_fd+1, NULL, &fds, NULL, &tv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	707 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	708 n = select(s->sock_fd+1, &fds, NULL, NULL, &tv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	709 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	710 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	711
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	712 if (n < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	713 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	714 if (n == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	715 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	716 return 0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	717 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	718
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	719 /* 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	720
24305 428cbbf05639 A Python float is a C double; redeclare defaulttimeout as such; stops Tim Peters <tim.peters@gmail.com> parents: 24303 diff changeset	721 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	722
24363 979ff5d0ae07 Replace DL_IMPORT with PyMODINIT_FUNC and remove "/export:init..." link Mark Hammond <mhammond@skippinet.com.au> parents: 24317 diff changeset	723 PyMODINIT_FUNC
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	724 init_sockobject(PySocketSockObject *s,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	725 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	726 {
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	727 #ifdef RISCOS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	728 int block = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	729 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	730 s->sock_fd = fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	731 s->sock_family = family;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	732 s->sock_type = type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	733 s->sock_proto = proto;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	734 s->sock_timeout = defaulttimeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	735
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	736 s->errorhandler = &set_error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	737
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	738 if (defaulttimeout >= 0.0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	739 internal_setblocking(s, 0);
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	740
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	741 #ifdef RISCOS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	742 if (taskwindow)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	743 socketioctl(s->sock_fd, 0x80046679, (u_long*)&block);
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	744 #endif
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	745 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	746
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	747
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	748 /* Create a new socket object.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	749 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	750 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	751 in NEWOBJ()). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	752
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	753 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	754 new_sockobject(SOCKET_T fd, int family, int type, int proto)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	755 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	756 PySocketSockObject *s;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	757 s = (PySocketSockObject *)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	758 PyType_GenericNew(&sock_type, NULL, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	759 if (s != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	760 init_sockobject(s, fd, family, type, proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	761 return s;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	762 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	763
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	764
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	765 /* 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	766 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	767 #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	768 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	769 #endif
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	770
ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	771
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	772 /* 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	773 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	774 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	775 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	776 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	777
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	778 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	779 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	780 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	781 struct addrinfo hints, *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	782 int error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	783 int d1, d2, d3, d4;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	784 char ch;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	785
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	786 memset((void ) addr_ret, '\0', sizeof(addr_ret));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	787 if (name[0] == '\0') {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	788 int siz;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	789 memset(&hints, 0, sizeof(hints));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	790 hints.ai_family = af;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	791 hints.ai_socktype = SOCK_DGRAM; /dummy/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	792 hints.ai_flags = AI_PASSIVE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	793 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	794 ACQUIRE_GETADDRINFO_LOCK
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	795 error = getaddrinfo(NULL, "0", &hints, &res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	796 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	797 /* We assume that those thread-unsafe getaddrinfo() versions
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	798 are safe regarding their return value, ie. that a
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	799 subsequent call to getaddrinfo() does not destroy the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	800 outcome of the first call. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	801 RELEASE_GETADDRINFO_LOCK
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	802 if (error) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	803 set_gaierror(error);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	804 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	805 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	806 switch (res->ai_family) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	807 case AF_INET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	808 siz = 4;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	809 break;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	810 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	811 case AF_INET6:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	812 siz = 16;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	813 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	814 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	815 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	816 freeaddrinfo(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	817 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	818 "unsupported address family");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	819 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	820 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	821 if (res->ai_next) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	822 freeaddrinfo(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	823 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	824 "wildcard resolved to multiple address");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	825 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	826 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	827 if (res->ai_addrlen < addr_ret_size)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	828 addr_ret_size = res->ai_addrlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	829 memcpy(addr_ret, res->ai_addr, addr_ret_size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	830 freeaddrinfo(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	831 return siz;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	832 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	833 if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	834 struct sockaddr_in *sin;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	835 if (af != AF_INET && af != AF_UNSPEC) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	836 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	837 "address family mismatched");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	838 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	839 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	840 sin = (struct sockaddr_in *)addr_ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	841 memset((void ) sin, '\0', sizeof(sin));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	842 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	843 #ifdef HAVE_SOCKADDR_SA_LEN
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	844 sin->sin_len = sizeof(*sin);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	845 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	846 sin->sin_addr.s_addr = INADDR_BROADCAST;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	847 return sizeof(sin->sin_addr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	848 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	849 if (sscanf(name, "%d.%d.%d.%d%c", &d1, &d2, &d3, &d4, &ch) == 4 &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	850 0 <= d1 && d1 <= 255 && 0 <= d2 && d2 <= 255 &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	851 0 <= d3 && d3 <= 255 && 0 <= d4 && d4 <= 255) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	852 struct sockaddr_in *sin;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	853 sin = (struct sockaddr_in *)addr_ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	854 sin->sin_addr.s_addr = htonl(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	855 ((long) d1 << 24) \| ((long) d2 << 16) \|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	856 ((long) d3 << 8) \| ((long) d4 << 0));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	857 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	858 #ifdef HAVE_SOCKADDR_SA_LEN
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	859 sin->sin_len = sizeof(*sin);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	860 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	861 return 4;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	862 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	863 memset(&hints, 0, sizeof(hints));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	864 hints.ai_family = af;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	865 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	866 ACQUIRE_GETADDRINFO_LOCK
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	867 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	868 #if defined(__digital__) && defined(__unix__)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	869 if (error == EAI_NONAME && af == AF_UNSPEC) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	870 /* On Tru64 V5.1, numeric-to-addr conversion fails
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	871 if no address family is given. Assume IPv4 for now.*/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	872 hints.ai_family = AF_INET;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	873 error = getaddrinfo(name, NULL, &hints, &res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	874 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	875 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	876 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	877 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	878 if (error) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	879 set_gaierror(error);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	880 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	881 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	882 if (res->ai_addrlen < addr_ret_size)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	883 addr_ret_size = res->ai_addrlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	884 memcpy((char *) addr_ret, res->ai_addr, addr_ret_size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	885 freeaddrinfo(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	886 switch (addr_ret->sa_family) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	887 case AF_INET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	888 return 4;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	889 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	890 case AF_INET6:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	891 return 16;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	892 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	893 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	894 PyErr_SetString(socket_error, "unknown address family");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	895 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	896 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	897 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	898
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	899
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	900 /* 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	901 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	902 size numbers). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	903
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	904 static PyObject *
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	905 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	906 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	907 char buf[NI_MAXHOST];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	908 int error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	909
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	910 error = getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	911 NI_NUMERICHOST);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	912 if (error) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	913 set_gaierror(error);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	914 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	915 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	916 return PyString_FromString(buf);
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	917 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	918
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	919
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	920 #ifdef USE_BLUETOOTH
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	921 /* 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	922 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	923 an error occurred. */
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	924
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	925 static int
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	926 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	927 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	928 unsigned int b0, b1, b2, b3, b4, b5;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	929 char ch;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	930 int n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	931
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	932 n = sscanf(name, "%X:%X:%X:%X:%X:%X%c",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	933 &b5, &b4, &b3, &b2, &b1, &b0, &ch);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	934 if (n == 6 && (b0 \| b1 \| b2 \| b3 \| b4 \| b5) < 256) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	935 bdaddr->b[0] = b0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	936 bdaddr->b[1] = b1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	937 bdaddr->b[2] = b2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	938 bdaddr->b[3] = b3;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	939 bdaddr->b[4] = b4;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	940 bdaddr->b[5] = b5;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	941 return 6;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	942 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	943 PyErr_SetString(socket_error, "bad bluetooth address");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	944 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	945 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	946 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	947
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	948 /* 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	949 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	950 value (zero padded if necessary). */
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	951
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	952 static PyObject *
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	953 makebdaddr(bdaddr_t *bdaddr)
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	954 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	955 char buf[(6 * 2) + 5 + 1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	956
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	957 sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	958 bdaddr->b[5], bdaddr->b[4], bdaddr->b[3],
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	959 bdaddr->b[2], bdaddr->b[1], bdaddr->b[0]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	960 return PyString_FromString(buf);
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	961 }
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	962 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	963
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	964
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	965 /* 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	966 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	967 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	968 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	969
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	970 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	971 static PyObject *
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	972 makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	973 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	974 if (addrlen == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	975 /* No address -- may be recvfrom() from known socket */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	976 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	977 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	978 }
925 61143bf03b44 Sometimes, recvfrom() returns an empty address; this is not an error. Guido van Rossum <guido@python.org> parents: 902 diff changeset	979
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	980 #ifdef __BEOS__
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	981 /* XXX: BeOS version of accept() doesn't set family correctly */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	982 addr->sa_family = AF_INET;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	983 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	984
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	985 switch (addr->sa_family) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	986
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	987 case AF_INET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	988 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	989 struct sockaddr_in *a;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	990 PyObject addrobj = makeipaddr(addr, sizeof(a));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	991 PyObject *ret = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	992 if (addrobj) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	993 a = (struct sockaddr_in *)addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	994 ret = Py_BuildValue("Oi", addrobj, ntohs(a->sin_port));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	995 Py_DECREF(addrobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	996 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	997 return ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	998 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	999
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	1000 #if defined(AF_UNIX)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1001 case AF_UNIX:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1002 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1003 struct sockaddr_un a = (struct sockaddr_un ) addr;
37853 29257ef6abeb SF Patch #1062014: AF_UNIX sockets under Linux have a special Armin Rigo <arigo@tunes.org> parents: 37732 diff changeset	1004 #ifdef linux
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1005 if (a->sun_path[0] == 0) { /* Linux abstract namespace */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1006 addrlen -= offsetof(struct sockaddr_un, sun_path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1007 return PyString_FromStringAndSize(a->sun_path,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1008 addrlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1009 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1010 else
37853 29257ef6abeb SF Patch #1062014: AF_UNIX sockets under Linux have a special Armin Rigo <arigo@tunes.org> parents: 37732 diff changeset	1011 #endif /* linux */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1012 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1013 /* regular NULL-terminated string */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1014 return PyString_FromString(a->sun_path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1015 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1016 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1017 #endif /* AF_UNIX */
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1018
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1019 #if defined(AF_NETLINK)
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1020 case AF_NETLINK:
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1021 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1022 struct sockaddr_nl a = (struct sockaddr_nl ) addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1023 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	1024 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1025 #endif /* AF_NETLINK */
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1026
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1027 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1028 case AF_INET6:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1029 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1030 struct sockaddr_in6 *a;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1031 PyObject addrobj = makeipaddr(addr, sizeof(a));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1032 PyObject *ret = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1033 if (addrobj) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1034 a = (struct sockaddr_in6 *)addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1035 ret = Py_BuildValue("Oiii",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1036 addrobj,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1037 ntohs(a->sin6_port),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1038 a->sin6_flowinfo,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1039 a->sin6_scope_id);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1040 Py_DECREF(addrobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1041 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1042 return ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1043 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1044 #endif
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1045
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1046 #ifdef USE_BLUETOOTH
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1047 case AF_BLUETOOTH:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1048 switch (proto) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1049
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1050 case BTPROTO_L2CAP:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1051 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1052 struct sockaddr_l2 a = (struct sockaddr_l2 ) addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1053 PyObject *addrobj = makebdaddr(&_BT_L2_MEMB(a, bdaddr));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1054 PyObject *ret = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1055 if (addrobj) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1056 ret = Py_BuildValue("Oi",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1057 addrobj,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1058 _BT_L2_MEMB(a, psm));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1059 Py_DECREF(addrobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1060 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1061 return ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1062 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1063
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1064 case BTPROTO_RFCOMM:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1065 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1066 struct sockaddr_rc a = (struct sockaddr_rc ) addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1067 PyObject *addrobj = makebdaddr(&_BT_RC_MEMB(a, bdaddr));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1068 PyObject *ret = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1069 if (addrobj) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1070 ret = Py_BuildValue("Oi",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1071 addrobj,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1072 _BT_RC_MEMB(a, channel));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1073 Py_DECREF(addrobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1074 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1075 return ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1076 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1077
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1078 case BTPROTO_HCI:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1079 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1080 struct sockaddr_hci a = (struct sockaddr_hci ) addr;
65430 7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1081 #if defined(__NetBSD__) \|\| defined(__DragonFly__)
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1082 return makebdaddr(&_BT_HCI_MEMB(a, bdaddr));
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1083 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1084 PyObject *ret = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1085 ret = Py_BuildValue("i", _BT_HCI_MEMB(a, dev));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1086 return ret;
65430 7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1087 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1088 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1089
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1090 #if !defined(__FreeBSD__)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1091 case BTPROTO_SCO:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1092 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1093 struct sockaddr_sco a = (struct sockaddr_sco ) addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1094 return makebdaddr(&_BT_SCO_MEMB(a, bdaddr));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1095 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1096 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1097
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1098 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1099 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1100 "Unknown Bluetooth protocol");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1101 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1102 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1103 #endif
70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1104
65669 f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	1105 #if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFNAME)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1106 case AF_PACKET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1107 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1108 struct sockaddr_ll a = (struct sockaddr_ll )addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1109 char *ifname = "";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1110 struct ifreq ifr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1111 /* need to look up interface name give index */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1112 if (a->sll_ifindex) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1113 ifr.ifr_ifindex = a->sll_ifindex;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1114 if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1115 ifname = ifr.ifr_name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1116 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1117 return Py_BuildValue("shbhs#",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1118 ifname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1119 ntohs(a->sll_protocol),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1120 a->sll_pkttype,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1121 a->sll_hatype,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1122 a->sll_addr,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1123 a->sll_halen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1124 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1125 #endif
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1126
44561 ac51cfe5c5c6 Issue #1646: Make socket support TIPC. The socket module now has support Christian Heimes <christian@cheimes.de> parents: 44474 diff changeset	1127 #ifdef HAVE_LINUX_TIPC_H
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1128 case AF_TIPC:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1129 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1130 struct sockaddr_tipc a = (struct sockaddr_tipc ) addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1131 if (a->addrtype == TIPC_ADDR_NAMESEQ) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1132 return Py_BuildValue("IIIII",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1133 a->addrtype,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1134 a->addr.nameseq.type,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1135 a->addr.nameseq.lower,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1136 a->addr.nameseq.upper,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1137 a->scope);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1138 } else if (a->addrtype == TIPC_ADDR_NAME) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1139 return Py_BuildValue("IIIII",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1140 a->addrtype,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1141 a->addr.name.name.type,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1142 a->addr.name.name.instance,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1143 a->addr.name.name.instance,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1144 a->scope);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1145 } else if (a->addrtype == TIPC_ADDR_ID) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1146 return Py_BuildValue("IIIII",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1147 a->addrtype,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1148 a->addr.id.node,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1149 a->addr.id.ref,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1150 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1151 a->scope);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1152 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1153 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1154 "Invalid address type");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1155 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1156 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1157 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1158 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1159
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1160 /* More cases here... */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1161
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1162 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1163 /* If we don't know the address family, don't raise an
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1164 exception -- return it as a tuple. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1165 return Py_BuildValue("is#",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1166 addr->sa_family,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1167 addr->sa_data,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1168 sizeof(addr->sa_data));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1169
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1170 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1171 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1172
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1173
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1174 /* 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	1175 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	1176 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	1177 through len_ret. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1178
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1179 static int
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1180 getsockaddrarg(PySocketSockObject s, PyObject args,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1181 struct sockaddr addr_ret, int len_ret)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1182 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1183 switch (s->sock_family) {
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1184
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	1185 #if defined(AF_UNIX)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1186 case AF_UNIX:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1187 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1188 struct sockaddr_un* addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1189 char *path;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1190 int len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1191 if (!PyArg_Parse(args, "t#", &path, &len))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1192 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1193
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1194 addr = (struct sockaddr_un*)addr_ret;
37853 29257ef6abeb SF Patch #1062014: AF_UNIX sockets under Linux have a special Armin Rigo <arigo@tunes.org> parents: 37732 diff changeset	1195 #ifdef linux
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1196 if (len > 0 && path[0] == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1197 /* Linux abstract namespace extension */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1198 if (len > sizeof addr->sun_path) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1199 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1200 "AF_UNIX path too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1201 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1202 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1203 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1204 else
37853 29257ef6abeb SF Patch #1062014: AF_UNIX sockets under Linux have a special Armin Rigo <arigo@tunes.org> parents: 37732 diff changeset	1205 #endif /* linux */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1206 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1207 /* regular NULL-terminated string */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1208 if (len >= sizeof addr->sun_path) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1209 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1210 "AF_UNIX path too long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1211 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1212 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1213 addr->sun_path[len] = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1214 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1215 addr->sun_family = s->sock_family;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1216 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	1217 #if defined(PYOS_OS2)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1218 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	1219 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1220 *len_ret = len + offsetof(struct sockaddr_un, sun_path);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1221 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1222 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1223 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1224 #endif /* AF_UNIX */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1225
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1226 #if defined(AF_NETLINK)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1227 case AF_NETLINK:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1228 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1229 struct sockaddr_nl* addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1230 int pid, groups;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1231 addr = (struct sockaddr_nl *)addr_ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1232 if (!PyTuple_Check(args)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1233 PyErr_Format(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1234 PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1235 "getsockaddrarg: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1236 "AF_NETLINK address must be tuple, not %.500s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1237 Py_TYPE(args)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1238 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1239 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1240 if (!PyArg_ParseTuple(args, "II:getsockaddrarg", &pid, &groups))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1241 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1242 addr->nl_family = AF_NETLINK;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1243 addr->nl_pid = pid;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1244 addr->nl_groups = groups;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1245 len_ret = sizeof(addr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1246 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1247 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1248 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1249
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1250 case AF_INET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1251 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1252 struct sockaddr_in* addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1253 char *host;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1254 int port, result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1255 if (!PyTuple_Check(args)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1256 PyErr_Format(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1257 PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1258 "getsockaddrarg: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1259 "AF_INET address must be tuple, not %.500s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1260 Py_TYPE(args)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1261 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1262 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1263 if (!PyArg_ParseTuple(args, "eti:getsockaddrarg",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1264 "idna", &host, &port))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1265 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1266 addr=(struct sockaddr_in*)addr_ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1267 result = setipaddr(host, (struct sockaddr *)addr,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1268 sizeof(*addr), AF_INET);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1269 PyMem_Free(host);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1270 if (result < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1271 return 0;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1272 if (port < 0 \|\| port > 0xffff) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1273 PyErr_SetString(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1274 PyExc_OverflowError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1275 "getsockaddrarg: port must be 0-65535.");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1276 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1277 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1278 addr->sin_family = AF_INET;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1279 addr->sin_port = htons((short)port);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1280 len_ret = sizeof addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1281 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1282 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1283
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1284 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1285 case AF_INET6:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1286 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1287 struct sockaddr_in6* addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1288 char *host;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1289 int port, flowinfo, scope_id, result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1290 flowinfo = scope_id = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1291 if (!PyTuple_Check(args)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1292 PyErr_Format(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1293 PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1294 "getsockaddrarg: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1295 "AF_INET6 address must be tuple, not %.500s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1296 Py_TYPE(args)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1297 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1298 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1299 if (!PyArg_ParseTuple(args, "eti\|ii",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1300 "idna", &host, &port, &flowinfo,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1301 &scope_id)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1302 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1303 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1304 addr = (struct sockaddr_in6*)addr_ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1305 result = setipaddr(host, (struct sockaddr *)addr,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1306 sizeof(*addr), AF_INET6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1307 PyMem_Free(host);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1308 if (result < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1309 return 0;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1310 if (port < 0 \|\| port > 0xffff) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1311 PyErr_SetString(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1312 PyExc_OverflowError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1313 "getsockaddrarg: port must be 0-65535.");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1314 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1315 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1316 addr->sin6_family = s->sock_family;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1317 addr->sin6_port = htons((short)port);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1318 addr->sin6_flowinfo = flowinfo;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1319 addr->sin6_scope_id = scope_id;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1320 len_ret = sizeof addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1321 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1322 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1323 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1324
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1325 #ifdef USE_BLUETOOTH
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1326 case AF_BLUETOOTH:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1327 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1328 switch (s->sock_proto) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1329 case BTPROTO_L2CAP:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1330 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1331 struct sockaddr_l2 *addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1332 char *straddr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1333
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1334 addr = (struct sockaddr_l2 *)addr_ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1335 memset(addr, 0, sizeof(struct sockaddr_l2));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1336 _BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1337 if (!PyArg_ParseTuple(args, "si", &straddr,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1338 &_BT_L2_MEMB(addr, psm))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1339 PyErr_SetString(socket_error, "getsockaddrarg: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1340 "wrong format");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1341 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1342 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1343 if (setbdaddr(straddr, &_BT_L2_MEMB(addr, bdaddr)) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1344 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1345
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1346 len_ret = sizeof addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1347 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1348 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1349 case BTPROTO_RFCOMM:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1350 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1351 struct sockaddr_rc *addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1352 char *straddr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1353
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1354 addr = (struct sockaddr_rc *)addr_ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1355 _BT_RC_MEMB(addr, family) = AF_BLUETOOTH;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1356 if (!PyArg_ParseTuple(args, "si", &straddr,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1357 &_BT_RC_MEMB(addr, channel))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1358 PyErr_SetString(socket_error, "getsockaddrarg: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1359 "wrong format");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1360 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1361 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1362 if (setbdaddr(straddr, &_BT_RC_MEMB(addr, bdaddr)) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1363 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1364
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1365 len_ret = sizeof addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1366 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1367 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1368 case BTPROTO_HCI:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1369 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1370 struct sockaddr_hci addr = (struct sockaddr_hci )addr_ret;
65430 7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1371 #if defined(__NetBSD__) \|\| defined(__DragonFly__)
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1372 char *straddr = PyBytes_AS_STRING(args);
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1373
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1374 _BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1375 if (straddr == NULL) {
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1376 PyErr_SetString(socket_error, "getsockaddrarg: "
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1377 "wrong format");
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1378 return 0;
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1379 }
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1380 if (setbdaddr(straddr, &_BT_HCI_MEMB(addr, bdaddr)) < 0)
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1381 return 0;
7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1382 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1383 _BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1384 if (!PyArg_ParseTuple(args, "i", &_BT_HCI_MEMB(addr, dev))) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1385 PyErr_SetString(socket_error, "getsockaddrarg: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1386 "wrong format");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1387 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1388 }
65430 7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	1389 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1390 len_ret = sizeof addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1391 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1392 }
32213 70dee2b193f7 Patch #929192: Improvements to bluetooth support. Martin v. Löwis <martin@v.loewis.de> parents: 32183 diff changeset	1393 #if !defined(__FreeBSD__)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1394 case BTPROTO_SCO:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1395 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1396 struct sockaddr_sco *addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1397 char *straddr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1398
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1399 addr = (struct sockaddr_sco *)addr_ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1400 _BT_SCO_MEMB(addr, family) = AF_BLUETOOTH;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1401 straddr = PyString_AsString(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1402 if (straddr == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1403 PyErr_SetString(socket_error, "getsockaddrarg: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1404 "wrong format");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1405 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1406 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1407 if (setbdaddr(straddr, &_BT_SCO_MEMB(addr, bdaddr)) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1408 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1409
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1410 len_ret = sizeof addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1411 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1412 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1413 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1414 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1415 PyErr_SetString(socket_error, "getsockaddrarg: unknown Bluetooth protocol");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1416 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1417 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1418 }
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1419 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1420
65669 f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	1421 #if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFINDEX)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1422 case AF_PACKET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1423 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1424 struct sockaddr_ll* addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1425 struct ifreq ifr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1426 char *interfaceName;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1427 int protoNumber;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1428 int hatype = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1429 int pkttype = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1430 char *haddr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1431 unsigned int halen = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1432
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1433 if (!PyTuple_Check(args)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1434 PyErr_Format(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1435 PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1436 "getsockaddrarg: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1437 "AF_PACKET address must be tuple, not %.500s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1438 Py_TYPE(args)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1439 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1440 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1441 if (!PyArg_ParseTuple(args, "si\|iis#", &interfaceName,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1442 &protoNumber, &pkttype, &hatype,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1443 &haddr, &halen))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1444 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1445 strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1446 ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1447 if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1448 s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1449 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1450 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1451 if (halen > 8) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1452 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1453 "Hardware address must be 8 bytes or less");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1454 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1455 }
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1456 if (protoNumber < 0 \|\| protoNumber > 0xffff) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1457 PyErr_SetString(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1458 PyExc_OverflowError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1459 "getsockaddrarg: protoNumber must be 0-65535.");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1460 return 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	1461 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1462 addr = (struct sockaddr_ll*)addr_ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1463 addr->sll_family = AF_PACKET;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1464 addr->sll_protocol = htons((short)protoNumber);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1465 addr->sll_ifindex = ifr.ifr_ifindex;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1466 addr->sll_pkttype = pkttype;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1467 addr->sll_hatype = hatype;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1468 if (halen != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1469 memcpy(&addr->sll_addr, haddr, halen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1470 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1471 addr->sll_halen = halen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1472 len_ret = sizeof addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1473 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1474 }
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1475 #endif
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1476
44561 ac51cfe5c5c6 Issue #1646: Make socket support TIPC. The socket module now has support Christian Heimes <christian@cheimes.de> parents: 44474 diff changeset	1477 #ifdef HAVE_LINUX_TIPC_H
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1478 case AF_TIPC:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1479 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1480 unsigned int atype, v1, v2, v3;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1481 unsigned int scope = TIPC_CLUSTER_SCOPE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1482 struct sockaddr_tipc *addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1483
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1484 if (!PyTuple_Check(args)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1485 PyErr_Format(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1486 PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1487 "getsockaddrarg: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1488 "AF_TIPC address must be tuple, not %.500s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1489 Py_TYPE(args)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1490 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1491 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1492
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1493 if (!PyArg_ParseTuple(args,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1494 "IIII\|I;Invalid TIPC address format",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1495 &atype, &v1, &v2, &v3, &scope))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1496 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1497
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1498 addr = (struct sockaddr_tipc *) addr_ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1499 memset(addr, 0, sizeof(struct sockaddr_tipc));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1500
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1501 addr->family = AF_TIPC;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1502 addr->scope = scope;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1503 addr->addrtype = atype;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1504
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1505 if (atype == TIPC_ADDR_NAMESEQ) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1506 addr->addr.nameseq.type = v1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1507 addr->addr.nameseq.lower = v2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1508 addr->addr.nameseq.upper = v3;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1509 } else if (atype == TIPC_ADDR_NAME) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1510 addr->addr.name.name.type = v1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1511 addr->addr.name.name.instance = v2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1512 } else if (atype == TIPC_ADDR_ID) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1513 addr->addr.id.node = v1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1514 addr->addr.id.ref = v2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1515 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1516 /* Shouldn't happen */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1517 PyErr_SetString(PyExc_TypeError, "Invalid address type");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1518 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1519 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1520
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1521 len_ret = sizeof(addr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1522
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1523 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1524 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1525 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1526
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1527 /* More cases here... */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1528
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1529 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1530 PyErr_SetString(socket_error, "getsockaddrarg: bad family");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1531 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1532
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1533 }
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1534 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1535
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1536
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1537 /* 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	1538 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	1539 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	1540
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1541 static int
13554 906efc1da247 Errare humanum est. Peter Schneider-Kamp <nowonder@nowonder.de> parents: 13538 diff changeset	1542 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	1543 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1544 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	1545
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	1546 #if defined(AF_UNIX)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1547 case AF_UNIX:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1548 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1549 *len_ret = sizeof (struct sockaddr_un);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1550 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1551 }
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	1552 #endif /* AF_UNIX */
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1553 #if defined(AF_NETLINK)
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1554 case AF_NETLINK:
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1555 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1556 *len_ret = sizeof (struct sockaddr_nl);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1557 return 1;
36286 ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1558 }
ae4480935016 Patch #1103116: AF_NETLINK sockets basic support. Martin v. Löwis <martin@v.loewis.de> parents: 36090 diff changeset	1559 #endif
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1560
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1561 case AF_INET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1562 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1563 *len_ret = sizeof (struct sockaddr_in);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1564 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1565 }
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1566
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	1567 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1568 case AF_INET6:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1569 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1570 *len_ret = sizeof (struct sockaddr_in6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1571 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1572 }
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1573 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	1574
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1575 #ifdef USE_BLUETOOTH
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1576 case AF_BLUETOOTH:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1577 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1578 switch(s->sock_proto)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1579 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1580
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1581 case BTPROTO_L2CAP:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1582 *len_ret = sizeof (struct sockaddr_l2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1583 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1584 case BTPROTO_RFCOMM:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1585 *len_ret = sizeof (struct sockaddr_rc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1586 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1587 case BTPROTO_HCI:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1588 *len_ret = sizeof (struct sockaddr_hci);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1589 return 1;
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	1590 #if !defined(__FreeBSD__)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1591 case BTPROTO_SCO:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1592 *len_ret = sizeof (struct sockaddr_sco);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1593 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1594 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1595 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1596 PyErr_SetString(socket_error, "getsockaddrlen: "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1597 "unknown BT protocol");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1598 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1599
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1600 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1601 }
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1602 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	1603
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	1604 #ifdef HAVE_NETPACKET_PACKET_H
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1605 case AF_PACKET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1606 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1607 *len_ret = sizeof (struct sockaddr_ll);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1608 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1609 }
16410 3d4a7cd0bf17 SF patch 101137 from Grant Edwards Jeremy Hylton <jeremy@alum.mit.edu> parents: 16400 diff changeset	1610 #endif
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1611
44561 ac51cfe5c5c6 Issue #1646: Make socket support TIPC. The socket module now has support Christian Heimes <christian@cheimes.de> parents: 44474 diff changeset	1612 #ifdef HAVE_LINUX_TIPC_H
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1613 case AF_TIPC:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1614 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1615 *len_ret = sizeof (struct sockaddr_tipc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1616 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1617 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1618 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1619
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1620 /* More cases here... */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1621
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1622 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1623 PyErr_SetString(socket_error, "getsockaddrlen: bad family");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1624 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1625
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1626 }
900 58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1627 }
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1628
58a7438c2e7e Some UNIX types want the exact size of the address structure Guido van Rossum <guido@python.org> parents: 896 diff changeset	1629
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1630 /* s.accept() method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1631
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1632 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	1633 sock_accept(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1634 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1635 sock_addr_t addrbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1636 SOCKET_T newfd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1637 socklen_t addrlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1638 PyObject *sock = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1639 PyObject *addr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1640 PyObject *res = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1641 int timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1642
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1643 if (!getsockaddrlen(s, &addrlen))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1644 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1645 memset(&addrbuf, 0, addrlen);
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1646
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1647 #ifdef MS_WINDOWS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1648 newfd = INVALID_SOCKET;
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1649 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1650 newfd = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1651 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1652
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1653 if (!IS_SELECTABLE(s))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1654 return select_error();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1655
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1656 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1657 timeout = internal_select(s, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1658 if (!timeout)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1659 newfd = accept(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1660 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1661
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1662 if (timeout == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1663 PyErr_SetString(socket_timeout, "timed out");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1664 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1665 }
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1666
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	1667 #ifdef MS_WINDOWS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1668 if (newfd == INVALID_SOCKET)
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	1669 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1670 if (newfd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1671 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1672 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1673
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1674 /* Create the new object with unspecified family,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1675 to avoid calls to bind() etc. on it. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1676 sock = (PyObject *) new_sockobject(newfd,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1677 s->sock_family,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1678 s->sock_type,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1679 s->sock_proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1680
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1681 if (sock == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1682 SOCKETCLOSE(newfd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1683 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1684 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1685 addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1686 addrlen, s->sock_proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1687 if (addr == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1688 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1689
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1690 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	1691
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1692 finally:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1693 Py_XDECREF(sock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1694 Py_XDECREF(addr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1695 return res;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1696 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1697
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1698 PyDoc_STRVAR(accept_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1699 "accept() -> (socket object, address info)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1700 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1701 Wait for an incoming connection. Return a new socket representing the\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1702 connection, and the address of the client. 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	1703 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	1704
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1705 /* s.setblocking(flag) method. Argument:
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1706 False -- non-blocking mode; same as settimeout(0)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1707 True -- blocking mode; same as settimeout(None)
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1708 */
1867 758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	1709
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1710 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	1711 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	1712 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1713 int block;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1714
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1715 block = PyInt_AsLong(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1716 if (block == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1717 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1718
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1719 s->sock_timeout = block ? -1.0 : 0.0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1720 internal_setblocking(s, block);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1721
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1722 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1723 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	1724 }
758c1374f303 Setup.in: added tkinter; rearranged the definition of PYTHONPATH so Guido van Rossum <guido@python.org> parents: 1792 diff changeset	1725
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1726 PyDoc_STRVAR(setblocking_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1727 "setblocking(flag)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1728 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1729 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	1730 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	1731 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	1732
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1733 /* s.settimeout(timeout) method. Argument:
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1734 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	1735 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	1736 > 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	1737 < 0 -- illegal; raises an exception
203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1738 */
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1739 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	1740 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	1741 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1742 double timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1743
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1744 if (arg == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1745 timeout = -1.0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1746 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1747 timeout = PyFloat_AsDouble(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1748 if (timeout < 0.0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1749 if (!PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1750 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1751 "Timeout value out of range");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1752 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1753 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1754 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1755
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1756 s->sock_timeout = timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1757 internal_setblocking(s, timeout < 0.0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1758
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1759 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1760 return Py_None;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1761 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1762
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1763 PyDoc_STRVAR(settimeout_doc,
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1764 "settimeout(timeout)\n\
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1765 \n\
23815 203d1412a7e8 Major overhaul of timeout sockets: Guido van Rossum <guido@python.org> parents: 23807 diff changeset	1766 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	1767 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	1768 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	1769 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	1770
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1771 /* s.gettimeout() method.
2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	1772 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	1773 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	1774 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	1775 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1776 if (s->sock_timeout < 0.0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1777 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1778 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1779 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1780 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1781 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	1782 }
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1783
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1784 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	1785 "gettimeout() -> timeout\n\
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1786 \n\
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	1787 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	1788 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	1789 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	1790
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1791 #ifdef RISCOS
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1792 /* s.sleeptaskw(1 \| 0) method */
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1793
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1794 static PyObject *
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	1795 sock_sleeptaskw(PySocketSockObject s,PyObject arg)
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1796 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1797 int block;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1798 block = PyInt_AsLong(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1799 if (block == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1800 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1801 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1802 socketioctl(s->sock_fd, 0x80046679, (u_long*)&block);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1803 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1804
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1805 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1806 return Py_None;
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1807 }
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1808 PyDoc_STRVAR(sleeptaskw_doc,
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1809 "sleeptaskw(flag)\n\
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1810 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1811 Allow sleeps in taskwindows.");
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1812 #endif
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1813
b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	1814
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	1815 /* 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	1816 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	1817 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	1818 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	1819
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1820 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	1821 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	1822 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1823 int level;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1824 int optname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1825 int res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1826 char *buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1827 int buflen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1828 int flag;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1829
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1830 if (PyArg_ParseTuple(args, "iii:setsockopt",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1831 &level, &optname, &flag)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1832 buf = (char *) &flag;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1833 buflen = sizeof flag;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1834 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1835 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1836 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1837 if (!PyArg_ParseTuple(args, "iis#:setsockopt",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1838 &level, &optname, &buf, &buflen))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1839 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1840 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1841 res = setsockopt(s->sock_fd, level, optname, (void *)buf, buflen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1842 if (res < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1843 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1844 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1845 return Py_None;
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1846 }
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1847
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1848 PyDoc_STRVAR(setsockopt_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1849 "setsockopt(level, option, value)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1850 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1851 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	1852 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	1853
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1854
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	1855 /* 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	1856 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	1857 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	1858 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	1859
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1860 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	1861 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	1862 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1863 int level;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1864 int optname;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1865 int res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1866 PyObject *buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1867 socklen_t buflen = 0;
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1868
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1869 #ifdef __BEOS__
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1870 /* We have incomplete socket support. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1871 PyErr_SetString(socket_error, "getsockopt not supported");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1872 return NULL;
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1873 #else
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1874
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1875 if (!PyArg_ParseTuple(args, "ii\|i:getsockopt",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1876 &level, &optname, &buflen))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1877 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1878
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1879 if (buflen == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1880 int flag = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1881 socklen_t flagsize = sizeof flag;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1882 res = getsockopt(s->sock_fd, level, optname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1883 (void *)&flag, &flagsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1884 if (res < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1885 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1886 return PyInt_FromLong(flag);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1887 }
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	1888 #ifdef __VMS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1889 /* socklen_t is unsigned so no negative test is needed,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1890 test buflen == 0 is previously done */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1891 if (buflen > 1024) {
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	1892 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1893 if (buflen <= 0 \|\| buflen > 1024) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1894 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1895 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1896 "getsockopt buflen out of range");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1897 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1898 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1899 buf = PyString_FromStringAndSize((char *)NULL, buflen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1900 if (buf == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1901 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1902 res = getsockopt(s->sock_fd, level, optname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1903 (void *)PyString_AS_STRING(buf), &buflen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1904 if (res < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1905 Py_DECREF(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1906 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1907 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1908 _PyString_Resize(&buf, buflen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1909 return buf;
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	1910 #endif /* __BEOS__ */
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1911 }
6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1912
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1913 PyDoc_STRVAR(getsockopt_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1914 "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	1915 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1916 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	1917 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	1918 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	1919
896 6459e2f21bf6 Added {get,set}sockopt(). allowbroadcast is now obsolete. Guido van Rossum <guido@python.org> parents: 795 diff changeset	1920
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	1921 /* s.bind(sockaddr) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1922
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1923 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	1924 sock_bind(PySocketSockObject s, PyObject addro)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1925 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1926 sock_addr_t addrbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1927 int addrlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1928 int res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1929
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1930 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1931 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1932 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1933 res = bind(s->sock_fd, SAS2SA(&addrbuf), addrlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1934 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1935 if (res < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1936 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1937 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1938 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1939 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1940
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1941 PyDoc_STRVAR(bind_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1942 "bind(address)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1943 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1944 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	1945 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	1946 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	1947
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1948
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1949 /* s.close() method.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1950 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	1951 will surely fail. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	1952
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	1953 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	1954 sock_close(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1955 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1956 SOCKET_T fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1957
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1958 if ((fd = s->sock_fd) != -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1959 s->sock_fd = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1960 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1961 (void) SOCKETCLOSE(fd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1962 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1963 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1964 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1965 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1966 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1967
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1968 PyDoc_STRVAR(close_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1969 "close()\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	1970 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	1971 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	1972
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1973 static int
29651 0a3751df4195 SF patch #760257: add socket.timeout exception Raymond Hettinger <python@rcn.com> parents: 29066 diff changeset	1974 internal_connect(PySocketSockObject s, struct sockaddr addr, int addrlen,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1975 int *timeoutp)
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1976 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1977 int res, timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1978
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1979 timeout = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1980 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	1981
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1982 #ifdef MS_WINDOWS
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	1983
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1984 if (s->sock_timeout > 0.0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1985 if (res < 0 && WSAGetLastError() == WSAEWOULDBLOCK &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1986 IS_SELECTABLE(s)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1987 /* This is a mess. Best solution: trust select */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1988 fd_set fds;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1989 fd_set fds_exc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1990 struct timeval tv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1991 tv.tv_sec = (int)s->sock_timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1992 tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1993 FD_ZERO(&fds);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1994 FD_SET(s->sock_fd, &fds);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1995 FD_ZERO(&fds_exc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1996 FD_SET(s->sock_fd, &fds_exc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1997 res = select(s->sock_fd+1, NULL, &fds, &fds_exc, &tv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1998 if (res == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	1999 res = WSAEWOULDBLOCK;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2000 timeout = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2001 } else if (res > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2002 if (FD_ISSET(s->sock_fd, &fds))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2003 /* The socket is in the writeable set - this
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2004 means connected */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2005 res = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2006 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2007 /* As per MS docs, we need to call getsockopt()
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2008 to get the underlying error */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2009 int res_size = sizeof res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2010 /* It must be in the exception set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2011 assert(FD_ISSET(s->sock_fd, &fds_exc));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2012 if (0 == getsockopt(s->sock_fd, SOL_SOCKET, SO_ERROR,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2013 (char *)&res, &res_size))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2014 /* getsockopt also clears WSAGetLastError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2015 so reset it back. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2016 WSASetLastError(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2017 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2018 res = WSAGetLastError();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2019 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2020 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2021 /* else if (res < 0) an error occurred */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2022 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2023 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2024
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2025 if (res < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2026 res = WSAGetLastError();
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2027
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2028 #else
8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2029
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2030 if (s->sock_timeout > 0.0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2031 if (res < 0 && errno == EINPROGRESS && IS_SELECTABLE(s)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2032 timeout = internal_select(s, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2033 if (timeout == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2034 /* Bug #1019808: in case of an EINPROGRESS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2035 use getsockopt(SO_ERROR) to get the real
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2036 error. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2037 socklen_t res_size = sizeof res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2038 (void)getsockopt(s->sock_fd, SOL_SOCKET,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2039 SO_ERROR, &res, &res_size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2040 if (res == EISCONN)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2041 res = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2042 errno = res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2043 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2044 else if (timeout == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2045 res = errno; /* had error */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2046 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2047 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2048 res = EWOULDBLOCK; /* timed out */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2049 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2050 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2051
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2052 if (res < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2053 res = errno;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2054
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2055 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2056 *timeoutp = timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2057
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2058 return res;
23818 8a0a14e3725e Fix non-blocking connect() for Windows. Refactored the code Guido van Rossum <guido@python.org> parents: 23815 diff changeset	2059 }
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2060
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	2061 /* s.connect(sockaddr) method */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2062
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2063 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	2064 sock_connect(PySocketSockObject s, PyObject addro)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2065 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2066 sock_addr_t addrbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2067 int addrlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2068 int res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2069 int timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2070
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2071 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2072 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2073
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2074 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2075 res = internal_connect(s, SAS2SA(&addrbuf), addrlen, &timeout);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2076 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2077
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2078 if (timeout == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2079 PyErr_SetString(socket_timeout, "timed out");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2080 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2081 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2082 if (res != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2083 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2084 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2085 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2086 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2087
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2088 PyDoc_STRVAR(connect_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2089 "connect(address)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2090 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2091 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	2092 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	2093
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2094
13278 3370edad08ce Restore strict checking of socket address values; addresses passed to Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	2095 /* 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	2096
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2097 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	2098 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	2099 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2100 sock_addr_t addrbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2101 int addrlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2102 int res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2103 int timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2104
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2105 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2106 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2107
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2108 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2109 res = internal_connect(s, SAS2SA(&addrbuf), addrlen, &timeout);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2110 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2111
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2112 /* Signals are not errors (though they may raise exceptions). Adapted
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2113 from PyErr_SetFromErrnoWithFilenameObject(). */
39354 85fdcdfca85c Patch #1519025 and bug #926423: If a KeyboardInterrupt occurs during Neal Norwitz <nnorwitz@gmail.com> parents: 39251 diff changeset	2114 #ifdef EINTR
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2115 if (res == EINTR && PyErr_CheckSignals())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2116 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2117 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2118
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2119 return PyInt_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	2120 }
f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2121
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2122 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	2123 "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	2124 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2125 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	2126 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	2127
6604 f67a6339ede7 Add s.connect_ex() which returns errno instead of raising an exception. Guido van Rossum <guido@python.org> parents: 6367 diff changeset	2128
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	2129 /* 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	2130
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2131 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	2132 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	2133 {
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2134 #if SIZEOF_SOCKET_T <= SIZEOF_LONG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2135 return PyInt_FromLong((long) s->sock_fd);
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2136 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2137 return PyLong_FromLongLong((PY_LONG_LONG)s->sock_fd);
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2138 #endif
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	2139 }
a4793ae26682 Changes for new UNIX-specific built-in module 'select' and new header for Guido van Rossum <guido@python.org> parents: 900 diff changeset	2140
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2141 PyDoc_STRVAR(fileno_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2142 "fileno() -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2143 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2144 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	2145
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	2146
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	2147 #ifndef NO_DUP
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	2148 /* s.dup() method */
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	2149
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	2150 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	2151 sock_dup(PySocketSockObject *s)
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	2152 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2153 SOCKET_T newfd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2154 PyObject *sock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2155
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2156 newfd = dup(s->sock_fd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2157 if (newfd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2158 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2159 sock = (PyObject *) new_sockobject(newfd,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2160 s->sock_family,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2161 s->sock_type,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2162 s->sock_proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2163 if (sock == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2164 SOCKETCLOSE(newfd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2165 return sock;
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	2166 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2167
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2168 PyDoc_STRVAR(dup_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2169 "dup() -> socket object\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2170 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2171 Return a new socket object connected to the same system resource.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2172
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	2173 #endif
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	2174
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	2175
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2176 /* s.getsockname() method */
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2177
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2178 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	2179 sock_getsockname(PySocketSockObject *s)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2180 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2181 sock_addr_t addrbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2182 int res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2183 socklen_t addrlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2184
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2185 if (!getsockaddrlen(s, &addrlen))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2186 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2187 memset(&addrbuf, 0, addrlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2188 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2189 res = getsockname(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2190 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2191 if (res < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2192 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2193 return makesockaddr(s->sock_fd, SAS2SA(&addrbuf), addrlen,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2194 s->sock_proto);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2195 }
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2196
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2197 PyDoc_STRVAR(getsockname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2198 "getsockname() -> address info\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2199 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2200 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	2201 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	2202
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2203
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2204 #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	2205 /* s.getpeername() method */
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2206
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2207 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	2208 sock_getpeername(PySocketSockObject *s)
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2209 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2210 sock_addr_t addrbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2211 int res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2212 socklen_t addrlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2213
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2214 if (!getsockaddrlen(s, &addrlen))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2215 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2216 memset(&addrbuf, 0, addrlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2217 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2218 res = getpeername(s->sock_fd, SAS2SA(&addrbuf), &addrlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2219 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2220 if (res < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2221 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2222 return makesockaddr(s->sock_fd, SAS2SA(&addrbuf), addrlen,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2223 s->sock_proto);
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2224 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2225
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2226 PyDoc_STRVAR(getpeername_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2227 "getpeername() -> address info\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2228 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2229 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	2230 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	2231
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	2232 #endif /* HAVE_GETPEERNAME */
1094 d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2233
d2af6bdcb6d0 * config.c: Added audioop to lists. Guido van Rossum <guido@python.org> parents: 1039 diff changeset	2234
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2235 /* s.listen(n) method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2236
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2237 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	2238 sock_listen(PySocketSockObject s, PyObject arg)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2239 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2240 int backlog;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2241 int res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2242
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2243 backlog = PyInt_AsLong(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2244 if (backlog == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2245 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2246 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2247 if (backlog < 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2248 backlog = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2249 res = listen(s->sock_fd, backlog);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2250 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2251 if (res < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2252 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2253 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2254 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2255 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2256
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2257 PyDoc_STRVAR(listen_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2258 "listen(backlog)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2259 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2260 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	2261 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	2262 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	2263
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2264
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	2265 #ifndef NO_DUP
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2266 /* s.makefile(mode) method.
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2267 Create a new open file object referring to a dupped version of
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2268 the socket's file descriptor. (The dup() call is necessary so
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2269 that the open file and socket objects may be closed independent
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2270 of each other.)
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2271 The mode argument specifies 'r' or 'w' passed to fdopen(). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2272
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2273 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	2274 sock_makefile(PySocketSockObject s, PyObject args)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2275 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2276 extern int fclose(FILE *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2277 char *mode = "r";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2278 int bufsize = -1;
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2279 #ifdef MS_WIN32
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2280 Py_intptr_t fd;
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	2281 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2282 int fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2283 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2284 FILE *fp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2285 PyObject *f;
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	2286 #ifdef __VMS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2287 char *mode_r = "r";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2288 char *mode_w = "w";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2289 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2290
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2291 if (!PyArg_ParseTuple(args, "\|si:makefile", &mode, &bufsize))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2292 return NULL;
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	2293 #ifdef __VMS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2294 if (strcmp(mode,"rb") == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2295 mode = mode_r;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2296 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2297 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2298 if (strcmp(mode,"wb") == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2299 mode = mode_w;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2300 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2301 }
26550 b9c912e2c3c0 Patch #614055: Support OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 25994 diff changeset	2302 #endif
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	2303 #ifdef MS_WIN32
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2304 if (((fd = _open_osfhandle(s->sock_fd, _O_BINARY)) < 0) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2305 ((fd = dup(fd)) < 0) \|\| ((fp = fdopen(fd, mode)) == NULL))
2736 37c48fde61b8 add setblocking(); NT changes; null-terminate Unix path Guido van Rossum <guido@python.org> parents: 2565 diff changeset	2306 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2307 if ((fd = dup(s->sock_fd)) < 0 \|\| (fp = fdopen(fd, mode)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2308 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2309 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2310 if (fd >= 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2311 SOCKETCLOSE(fd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2312 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2313 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2314 f = PyFile_FromFile(fp, "<socket>", mode, fclose);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2315 if (f != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2316 PyFile_SetBufSize(f, bufsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2317 return f;
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2318 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2319
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2320 PyDoc_STRVAR(makefile_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2321 "makefile([mode[, buffersize]]) -> file object\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2322 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2323 Return a regular file object corresponding to the socket.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2324 The mode and buffersize arguments are as for the built-in open() function.");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2325
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	2326 #endif /* NO_DUP */
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2327
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2328 /*
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2329 * This is the guts of the recv() and recv_into() methods, which reads into a
40475 17e74ce2bc35 Comment typo Andrew M. Kuchling <amk@amk.ca> parents: 40416 diff changeset	2330 * char buffer. If you have any inc/dec ref to do to the objects that contain
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2331 * the buffer, do it in the caller. This function returns the number of bytes
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2332 * succesfully read. If there was an error, it returns -1. Note that it is
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2333 * also possible that we return a number of bytes smaller than the request
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2334 * bytes.
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2335 */
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2336 static ssize_t
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2337 sock_recv_guts(PySocketSockObject s, char cbuf, int len, int flags)
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2338 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2339 ssize_t outlen = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2340 int timeout;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2341 #ifdef __VMS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2342 int remaining;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2343 char *read_buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2344 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2345
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2346 if (!IS_SELECTABLE(s)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2347 select_error();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2348 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2349 }
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2350
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2351 #ifndef __VMS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2352 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2353 timeout = internal_select(s, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2354 if (!timeout)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2355 outlen = recv(s->sock_fd, cbuf, len, flags);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2356 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2357
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2358 if (timeout == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2359 PyErr_SetString(socket_timeout, "timed out");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2360 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2361 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2362 if (outlen < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2363 /* Note: the call to errorhandler() ALWAYS indirectly returned
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2364 NULL, so ignore its return value */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2365 s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2366 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2367 }
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2368 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2369 read_buf = cbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2370 remaining = len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2371 while (remaining != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2372 unsigned int segment;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2373 int nread = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2374
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2375 segment = remaining /SEGMENT_SIZE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2376 if (segment != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2377 segment = SEGMENT_SIZE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2378 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2379 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2380 segment = remaining;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2381 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2382
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2383 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2384 timeout = internal_select(s, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2385 if (!timeout)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2386 nread = recv(s->sock_fd, read_buf, segment, flags);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2387 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2388
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2389 if (timeout == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2390 PyErr_SetString(socket_timeout, "timed out");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2391 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2392 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2393 if (nread < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2394 s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2395 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2396 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2397 if (nread != remaining) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2398 read_buf += nread;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2399 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2400 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2401
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2402 remaining -= segment;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2403 read_buf += segment;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2404 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2405 outlen = read_buf - cbuf;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2406 #endif /* !__VMS */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2407
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2408 return outlen;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2409 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2410
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	2411
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	2412 /* 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	2413
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2414 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	2415 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	2416 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2417 int recvlen, flags = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2418 ssize_t outlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2419 PyObject *buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2420
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2421 if (!PyArg_ParseTuple(args, "i\|i:recv", &recvlen, &flags))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2422 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2423
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2424 if (recvlen < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2425 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2426 "negative buffersize in recv");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2427 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2428 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2429
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2430 /* Allocate a new string. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2431 buf = PyString_FromStringAndSize((char *) 0, recvlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2432 if (buf == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2433 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2434
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2435 /* Call the guts */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2436 outlen = sock_recv_guts(s, PyString_AS_STRING(buf), recvlen, flags);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2437 if (outlen < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2438 /* An error occurred, release the string and return an
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2439 error. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2440 Py_DECREF(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2441 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2442 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2443 if (outlen != recvlen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2444 /* We did not read as many bytes as we anticipated, resize the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2445 string if possible and be succesful. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2446 if (_PyString_Resize(&buf, outlen) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2447 /* Oopsy, not so succesful after all. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2448 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2449 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2450
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2451 return buf;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2452 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2453
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2454 PyDoc_STRVAR(recv_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2455 "recv(buffersize[, flags]) -> data\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2456 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2457 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	2458 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	2459 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	2460 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	2461
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2462
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2463 /* s.recv_into(buffer, [nbytes [,flags]]) method */
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2464
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2465 static PyObject*
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2466 sock_recv_into(PySocketSockObject s, PyObject args, PyObject *kwds)
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2467 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2468 static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2469
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2470 int recvlen = 0, flags = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2471 ssize_t readlen;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2472 Py_buffer buf;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2473 Py_ssize_t buflen;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2474
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2475 /* Get the buffer's memory */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2476 if (!PyArg_ParseTupleAndKeywords(args, kwds, "w*\|ii:recv_into", kwlist,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2477 &buf, &recvlen, &flags))
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2478 return NULL;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2479 buflen = buf.len;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2480 assert(buf.buf != 0 && buflen > 0);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2481
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2482 if (recvlen < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2483 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2484 "negative buffersize in recv_into");
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2485 goto error;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2486 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2487 if (recvlen == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2488 /* If nbytes was not specified, use the buffer's length */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2489 recvlen = buflen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2490 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2491
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2492 /* Check if the buffer is large enough */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2493 if (buflen < recvlen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2494 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2495 "buffer too small for requested bytes");
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2496 goto error;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2497 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2498
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2499 /* Call the guts */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2500 readlen = sock_recv_guts(s, buf.buf, recvlen, flags);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2501 if (readlen < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2502 /* Return an error. */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2503 goto error;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2504 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2505
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2506 PyBuffer_Release(&buf);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2507 /* Return the number of bytes read. Note that we do not do anything
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2508 special here in the case that readlen < recvlen. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2509 return PyInt_FromSsize_t(readlen);
59676 435fa215d33f Issue #8104: socket.recv_into() and socket.recvfrom_into() now support Antoine Pitrou <solipsis@pitrou.net> parents: 58695 diff changeset	2510
435fa215d33f Issue #8104: socket.recv_into() and socket.recvfrom_into() now support Antoine Pitrou <solipsis@pitrou.net> parents: 58695 diff changeset	2511 error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2512 PyBuffer_Release(&buf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2513 return NULL;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2514 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2515
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2516 PyDoc_STRVAR(recv_into_doc,
a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2517 "recv_into(buffer, [nbytes[, flags]]) -> nbytes_read\n\
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2518 \n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2519 A version of recv() that stores its data into a buffer rather than creating \n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2520 a new string. Receive up to buffersize bytes from the socket. If buffersize \n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2521 is not specified (or 0), receive up to the size available in the given buffer.\n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2522 \n\
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2523 See recv() for documentation about the flags.");
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2524
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2525
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2526 /*
44337 b59c328bfa62 Issue #1645 by Alberto Bertogli. Fix a comment. Guido van Rossum <guido@python.org> parents: 43972 diff changeset	2527 * This is the guts of the recvfrom() and recvfrom_into() methods, which reads
b59c328bfa62 Issue #1645 by Alberto Bertogli. Fix a comment. Guido van Rossum <guido@python.org> parents: 43972 diff changeset	2528 * into a char buffer. If you have any inc/def ref to do to the objects that
b59c328bfa62 Issue #1645 by Alberto Bertogli. Fix a comment. Guido van Rossum <guido@python.org> parents: 43972 diff changeset	2529 * contain the buffer, do it in the caller. This function returns the number
b59c328bfa62 Issue #1645 by Alberto Bertogli. Fix a comment. Guido van Rossum <guido@python.org> parents: 43972 diff changeset	2530 * of bytes succesfully read. If there was an error, it returns -1. Note
b59c328bfa62 Issue #1645 by Alberto Bertogli. Fix a comment. Guido van Rossum <guido@python.org> parents: 43972 diff changeset	2531 * that it is also possible that we return a number of bytes smaller than the
b59c328bfa62 Issue #1645 by Alberto Bertogli. Fix a comment. Guido van Rossum <guido@python.org> parents: 43972 diff changeset	2532 * request bytes.
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2533 *
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2534 * 'addr' is a return value for the address object. Note that you must decref
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2535 * it yourself.
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2536 */
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2537 static ssize_t
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2538 sock_recvfrom_guts(PySocketSockObject s, char cbuf, int len, int flags,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2539 PyObject** addr)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2540 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2541 sock_addr_t addrbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2542 int timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2543 ssize_t n = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2544 socklen_t addrlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2545
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2546 *addr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2547
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2548 if (!getsockaddrlen(s, &addrlen))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2549 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2550
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2551 if (!IS_SELECTABLE(s)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2552 select_error();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2553 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2554 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2555
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2556 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2557 memset(&addrbuf, 0, addrlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2558 timeout = internal_select(s, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2559 if (!timeout) {
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	2560 #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	2561 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2562 n = recvfrom(s->sock_fd, cbuf, len, flags,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2563 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	2564 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2565 n = recvfrom(s->sock_fd, cbuf, len, flags,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2566 (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	2567 #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	2568 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2569 n = recvfrom(s->sock_fd, cbuf, len, flags,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2570 SAS2SA(&addrbuf), &addrlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2571 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2572 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2573 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2574
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2575 if (timeout == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2576 PyErr_SetString(socket_timeout, "timed out");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2577 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2578 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2579 if (n < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2580 s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2581 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2582 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2583
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2584 if (!(*addr = makesockaddr(s->sock_fd, SAS2SA(&addrbuf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2585 addrlen, s->sock_proto)))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2586 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2587
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2588 return n;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2589 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2590
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2591 /* s.recvfrom(nbytes [,flags]) method */
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2592
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2593 static PyObject *
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2594 sock_recvfrom(PySocketSockObject s, PyObject args)
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2595 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2596 PyObject *buf = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2597 PyObject *addr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2598 PyObject *ret = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2599 int recvlen, flags = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2600 ssize_t outlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2601
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2602 if (!PyArg_ParseTuple(args, "i\|i:recvfrom", &recvlen, &flags))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2603 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2604
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2605 if (recvlen < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2606 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2607 "negative buffersize in recvfrom");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2608 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2609 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2610
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2611 buf = PyString_FromStringAndSize((char *) 0, recvlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2612 if (buf == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2613 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2614
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2615 outlen = sock_recvfrom_guts(s, PyString_AS_STRING(buf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2616 recvlen, flags, &addr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2617 if (outlen < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2618 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2619 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2620
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2621 if (outlen != recvlen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2622 /* We did not read as many bytes as we anticipated, resize the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2623 string if possible and be succesful. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2624 if (_PyString_Resize(&buf, outlen) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2625 /* Oopsy, not so succesful after all. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2626 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2627 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2628
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2629 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	2630
c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	2631 finally:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2632 Py_XDECREF(buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2633 Py_XDECREF(addr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2634 return ret;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2635 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2636
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2637 PyDoc_STRVAR(recvfrom_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2638 "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	2639 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2640 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	2641
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2642
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2643 /* s.recvfrom_into(buffer[, nbytes [,flags]]) method */
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2644
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2645 static PyObject *
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2646 sock_recvfrom_into(PySocketSockObject s, PyObject args, PyObject* kwds)
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2647 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2648 static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2649
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2650 int recvlen = 0, flags = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2651 ssize_t readlen;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2652 Py_buffer buf;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2653 int buflen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2654
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2655 PyObject *addr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2656
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2657 if (!PyArg_ParseTupleAndKeywords(args, kwds, "w*\|ii:recvfrom_into",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2658 kwlist, &buf,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2659 &recvlen, &flags))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2660 return NULL;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2661 buflen = buf.len;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2662 assert(buf.buf != 0 && buflen > 0);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2663
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2664 if (recvlen < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2665 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2666 "negative buffersize in recvfrom_into");
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2667 goto error;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2668 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2669 if (recvlen == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2670 /* If nbytes was not specified, use the buffer's length */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2671 recvlen = buflen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2672 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2673
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2674 readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2675 if (readlen < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2676 /* Return an error */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2677 goto error;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2678 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2679
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2680 PyBuffer_Release(&buf);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2681 /* Return the number of bytes read and the address. Note that we do
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2682 not do anything special here in the case that readlen < recvlen. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2683 return Py_BuildValue("lN", readlen, addr);
59676 435fa215d33f Issue #8104: socket.recv_into() and socket.recvfrom_into() now support Antoine Pitrou <solipsis@pitrou.net> parents: 58695 diff changeset	2684
435fa215d33f Issue #8104: socket.recv_into() and socket.recvfrom_into() now support Antoine Pitrou <solipsis@pitrou.net> parents: 58695 diff changeset	2685 error:
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2686 Py_XDECREF(addr);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2687 PyBuffer_Release(&buf);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2688 return NULL;
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2689 }
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2690
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2691 PyDoc_STRVAR(recvfrom_into_doc,
a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2692 "recvfrom_into(buffer[, nbytes[, flags]]) -> (nbytes, address info)\n\
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2693 \n\
38580 a114003aa3d3 Fixes in struct and socket from merge reviews. Martin Blais <blais@furius.ca> parents: 38498 diff changeset	2694 Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info.");
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2695
36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	2696
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	2697 /* 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	2698
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2699 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	2700 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	2701 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2702 char *buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2703 int len, n = -1, flags = 0, timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2704 Py_buffer pbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2705
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2706 if (!PyArg_ParseTuple(args, "s*\|i:send", &pbuf, &flags))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2707 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2708
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2709 if (!IS_SELECTABLE(s)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2710 PyBuffer_Release(&pbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2711 return select_error();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2712 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2713 buf = pbuf.buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2714 len = pbuf.len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2715
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2716 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2717 timeout = internal_select(s, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2718 if (!timeout)
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	2719 #ifdef __VMS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2720 n = sendsegmented(s->sock_fd, buf, len, flags);
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	2721 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2722 n = send(s->sock_fd, buf, len, flags);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2723 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2724 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2725
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2726 PyBuffer_Release(&pbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2727
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2728 if (timeout == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2729 PyErr_SetString(socket_timeout, "timed out");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2730 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2731 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2732 if (n < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2733 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2734 return PyInt_FromLong((long)n);
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2735 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2736
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2737 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	2738 "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	2739 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2740 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	2741 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	2742 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	2743
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2744
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2745 /* 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	2746
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2747 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	2748 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	2749 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2750 char *buf;
64962 1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2751 int len, n = -1, flags = 0, timeout, saved_errno;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2752 Py_buffer pbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2753
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2754 if (!PyArg_ParseTuple(args, "s*\|i:sendall", &pbuf, &flags))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2755 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2756 buf = pbuf.buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2757 len = pbuf.len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2758
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2759 if (!IS_SELECTABLE(s)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2760 PyBuffer_Release(&pbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2761 return select_error();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2762 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2763
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2764 do {
64962 1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2765 Py_BEGIN_ALLOW_THREADS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2766 timeout = internal_select(s, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2767 n = -1;
64962 1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2768 if (!timeout) {
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	2769 #ifdef __VMS
64962 1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2770 n = sendsegmented(s->sock_fd, buf, len, flags);
39043 c67b23397f30 Patch #1516912: improve Modules support for OpenVMS. Neal Norwitz <nnorwitz@gmail.com> parents: 38716 diff changeset	2771 #else
64962 1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2772 n = send(s->sock_fd, buf, len, flags);
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2773 #endif
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2774 }
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2775 Py_END_ALLOW_THREADS
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2776 if (timeout == 1) {
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2777 PyBuffer_Release(&pbuf);
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2778 PyErr_SetString(socket_timeout, "timed out");
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2779 return NULL;
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2780 }
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2781 /* PyErr_CheckSignals() might change errno */
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2782 saved_errno = errno;
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2783 /* We must run our signal handlers before looping again.
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2784 send() can return a successful partial write when it is
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2785 interrupted, so we can't restrict ourselves to EINTR. */
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2786 if (PyErr_CheckSignals()) {
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2787 PyBuffer_Release(&pbuf);
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2788 return NULL;
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2789 }
61875 dca3cb19dbdd Merged revisions 74426 via svnmerge from Jean-Paul Calderone <exarkun@divmod.com> parents: 61465 diff changeset	2790 if (n < 0) {
64962 1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2791 /* If interrupted, try again */
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2792 if (saved_errno == EINTR)
61875 dca3cb19dbdd Merged revisions 74426 via svnmerge from Jean-Paul Calderone <exarkun@divmod.com> parents: 61465 diff changeset	2793 continue;
64962 1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2794 else
1dc2b50d344f Merged revisions 85032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61463 diff changeset	2795 break;
61875 dca3cb19dbdd Merged revisions 74426 via svnmerge from Jean-Paul Calderone <exarkun@divmod.com> parents: 61465 diff changeset	2796 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2797 buf += n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2798 len -= n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2799 } while (len > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2800 PyBuffer_Release(&pbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2801
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2802 if (n < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2803 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2804
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2805 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2806 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	2807 }
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2808
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2809 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	2810 "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	2811 \n\
e89c25ca6b29 Add sendall() method, which loops until all data is written or an Guido van Rossum <guido@python.org> parents: 20661 diff changeset	2812 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	2813 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	2814 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	2815 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	2816
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2817
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	2818 /* 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	2819
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2820 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	2821 sock_sendto(PySocketSockObject s, PyObject args)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2822 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2823 Py_buffer pbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2824 PyObject *addro;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2825 char *buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2826 Py_ssize_t len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2827 sock_addr_t addrbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2828 int addrlen, n = -1, flags, timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2829
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2830 flags = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2831 if (!PyArg_ParseTuple(args, "s*O:sendto", &pbuf, &addro)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2832 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2833 if (!PyArg_ParseTuple(args, "s*iO:sendto",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2834 &pbuf, &flags, &addro))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2835 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2836 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2837 buf = pbuf.buf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2838 len = pbuf.len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2839
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2840 if (!IS_SELECTABLE(s)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2841 PyBuffer_Release(&pbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2842 return select_error();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2843 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2844
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2845 if (!getsockaddrarg(s, addro, SAS2SA(&addrbuf), &addrlen)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2846 PyBuffer_Release(&pbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2847 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2848 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2849
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2850 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2851 timeout = internal_select(s, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2852 if (!timeout)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2853 n = sendto(s->sock_fd, buf, len, flags, SAS2SA(&addrbuf), addrlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2854 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2855
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2856 PyBuffer_Release(&pbuf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2857 if (timeout == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2858 PyErr_SetString(socket_timeout, "timed out");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2859 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2860 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2861 if (n < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2862 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2863 return PyInt_FromLong((long)n);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2864 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2865
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2866 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	2867 "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	2868 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2869 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	2870 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	2871
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2872
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2873 /* s.shutdown(how) method */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2874
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	2875 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	2876 sock_shutdown(PySocketSockObject s, PyObject arg)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2877 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2878 int how;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2879 int res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2880
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2881 how = PyInt_AsLong(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2882 if (how == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2883 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2884 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2885 res = shutdown(s->sock_fd, how);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2886 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2887 if (res < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2888 return s->errorhandler();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2889 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2890 return Py_None;
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2891 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2892
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	2893 PyDoc_STRVAR(shutdown_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2894 "shutdown(flag)\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2895 \n\
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	2896 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	2897 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	2898
47666 fcfe10f3dc14 Restore support for Microsoft VC6 compiler. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	2899 #if defined(MS_WINDOWS) && defined(SIO_RCVALL)
44474 bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	2900 static PyObject*
bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	2901 sock_ioctl(PySocketSockObject s, PyObject arg)
bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	2902 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2903 unsigned long cmd = SIO_RCVALL;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2904 PyObject *argO;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2905 DWORD recv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2906
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2907 if (!PyArg_ParseTuple(arg, "kO:ioctl", &cmd, &argO))
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2908 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2909
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2910 switch (cmd) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2911 case SIO_RCVALL: {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2912 unsigned int option = RCVALL_ON;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2913 if (!PyArg_ParseTuple(arg, "kI:ioctl", &cmd, &option))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2914 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2915 if (WSAIoctl(s->sock_fd, cmd, &option, sizeof(option),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2916 NULL, 0, &recv, NULL, NULL) == SOCKET_ERROR) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2917 return set_error();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2918 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2919 return PyLong_FromUnsignedLong(recv); }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2920 case SIO_KEEPALIVE_VALS: {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2921 struct tcp_keepalive ka;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2922 if (!PyArg_ParseTuple(arg, "k(kkk):ioctl", &cmd,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2923 &ka.onoff, &ka.keepalivetime, &ka.keepaliveinterval))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2924 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2925 if (WSAIoctl(s->sock_fd, cmd, &ka, sizeof(ka),
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2926 NULL, 0, &recv, NULL, NULL) == SOCKET_ERROR) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2927 return set_error();
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2928 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2929 return PyLong_FromUnsignedLong(recv); }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2930 default:
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2931 PyErr_Format(PyExc_ValueError, "invalid ioctl command %d", cmd);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	2932 return NULL;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2933 }
44474 bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	2934 }
bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	2935 PyDoc_STRVAR(sock_ioctl_doc,
bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	2936 "ioctl(cmd, option) -> long\n\
bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	2937 \n\
56212 3def952b515c http://bugs.python.org/issue6971 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 56107 diff changeset	2938 Control the socket with WSAIoctl syscall. Currently supported 'cmd' values are\n\
3def952b515c http://bugs.python.org/issue6971 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 56107 diff changeset	2939 SIO_RCVALL: 'option' must be one of the socket.RCVALL_* constants.\n\
3def952b515c http://bugs.python.org/issue6971 Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 56107 diff changeset	2940 SIO_KEEPALIVE_VALS: 'option' is a tuple of (onoff, timeout, interval).");
44474 bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	2941
bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	2942 #endif
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2943
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	2944 /* List of methods for socket objects */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2945
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	2946 static PyMethodDef sock_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2947 {"accept", (PyCFunction)sock_accept, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2948 accept_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2949 {"bind", (PyCFunction)sock_bind, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2950 bind_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2951 {"close", (PyCFunction)sock_close, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2952 close_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2953 {"connect", (PyCFunction)sock_connect, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2954 connect_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2955 {"connect_ex", (PyCFunction)sock_connect_ex, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2956 connect_ex_doc},
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	2957 #ifndef NO_DUP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2958 {"dup", (PyCFunction)sock_dup, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2959 dup_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2960 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2961 {"fileno", (PyCFunction)sock_fileno, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2962 fileno_doc},
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	2963 #ifdef HAVE_GETPEERNAME
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2964 {"getpeername", (PyCFunction)sock_getpeername,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2965 METH_NOARGS, getpeername_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2966 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2967 {"getsockname", (PyCFunction)sock_getsockname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2968 METH_NOARGS, getsockname_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2969 {"getsockopt", (PyCFunction)sock_getsockopt, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2970 getsockopt_doc},
47666 fcfe10f3dc14 Restore support for Microsoft VC6 compiler. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47527 diff changeset	2971 #if defined(MS_WINDOWS) && defined(SIO_RCVALL)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2972 {"ioctl", (PyCFunction)sock_ioctl, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2973 sock_ioctl_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2974 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2975 {"listen", (PyCFunction)sock_listen, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2976 listen_doc},
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	2977 #ifndef NO_DUP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2978 {"makefile", (PyCFunction)sock_makefile, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2979 makefile_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2980 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2981 {"recv", (PyCFunction)sock_recv, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2982 recv_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2983 {"recv_into", (PyCFunction)sock_recv_into, METH_VARARGS \| METH_KEYWORDS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2984 recv_into_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2985 {"recvfrom", (PyCFunction)sock_recvfrom, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2986 recvfrom_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2987 {"recvfrom_into", (PyCFunction)sock_recvfrom_into, METH_VARARGS \| METH_KEYWORDS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2988 recvfrom_into_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2989 {"send", (PyCFunction)sock_send, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2990 send_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2991 {"sendall", (PyCFunction)sock_sendall, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2992 sendall_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2993 {"sendto", (PyCFunction)sock_sendto, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2994 sendto_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2995 {"setblocking", (PyCFunction)sock_setblocking, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2996 setblocking_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2997 {"settimeout", (PyCFunction)sock_settimeout, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2998 settimeout_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	2999 {"gettimeout", (PyCFunction)sock_gettimeout, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3000 gettimeout_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3001 {"setsockopt", (PyCFunction)sock_setsockopt, METH_VARARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3002 setsockopt_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3003 {"shutdown", (PyCFunction)sock_shutdown, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3004 shutdown_doc},
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	3005 #ifdef RISCOS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3006 {"sleeptaskw", (PyCFunction)sock_sleeptaskw, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3007 sleeptaskw_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3008 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3009 {NULL, NULL} /* sentinel */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3010 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3011
37069 dd49847a60d3 RFE #567972: Socket objects' family, type and proto properties are Georg Brandl <georg@python.org> parents: 36684 diff changeset	3012 /* SockObject members */
dd49847a60d3 RFE #567972: Socket objects' family, type and proto properties are Georg Brandl <georg@python.org> parents: 36684 diff changeset	3013 static PyMemberDef sock_memberlist[] = {
dd49847a60d3 RFE #567972: Socket objects' family, type and proto properties are Georg Brandl <georg@python.org> parents: 36684 diff changeset	3014 {"family", T_INT, offsetof(PySocketSockObject, sock_family), READONLY, "the socket family"},
dd49847a60d3 RFE #567972: Socket objects' family, type and proto properties are Georg Brandl <georg@python.org> parents: 36684 diff changeset	3015 {"type", T_INT, offsetof(PySocketSockObject, sock_type), READONLY, "the socket type"},
dd49847a60d3 RFE #567972: Socket objects' family, type and proto properties are Georg Brandl <georg@python.org> parents: 36684 diff changeset	3016 {"proto", T_INT, offsetof(PySocketSockObject, sock_proto), READONLY, "the socket protocol"},
dd49847a60d3 RFE #567972: Socket objects' family, type and proto properties are Georg Brandl <georg@python.org> parents: 36684 diff changeset	3017 {"timeout", T_DOUBLE, offsetof(PySocketSockObject, sock_timeout), READONLY, "the socket timeout"},
dd49847a60d3 RFE #567972: Socket objects' family, type and proto properties are Georg Brandl <georg@python.org> parents: 36684 diff changeset	3018 {0},
dd49847a60d3 RFE #567972: Socket objects' family, type and proto properties are Georg Brandl <georg@python.org> parents: 36684 diff changeset	3019 };
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3020
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3021 /* 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	3022 First close the file description. */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3023
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3024 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	3025 sock_dealloc(PySocketSockObject *s)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3026 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3027 if (s->sock_fd != -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3028 (void) SOCKETCLOSE(s->sock_fd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3029 Py_TYPE(s)->tp_free((PyObject *)s);
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3030 }
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3031
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3032
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3033 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	3034 sock_repr(PySocketSockObject *s)
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3035 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3036 char buf[512];
13171 c17fd2ca6659 Trent Mick <trentm@activestate.com>: Fred Drake <fdrake@acm.org> parents: 12712 diff changeset	3037 #if SIZEOF_SOCKET_T > SIZEOF_LONG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3038 if (s->sock_fd > LONG_MAX) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3039 /* this can occur on Win64, and actually there is a special
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3040 ugly printf formatter for decimal pointer length integer
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3041 printing, only bother if necessary*/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3042 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3043 "no printf formatter to display "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3044 "the socket descriptor in decimal");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3045 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3046 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3047 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3048 PyOS_snprintf(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3049 buf, sizeof(buf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3050 "<socket object, fd=%ld, family=%d, type=%d, protocol=%d>",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3051 (long)s->sock_fd, s->sock_family,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3052 s->sock_type,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3053 s->sock_proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3054 return PyString_FromString(buf);
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3055 }
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3056
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3057
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3058 /* 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	3059
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3060 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	3061 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	3062 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3063 PyObject *new;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3064
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3065 new = type->tp_alloc(type, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3066 if (new != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3067 ((PySocketSockObject *)new)->sock_fd = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3068 ((PySocketSockObject *)new)->sock_timeout = -1.0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3069 ((PySocketSockObject *)new)->errorhandler = &set_error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3070 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3071 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	3072 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3073
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3074
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3075 /* 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	3076
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3077 /ARGSUSED/
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3078 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	3079 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	3080 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3081 PySocketSockObject s = (PySocketSockObject )self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3082 SOCKET_T fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3083 int family = AF_INET, type = SOCK_STREAM, proto = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3084 static char *keywords[] = {"family", "type", "proto", 0};
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3085
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3086 if (!PyArg_ParseTupleAndKeywords(args, kwds,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3087 "\|iii:socket", keywords,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3088 &family, &type, &proto))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3089 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3090
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3091 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3092 fd = socket(family, type, proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3093 Py_END_ALLOW_THREADS
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3094
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3095 #ifdef MS_WINDOWS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3096 if (fd == INVALID_SOCKET)
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3097 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3098 if (fd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3099 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3100 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3101 set_error();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3102 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3103 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3104 init_sockobject(s, fd, family, type, proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3105
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3106 return 0;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3107
20727 abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3108 }
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3109
abd71e89840f Made SocketType and socket the same thing: a subclassable type whose Guido van Rossum <guido@python.org> parents: 20679 diff changeset	3110
1746 1940892d2fe3 Merge alpha100 branch back to main trunk Guido van Rossum <guido@python.org> parents: 1413 diff changeset	3111 /* 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	3112
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3113 static PyTypeObject sock_type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3114 PyVarObject_HEAD_INIT(0, 0) /* Must fill in type value later */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3115 "_socket.socket", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3116 sizeof(PySocketSockObject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3117 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3118 (destructor)sock_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3119 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3120 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3121 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3122 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3123 (reprfunc)sock_repr, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3124 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3125 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3126 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3127 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3128 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3129 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3130 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3131 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3132 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3133 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3134 sock_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3135 0, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3136 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3137 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3138 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3139 0, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3140 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3141 sock_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3142 sock_memberlist, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3143 0, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3144 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3145 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3146 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3147 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3148 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3149 sock_initobj, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3150 PyType_GenericAlloc, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3151 sock_new, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3152 PyObject_Del, /* tp_free */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3153 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3154
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3155
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	3156 /* Python interface to gethostname(). */
a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	3157
a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	3158 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3159 static PyObject *
38489 3fe3ccdf0155 Make use of METH_O and METH_NOARGS where possible. Georg Brandl <georg@python.org> parents: 38476 diff changeset	3160 socket_gethostname(PyObject self, PyObject unused)
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	3161 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3162 char buf[1024];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3163 int res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3164 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3165 res = gethostname(buf, (int) sizeof buf - 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3166 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3167 if (res < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3168 return set_error();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3169 buf[sizeof buf - 1] = '\0';
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3170 return PyString_FromString(buf);
324 a81020d505bf Add gethostname() and s.avail(). Guido van Rossum <guido@python.org> parents: 309 diff changeset	3171 }
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	3172
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3173 PyDoc_STRVAR(gethostname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3174 "gethostname() -> string\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3175 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3176 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	3177
926 c156d4960c2b * Makefile: cosmetics Guido van Rossum <guido@python.org> parents: 925 diff changeset	3178
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3179 /* Python interface to gethostbyname(name). */
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3180
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3181 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3182 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	3183 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	3184 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3185 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3186 sock_addr_t addrbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3187
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3188 if (!PyArg_ParseTuple(args, "s:gethostbyname", &name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3189 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3190 if (setipaddr(name, SAS2SA(&addrbuf), sizeof(addrbuf), AF_INET) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3191 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3192 return makeipaddr(SAS2SA(&addrbuf), sizeof(struct sockaddr_in));
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3193 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3194
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3195 PyDoc_STRVAR(gethostbyname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3196 "gethostbyname(host) -> address\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3197 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3198 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	3199
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3200
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3201 /* 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	3202
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3203 static PyObject *
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	3204 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	3205 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3206 char **pch;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3207 PyObject rtn_tuple = (PyObject )NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3208 PyObject name_list = (PyObject )NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3209 PyObject addr_list = (PyObject )NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3210 PyObject *tmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3211
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3212 if (h == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3213 /* Let's get real error message to return */
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20648 diff changeset	3214 #ifndef RISCOS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3215 set_herror(h_errno);
20654 edd9d0b3c47e SF patch #474590 -- RISC OS support Guido van Rossum <guido@python.org> parents: 20648 diff changeset	3216 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3217 PyErr_SetString(socket_error, "host not found");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3218 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3219 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3220 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3221
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3222 if (h->h_addrtype != af) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3223 /* Let's get real error message to return */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3224 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3225 (char *)strerror(EAFNOSUPPORT));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3226
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3227 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3228 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3229
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3230 switch (af) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3231
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3232 case AF_INET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3233 if (alen < sizeof(struct sockaddr_in))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3234 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3235 break;
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3236
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3237 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3238 case AF_INET6:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3239 if (alen < sizeof(struct sockaddr_in6))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3240 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3241 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3242 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3243
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3244 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3245
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3246 if ((name_list = PyList_New(0)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3247 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3248
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3249 if ((addr_list = PyList_New(0)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3250 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3251
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3252 /* SF #1511317: h_aliases can be NULL */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3253 if (h->h_aliases) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3254 for (pch = h->h_aliases; *pch != NULL; pch++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3255 int status;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3256 tmp = PyString_FromString(*pch);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3257 if (tmp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3258 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3259
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3260 status = PyList_Append(name_list, tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3261 Py_DECREF(tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3262
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3263 if (status)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3264 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3265 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3266 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3267
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3268 for (pch = h->h_addr_list; *pch != NULL; pch++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3269 int status;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3270
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3271 switch (af) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3272
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3273 case AF_INET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3274 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3275 struct sockaddr_in sin;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3276 memset(&sin, 0, sizeof(sin));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3277 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	3278 #ifdef HAVE_SOCKADDR_SA_LEN
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3279 sin.sin_len = sizeof(sin);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3280 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3281 memcpy(&sin.sin_addr, *pch, sizeof(sin.sin_addr));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3282 tmp = makeipaddr((struct sockaddr *)&sin, sizeof(sin));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3283
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3284 if (pch == h->h_addr_list && alen >= sizeof(sin))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3285 memcpy((char *) addr, &sin, sizeof(sin));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3286 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3287 }
23715 c2733e8f6612 SF patch 555085 (timeout socket implementation) by Michael Gilfix. Guido van Rossum <guido@python.org> parents: 23714 diff changeset	3288
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3289 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3290 case AF_INET6:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3291 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3292 struct sockaddr_in6 sin6;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3293 memset(&sin6, 0, sizeof(sin6));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3294 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	3295 #ifdef HAVE_SOCKADDR_SA_LEN
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3296 sin6.sin6_len = sizeof(sin6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3297 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3298 memcpy(&sin6.sin6_addr, *pch, sizeof(sin6.sin6_addr));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3299 tmp = makeipaddr((struct sockaddr *)&sin6,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3300 sizeof(sin6));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3301
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3302 if (pch == h->h_addr_list && alen >= sizeof(sin6))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3303 memcpy((char *) addr, &sin6, sizeof(sin6));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3304 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3305 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3306 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3307
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3308 default: /* can't happen */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3309 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3310 "unsupported address family");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3311 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3312 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3313
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3314 if (tmp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3315 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3316
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3317 status = PyList_Append(addr_list, tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3318 Py_DECREF(tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3319
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3320 if (status)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3321 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3322 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3323
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3324 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	3325
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3326 err:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3327 Py_XDECREF(name_list);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3328 Py_XDECREF(addr_list);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3329 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	3330 }
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3331
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3332
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3333 /* 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	3334
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3335 /ARGSUSED/
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3336 static PyObject *
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	3337 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	3338 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3339 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3340 struct hostent *h;
28949 ac487a7f7f2c Patch #708495: Port more stuff to OpenVMS. Martin v. Löwis <martin@v.loewis.de> parents: 28925 diff changeset	3341 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3342 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	3343 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3344 struct sockaddr_in addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3345 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3346 struct sockaddr *sa;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3347 PyObject *ret;
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3348 #ifdef HAVE_GETHOSTBYNAME_R
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3349 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	3350 #ifdef HAVE_GETHOSTBYNAME_R_3_ARG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3351 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	3352 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3353 char buf[16384];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3354 int buf_len = (sizeof buf) - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3355 int errnop;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3356 #endif
5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3357 #if defined(HAVE_GETHOSTBYNAME_R_3_ARG) \|\| defined(HAVE_GETHOSTBYNAME_R_6_ARG)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3358 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	3359 #endif
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3360 #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	3361
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3362 if (!PyArg_ParseTuple(args, "s:gethostbyname_ex", &name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3363 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3364 if (setipaddr(name, (struct sockaddr *)&addr, sizeof(addr), AF_INET) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3365 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3366 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	3367 #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	3368 #if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3369 result = gethostbyname_r(name, &hp_allocated, buf, buf_len,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3370 &h, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3371 #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3372 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	3373 #else /* HAVE_GETHOSTBYNAME_R_3_ARG */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3374 memset((void *) &data, '\0', sizeof(data));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3375 result = gethostbyname_r(name, &hp_allocated, &data);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3376 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	3377 #endif
8821 a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3378 #else /* not HAVE_GETHOSTBYNAME_R */
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3379 #ifdef USE_GETHOSTBYNAME_LOCK
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3380 PyThread_acquire_lock(netdb_lock, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3381 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3382 h = gethostbyname(name);
10441 9ba5dffccb1b Jonathan Giddy writes: Guido van Rossum <guido@python.org> parents: 10401 diff changeset	3383 #endif /* HAVE_GETHOSTBYNAME_R */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3384 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3385 /* Some C libraries would require addr.__ss_family instead of
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3386 addr.ss_family.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3387 Therefore, we cast the sockaddr_storage into sockaddr to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3388 access sa_family. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3389 sa = (struct sockaddr*)&addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3390 ret = gethost_common(h, (struct sockaddr *)&addr, sizeof(addr),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3391 sa->sa_family);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3392 #ifdef USE_GETHOSTBYNAME_LOCK
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3393 PyThread_release_lock(netdb_lock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3394 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3395 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	3396 }
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3397
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3398 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	3399 "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	3400 \n\
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3401 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	3402 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	3403
a1c16a3fa7db Added gethostbyname_ex(), which returns the same kind of data as Guido van Rossum <guido@python.org> parents: 8631 diff changeset	3404
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3405 /* Python interface to gethostbyaddr(IP). */
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3406
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3407 /ARGSUSED/
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3408 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	3409 socket_gethostbyaddr(PyObject self, PyObject args)
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3410 {
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3411 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3412 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	3413 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3414 struct sockaddr_in addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3415 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3416 struct sockaddr sa = (struct sockaddr )&addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3417 char *ip_num;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3418 struct hostent *h;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3419 PyObject *ret;
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3420 #ifdef HAVE_GETHOSTBYNAME_R
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3421 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	3422 #ifdef HAVE_GETHOSTBYNAME_R_3_ARG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3423 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	3424 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3425 /* glibcs up to 2.10 assume that the buf argument to
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3426 gethostbyaddr_r is 8-byte aligned, which at least llvm-gcc
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3427 does not ensure. The attribute below instructs the compiler
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3428 to maintain this alignment. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3429 char buf[16384] Py_ALIGNED(8);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3430 int buf_len = (sizeof buf) - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3431 int errnop;
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3432 #endif
5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3433 #if defined(HAVE_GETHOSTBYNAME_R_3_ARG) \|\| defined(HAVE_GETHOSTBYNAME_R_6_ARG)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3434 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	3435 #endif
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3436 #endif /* HAVE_GETHOSTBYNAME_R */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3437 char *ap;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3438 int al;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3439 int af;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3440
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3441 if (!PyArg_ParseTuple(args, "s:gethostbyaddr", &ip_num))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3442 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3443 af = AF_UNSPEC;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3444 if (setipaddr(ip_num, sa, sizeof(addr), af) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3445 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3446 af = sa->sa_family;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3447 ap = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3448 switch (af) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3449 case AF_INET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3450 ap = (char )&((struct sockaddr_in )sa)->sin_addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3451 al = sizeof(((struct sockaddr_in *)sa)->sin_addr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3452 break;
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	3453 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3454 case AF_INET6:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3455 ap = (char )&((struct sockaddr_in6 )sa)->sin6_addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3456 al = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3457 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3458 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3459 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3460 PyErr_SetString(socket_error, "unsupported address family");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3461 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3462 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3463 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	3464 #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	3465 #if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3466 result = gethostbyaddr_r(ap, al, af,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3467 &hp_allocated, buf, buf_len,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3468 &h, &errnop);
10453 5b54fa775e55 Vladimir Marangozov implements the AIX 3-arg gethostbyname_r code. Guido van Rossum <guido@python.org> parents: 10442 diff changeset	3469 #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3470 h = gethostbyaddr_r(ap, al, af,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3471 &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	3472 #else /* HAVE_GETHOSTBYNAME_R_3_ARG */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3473 memset((void *) &data, '\0', sizeof(data));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3474 result = gethostbyaddr_r(ap, al, af, &hp_allocated, &data);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3475 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	3476 #endif
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	3477 #else /* not HAVE_GETHOSTBYNAME_R */
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3478 #ifdef USE_GETHOSTBYNAME_LOCK
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3479 PyThread_acquire_lock(netdb_lock, 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3480 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3481 h = gethostbyaddr(ap, al, af);
10442 9184c9e108f9 Clean up pass for the previous patches. Guido van Rossum <guido@python.org> parents: 10441 diff changeset	3482 #endif /* HAVE_GETHOSTBYNAME_R */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3483 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3484 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	3485 #ifdef USE_GETHOSTBYNAME_LOCK
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3486 PyThread_release_lock(netdb_lock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3487 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3488 return ret;
2055 cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3489 }
cf31eab6ab5a Another bulky set of minor changes. Guido van Rossum <guido@python.org> parents: 1970 diff changeset	3490
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3491 PyDoc_STRVAR(gethostbyaddr_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3492 "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	3493 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3494 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	3495 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	3496
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3497
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3498 /* Python interface to getservbyname(name).
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3499 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	3500 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	3501
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3502 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3503 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	3504 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	3505 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3506 char name, proto=NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3507 struct servent *sp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3508 if (!PyArg_ParseTuple(args, "s\|s:getservbyname", &name, &proto))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3509 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3510 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3511 sp = getservbyname(name, proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3512 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3513 if (sp == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3514 PyErr_SetString(socket_error, "service/proto not found");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3515 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3516 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3517 return PyInt_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	3518 }
d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	3519
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3520 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	3521 "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	3522 \n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3523 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	3524 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	3525 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	3526
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3527
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3528 /* 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	3529 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	3530 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	3531
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3532 /ARGSUSED/
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3533 static PyObject *
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3534 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	3535 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	3536 int port;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3537 char *proto=NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3538 struct servent *sp;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	3539 if (!PyArg_ParseTuple(args, "i\|s:getservbyport", &port, &proto))
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3540 return NULL;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	3541 if (port < 0 \|\| port > 0xffff) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	3542 PyErr_SetString(
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	3543 PyExc_OverflowError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	3544 "getservbyport: port must be 0-65535.");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	3545 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	3546 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3547 Py_BEGIN_ALLOW_THREADS
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	3548 sp = getservbyport(htons((short)port), proto);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3549 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3550 if (sp == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3551 PyErr_SetString(socket_error, "port/proto not found");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3552 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3553 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3554 return PyString_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	3555 }
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3556
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3557 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	3558 "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	3559 \n\
d8abf582f893 Added socket.getservbyport(), and make its second argument and that of Barry Warsaw <barry@python.org> parents: 32213 diff changeset	3560 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	3561 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	3562 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	3563
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3564 /* Python interface to getprotobyname(name).
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3565 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	3566 already known or not useful (like the list of aliases). */
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3567
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3568 /ARGSUSED/
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3569 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	3570 socket_getprotobyname(PyObject self, PyObject args)
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3571 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3572 char *name;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3573 struct protoent *sp;
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	3574 #ifdef __BEOS__
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	3575 /* Not available in BeOS yet. - [cjh] */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3576 PyErr_SetString(socket_error, "getprotobyname not supported");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3577 return NULL;
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	3578 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3579 if (!PyArg_ParseTuple(args, "s:getprotobyname", &name))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3580 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3581 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3582 sp = getprotobyname(name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3583 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3584 if (sp == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3585 PyErr_SetString(socket_error, "protocol not found");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3586 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3587 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3588 return PyInt_FromLong((long) sp->p_proto);
8823 f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	3589 #endif
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3590 }
2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3591
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3592 PyDoc_STRVAR(getprotobyname_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3593 "getprotobyname(name) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3594 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3595 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	3596
4782 2426a220664b Added getprotobyname() interface. Guido van Rossum <guido@python.org> parents: 4651 diff changeset	3597
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3598 #ifdef HAVE_SOCKETPAIR
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3599 /* 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	3600 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	3601 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	3602
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3603 /ARGSUSED/
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3604 static PyObject *
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3605 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	3606 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3607 PySocketSockObject s0 = NULL, s1 = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3608 SOCKET_T sv[2];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3609 int family, type = SOCK_STREAM, proto = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3610 PyObject *res = NULL;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3611
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3612 #if defined(AF_UNIX)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3613 family = AF_UNIX;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3614 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3615 family = AF_INET;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3616 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3617 if (!PyArg_ParseTuple(args, "\|iii:socketpair",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3618 &family, &type, &proto))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3619 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3620 /* Create a pair of socket fds */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3621 if (socketpair(family, type, proto, sv) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3622 return set_error();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3623 s0 = new_sockobject(sv[0], family, type, proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3624 if (s0 == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3625 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3626 s1 = new_sockobject(sv[1], family, type, proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3627 if (s1 == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3628 goto finally;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3629 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	3630
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3631 finally:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3632 if (res == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3633 if (s0 == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3634 SOCKETCLOSE(sv[0]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3635 if (s1 == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3636 SOCKETCLOSE(sv[1]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3637 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3638 Py_XDECREF(s0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3639 Py_XDECREF(s1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3640 return res;
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3641 }
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3642
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3643 PyDoc_STRVAR(socketpair_doc,
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3644 "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	3645 \n\
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3646 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	3647 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	3648 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	3649 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	3650
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3651 #endif /* HAVE_SOCKETPAIR */
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3652
90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	3653
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	3654 #ifndef NO_DUP
1099 3dd7b8255619 socketmodule.c: added socket.fromfd(fd, family, type, [proto]); Guido van Rossum <guido@python.org> parents: 1094 diff changeset	3655 /* Create a socket object from a numeric file description.
3dd7b8255619 socketmodule.c: added socket.fromfd(fd, family, type, [proto]); Guido van Rossum <guido@python.org> parents: 1094 diff changeset	3656 Useful e.g. if stdin is a socket.
3dd7b8255619 socketmodule.c: added socket.fromfd(fd, family, type, [proto]); Guido van Rossum <guido@python.org> parents: 1094 diff changeset	3657 Additional arguments as for socket(). */
3dd7b8255619 socketmodule.c: added socket.fromfd(fd, family, type, [proto]); Guido van Rossum <guido@python.org> parents: 1094 diff changeset	3658
3dd7b8255619 socketmodule.c: added socket.fromfd(fd, family, type, [proto]); Guido van Rossum <guido@python.org> parents: 1094 diff changeset	3659 /ARGSUSED/
1970 84637cfdbc07 new style Guido van Rossum <guido@python.org> parents: 1915 diff changeset	3660 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	3661 socket_fromfd(PyObject self, PyObject args)
1099 3dd7b8255619 socketmodule.c: added socket.fromfd(fd, family, type, [proto]); Guido van Rossum <guido@python.org> parents: 1094 diff changeset	3662 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3663 PySocketSockObject *s;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3664 SOCKET_T fd;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3665 int family, type, proto = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3666 if (!PyArg_ParseTuple(args, "iii\|i:fromfd",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3667 &fd, &family, &type, &proto))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3668 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3669 /* Dup the fd so it and the socket can be closed independently */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3670 fd = dup(fd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3671 if (fd < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3672 return set_error();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3673 s = new_sockobject(fd, family, type, proto);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3674 return (PyObject *) s;
1099 3dd7b8255619 socketmodule.c: added socket.fromfd(fd, family, type, [proto]); Guido van Rossum <guido@python.org> parents: 1094 diff changeset	3675 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3676
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3677 PyDoc_STRVAR(fromfd_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3678 "fromfd(fd, family, type[, proto]) -> socket object\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3679 \n\
37371 492044034a87 Bug #1460564: document that socket.fromfd() duplicates the given Georg Brandl <georg@python.org> parents: 37069 diff changeset	3680 Create a socket object from a duplicate of the given\n\
492044034a87 Bug #1460564: document that socket.fromfd() duplicates the given Georg Brandl <georg@python.org> parents: 37069 diff changeset	3681 file descriptor.\n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3682 The remaining arguments are the same as for socket().");
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3683
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	3684 #endif /* NO_DUP */
1099 3dd7b8255619 socketmodule.c: added socket.fromfd(fd, family, type, [proto]); Guido van Rossum <guido@python.org> parents: 1094 diff changeset	3685
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3686
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3687 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	3688 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	3689 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3690 int x1, x2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3691
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3692 if (!PyArg_ParseTuple(args, "i:ntohs", &x1)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3693 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3694 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3695 if (x1 < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3696 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3697 "can't convert negative number to unsigned long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3698 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3699 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3700 x2 = (unsigned int)ntohs((unsigned short)x1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3701 return PyInt_FromLong(x2);
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3702 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3703
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3704 PyDoc_STRVAR(ntohs_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3705 "ntohs(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3706 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3707 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	3708
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3709
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3710 static PyObject *
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3711 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	3712 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3713 unsigned long x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3714
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3715 if (PyInt_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3716 x = PyInt_AS_LONG(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3717 if (x == (unsigned long) -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3718 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3719 if ((long)x < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3720 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3721 "can't convert negative number to unsigned long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3722 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3723 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3724 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3725 else if (PyLong_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3726 x = PyLong_AsUnsignedLong(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3727 if (x == (unsigned long) -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3728 return NULL;
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3729 #if SIZEOF_LONG > 4
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3730 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3731 unsigned long y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3732 /* only want the trailing 32 bits */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3733 y = x & 0xFFFFFFFFUL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3734 if (y ^ x)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3735 return PyErr_Format(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3736 "long int larger than 32 bits");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3737 x = y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3738 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3739 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3740 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3741 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3742 return PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3743 "expected int/long, %s found",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3744 Py_TYPE(arg)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3745 if (x == (unsigned long) -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3746 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3747 return PyLong_FromUnsignedLong(ntohl(x));
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3748 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3749
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3750 PyDoc_STRVAR(ntohl_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3751 "ntohl(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3752 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3753 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	3754
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3755
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3756 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	3757 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	3758 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3759 int x1, x2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3760
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3761 if (!PyArg_ParseTuple(args, "i:htons", &x1)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3762 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3763 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3764 if (x1 < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3765 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3766 "can't convert negative number to unsigned long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3767 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3768 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3769 x2 = (unsigned int)htons((unsigned short)x1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3770 return PyInt_FromLong(x2);
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3771 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3772
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3773 PyDoc_STRVAR(htons_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3774 "htons(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3775 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3776 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	3777
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3778
3673 f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3779 static PyObject *
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3780 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	3781 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3782 unsigned long x;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3783
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3784 if (PyInt_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3785 x = PyInt_AS_LONG(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3786 if (x == (unsigned long) -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3787 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3788 if ((long)x < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3789 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3790 "can't convert negative number to unsigned long");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3791 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3792 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3793 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3794 else if (PyLong_Check(arg)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3795 x = PyLong_AsUnsignedLong(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3796 if (x == (unsigned long) -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3797 return NULL;
24375 89ce62126664 Extended socket.htonl and ntohl to accept longs. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24363 diff changeset	3798 #if SIZEOF_LONG > 4
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3799 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3800 unsigned long y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3801 /* only want the trailing 32 bits */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3802 y = x & 0xFFFFFFFFUL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3803 if (y ^ x)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3804 return PyErr_Format(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3805 "long int larger than 32 bits");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3806 x = y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3807 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3808 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3809 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3810 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3811 return PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3812 "expected int/long, %s found",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3813 Py_TYPE(arg)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3814 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	3815 }
f6ace61c3dfe ntohs, ntohl, htons, htonl -- thanks to Lance Guido van Rossum <guido@python.org> parents: 3672 diff changeset	3816
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3817 PyDoc_STRVAR(htonl_doc,
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3818 "htonl(integer) -> integer\n\
d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3819 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3820 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	3821
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	3822 /* 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	3823
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3824 PyDoc_STRVAR(inet_aton_doc,
11217 f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3825 "inet_aton(string) -> packed 32-bit IP representation\n\
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3826 \n\
11219 2d7331f4dfe3 Port inet_ntoa and inet_aton to Windows: Guido van Rossum <guido@python.org> parents: 11217 diff changeset	3827 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	3828 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	3829
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3830 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	3831 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	3832 {
11268 3fe8d13328c8 It appears that inet_aton() doesn't really exist except in libresolv; Guido van Rossum <guido@python.org> parents: 11219 diff changeset	3833 #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	3834 #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	3835 #endif
27858 9453d8cdd01e Ummm, try to get it right this time Neal Norwitz <nnorwitz@gmail.com> parents: 27857 diff changeset	3836 #ifdef HAVE_INET_ATON
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3837 struct in_addr buf;
37934 ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3838 #endif
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3839
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3840 #if !defined(HAVE_INET_ATON) \|\| defined(USE_INET_ATON_WEAKLINK)
57037 c78a00a1d6db Merged revisions 69519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 56109 diff changeset	3841 #if (SIZEOF_INT != 4)
c78a00a1d6db Merged revisions 69519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 56109 diff changeset	3842 #error "Not sure if in_addr_t exists and int is not 32-bits."
c78a00a1d6db Merged revisions 69519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 56109 diff changeset	3843 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3844 /* Have to use inet_addr() instead */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3845 unsigned int packed_addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3846 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3847 char *ip_addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3848
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3849 if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3850 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	3851
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3852
f8440bb8ede5 socket_inet_aton(): ip_addr was left undefined before use in the Tim Peters <tim.peters@gmail.com> parents: 27858 diff changeset	3853 #ifdef HAVE_INET_ATON
37934 ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3854
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3855 #ifdef USE_INET_ATON_WEAKLINK
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3856 if (inet_aton != NULL) {
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3857 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3858 if (inet_aton(ip_addr, &buf))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3859 return PyString_FromStringAndSize((char *)(&buf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3860 sizeof(buf));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3861
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3862 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3863 "illegal IP address string passed to inet_aton");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3864 return NULL;
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3865
37934 ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3866 #ifdef USE_INET_ATON_WEAKLINK
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3867 } else {
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3868 #endif
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3869
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3870 #endif
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3871
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3872 #if !defined(HAVE_INET_ATON) \|\| defined(USE_INET_ATON_WEAKLINK)
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3873
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3874 /* special-case this address as inet_addr might return INADDR_NONE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3875 * for this */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3876 if (strcmp(ip_addr, "255.255.255.255") == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3877 packed_addr = 0xFFFFFFFF;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3878 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3879
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3880 packed_addr = inet_addr(ip_addr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3881
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3882 if (packed_addr == INADDR_NONE) { /* invalid address */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3883 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3884 "illegal IP address string passed to inet_aton");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3885 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3886 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3887 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3888 return PyString_FromStringAndSize((char *) &packed_addr,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3889 sizeof(packed_addr));
37934 ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3890
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3891 #ifdef USE_INET_ATON_WEAKLINK
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3892 }
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3893 #endif
ea67628ddae5 Patch 1471925 - Weak linking support for OSX Ronald Oussoren <ronaldoussoren@mac.com> parents: 37853 diff changeset	3894
27854 81afca747caa Addressing SF bug #643005, implement socket.inet_aton() using Guido van Rossum <guido@python.org> parents: 27558 diff changeset	3895 #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	3896 }
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3897
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3898 PyDoc_STRVAR(inet_ntoa_doc,
11937 ef98ee6aeb42 Fixed inet_ntoa() docstring. Fred Drake <fdrake@acm.org> parents: 11882 diff changeset	3899 "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	3900 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	3901 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	3902
f406e78ec10b Patch by Ben Gertzfield to add inet_aton() and inet_ntoa() calls. Guido van Rossum <guido@python.org> parents: 11182 diff changeset	3903 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	3904 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	3905 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3906 char *packed_str;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3907 int addr_len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3908 struct in_addr packed_addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3909
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3910 if (!PyArg_ParseTuple(args, "s#:inet_ntoa", &packed_str, &addr_len)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3911 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3912 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3913
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3914 if (addr_len != sizeof(packed_addr)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3915 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3916 "packed IP wrong length for inet_ntoa");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3917 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3918 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3919
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3920 memcpy(&packed_addr, packed_str, addr_len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3921
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3922 return PyString_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	3923 }
8631 d86733676815 Added copious docstrings, plus two minor layout tweaks. Guido van Rossum <guido@python.org> parents: 8439 diff changeset	3924
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3925 #ifdef HAVE_INET_PTON
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3926
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3927 PyDoc_STRVAR(inet_pton_doc,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3928 "inet_pton(af, ip) -> packed IP address string\n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3929 \n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3930 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	3931 for use with low-level network functions.");
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3932
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3933 static PyObject *
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3934 socket_inet_pton(PyObject self, PyObject args)
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3935 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3936 int af;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3937 char* ip;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3938 int retval;
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	3939 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3940 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	3941 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3942 char packed[sizeof(struct in_addr)];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3943 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3944 if (!PyArg_ParseTuple(args, "is:inet_pton", &af, &ip)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3945 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3946 }
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3947
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	3948 #if !defined(ENABLE_IPV6) && defined(AF_INET6)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3949 if(af == AF_INET6) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3950 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3951 "can't use AF_INET6, IPv6 is disabled");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3952 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3953 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3954 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3955
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3956 retval = inet_pton(af, ip, packed);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3957 if (retval < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3958 PyErr_SetFromErrno(socket_error);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3959 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3960 } else if (retval == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3961 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3962 "illegal IP address string passed to inet_pton");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3963 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3964 } else if (af == AF_INET) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3965 return PyString_FromStringAndSize(packed,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3966 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	3967 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3968 } else if (af == AF_INET6) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3969 return PyString_FromStringAndSize(packed,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3970 sizeof(struct in6_addr));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3971 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3972 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3973 PyErr_SetString(socket_error, "unknown address family");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3974 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3975 }
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3976 }
38353 36cd4a4ab8f7 Support for buffer protocol for socket and struct. Martin Blais <blais@furius.ca> parents: 37979 diff changeset	3977
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3978 PyDoc_STRVAR(inet_ntop_doc,
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3979 "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	3980 \n\
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3981 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	3982
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3983 static PyObject *
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3984 socket_inet_ntop(PyObject self, PyObject args)
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	3985 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3986 int af;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3987 char* packed;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3988 int len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3989 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	3990 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3991 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	3992 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3993 char ip[INET_ADDRSTRLEN + 1];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3994 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3995
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3996 /* Guarantee NUL-termination for PyString_FromString() below */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3997 memset((void *) &ip[0], '\0', sizeof(ip));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3998
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	3999 if (!PyArg_ParseTuple(args, "is#:inet_ntop", &af, &packed, &len)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4000 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4001 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4002
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4003 if (af == AF_INET) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4004 if (len != sizeof(struct in_addr)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4005 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4006 "invalid length of packed IP address string");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4007 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4008 }
29066 90342f395721 Patch #734231: Update RiscOS support. In particular, correct Martin v. Löwis <martin@v.loewis.de> parents: 29037 diff changeset	4009 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4010 } else if (af == AF_INET6) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4011 if (len != sizeof(struct in6_addr)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4012 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4013 "invalid length of packed IP address string");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4014 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4015 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4016 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4017 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4018 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4019 "unknown address family %d", af);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4020 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4021 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4022
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4023 retval = inet_ntop(af, packed, ip, sizeof(ip));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4024 if (!retval) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4025 PyErr_SetFromErrno(socket_error);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4026 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4027 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4028 return PyString_FromString(retval);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4029 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4030
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4031 /* NOTREACHED */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4032 PyErr_SetString(PyExc_RuntimeError, "invalid handling of inet_ntop");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4033 return NULL;
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4034 }
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4035
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4036 #endif /* HAVE_INET_PTON */
57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4037
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4038 /* 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	4039
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4040 /ARGSUSED/
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4041 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	4042 socket_getaddrinfo(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	4043 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4044 struct addrinfo hints, *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4045 struct addrinfo *res0 = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4046 PyObject *hobj = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4047 PyObject pobj = (PyObject )NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4048 char pbuf[30];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4049 char hptr, pptr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4050 int family, socktype, protocol, flags;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4051 int error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4052 PyObject all = (PyObject )NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4053 PyObject single = (PyObject )NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4054 PyObject *idna = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4055
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4056 family = socktype = protocol = flags = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4057 family = AF_UNSPEC;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4058 if (!PyArg_ParseTuple(args, "OO\|iiii:getaddrinfo",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4059 &hobj, &pobj, &family, &socktype,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4060 &protocol, &flags)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4061 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4062 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4063 if (hobj == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4064 hptr = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4065 } else if (PyUnicode_Check(hobj)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4066 idna = PyObject_CallMethod(hobj, "encode", "s", "idna");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4067 if (!idna)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4068 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4069 hptr = PyString_AsString(idna);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4070 } else if (PyString_Check(hobj)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4071 hptr = PyString_AsString(hobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4072 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4073 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4074 "getaddrinfo() argument 1 must be string or None");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4075 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4076 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4077 if (PyInt_Check(pobj)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4078 PyOS_snprintf(pbuf, sizeof(pbuf), "%ld", PyInt_AsLong(pobj));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4079 pptr = pbuf;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4080 } else if (PyString_Check(pobj)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4081 pptr = PyString_AsString(pobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4082 } else if (pobj == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4083 pptr = (char *)NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4084 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4085 PyErr_SetString(socket_error, "Int or String expected");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4086 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4087 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4088 memset(&hints, 0, sizeof(hints));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4089 hints.ai_family = family;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4090 hints.ai_socktype = socktype;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4091 hints.ai_protocol = protocol;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4092 hints.ai_flags = flags;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4093 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4094 ACQUIRE_GETADDRINFO_LOCK
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4095 error = getaddrinfo(hptr, pptr, &hints, &res0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4096 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4097 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4098 if (error) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4099 set_gaierror(error);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4100 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4101 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4102
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4103 if ((all = PyList_New(0)) == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4104 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4105 for (res = res0; res; res = res->ai_next) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4106 PyObject *addr =
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4107 makesockaddr(-1, res->ai_addr, res->ai_addrlen, protocol);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4108 if (addr == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4109 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4110 single = Py_BuildValue("iiisO", res->ai_family,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4111 res->ai_socktype, res->ai_protocol,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4112 res->ai_canonname ? res->ai_canonname : "",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4113 addr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4114 Py_DECREF(addr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4115 if (single == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4116 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4117
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4118 if (PyList_Append(all, single))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4119 goto err;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4120 Py_XDECREF(single);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4121 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4122 Py_XDECREF(idna);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4123 if (res0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4124 freeaddrinfo(res0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4125 return all;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4126 err:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4127 Py_XDECREF(single);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4128 Py_XDECREF(all);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4129 Py_XDECREF(idna);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4130 if (res0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4131 freeaddrinfo(res0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4132 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	4133 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4134
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4135 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	4136 "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	4137 -> 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	4138 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4139 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	4140
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4141 /* 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	4142
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4143 /ARGSUSED/
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4144 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	4145 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	4146 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4147 PyObject sa = (PyObject )NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4148 int flags;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4149 char *hostp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4150 int port, flowinfo, scope_id;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4151 char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4152 struct addrinfo hints, *res = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4153 int error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4154 PyObject ret = (PyObject )NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4155
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4156 flags = flowinfo = scope_id = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4157 if (!PyArg_ParseTuple(args, "Oi:getnameinfo", &sa, &flags))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4158 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4159 if (!PyTuple_Check(sa)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4160 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4161 "getnameinfo() argument 1 must be a tuple");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4162 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4163 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4164 if (!PyArg_ParseTuple(sa, "si\|ii",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4165 &hostp, &port, &flowinfo, &scope_id))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4166 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4167 PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4168 memset(&hints, 0, sizeof(hints));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4169 hints.ai_family = AF_UNSPEC;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4170 hints.ai_socktype = SOCK_DGRAM; /* make numeric port happy */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4171 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4172 ACQUIRE_GETADDRINFO_LOCK
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4173 error = getaddrinfo(hostp, pbuf, &hints, &res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4174 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4175 RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4176 if (error) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4177 set_gaierror(error);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4178 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4179 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4180 if (res->ai_next) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4181 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4182 "sockaddr resolved to multiple addresses");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4183 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4184 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4185 switch (res->ai_family) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4186 case AF_INET:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4187 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4188 if (PyTuple_GET_SIZE(sa) != 2) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4189 PyErr_SetString(socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4190 "IPv4 sockaddr must be 2 tuple");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4191 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4192 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4193 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4194 }
21128 15ff504632ed Remove INET6 define. Use ENABLE_IPV6 instead. Martin v. Löwis <martin@v.loewis.de> parents: 21094 diff changeset	4195 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4196 case AF_INET6:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4197 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4198 struct sockaddr_in6 *sin6;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4199 sin6 = (struct sockaddr_in6 *)res->ai_addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4200 sin6->sin6_flowinfo = flowinfo;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4201 sin6->sin6_scope_id = scope_id;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4202 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4203 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4204 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4205 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4206 error = getnameinfo(res->ai_addr, res->ai_addrlen,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4207 hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), flags);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4208 if (error) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4209 set_gaierror(error);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4210 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4211 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4212 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	4213
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4214 fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4215 if (res)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4216 freeaddrinfo(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4217 return ret;
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4218 }
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	4219
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4220 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	4221 "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	4222 \n\
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4223 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	4224
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4225
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4226 /* 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	4227
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4228 static PyObject *
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4229 socket_getdefaulttimeout(PyObject *self)
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4230 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4231 if (defaulttimeout < 0.0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4232 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4233 return Py_None;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4234 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4235 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4236 return PyFloat_FromDouble(defaulttimeout);
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4237 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4238
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4239 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	4240 "getdefaulttimeout() -> timeout\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4241 \n\
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4242 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	4243 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	4244 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	4245
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4246 static PyObject *
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4247 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	4248 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4249 double timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4250
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4251 if (arg == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4252 timeout = -1.0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4253 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4254 timeout = PyFloat_AsDouble(arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4255 if (timeout < 0.0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4256 if (!PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4257 PyErr_SetString(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4258 "Timeout value out of range");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4259 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4260 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4261 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4262
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4263 defaulttimeout = timeout;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4264
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4265 Py_INCREF(Py_None);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4266 return Py_None;
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4267 }
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4268
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4269 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	4270 "setdefaulttimeout(timeout)\n\
24293 640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4271 \n\
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4272 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	4273 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	4274 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	4275
640370f08e2a Add default timeout functionality. This adds setdefaulttimeout() and Guido van Rossum <guido@python.org> parents: 24280 diff changeset	4276
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4277 /* 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	4278
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4279 static PyMethodDef socket_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4280 {"gethostbyname", socket_gethostbyname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4281 METH_VARARGS, gethostbyname_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4282 {"gethostbyname_ex", socket_gethostbyname_ex,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4283 METH_VARARGS, ghbn_ex_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4284 {"gethostbyaddr", socket_gethostbyaddr,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4285 METH_VARARGS, gethostbyaddr_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4286 {"gethostname", socket_gethostname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4287 METH_NOARGS, gethostname_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4288 {"getservbyname", socket_getservbyname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4289 METH_VARARGS, getservbyname_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4290 {"getservbyport", socket_getservbyport,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4291 METH_VARARGS, getservbyport_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4292 {"getprotobyname", socket_getprotobyname,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4293 METH_VARARGS, getprotobyname_doc},
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	4294 #ifndef NO_DUP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4295 {"fromfd", socket_fromfd,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4296 METH_VARARGS, fromfd_doc},
1792 a584b4bbbc59 Changes to make it work and compile on NT, by Mark Hammond. Guido van Rossum <guido@python.org> parents: 1760 diff changeset	4297 #endif
33063 90da70986407 Patch #1003700: Add socketpair function to socket module. Dave Cole <djc@object-craft.com.au> parents: 32913 diff changeset	4298 #ifdef HAVE_SOCKETPAIR
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4299 {"socketpair", socket_socketpair,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4300 METH_VARARGS, socketpair_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4301 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4302 {"ntohs", socket_ntohs,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4303 METH_VARARGS, ntohs_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4304 {"ntohl", socket_ntohl,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4305 METH_O, ntohl_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4306 {"htons", socket_htons,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4307 METH_VARARGS, htons_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4308 {"htonl", socket_htonl,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4309 METH_O, htonl_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4310 {"inet_aton", socket_inet_aton,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4311 METH_VARARGS, inet_aton_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4312 {"inet_ntoa", socket_inet_ntoa,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4313 METH_VARARGS, inet_ntoa_doc},
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4314 #ifdef HAVE_INET_PTON
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4315 {"inet_pton", socket_inet_pton,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4316 METH_VARARGS, inet_pton_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4317 {"inet_ntop", socket_inet_ntop,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4318 METH_VARARGS, inet_ntop_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4319 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4320 {"getaddrinfo", socket_getaddrinfo,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4321 METH_VARARGS, getaddrinfo_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4322 {"getnameinfo", socket_getnameinfo,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4323 METH_VARARGS, getnameinfo_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4324 {"getdefaulttimeout", (PyCFunction)socket_getdefaulttimeout,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4325 METH_NOARGS, getdefaulttimeout_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4326 {"setdefaulttimeout", socket_setdefaulttimeout,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4327 METH_O, setdefaulttimeout_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4328 {NULL, NULL} /* Sentinel */
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4329 };
8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4330
295 d7a38dece86a Many changes to the interface, and added comments. Guido van Rossum <guido@python.org> parents: 294 diff changeset	4331
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4332 #ifdef RISCOS
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4333 #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	4334
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4335 static int
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4336 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	4337 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4338 _kernel_swi_regs r;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4339
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4340 r.r[0] = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4341 _kernel_swi(0x43380, &r, &r);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4342 taskwindow = r.r[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4343
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4344 return 1;
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4345 }
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4346
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4347 #endif /* RISCOS */
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4348
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4349
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	4350 #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	4351 #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	4352
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4353 /* 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	4354
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	4355 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	4356 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	4357 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4358 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	4359 }
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	4360
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	4361 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	4362 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	4363 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4364 WSADATA WSAData;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4365 int ret;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4366 char buf[100];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4367 ret = WSAStartup(0x0101, &WSAData);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4368 switch (ret) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4369 case 0: /* No error */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4370 Py_AtExit(os_cleanup);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4371 return 1; /* Success */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4372 case WSASYSNOTREADY:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4373 PyErr_SetString(PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4374 "WSAStartup failed: network not ready");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4375 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4376 case WSAVERNOTSUPPORTED:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4377 case WSAEINVAL:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4378 PyErr_SetString(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4379 PyExc_ImportError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4380 "WSAStartup failed: requested version not supported");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4381 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4382 default:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4383 PyOS_snprintf(buf, sizeof(buf),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4384 "WSAStartup failed: error code %d", ret);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4385 PyErr_SetString(PyExc_ImportError, buf);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4386 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4387 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4388 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	4389 }
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	4390
3702 3408756ec601 changed windows test symbols; removed debug printf from sockets Guido van Rossum <guido@python.org> parents: 3700 diff changeset	4391 #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	4392
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4393
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4394 #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	4395 #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	4396
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4397 /* Additional initialization for OS/2 */
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4398
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4399 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	4400 os_init(void)
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4401 {
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4402 #ifndef PYCC_GCC
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4403 char reason[64];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4404 int rc = sock_init();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4405
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4406 if (rc == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4407 return 1; /* Success */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4408 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4409
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4410 PyOS_snprintf(reason, sizeof(reason),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4411 "OS/2 TCP/IP Error# %d", sock_errno());
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4412 PyErr_SetString(PyExc_ImportError, reason);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4413
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4414 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	4415 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4416 /* No need to initialise sockets with GCC/EMX */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4417 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	4418 #endif
6626 5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4419 }
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4420
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4421 #endif /* PYOS_OS2 */
5e31d381fa47 os2 patch by Jeff Rush Guido van Rossum <guido@python.org> parents: 6618 diff changeset	4422
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4423
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4424 #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	4425 static int
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4426 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	4427 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4428 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	4429 }
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4430 #endif
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4431
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4432
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	4433 /* 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	4434 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	4435 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	4436 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	4437 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4438 &sock_type,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4439 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	4440 };
3957d155f8c5 Break SSL support out of _socket module and place it into a new Marc-André Lemburg <mal@egenix.com> parents: 21757 diff changeset	4441
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4442
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4443 /* 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	4444
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4445 This module is actually called "_socket", and there's a wrapper
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4446 "socket.py" which implements some additional functionality. On some
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4447 platforms (e.g. Windows and OS/2), socket.py also implements a
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4448 wrapper for the socket type that provides missing functionality such
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4449 as makefile(), dup() and fromfd(). The import of "_socket" may fail
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4450 with an ImportError exception if os-specific initialization fails.
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4451 On Windows, this does WINSOCK initialization. When WINSOCK is
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4452 initialized succesfully, a call to WSACleanup() is scheduled to be
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4453 made at exit time.
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4454 */
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	4455
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23818 diff changeset	4456 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	4457 "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	4458 \n\
980767c6cd97 Clean up some docstrings. Some docstrings didn't show their return Guido van Rossum <guido@python.org> parents: 24619 diff changeset	4459 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	4460
24471 f66b3a3509c7 Excise DL_EXPORT/DL_IMPORT from Modules/. Required adding a prototype Mark Hammond <mhammond@skippinet.com.au>* parents: 24411 diff changeset	4461 PyMODINIT_FUNC
13694 b54f11ada91e Create a new section of pyport.h to hold all external function declarations Thomas Wouters <thomas@python.org> parents: 13680 diff changeset	4462 init_socket(void)
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4463 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4464 PyObject m, has_ipv6;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4465
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4466 if (!os_init())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4467 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4468
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4469 Py_TYPE(&sock_type) = &PyType_Type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4470 m = Py_InitModule3(PySocket_MODULE_NAME,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4471 socket_methods,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4472 socket_doc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4473 if (m == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4474 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4475
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4476 socket_error = PyErr_NewException("socket.error",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4477 PyExc_IOError, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4478 if (socket_error == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4479 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4480 PySocketModuleAPI.error = socket_error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4481 Py_INCREF(socket_error);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4482 PyModule_AddObject(m, "error", socket_error);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4483 socket_herror = PyErr_NewException("socket.herror",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4484 socket_error, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4485 if (socket_herror == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4486 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4487 Py_INCREF(socket_herror);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4488 PyModule_AddObject(m, "herror", socket_herror);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4489 socket_gaierror = PyErr_NewException("socket.gaierror", socket_error,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4490 NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4491 if (socket_gaierror == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4492 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4493 Py_INCREF(socket_gaierror);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4494 PyModule_AddObject(m, "gaierror", socket_gaierror);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4495 socket_timeout = PyErr_NewException("socket.timeout",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4496 socket_error, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4497 if (socket_timeout == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4498 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4499 Py_INCREF(socket_timeout);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4500 PyModule_AddObject(m, "timeout", socket_timeout);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4501 Py_INCREF((PyObject *)&sock_type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4502 if (PyModule_AddObject(m, "SocketType",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4503 (PyObject *)&sock_type) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4504 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4505 Py_INCREF((PyObject *)&sock_type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4506 if (PyModule_AddObject(m, "socket",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4507 (PyObject *)&sock_type) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4508 return;
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4509
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4510 #ifdef ENABLE_IPV6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4511 has_ipv6 = Py_True;
28818 57e61588571b Patch by Jp Calderone: Guido van Rossum <guido@python.org> parents: 28671 diff changeset	4512 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4513 has_ipv6 = Py_False;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4514 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4515 Py_INCREF(has_ipv6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4516 PyModule_AddObject(m, "has_ipv6", has_ipv6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4517
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4518 /* Export C API */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4519 if (PyModule_AddObject(m, PySocket_CAPI_NAME,
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	4520 PyCapsule_New(&PySocketModuleAPI, PySocket_CAPSULE_NAME, NULL)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4521 ) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4522 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4523
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4524 /* 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	4525 #ifdef AF_UNSPEC
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4526 PyModule_AddIntConstant(m, "AF_UNSPEC", AF_UNSPEC);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4527 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4528 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	4529 #ifdef AF_INET6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4530 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	4531 #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	4532 #if defined(AF_UNIX)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4533 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	4534 #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	4535 #ifdef AF_AX25
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4536 /* Amateur Radio AX.25 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4537 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	4538 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4539 #ifdef AF_IPX
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4540 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	4541 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4542 #ifdef AF_APPLETALK
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4543 /* Appletalk DDP */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4544 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	4545 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4546 #ifdef AF_NETROM
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4547 /* Amateur radio NetROM */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4548 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	4549 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4550 #ifdef AF_BRIDGE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4551 /* Multiprotocol bridge */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4552 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	4553 #endif
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4554 #ifdef AF_ATMPVC
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4555 /* ATM PVCs */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4556 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	4557 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4558 #ifdef AF_AAL5
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4559 /* Reserved for Werner's ATM */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4560 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	4561 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4562 #ifdef AF_X25
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4563 /* Reserved for X.25 project */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4564 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	4565 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4566 #ifdef AF_INET6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4567 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	4568 #endif
35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4569 #ifdef AF_ROSE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4570 /* Amateur Radio X.25 PLP */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4571 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	4572 #endif
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4573 #ifdef AF_DECnet
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4574 /* Reserved for DECnet project */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4575 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	4576 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4577 #ifdef AF_NETBEUI
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4578 /* Reserved for 802.2LLC project */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4579 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	4580 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4581 #ifdef AF_SECURITY
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4582 /* Security callback pseudo AF */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4583 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	4584 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4585 #ifdef AF_KEY
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4586 /* PF_KEY key management API */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4587 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	4588 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4589 #ifdef AF_NETLINK
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4590 /* */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4591 PyModule_AddIntConstant(m, "AF_NETLINK", AF_NETLINK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4592 PyModule_AddIntConstant(m, "NETLINK_ROUTE", NETLINK_ROUTE);
37530 3c7ea50518be Patch #1462080: Conditionalize some NETLINK defines. Martin v. Löwis <martin@v.loewis.de> parents: 37371 diff changeset	4593 #ifdef NETLINK_SKIP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4594 PyModule_AddIntConstant(m, "NETLINK_SKIP", NETLINK_SKIP);
37530 3c7ea50518be Patch #1462080: Conditionalize some NETLINK defines. Martin v. Löwis <martin@v.loewis.de> parents: 37371 diff changeset	4595 #endif
3c7ea50518be Patch #1462080: Conditionalize some NETLINK defines. Martin v. Löwis <martin@v.loewis.de> parents: 37371 diff changeset	4596 #ifdef NETLINK_W1
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4597 PyModule_AddIntConstant(m, "NETLINK_W1", NETLINK_W1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4598 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4599 PyModule_AddIntConstant(m, "NETLINK_USERSOCK", NETLINK_USERSOCK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4600 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	4601 #ifdef NETLINK_TCPDIAG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4602 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	4603 #endif
4d988dda6478 NETLINK_TCPDIAG and NETLINK_NFLOG aren't defined on older Linux Guido van Rossum <guido@python.org> parents: 36610 diff changeset	4604 #ifdef NETLINK_NFLOG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4605 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	4606 #endif
36298 9eeaa33f9640 Get socketmodule to build after adding netlink support. Neal Norwitz <nnorwitz@gmail.com> parents: 36289 diff changeset	4607 #ifdef NETLINK_XFRM
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4608 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	4609 #endif
37530 3c7ea50518be Patch #1462080: Conditionalize some NETLINK defines. Martin v. Löwis <martin@v.loewis.de> parents: 37371 diff changeset	4610 #ifdef NETLINK_ARPD
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4611 PyModule_AddIntConstant(m, "NETLINK_ARPD", NETLINK_ARPD);
37530 3c7ea50518be Patch #1462080: Conditionalize some NETLINK defines. Martin v. Löwis <martin@v.loewis.de> parents: 37371 diff changeset	4612 #endif
3c7ea50518be Patch #1462080: Conditionalize some NETLINK defines. Martin v. Löwis <martin@v.loewis.de> parents: 37371 diff changeset	4613 #ifdef NETLINK_ROUTE6
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4614 PyModule_AddIntConstant(m, "NETLINK_ROUTE6", NETLINK_ROUTE6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4615 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4616 PyModule_AddIntConstant(m, "NETLINK_IP6_FW", NETLINK_IP6_FW);
40838 885a77fd5c01 Patch #1657276: Make NETLINK_DNRTMSG conditional. Martin v. Löwis <martin@v.loewis.de> parents: 40416 diff changeset	4617 #ifdef NETLINK_DNRTMSG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4618 PyModule_AddIntConstant(m, "NETLINK_DNRTMSG", NETLINK_DNRTMSG);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4619 #endif
37530 3c7ea50518be Patch #1462080: Conditionalize some NETLINK defines. Martin v. Löwis <martin@v.loewis.de> parents: 37371 diff changeset	4620 #ifdef NETLINK_TAPBASE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4621 PyModule_AddIntConstant(m, "NETLINK_TAPBASE", NETLINK_TAPBASE);
37530 3c7ea50518be Patch #1462080: Conditionalize some NETLINK defines. Martin v. Löwis <martin@v.loewis.de> parents: 37371 diff changeset	4622 #endif
37371 492044034a87 Bug #1460564: document that socket.fromfd() duplicates the given Georg Brandl <georg@python.org> parents: 37069 diff changeset	4623 #endif /* AF_NETLINK */
32764 ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4624 #ifdef AF_ROUTE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4625 /* Alias to emulate 4.4BSD */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4626 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	4627 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4628 #ifdef AF_ASH
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4629 /* Ash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4630 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	4631 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4632 #ifdef AF_ECONET
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4633 /* Acorn Econet */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4634 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	4635 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4636 #ifdef AF_ATMSVC
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4637 /* ATM SVCs */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4638 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	4639 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4640 #ifdef AF_SNA
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4641 /* Linux SNA Project (nutters!) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4642 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	4643 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4644 #ifdef AF_IRDA
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4645 /* IRDA sockets */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4646 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	4647 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4648 #ifdef AF_PPPOX
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4649 /* PPPoX sockets */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4650 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	4651 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4652 #ifdef AF_WANPIPE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4653 /* Wanpipe API Sockets */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4654 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	4655 #endif
ecb0c97f1e42 Patch #984654: Add more address family constants. Martin v. Löwis <martin@v.loewis.de> parents: 32611 diff changeset	4656 #ifdef AF_LLC
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4657 /* Linux LLC */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4658 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	4659 #endif
31441 493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	4660
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	4661 #ifdef USE_BLUETOOTH
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4662 PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4663 PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4664 PyModule_AddIntConstant(m, "BTPROTO_HCI", BTPROTO_HCI);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4665 PyModule_AddIntConstant(m, "SOL_HCI", SOL_HCI);
65430 7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	4666 #if !defined(__NetBSD__) && !defined(__DragonFly__)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4667 PyModule_AddIntConstant(m, "HCI_FILTER", HCI_FILTER);
65430 7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	4668 #endif
31443 afb4c9726d1a Add FreeBSD support for bluetooth sockets. Hye-Shik Chang <hyeshik@gmail.com> parents: 31441 diff changeset	4669 #if !defined(__FreeBSD__)
65430 7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	4670 #if !defined(__NetBSD__) && !defined(__DragonFly__)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4671 PyModule_AddIntConstant(m, "HCI_TIME_STAMP", HCI_TIME_STAMP);
65430 7025278c5a41 Merged revisions 85586-85587,85596-85598 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 65244 diff changeset	4672 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4673 PyModule_AddIntConstant(m, "HCI_DATA_DIR", HCI_DATA_DIR);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4674 PyModule_AddIntConstant(m, "BTPROTO_SCO", BTPROTO_SCO);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4675 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4676 PyModule_AddIntConstant(m, "BTPROTO_RFCOMM", BTPROTO_RFCOMM);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4677 PyModule_AddStringConstant(m, "BDADDR_ANY", "00:00:00:00:00:00");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4678 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	4679 #endif
493707692671 Patch #874083: Bluetooth support for socket module. Martin v. Löwis <martin@v.loewis.de> parents: 31274 diff changeset	4680
65669 f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4681 #ifdef AF_PACKET
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4682 PyModule_AddIntMacro(m, AF_PACKET);
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4683 #endif
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4684 #ifdef PF_PACKET
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4685 PyModule_AddIntMacro(m, PF_PACKET);
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4686 #endif
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4687 #ifdef PACKET_HOST
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4688 PyModule_AddIntMacro(m, PACKET_HOST);
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4689 #endif
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4690 #ifdef PACKET_BROADCAST
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4691 PyModule_AddIntMacro(m, PACKET_BROADCAST);
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4692 #endif
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4693 #ifdef PACKET_MULTICAST
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4694 PyModule_AddIntMacro(m, PACKET_MULTICAST);
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4695 #endif
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4696 #ifdef PACKET_OTHERHOST
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4697 PyModule_AddIntMacro(m, PACKET_OTHERHOST);
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4698 #endif
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4699 #ifdef PACKET_OUTGOING
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4700 PyModule_AddIntMacro(m, PACKET_OUTGOING);
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4701 #endif
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4702 #ifdef PACKET_LOOPBACK
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4703 PyModule_AddIntMacro(m, PACKET_LOOPBACK);
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4704 #endif
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4705 #ifdef PACKET_FASTROUTE
f5e3de87b14b Merged revisions 85868 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 65430 diff changeset	4706 PyModule_AddIntMacro(m, PACKET_FASTROUTE);
16947 b25131bc6ec7 RISCOS changes by dschwertberger. Guido van Rossum <guido@python.org> parents: 16472 diff changeset	4707 #endif
11182 35e0d03f2b02 Patch by Marc-Andre Lemburg to add a bunch more symbols. Guido van Rossum <guido@python.org> parents: 10579 diff changeset	4708
44561 ac51cfe5c5c6 Issue #1646: Make socket support TIPC. The socket module now has support Christian Heimes <christian@cheimes.de> parents: 44474 diff changeset	4709 #ifdef HAVE_LINUX_TIPC_H
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4710 PyModule_AddIntConstant(m, "AF_TIPC", AF_TIPC);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4711
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4712 /* for addresses */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4713 PyModule_AddIntConstant(m, "TIPC_ADDR_NAMESEQ", TIPC_ADDR_NAMESEQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4714 PyModule_AddIntConstant(m, "TIPC_ADDR_NAME", TIPC_ADDR_NAME);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4715 PyModule_AddIntConstant(m, "TIPC_ADDR_ID", TIPC_ADDR_ID);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4716
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4717 PyModule_AddIntConstant(m, "TIPC_ZONE_SCOPE", TIPC_ZONE_SCOPE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4718 PyModule_AddIntConstant(m, "TIPC_CLUSTER_SCOPE", TIPC_CLUSTER_SCOPE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4719 PyModule_AddIntConstant(m, "TIPC_NODE_SCOPE", TIPC_NODE_SCOPE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4720
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4721 /* for setsockopt() */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4722 PyModule_AddIntConstant(m, "SOL_TIPC", SOL_TIPC);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4723 PyModule_AddIntConstant(m, "TIPC_IMPORTANCE", TIPC_IMPORTANCE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4724 PyModule_AddIntConstant(m, "TIPC_SRC_DROPPABLE", TIPC_SRC_DROPPABLE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4725 PyModule_AddIntConstant(m, "TIPC_DEST_DROPPABLE",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4726 TIPC_DEST_DROPPABLE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4727 PyModule_AddIntConstant(m, "TIPC_CONN_TIMEOUT", TIPC_CONN_TIMEOUT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4728
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4729 PyModule_AddIntConstant(m, "TIPC_LOW_IMPORTANCE",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4730 TIPC_LOW_IMPORTANCE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4731 PyModule_AddIntConstant(m, "TIPC_MEDIUM_IMPORTANCE",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4732 TIPC_MEDIUM_IMPORTANCE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4733 PyModule_AddIntConstant(m, "TIPC_HIGH_IMPORTANCE",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4734 TIPC_HIGH_IMPORTANCE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4735 PyModule_AddIntConstant(m, "TIPC_CRITICAL_IMPORTANCE",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4736 TIPC_CRITICAL_IMPORTANCE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4737
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4738 /* for subscriptions */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4739 PyModule_AddIntConstant(m, "TIPC_SUB_PORTS", TIPC_SUB_PORTS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4740 PyModule_AddIntConstant(m, "TIPC_SUB_SERVICE", TIPC_SUB_SERVICE);
44636 2ad3e35c5825 Guard definition of TIPC_SUB_CANCEL with an #ifdef. Georg Brandl <georg@python.org> parents: 44630 diff changeset	4741 #ifdef TIPC_SUB_CANCEL
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4742 /* doesn't seem to be available everywhere */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4743 PyModule_AddIntConstant(m, "TIPC_SUB_CANCEL", TIPC_SUB_CANCEL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4744 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4745 PyModule_AddIntConstant(m, "TIPC_WAIT_FOREVER", TIPC_WAIT_FOREVER);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4746 PyModule_AddIntConstant(m, "TIPC_PUBLISHED", TIPC_PUBLISHED);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4747 PyModule_AddIntConstant(m, "TIPC_WITHDRAWN", TIPC_WITHDRAWN);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4748 PyModule_AddIntConstant(m, "TIPC_SUBSCR_TIMEOUT", TIPC_SUBSCR_TIMEOUT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4749 PyModule_AddIntConstant(m, "TIPC_CFG_SRV", TIPC_CFG_SRV);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4750 PyModule_AddIntConstant(m, "TIPC_TOP_SRV", TIPC_TOP_SRV);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4751 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4752
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4753 /* Socket types */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4754 PyModule_AddIntConstant(m, "SOCK_STREAM", SOCK_STREAM);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4755 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	4756 #ifndef __BEOS__
f2a4a2b60860 Changes for BeOS, QNX and long long, by Chris Herborth. Guido van Rossum <guido@python.org> parents: 8821 diff changeset	4757 /* We have incomplete socket support. */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4758 PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4759 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	4760 #if defined(SOCK_RDM)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4761 PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4762 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4763 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4764
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4765 #ifdef SO_DEBUG
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4766 PyModule_AddIntConstant(m, "SO_DEBUG", SO_DEBUG);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4767 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4768 #ifdef SO_ACCEPTCONN
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4769 PyModule_AddIntConstant(m, "SO_ACCEPTCONN", SO_ACCEPTCONN);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4770 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4771 #ifdef SO_REUSEADDR
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4772 PyModule_AddIntConstant(m, "SO_REUSEADDR", SO_REUSEADDR);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4773 #endif
32578 21fd6e62cd27 [Patch #982665 ] add SO_EXCLUSIVEADDRUSE constant Andrew M. Kuchling <amk@amk.ca> parents: 32521 diff changeset	4774 #ifdef SO_EXCLUSIVEADDRUSE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4775 PyModule_AddIntConstant(m, "SO_EXCLUSIVEADDRUSE", SO_EXCLUSIVEADDRUSE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4776 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4777
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4778 #ifdef SO_KEEPALIVE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4779 PyModule_AddIntConstant(m, "SO_KEEPALIVE", SO_KEEPALIVE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4780 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4781 #ifdef SO_DONTROUTE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4782 PyModule_AddIntConstant(m, "SO_DONTROUTE", SO_DONTROUTE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4783 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4784 #ifdef SO_BROADCAST
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4785 PyModule_AddIntConstant(m, "SO_BROADCAST", SO_BROADCAST);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4786 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4787 #ifdef SO_USELOOPBACK
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4788 PyModule_AddIntConstant(m, "SO_USELOOPBACK", SO_USELOOPBACK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4789 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4790 #ifdef SO_LINGER
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4791 PyModule_AddIntConstant(m, "SO_LINGER", SO_LINGER);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4792 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4793 #ifdef SO_OOBINLINE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4794 PyModule_AddIntConstant(m, "SO_OOBINLINE", SO_OOBINLINE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4795 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4796 #ifdef SO_REUSEPORT
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4797 PyModule_AddIntConstant(m, "SO_REUSEPORT", SO_REUSEPORT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4798 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4799 #ifdef SO_SNDBUF
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4800 PyModule_AddIntConstant(m, "SO_SNDBUF", SO_SNDBUF);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4801 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4802 #ifdef SO_RCVBUF
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4803 PyModule_AddIntConstant(m, "SO_RCVBUF", SO_RCVBUF);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4804 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4805 #ifdef SO_SNDLOWAT
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4806 PyModule_AddIntConstant(m, "SO_SNDLOWAT", SO_SNDLOWAT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4807 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4808 #ifdef SO_RCVLOWAT
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4809 PyModule_AddIntConstant(m, "SO_RCVLOWAT", SO_RCVLOWAT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4810 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4811 #ifdef SO_SNDTIMEO
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4812 PyModule_AddIntConstant(m, "SO_SNDTIMEO", SO_SNDTIMEO);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4813 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4814 #ifdef SO_RCVTIMEO
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4815 PyModule_AddIntConstant(m, "SO_RCVTIMEO", SO_RCVTIMEO);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4816 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4817 #ifdef SO_ERROR
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4818 PyModule_AddIntConstant(m, "SO_ERROR", SO_ERROR);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4819 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4820 #ifdef SO_TYPE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4821 PyModule_AddIntConstant(m, "SO_TYPE", SO_TYPE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4822 #endif
60159 1df34fa491bd Issue #8235: _socket: Add the constant ``SO_SETFIB``. SO_SETFIB is Larry Hastings <larry@hastings.org> parents: 59998 diff changeset	4823 #ifdef SO_SETFIB
1df34fa491bd Issue #8235: _socket: Add the constant ``SO_SETFIB``. SO_SETFIB is Larry Hastings <larry@hastings.org> parents: 59998 diff changeset	4824 PyModule_AddIntConstant(m, "SO_SETFIB", SO_SETFIB);
1df34fa491bd Issue #8235: _socket: Add the constant ``SO_SETFIB``. SO_SETFIB is Larry Hastings <larry@hastings.org> parents: 59998 diff changeset	4825 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4826
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4827 /* Maximum number of connections for "listen" */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4828 #ifdef SOMAXCONN
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4829 PyModule_AddIntConstant(m, "SOMAXCONN", SOMAXCONN);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	4830 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4831 PyModule_AddIntConstant(m, "SOMAXCONN", 5); /* Common value */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4832 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4833
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4834 /* Flags for send, recv */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4835 #ifdef MSG_OOB
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4836 PyModule_AddIntConstant(m, "MSG_OOB", MSG_OOB);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4837 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4838 #ifdef MSG_PEEK
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4839 PyModule_AddIntConstant(m, "MSG_PEEK", MSG_PEEK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4840 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4841 #ifdef MSG_DONTROUTE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4842 PyModule_AddIntConstant(m, "MSG_DONTROUTE", MSG_DONTROUTE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4843 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4844 #ifdef MSG_DONTWAIT
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4845 PyModule_AddIntConstant(m, "MSG_DONTWAIT", MSG_DONTWAIT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4846 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4847 #ifdef MSG_EOR
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4848 PyModule_AddIntConstant(m, "MSG_EOR", MSG_EOR);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4849 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4850 #ifdef MSG_TRUNC
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4851 PyModule_AddIntConstant(m, "MSG_TRUNC", MSG_TRUNC);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4852 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4853 #ifdef MSG_CTRUNC
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4854 PyModule_AddIntConstant(m, "MSG_CTRUNC", MSG_CTRUNC);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4855 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4856 #ifdef MSG_WAITALL
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4857 PyModule_AddIntConstant(m, "MSG_WAITALL", MSG_WAITALL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4858 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4859 #ifdef MSG_BTAG
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4860 PyModule_AddIntConstant(m, "MSG_BTAG", MSG_BTAG);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4861 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4862 #ifdef MSG_ETAG
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4863 PyModule_AddIntConstant(m, "MSG_ETAG", MSG_ETAG);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4864 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4865
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4866 /* Protocol level and numbers, usable for [gs]etsockopt */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4867 #ifdef SOL_SOCKET
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4868 PyModule_AddIntConstant(m, "SOL_SOCKET", SOL_SOCKET);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4869 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4870 #ifdef SOL_IP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4871 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	4872 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4873 PyModule_AddIntConstant(m, "SOL_IP", 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4874 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4875 #ifdef SOL_IPX
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4876 PyModule_AddIntConstant(m, "SOL_IPX", SOL_IPX);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4877 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4878 #ifdef SOL_AX25
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4879 PyModule_AddIntConstant(m, "SOL_AX25", SOL_AX25);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4880 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4881 #ifdef SOL_ATALK
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4882 PyModule_AddIntConstant(m, "SOL_ATALK", SOL_ATALK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4883 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4884 #ifdef SOL_NETROM
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4885 PyModule_AddIntConstant(m, "SOL_NETROM", SOL_NETROM);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4886 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4887 #ifdef SOL_ROSE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4888 PyModule_AddIntConstant(m, "SOL_ROSE", SOL_ROSE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4889 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4890 #ifdef SOL_TCP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4891 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	4892 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4893 PyModule_AddIntConstant(m, "SOL_TCP", 6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4894 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4895 #ifdef SOL_UDP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4896 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	4897 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4898 PyModule_AddIntConstant(m, "SOL_UDP", 17);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4899 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4900 #ifdef IPPROTO_IP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4901 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	4902 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4903 PyModule_AddIntConstant(m, "IPPROTO_IP", 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4904 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4905 #ifdef IPPROTO_HOPOPTS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4906 PyModule_AddIntConstant(m, "IPPROTO_HOPOPTS", IPPROTO_HOPOPTS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4907 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4908 #ifdef IPPROTO_ICMP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4909 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	4910 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4911 PyModule_AddIntConstant(m, "IPPROTO_ICMP", 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4912 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4913 #ifdef IPPROTO_IGMP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4914 PyModule_AddIntConstant(m, "IPPROTO_IGMP", IPPROTO_IGMP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4915 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4916 #ifdef IPPROTO_GGP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4917 PyModule_AddIntConstant(m, "IPPROTO_GGP", IPPROTO_GGP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4918 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4919 #ifdef IPPROTO_IPV4
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4920 PyModule_AddIntConstant(m, "IPPROTO_IPV4", IPPROTO_IPV4);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4921 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4922 #ifdef IPPROTO_IPV6
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4923 PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4924 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4925 #ifdef IPPROTO_IPIP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4926 PyModule_AddIntConstant(m, "IPPROTO_IPIP", IPPROTO_IPIP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4927 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4928 #ifdef IPPROTO_TCP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4929 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	4930 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4931 PyModule_AddIntConstant(m, "IPPROTO_TCP", 6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4932 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4933 #ifdef IPPROTO_EGP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4934 PyModule_AddIntConstant(m, "IPPROTO_EGP", IPPROTO_EGP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4935 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4936 #ifdef IPPROTO_PUP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4937 PyModule_AddIntConstant(m, "IPPROTO_PUP", IPPROTO_PUP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4938 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4939 #ifdef IPPROTO_UDP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4940 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	4941 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4942 PyModule_AddIntConstant(m, "IPPROTO_UDP", 17);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4943 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4944 #ifdef IPPROTO_IDP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4945 PyModule_AddIntConstant(m, "IPPROTO_IDP", IPPROTO_IDP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4946 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4947 #ifdef IPPROTO_HELLO
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4948 PyModule_AddIntConstant(m, "IPPROTO_HELLO", IPPROTO_HELLO);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4949 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4950 #ifdef IPPROTO_ND
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4951 PyModule_AddIntConstant(m, "IPPROTO_ND", IPPROTO_ND);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4952 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4953 #ifdef IPPROTO_TP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4954 PyModule_AddIntConstant(m, "IPPROTO_TP", IPPROTO_TP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4955 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4956 #ifdef IPPROTO_IPV6
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4957 PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4958 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4959 #ifdef IPPROTO_ROUTING
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4960 PyModule_AddIntConstant(m, "IPPROTO_ROUTING", IPPROTO_ROUTING);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4961 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4962 #ifdef IPPROTO_FRAGMENT
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4963 PyModule_AddIntConstant(m, "IPPROTO_FRAGMENT", IPPROTO_FRAGMENT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4964 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4965 #ifdef IPPROTO_RSVP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4966 PyModule_AddIntConstant(m, "IPPROTO_RSVP", IPPROTO_RSVP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4967 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4968 #ifdef IPPROTO_GRE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4969 PyModule_AddIntConstant(m, "IPPROTO_GRE", IPPROTO_GRE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4970 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4971 #ifdef IPPROTO_ESP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4972 PyModule_AddIntConstant(m, "IPPROTO_ESP", IPPROTO_ESP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4973 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4974 #ifdef IPPROTO_AH
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4975 PyModule_AddIntConstant(m, "IPPROTO_AH", IPPROTO_AH);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4976 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4977 #ifdef IPPROTO_MOBILE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4978 PyModule_AddIntConstant(m, "IPPROTO_MOBILE", IPPROTO_MOBILE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4979 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4980 #ifdef IPPROTO_ICMPV6
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4981 PyModule_AddIntConstant(m, "IPPROTO_ICMPV6", IPPROTO_ICMPV6);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4982 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4983 #ifdef IPPROTO_NONE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4984 PyModule_AddIntConstant(m, "IPPROTO_NONE", IPPROTO_NONE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4985 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4986 #ifdef IPPROTO_DSTOPTS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4987 PyModule_AddIntConstant(m, "IPPROTO_DSTOPTS", IPPROTO_DSTOPTS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4988 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4989 #ifdef IPPROTO_XTP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4990 PyModule_AddIntConstant(m, "IPPROTO_XTP", IPPROTO_XTP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4991 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4992 #ifdef IPPROTO_EON
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4993 PyModule_AddIntConstant(m, "IPPROTO_EON", IPPROTO_EON);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4994 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4995 #ifdef IPPROTO_PIM
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4996 PyModule_AddIntConstant(m, "IPPROTO_PIM", IPPROTO_PIM);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4997 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4998 #ifdef IPPROTO_IPCOMP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	4999 PyModule_AddIntConstant(m, "IPPROTO_IPCOMP", IPPROTO_IPCOMP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5000 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5001 #ifdef IPPROTO_VRRP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5002 PyModule_AddIntConstant(m, "IPPROTO_VRRP", IPPROTO_VRRP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5003 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5004 #ifdef IPPROTO_BIP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5005 PyModule_AddIntConstant(m, "IPPROTO_BIP", IPPROTO_BIP);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	5006 #endif
990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	5007 /**/
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5008 #ifdef IPPROTO_RAW
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5009 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	5010 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5011 PyModule_AddIntConstant(m, "IPPROTO_RAW", 255);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5012 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5013 #ifdef IPPROTO_MAX
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5014 PyModule_AddIntConstant(m, "IPPROTO_MAX", IPPROTO_MAX);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5015 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5016
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5017 /* Some port configuration */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5018 #ifdef IPPORT_RESERVED
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5019 PyModule_AddIntConstant(m, "IPPORT_RESERVED", IPPORT_RESERVED);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	5020 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5021 PyModule_AddIntConstant(m, "IPPORT_RESERVED", 1024);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5022 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5023 #ifdef IPPORT_USERRESERVED
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5024 PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", IPPORT_USERRESERVED);
2299 990099ed7810 add socket related constants Guido van Rossum <guido@python.org> parents: 2123 diff changeset	5025 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5026 PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", 5000);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5027 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5028
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5029 /* Some reserved IP v.4 addresses */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5030 #ifdef INADDR_ANY
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5031 PyModule_AddIntConstant(m, "INADDR_ANY", INADDR_ANY);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	5032 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5033 PyModule_AddIntConstant(m, "INADDR_ANY", 0x00000000);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5034 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5035 #ifdef INADDR_BROADCAST
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5036 PyModule_AddIntConstant(m, "INADDR_BROADCAST", INADDR_BROADCAST);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	5037 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5038 PyModule_AddIntConstant(m, "INADDR_BROADCAST", 0xffffffff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5039 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5040 #ifdef INADDR_LOOPBACK
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5041 PyModule_AddIntConstant(m, "INADDR_LOOPBACK", INADDR_LOOPBACK);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	5042 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5043 PyModule_AddIntConstant(m, "INADDR_LOOPBACK", 0x7F000001);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5044 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5045 #ifdef INADDR_UNSPEC_GROUP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5046 PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	5047 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5048 PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", 0xe0000000);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5049 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5050 #ifdef INADDR_ALLHOSTS_GROUP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5051 PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5052 INADDR_ALLHOSTS_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	5053 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5054 PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP", 0xe0000001);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5055 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5056 #ifdef INADDR_MAX_LOCAL_GROUP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5057 PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5058 INADDR_MAX_LOCAL_GROUP);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	5059 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5060 PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5061 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5062 #ifdef INADDR_NONE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5063 PyModule_AddIntConstant(m, "INADDR_NONE", INADDR_NONE);
2369 ba1b76c09041 add INADDR_* symbols Guido van Rossum <guido@python.org> parents: 2299 diff changeset	5064 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5065 PyModule_AddIntConstant(m, "INADDR_NONE", 0xffffffff);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5066 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5067
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5068 /* IPv4 [gs]etsockopt options */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5069 #ifdef IP_OPTIONS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5070 PyModule_AddIntConstant(m, "IP_OPTIONS", IP_OPTIONS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5071 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5072 #ifdef IP_HDRINCL
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5073 PyModule_AddIntConstant(m, "IP_HDRINCL", IP_HDRINCL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5074 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5075 #ifdef IP_TOS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5076 PyModule_AddIntConstant(m, "IP_TOS", IP_TOS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5077 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5078 #ifdef IP_TTL
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5079 PyModule_AddIntConstant(m, "IP_TTL", IP_TTL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5080 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5081 #ifdef IP_RECVOPTS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5082 PyModule_AddIntConstant(m, "IP_RECVOPTS", IP_RECVOPTS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5083 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5084 #ifdef IP_RECVRETOPTS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5085 PyModule_AddIntConstant(m, "IP_RECVRETOPTS", IP_RECVRETOPTS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5086 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5087 #ifdef IP_RECVDSTADDR
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5088 PyModule_AddIntConstant(m, "IP_RECVDSTADDR", IP_RECVDSTADDR);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5089 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5090 #ifdef IP_RETOPTS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5091 PyModule_AddIntConstant(m, "IP_RETOPTS", IP_RETOPTS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5092 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5093 #ifdef IP_MULTICAST_IF
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5094 PyModule_AddIntConstant(m, "IP_MULTICAST_IF", IP_MULTICAST_IF);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5095 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5096 #ifdef IP_MULTICAST_TTL
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5097 PyModule_AddIntConstant(m, "IP_MULTICAST_TTL", IP_MULTICAST_TTL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5098 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5099 #ifdef IP_MULTICAST_LOOP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5100 PyModule_AddIntConstant(m, "IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5101 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5102 #ifdef IP_ADD_MEMBERSHIP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5103 PyModule_AddIntConstant(m, "IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5104 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5105 #ifdef IP_DROP_MEMBERSHIP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5106 PyModule_AddIntConstant(m, "IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5107 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5108 #ifdef IP_DEFAULT_MULTICAST_TTL
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5109 PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_TTL",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5110 IP_DEFAULT_MULTICAST_TTL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5111 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5112 #ifdef IP_DEFAULT_MULTICAST_LOOP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5113 PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_LOOP",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5114 IP_DEFAULT_MULTICAST_LOOP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5115 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5116 #ifdef IP_MAX_MEMBERSHIPS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5117 PyModule_AddIntConstant(m, "IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5118 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5119
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5120 /* IPv6 [gs]etsockopt options, defined in RFC2553 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5121 #ifdef IPV6_JOIN_GROUP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5122 PyModule_AddIntConstant(m, "IPV6_JOIN_GROUP", IPV6_JOIN_GROUP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5123 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5124 #ifdef IPV6_LEAVE_GROUP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5125 PyModule_AddIntConstant(m, "IPV6_LEAVE_GROUP", IPV6_LEAVE_GROUP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5126 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5127 #ifdef IPV6_MULTICAST_HOPS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5128 PyModule_AddIntConstant(m, "IPV6_MULTICAST_HOPS", IPV6_MULTICAST_HOPS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5129 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5130 #ifdef IPV6_MULTICAST_IF
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5131 PyModule_AddIntConstant(m, "IPV6_MULTICAST_IF", IPV6_MULTICAST_IF);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5132 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5133 #ifdef IPV6_MULTICAST_LOOP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5134 PyModule_AddIntConstant(m, "IPV6_MULTICAST_LOOP", IPV6_MULTICAST_LOOP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5135 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5136 #ifdef IPV6_UNICAST_HOPS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5137 PyModule_AddIntConstant(m, "IPV6_UNICAST_HOPS", IPV6_UNICAST_HOPS);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5138 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5139 /* 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	5140 #ifdef IPV6_V6ONLY
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5141 PyModule_AddIntConstant(m, "IPV6_V6ONLY", IPV6_V6ONLY);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5142 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5143 /* 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	5144 #ifdef IPV6_CHECKSUM
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5145 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	5146 #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	5147 #ifdef IPV6_DONTFRAG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5148 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	5149 #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	5150 #ifdef IPV6_DSTOPTS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5151 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	5152 #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	5153 #ifdef IPV6_HOPLIMIT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5154 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	5155 #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	5156 #ifdef IPV6_HOPOPTS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5157 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	5158 #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	5159 #ifdef IPV6_NEXTHOP
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5160 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	5161 #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	5162 #ifdef IPV6_PATHMTU
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5163 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	5164 #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	5165 #ifdef IPV6_PKTINFO
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5166 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	5167 #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	5168 #ifdef IPV6_RECVDSTOPTS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5169 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	5170 #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	5171 #ifdef IPV6_RECVHOPLIMIT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5172 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	5173 #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	5174 #ifdef IPV6_RECVHOPOPTS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5175 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	5176 #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	5177 #ifdef IPV6_RECVPKTINFO
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5178 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	5179 #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	5180 #ifdef IPV6_RECVRTHDR
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5181 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	5182 #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	5183 #ifdef IPV6_RECVTCLASS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5184 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	5185 #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	5186 #ifdef IPV6_RTHDR
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5187 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	5188 #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	5189 #ifdef IPV6_RTHDRDSTOPTS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5190 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	5191 #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	5192 #ifdef IPV6_RTHDR_TYPE_0
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5193 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	5194 #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	5195 #ifdef IPV6_RECVPATHMTU
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5196 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	5197 #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	5198 #ifdef IPV6_TCLASS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5199 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	5200 #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	5201 #ifdef IPV6_USE_MIN_MTU
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5202 PyModule_AddIntConstant(m, "IPV6_USE_MIN_MTU", IPV6_USE_MIN_MTU);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5203 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5204
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5205 /* TCP options */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5206 #ifdef TCP_NODELAY
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5207 PyModule_AddIntConstant(m, "TCP_NODELAY", TCP_NODELAY);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5208 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5209 #ifdef TCP_MAXSEG
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5210 PyModule_AddIntConstant(m, "TCP_MAXSEG", TCP_MAXSEG);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5211 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5212 #ifdef TCP_CORK
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5213 PyModule_AddIntConstant(m, "TCP_CORK", TCP_CORK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5214 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5215 #ifdef TCP_KEEPIDLE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5216 PyModule_AddIntConstant(m, "TCP_KEEPIDLE", TCP_KEEPIDLE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5217 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5218 #ifdef TCP_KEEPINTVL
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5219 PyModule_AddIntConstant(m, "TCP_KEEPINTVL", TCP_KEEPINTVL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5220 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5221 #ifdef TCP_KEEPCNT
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5222 PyModule_AddIntConstant(m, "TCP_KEEPCNT", TCP_KEEPCNT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5223 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5224 #ifdef TCP_SYNCNT
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5225 PyModule_AddIntConstant(m, "TCP_SYNCNT", TCP_SYNCNT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5226 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5227 #ifdef TCP_LINGER2
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5228 PyModule_AddIntConstant(m, "TCP_LINGER2", TCP_LINGER2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5229 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5230 #ifdef TCP_DEFER_ACCEPT
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5231 PyModule_AddIntConstant(m, "TCP_DEFER_ACCEPT", TCP_DEFER_ACCEPT);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5232 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5233 #ifdef TCP_WINDOW_CLAMP
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5234 PyModule_AddIntConstant(m, "TCP_WINDOW_CLAMP", TCP_WINDOW_CLAMP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5235 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5236 #ifdef TCP_INFO
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5237 PyModule_AddIntConstant(m, "TCP_INFO", TCP_INFO);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5238 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5239 #ifdef TCP_QUICKACK
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5240 PyModule_AddIntConstant(m, "TCP_QUICKACK", TCP_QUICKACK);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5241 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5242
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5243
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5244 /* IPX options */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5245 #ifdef IPX_TYPE
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5246 PyModule_AddIntConstant(m, "IPX_TYPE", IPX_TYPE);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5247 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5248
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5249 /* 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	5250 #ifdef EAI_ADDRFAMILY
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5251 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	5252 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5253 #ifdef EAI_AGAIN
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5254 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	5255 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5256 #ifdef EAI_BADFLAGS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5257 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	5258 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5259 #ifdef EAI_FAIL
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5260 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	5261 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5262 #ifdef EAI_FAMILY
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5263 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	5264 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5265 #ifdef EAI_MEMORY
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5266 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	5267 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5268 #ifdef EAI_NODATA
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5269 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	5270 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5271 #ifdef EAI_NONAME
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5272 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	5273 #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	5274 #ifdef EAI_OVERFLOW
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5275 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	5276 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5277 #ifdef EAI_SERVICE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5278 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	5279 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5280 #ifdef EAI_SOCKTYPE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5281 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	5282 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5283 #ifdef EAI_SYSTEM
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5284 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	5285 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5286 #ifdef EAI_BADHINTS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5287 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	5288 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5289 #ifdef EAI_PROTOCOL
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5290 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	5291 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5292 #ifdef EAI_MAX
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5293 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	5294 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5295 #ifdef AI_PASSIVE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5296 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	5297 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5298 #ifdef AI_CANONNAME
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5299 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	5300 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5301 #ifdef AI_NUMERICHOST
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5302 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	5303 #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	5304 #ifdef AI_NUMERICSERV
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5305 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	5306 #endif
18794 4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5307 #ifdef AI_MASK
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5308 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	5309 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5310 #ifdef AI_ALL
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5311 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	5312 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5313 #ifdef AI_V4MAPPED_CFG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5314 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	5315 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5316 #ifdef AI_ADDRCONFIG
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5317 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	5318 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5319 #ifdef AI_V4MAPPED
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5320 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	5321 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5322 #ifdef AI_DEFAULT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5323 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	5324 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5325 #ifdef NI_MAXHOST
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5326 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	5327 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5328 #ifdef NI_MAXSERV
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5329 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	5330 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5331 #ifdef NI_NOFQDN
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5332 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	5333 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5334 #ifdef NI_NUMERICHOST
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5335 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	5336 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5337 #ifdef NI_NAMEREQD
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5338 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	5339 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5340 #ifdef NI_NUMERICSERV
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5341 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	5342 #endif
4d0ea4c2386d Patch #401196: IPv6 extensions to the socket module. Martin v. Löwis <martin@v.loewis.de> parents: 18790 diff changeset	5343 #ifdef NI_DGRAM
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5344 PyModule_AddIntConstant(m, "NI_DGRAM", NI_DGRAM);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5345 #endif
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5346
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5347 /* shutdown() parameters */
31027 bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	5348 #ifdef SHUT_RD
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5349 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	5350 #elif defined(SD_RECEIVE)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5351 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	5352 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5353 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	5354 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	5355 #ifdef SHUT_WR
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5356 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	5357 #elif defined(SD_SEND)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5358 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	5359 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5360 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	5361 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	5362 #ifdef SHUT_RDWR
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5363 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	5364 #elif defined(SD_BOTH)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5365 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	5366 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5367 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	5368 #endif
bf038986cb8f Patch #849595: Add socket.shutdown() constants. Martin v. Löwis <martin@v.loewis.de> parents: 30978 diff changeset	5369
44474 bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	5370 #ifdef SIO_RCVALL
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5371 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	5372 DWORD codes[] = {SIO_RCVALL, SIO_KEEPALIVE_VALS};
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	5373 const char *names[] = {"SIO_RCVALL", "SIO_KEEPALIVE_VALS"};
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	5374 int i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	5375 for(i = 0; i<sizeof(codes)/sizeof(*codes); ++i) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	5376 PyObject *tmp;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	5377 tmp = PyLong_FromUnsignedLong(codes[i]);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	5378 if (tmp == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	5379 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	5380 PyModule_AddObject(m, names[i], tmp);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61201 diff changeset	5381 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5382 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5383 PyModule_AddIntConstant(m, "RCVALL_OFF", RCVALL_OFF);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5384 PyModule_AddIntConstant(m, "RCVALL_ON", RCVALL_ON);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5385 PyModule_AddIntConstant(m, "RCVALL_SOCKETLEVELONLY", RCVALL_SOCKETLEVELONLY);
46173 c4ed664a1da1 Repair compilation for Visual Studio 2005. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45854 diff changeset	5386 #ifdef RCVALL_IPLEVEL
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5387 PyModule_AddIntConstant(m, "RCVALL_IPLEVEL", RCVALL_IPLEVEL);
46173 c4ed664a1da1 Repair compilation for Visual Studio 2005. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45854 diff changeset	5388 #endif
c4ed664a1da1 Repair compilation for Visual Studio 2005. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45854 diff changeset	5389 #ifdef RCVALL_MAX
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5390 PyModule_AddIntConstant(m, "RCVALL_MAX", RCVALL_MAX);
46173 c4ed664a1da1 Repair compilation for Visual Studio 2005. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 45854 diff changeset	5391 #endif
44474 bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	5392 #endif /* _MSTCPIP_ */
bfed70277ab3 Added interface to Windows' WSAIoctl and a simple example for a network sniffer. Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	5393
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5394 /* Initialize gethostbyname lock */
29035 e1d5ca8ab7dc [ 731644] & [ 604210 ] Release the GIL around getaddrinfo(), yet protect Just van Rossum <just@letterror.com> parents: 28953 diff changeset	5395 #if defined(USE_GETHOSTBYNAME_LOCK) \|\| defined(USE_GETADDRINFO_LOCK)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5396 netdb_lock = PyThread_allocate_lock();
7942 ee2aaa2f722a Threading speedup patches by Christopher Lindblad <cjl@infoseek.com>. Guido van Rossum <guido@python.org> parents: 6718 diff changeset	5397 #endif
294 8938b3132caa Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5398 }
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	5399
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5400
1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5401 #ifndef HAVE_INET_PTON
43972 a8dd8874ff2d Backport of the PCbuild9 directory from the py3k branch. Christian Heimes <christian@cheimes.de> parents: 43876 diff changeset	5402 #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	5403
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	5404 /* 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	5405 /* 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	5406
23723 2f6f8708e3e9 Whitespace normalization, folding long lines, uniform comment Guido van Rossum <guido@python.org> parents: 23722 diff changeset	5407 int
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5408 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	5409 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5410 if (af == AF_INET) {
57037 c78a00a1d6db Merged revisions 69519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 56109 diff changeset	5411 #if (SIZEOF_INT != 4)
c78a00a1d6db Merged revisions 69519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 56109 diff changeset	5412 #error "Not sure if in_addr_t exists and int is not 32-bits."
c78a00a1d6db Merged revisions 69519 via svnmerge from Gregory P. Smith <greg@mad-scientist.com> parents: 56109 diff changeset	5413 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5414 unsigned int packed_addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5415 packed_addr = inet_addr(src);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5416 if (packed_addr == INADDR_NONE)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5417 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5418 memcpy(dst, &packed_addr, 4);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5419 return 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5420 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5421 /* Should set errno to EAFNOSUPPORT */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5422 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	5423 }
6b0a8157be3b Emulate inet_{pton,ntop} on systems that don't provide it. Martin v. Löwis <martin@v.loewis.de> parents: 18253 diff changeset	5424
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	5425 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	5426 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	5427 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5428 if (af == AF_INET) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5429 struct in_addr packed_addr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5430 if (size < 16)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5431 /* Should set errno to ENOSPC. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5432 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5433 memcpy(&packed_addr, src, sizeof(packed_addr));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5434 return strncpy(dst, inet_ntoa(packed_addr), size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5435 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5436 /* Should set errno to EAFNOSUPPORT */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61084 diff changeset	5437 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	5438 }
23725 1235a95fedcd Major cleanup. Renamed static methods to avoid Py prefix. Other misc Guido van Rossum <guido@python.org> parents: 23723 diff changeset	5439
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	5440 #endif
43972 a8dd8874ff2d Backport of the PCbuild9 directory from the py3k branch. Christian Heimes <christian@cheimes.de> parents: 43876 diff changeset	5441 #endif

Mercurial > cpython-lru_cache-weakref

annotate Modules/socketmodule.c @ 68256:b36cb4602e21 2.7